From 39f1b58ed87d5b05bde112762c51d384471ae1b5 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 13 十一月 2023 10:42:08 +0800
Subject: [PATCH] 1、优化首页布局 2、班次班制管理页面表格数据新增增加表单项验证 3、班次班制管理页面新增班次时如果并未选择开始与结束休息时间，应默认为空，而不是当前时间 4、班次班制管理页面新增或修改班次时如果选择跨天，则时间请求参数会混乱，应与不跨天时保持一致

---
 src/views/eam/DailyMaintenanceOrderList.vue |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 0174fad..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>
@@ -356,7 +356,7 @@
           dataIndex: 'assignModeName'
         },
         {
-          title: '璁惧缂栫爜',
+          title: '缁熶竴缂栫爜',
           align: "center",
           dataIndex: 'equipmentNum',
         },
@@ -503,7 +503,7 @@
 
     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//淇濆瓨銆佹殏瀛樸�佹姤宸�
@@ -596,6 +596,11 @@
       this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳'
       this.$refs.MaintenanceOrderAssignModal.disableSubmit = false
     },
+
+    searchReset() {
+      this.queryParam = { maintenanceType: '2' }
+      this.loadData(1);
+    },
     // modalFormOk() {
     //   alert(0)
     //   // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃

--
Gitblit v1.9.3