From 0885d828e6f6c8f815d1f66f6f06dad5775b144a Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sun, 18 Aug 2024 20:32:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=8D=A2=E7=94=B5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E4=BD=BF=E7=94=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/apps/equipment/record/model/index.ts  |  2 ++
 .../yunxinwei/order/components/order-info.vue | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

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 @@
             <template v-if="column.key === 'expirationDay'">
               <span class="ele-text-danger">{{ expirationDay(record) }}</span>
             </template>
+
+            <template v-if="column.key === 'duration'">
+              <span class="ele-text-danger">{{ countDuration (record)}}</span>
+            </template>
+
           </template>
         </ele-pro-table>
       </a-spin>
@@ -612,7 +617,8 @@ const columns3 = ref<ColumnItem[]>([
   },
   {
     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(<string>order.orderSourceData);