From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue |   77 ++++++++++++++++++++------------------
 1 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index 8a321a6..f0ec1cb 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -47,38 +47,30 @@
              @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
-            <a @click="handleEdit(record)">缂栬緫</a>
-
-            <a-divider type="vertical"/>
-
             <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
               <a>棰嗗彇</a>
             </a-popconfirm>
 
             <a-divider type="vertical"/>
 
-            <a-dropdown>
-              <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handlerAbolish(record.id)">
-                    <a>浣滃簾</a>
-                  </a-popconfirm>
-                </a-menu-item>
-                <a-menu-item>
-                  <a @click="handleDetail(record)">璇︽儏</a>
-                </a-menu-item>
-              </a-menu>
-            </a-dropdown>
+            <a @click="handlerAbolish(record.id)">浣滃簾</a>
+
+            <a-divider type="vertical"/>
           </template>
 
-          <template v-else>
-            <a @click="handleDetail(record)">璇︽儏</a>
+          <template v-if="record.maintenanceStatus == 'WAIT_MAINTENANCE'||record.maintenanceStatus=='FREEZE'">
+             <a @click="handleOrderChange(record)">鍙樻洿</a>
+
+             <a-divider type="vertical"/>
           </template>
 
-          <a-divider v-if="record.maintenanceStatus === 'COMPLETE'" type="vertical"/>
+          <a @click="handleDetail(record)">璇︽儏</a>
 
-          <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
+          <template v-if="record.maintenanceStatus === 'COMPLETE'">
+          <a-divider type="vertical"/>
+
+          <a @click="handlePrint(record)">鎵撳嵃</a>
+          </template>
         </span>
     </a-table>
     <!-- table鍖哄煙-end -->
@@ -88,6 +80,9 @@
 
     <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
                                       :selectShenpiData="selectThirdMaintenanceData"/>
+
+    <!--宸ュ崟鍙樻洿寮圭獥-->
+    <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
   </a-card>
 </template>
 
@@ -98,11 +93,14 @@
   import { deleteAction, getAction } from '@api/manage'
   import ThirdMaintenanceApprovalModal
     from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
+  import EamThirdMaintenanceChangeModal
+    from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
 
   export default {
     name: 'EamThirdMaintenanceOrderList',
     mixins: [JeecgListMixin],
     components: {
+      EamThirdMaintenanceChangeModal,
       LxSearchEquipmentSelect,
       EamThirdMaintenanceOrderModal,
       ThirdMaintenanceApprovalModal
@@ -163,16 +161,6 @@
             title: '璁″垝淇濆吇鏃ユ湡',
             align: 'center',
             dataIndex: 'maintenanceDate'
-          },
-          {
-            title: '閿佸畾宸ュ崟鏃ユ湡',
-            align: 'center',
-            dataIndex: 'freezeOrderDate'
-          },
-          {
-            title: '宸ュ崟杩囨湡鏃ユ湡',
-            align: 'center',
-            dataIndex: 'orderExpirationDate'
           },
           {
             title: '瀹為檯寮�濮嬫椂闂�',
@@ -269,13 +257,21 @@
             align: 'center',
             dataIndex: 'inspectorSignatureTime'
           },
+          {
+            title: '绉讳氦鍗旽F缂栫爜',
+            align: 'center',
+            dataIndex: 'hfCodeA'
+          },
+          {
+            title: '楠屾敹鍗旽F缂栫爜',
+            align: 'center',
+            dataIndex: 'hfCodeB'
+          }
         ],
         url: {
           list: '/eam/thirdMaintenanceOrder/list',
           abolish: '/eam/thirdMaintenanceOrder/abolish',
-          abolishBatch: '/eam/thirdMaintenanceOrder/abolishBatch',
-          collect: '/eam/thirdMaintenanceOrder/collect',
-          collectBatch: '/eam/thirdMaintenanceOrder/collectBatch'
+          collect: '/eam/thirdMaintenanceOrder/collect'
         }
       }
     },
@@ -288,7 +284,6 @@
         dataIndex: 'action',
         align: 'center',
         fixed: 'right',
-        width: 200,
         scopedSlots: { customRender: 'action' }
       }
       this.columns = [...this.columns, operationColumn]
@@ -322,6 +317,15 @@
       },
 
       /**
+       * 鐐瑰嚮鍙樻洿鏃惰Е鍙�
+       * @param record
+       */
+      handleOrderChange(record) {
+        this.$refs.orderChangeModal.title = '鍙樻洿'
+        this.$refs.orderChangeModal.add(record)
+      },
+
+      /**
        * 鐐瑰嚮棰嗗彇鏃惰Е鍙�
        * @param id
        */
@@ -352,9 +356,10 @@
        */
       handleDetail(record) {
         this.selectThirdMaintenanceData = Object.assign({}, record)
-        this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
         this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
+        this.$refs.thirdMaintenanceApprovalModal.visible = true
         this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
+        this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
       },
 
       onMaintenanceDateChange(dateString) {

--
Gitblit v1.9.3