From eecd51db2f0e1094650206fa534dd02f5de58c9c Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 18 五月 2026 10:22:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/equipmentManagement/upkeep/index.vue |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 0ee99eb..6bdbc8f 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -300,6 +300,12 @@
       prop: "deviceModel",
     },
     {
+      label: "淇濆吇椤圭洰",
+      prop: "machineryCategory",
+      minWidth: 120,
+      formatData: cell => cell || "--",
+    },
+    {
       prop: "frequencyType",
       label: "棰戞",
       minWidth: 150,
@@ -336,6 +342,7 @@
         );
       },
     },
+    { prop: "maintenancePerson", label: "淇濆吇浜�", minWidth: 100 },
     { prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
     { prop: "registrationDate", label: "鐧昏鏃ユ湡", minWidth: 100 },
     {
@@ -372,9 +379,10 @@
       prop: "createUserName",
     },
     {
-      label: "椤圭洰",
+      label: "淇濆吇椤圭洰",
       align: "center",
       prop: "machineryCategory",
+      formatData: cell => cell || "--",
     },
     // {
     //   label: "褰曞叆鏃ユ湡",

--
Gitblit v1.9.3