From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test

---
 src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
index f1fec14..f1bdb59 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
@@ -152,17 +152,17 @@
           dataIndex: 'standard',
 
         },
-        {
-          title: '鏂规硶',
-          align: "center",
-          dataIndex: 'maintenanceMethodName',
+        // {
+        //   title: '鏂规硶',
+        //   align: "center",
+        //   dataIndex: 'maintenanceMethodName',
 
-        },
-        {
-          title: '宸ュ叿',
-          align: "center",
-          dataIndex: 'maintenanceTool',
-        },
+        // },
+        // {
+        //   title: '宸ュ叿',
+        //   align: "center",
+        //   dataIndex: 'maintenanceTool',
+        // },
         {
           title: '瀹夊叏瑕佹眰',
           align: "center",
@@ -178,10 +178,15 @@
           align: "center",
           dataIndex: 'maintenanceCycleName',
         },
+        // {
+        //   title: '缁翠繚涓撲笟',
+        //   align: "center",
+        //   dataIndex: 'maintenanceSpecialtyName',
+        // },
         {
-          title: '缁翠繚涓撲笟',
+          title: '缁翠慨淇濆吇瑙掕壊',
           align: "center",
-          dataIndex: 'maintenanceSpecialtyName',
+          dataIndex: 'maintenanceRoleName',
         },
 
       ],

--
Gitblit v1.9.3