From a4674a75bfffc500a049beafb74daaec50c8f87f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 17 七月 2025 17:46:06 +0800
Subject: [PATCH] 三保工单审批流程

---
 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue |  120 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index 00e0647..215c2a4 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -47,38 +47,24 @@
              @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>
+          <a @click="handleDetail(record)">璇︽儏</a>
+
+          <template v-if="record.maintenanceStatus === 'COMPLETE'">
+          <a-divider type="vertical"/>
+
+          <a @click="handlePrint(record)">鎵撳嵃</a>
           </template>
-
-          <a-divider v-if="record.maintenanceStatus === 'COMPLETE'" type="vertical"/>
-
-          <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
         </span>
     </a-table>
     <!-- table鍖哄煙-end -->
@@ -175,9 +161,9 @@
             dataIndex: 'actualEndTime'
           },
           {
-            title: '淇濆吇浜�',
+            title: '缁翠慨浜�',
             align: 'center',
-            dataIndex: 'operator_dictText'
+            dataIndex: 'repairman_dictText'
           },
           {
             title: '淇濆吇鐘舵��',
@@ -190,32 +176,90 @@
             dataIndex: 'creationMethod_dictText'
           },
           {
-            title: '鏈哄姩鍔炵‘璁�',
+            title: '璁惧鍔熻兘鏄惁榻愬',
             align: 'center',
-            dataIndex: 'confirmUser_dictText'
+            dataIndex: 'fullyFunctional_dictText'
           },
           {
-            title: '鏈哄姩鍔炵‘璁ゆ椂闂�',
+            title: '璁惧鑳藉惁姝e父杩愯浆',
             align: 'center',
-            dataIndex: 'confirmTime'
+            dataIndex: 'runningNormally_dictText'
           },
           {
-            title: '纭棰嗗',
+            title: '妫�鏌ヤ汉',
             align: 'center',
-            dataIndex: 'confirmLeader_dictText'
+            dataIndex: 'inspector_dictText'
           },
           {
-            title: '棰嗗纭鏃堕棿',
+            title: '妫�鏌ユ椂闂�',
             align: 'center',
-            dataIndex: 'leaderConfirmTime'
+            dataIndex: 'inspectTime'
+          },
+          {
+            title: '鎿嶄綔浜虹瀛�',
+            align: 'center',
+            dataIndex: 'operatorSignature_dictText'
+          },
+          {
+            title: '鍗忓姪鎿嶄綔浜�',
+            align: 'center',
+            dataIndex: 'assistantOperator'
+          },
+          {
+            title: '鎿嶄綔浜虹瀛楁椂闂�',
+            align: 'center',
+            dataIndex: 'operatorSignatureTime'
+          },
+          {
+            title: '缁翠慨浜虹瀛�',
+            align: 'center',
+            dataIndex: 'repairmanSignature_dictText'
+          },
+          {
+            title: '鍗忓姪缁翠慨浜�',
+            align: 'center',
+            dataIndex: 'assistantRepairman'
+          },
+          {
+            title: '缁翠慨浜虹瀛楁椂闂�',
+            align: 'center',
+            dataIndex: 'repairmanSignatureTime'
+          },
+          {
+            title: '缁翠慨瀹や富浠荤瀛�',
+            align: 'center',
+            dataIndex: 'repairManagerSignature_dictText'
+          },
+          {
+            title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
+            align: 'center',
+            dataIndex: 'repairManagerSignatureTime'
+          },
+          {
+            title: '璁惧妫�鏌ヤ汉绛惧瓧',
+            align: 'center',
+            dataIndex: 'inspectorSignature_dictText'
+          },
+          {
+            title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
+            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'
         }
       }
     },
@@ -228,7 +272,6 @@
         dataIndex: 'action',
         align: 'center',
         fixed: 'right',
-        width: 200,
         scopedSlots: { customRender: 'action' }
       }
       this.columns = [...this.columns, operationColumn]
@@ -292,9 +335,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