diff --git a/src/api/apps/equipment/record/model/index.ts b/src/api/apps/equipment/record/model/index.ts
index 34ccd68..cc01ef9 100644
--- a/src/api/apps/equipment/record/model/index.ts
+++ b/src/api/apps/equipment/record/model/index.ts
@@ -14,6 +14,8 @@ export interface EquipmentRecord {
createTime?: string;
tenantId?: number;
merchantCode?: string;
+ //使用时间按天算
+ duration?:number;
}
/**
diff --git a/src/views/yunxinwei/order/components/order-info.vue b/src/views/yunxinwei/order/components/order-info.vue
index 5c90fea..ece579f 100644
--- a/src/views/yunxinwei/order/components/order-info.vue
+++ b/src/views/yunxinwei/order/components/order-info.vue
@@ -272,6 +272,11 @@
{{ expirationDay(record) }}
+
+
+ {{ countDuration (record)}}
+
+
@@ -612,7 +617,8 @@ const columns3 = ref([
},
{
title: '使用电池',
- dataIndex: 'use'
+ dataIndex: 'duration',
+ key:'duration'
},
{
title: '操作人',
@@ -765,6 +771,21 @@ const expirationDay = (order) => {
}
};
+const countDuration = (equipmentRecord) =>{//计算使用时间
+ if (equipmentRecord.eventType ==="电池解绑"){
+ if (equipmentRecord.duration !== null){
+ return equipmentRecord.duration+'天'
+ }
+ return '0天'
+ } else {
+ if (equipmentRecord.duration !== null){
+ return equipmentRecord.duration+'天';
+ }else {
+ return '';
+ }
+ }
+}
+
const getFiles = () => {
if (order.orderSourceData != '') {
const array = JSON.parse(order.orderSourceData);