From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index a5c51b5..d72624a 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -424,21 +424,26 @@
           },
           width: 50,
         },
+        // {
+        //   title: '閮ㄤ綅',
+        //   align: 'center',
+        //   dataIndex: 'location'
+        // },
         {
-          title: '閮ㄤ綅',
+          title: '淇濆吇瑙掕壊',
           align: 'center',
-          dataIndex: 'location'
+          dataIndex: 'maintenanceRole'
         },
         {
-          title: '淇濆吇椤圭洰',
+          title: '淇濆吇鍐呭',
           align: 'center',
           dataIndex: 'maintenanceProjectName'
         },
-        {
-          title: '淇濆吇鏍囧噯',
-          align: 'center',
-          dataIndex: 'standard'
-        },
+        // {
+        //   title: '淇濆吇鏍囧噯',
+        //   align: 'center',
+        //   dataIndex: 'standard'
+        // },
         // {
         //   title: '鏂规硶',
         //   align: 'center',
@@ -641,7 +646,7 @@
       //   return
       // }
       this.$refs.DailyMaintenanceStandardList.list(data.useId);
-      this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨鏃ュ父淇濆吇鏍囧噯";
+      this.$refs.DailyMaintenanceStandardList.title = "閫夋嫨浜岀骇淇濆吇鏍囧噯";
     },
     sendMaintenanceStandardRecord(data) {
       let record = data.record;

--
Gitblit v1.9.3