From 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 12 六月 2026 09:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

---
 src/views/equipmentManagement/upkeep/index.vue |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index c22ebcc..52ad842 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -63,6 +63,12 @@
             }"
                     @selection-change="handleScheduledSelectionChange"
                     @pagination="changeScheduledPage">
+            <template #isActiveRef="{ row }">
+              <el-tag v-if="row.isActive === 1"
+                      type="success">寮�鍚�</el-tag>
+              <el-tag v-else
+                      type="info">鍏抽棴</el-tag>
+            </template>
             <template #statusRef="{ row }">
               <el-tag v-if="row.status === 1"
                       type="success">鍚敤</el-tag>
@@ -308,7 +314,7 @@
     {
       prop: "frequencyType",
       label: "棰戞",
-      minWidth: 150,
+      minWidth: 50,
       // PIMTable 浣跨敤鐨勬槸 formatData锛岃�屼笉鏄� Element-Plus 鐨� formatter
       formatData: cell =>
         ({
@@ -321,7 +327,7 @@
     {
       prop: "frequencyDetail",
       label: "寮�濮嬫棩鏈熶笌鏃堕棿",
-      minWidth: 150,
+      minWidth: 130,
       // 鍚屾牱鏀圭敤 formatData锛孭IMTable 鍐呴儴浼氭妸鍗曞厓鏍煎�间紶杩涙潵
       formatData: cell => {
         if (typeof cell !== "string") return "";
@@ -342,16 +348,30 @@
         );
       },
     },
+    {
+      prop: "isActive",
+      label: "瀹氭椂浠诲姟",
+      dataType: "slot",
+      slot: "isActiveRef",
+      align: "center",
+      minWidth: 100,
+    },
     { prop: "maintenancePerson", label: "淇濆吇浜�", minWidth: 100 },
     { prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
-    { prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
+    {
+      prop: "registrationDate",
+      label: "鐧昏鏃ユ湡",
+      minWidth: 100,
+      formatData: cell =>
+        cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
+    },
     {
       fixed: "right",
       label: "鎿嶄綔",
       dataType: "slot",
       slot: "operation",
       align: "center",
-      width: "200px",
+      width: "150px",
     },
   ]);
 
@@ -371,7 +391,9 @@
       label: "璁″垝淇濆吇鏃ユ湡",
       align: "center",
       prop: "maintenancePlanTime",
-      formatData: cell => dayjs(cell).format("YYYY-MM-DD"),
+      formatData: cell => {
+        return cell == null ? "-" : dayjs(cell).format("YYYY-MM-DD");
+      },
     },
     {
       label: "褰曞叆浜�",
@@ -401,7 +423,7 @@
       align: "center",
       prop: "maintenanceActuallyTime",
       formatData: cell =>
-        cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : "-",
+        cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
     },
     {
       label: "淇濆吇缁撴灉",

--
Gitblit v1.9.3