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/DailyMaintenanceOrderList.vue |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 9b77df9..3d0edaf 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鏃ュ父淇濆吇宸ュ崟"
+    title="浜岀骇淇濆吇"
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
@@ -142,11 +142,11 @@
           slot-scope="text, record"
         >
           <a-popconfirm
-            title="纭畾涓嬪彂宸ュ崟鍚�?"
+            title="纭畾鎺ユ敹宸ュ崟鍚�?"
             @confirm="() => handleOrderIssue(record)"
             v-has="'dailyMaintenanceOrder:issue'"
           >
-            <a v-if="record.status == '1'">涓嬪彂</a>
+            <a v-if="record.status == '1'">鎺ユ敹</a>
           </a-popconfirm>
           <a-divider
             v-if="record.status == '1'"
@@ -233,11 +233,11 @@
             type="vertical"
           />
           <a
-            v-if="record.status === '5'"
+            v-if="record.status === '5' || record.status === '8'"
             @click="handleFinish(record)"
-          >纭</a>
+          >瀹屽伐绉讳氦鍗�</a>
           <a-divider
-            v-if="record.status === '5'"
+            v-if="record.status === '5' || record.status === '8'"
             type="vertical"
           />
           <a-dropdown>
@@ -315,7 +315,8 @@
   },
   data() {
     return {
-      description: '鏃ュ父淇濆吇宸ュ崟',
+      description: '浜岀骇淇濆吇宸ュ崟',
+      queryParam: { maintenanceType: '2' },
       // 琛ㄥご
       columns: [
         {
@@ -329,16 +330,21 @@
           }
         },
         {
-          title: '鐘舵��',
-          align: "center",
-          dataIndex: 'statusName'
-        },
-        {
           title: '淇濆吇宸ュ崟鍙�',
           align: "center",
           dataIndex: 'num',
           scopedSlots: { customRender: 'num' }
         },
+        {
+          title: '鐘舵��',
+          align: "center",
+          dataIndex: 'statusName'
+        },
+        // {
+        //   title: '淇濆吇绫诲瀷',
+        //   align: "center",
+        //   dataIndex: 'maintenanceTypeName',
+        // },
         {
           title: '淇濆吇鍛ㄦ湡',
           align: "center",
@@ -350,7 +356,7 @@
           dataIndex: 'assignModeName'
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'equipmentNum',
         },
@@ -491,13 +497,13 @@
     },
 
     handlePrintInfo(record) {
-      let href = `${window._CONFIG['domianURL']}/jmreport/view/857408393168490496?id=`+record.id; //缃戠珯閾炬帴
+      let href = `${window._CONFIG['domianURL']}/jmreport/view/857408393168490496?id=` + record.id; //缃戠珯閾炬帴
       window.open(href, "_blank");
     },
 
     handleOrderExe(record) {
       this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
-      this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+      this.$refs.DailyMaintenanceOrderExeDrawer.title = '浜岀骇淇濆吇宸ュ崟鎵ц'
       this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
       if (record.status === '3') {
         this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
@@ -590,6 +596,11 @@
       this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳'
       this.$refs.MaintenanceOrderAssignModal.disableSubmit = false
     },
+
+    searchReset() {
+      this.queryParam = { maintenanceType: '2' }
+      this.loadData(1);
+    },
     // modalFormOk() {
     //   alert(0)
     //   // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
@@ -627,7 +638,7 @@
   font-weight: bold;
 }
 .yellow {
-  color: yellow;
+  color: rgba(255, 255, 0, 0.443);
   font-weight: bold;
 }
 .fontweight {

--
Gitblit v1.9.3