From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/base/EamMaintenanceStandardList.vue |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index e1e7223..a3af2bd 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -117,12 +117,19 @@
               </a-popconfirm>
           </template>
 
-          <template v-if="record.standardStatus != 'WAIT_SUBMIT'">
+          <template v-if="record.standardStatus !== 'WAIT_SUBMIT'">
             <a-divider v-has="'standard:delete'" type="vertical" v-if="record.standardStatus=='START'"/>
 
           <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
             <a v-has="'standard:delete'" @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
           </a-popconfirm>
+          </template>
+
+          <template
+            v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
+            <a-divider type="vertical"/>
+
+            <a @click.stop="handleDetail(record)">璇︽儏</a>
           </template>
         </span>
       </a-table>
@@ -160,6 +167,9 @@
 
     <!-- 琛ㄥ崟鍖哄煙 -->
     <eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/>
+
+    <!--瀹℃壒绐楀彛-->
+    <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
   </a-card>
 </template>
 
@@ -170,6 +180,8 @@
   import EamMaintenanceStandardDetailList from '@views/eam/base/modules/EamMaintenanceStandardDetailList'
   import { deleteAction, getAction, templateXlsDownload } from '@api/manage'
   import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
+  import MaintenanceStandardApprovalModal
+    from '../../flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal'
 
 
   export default {
@@ -182,6 +194,7 @@
       }
     },
     components: {
+      MaintenanceStandardApprovalModal,
       LxSearchEquipmentSelect,
       EamMaintenanceStandardModal,
       EamMaintenanceStandardDetailList
@@ -190,22 +203,28 @@
       return {
         description: '淇濆吇瑙勮寖椤甸潰',
         disableMixinCreated: true,
+        selectedRowData: {},
         // 琛ㄥご
         columns: [
           {
             title: '缁熶竴缂栫爜',
             align: 'center',
-            dataIndex: 'equipmentCode'
+            dataIndex: 'equipmentCode',
           },
           {
             title: '璁惧鍚嶇О',
             align: 'center',
-            dataIndex: 'equipmentName'
+            dataIndex: 'equipmentName',
           },
           {
             title: '璁惧鍨嬪彿',
             align: 'center',
-            dataIndex: 'equipmentModel'
+            dataIndex: 'equipmentModel',
+          },
+          {
+            title: '瑙勮寖鐘舵��',
+            align: 'center',
+            dataIndex: 'standardStatus_dictText',
           },
           {
             title: '淇濆吇鍒嗙被',
@@ -228,30 +247,21 @@
             title: '淇濆吇鍛ㄦ湡',
             align: 'center',
             dataIndex: 'maintenancePeriod',
-            width: 100
           },
           {
             title: '淇濆吇鍛ㄦ湡鍗曚綅',
             align: 'center',
             dataIndex: 'periodUnit',
-            width: 120
           },
           {
             title: '鍒濆鏃ユ湡',
             align: 'center',
             dataIndex: 'initialDate',
-            width: 100
-          },
-          {
-            title: '瑙勮寖鐘舵��',
-            align: 'center',
-            dataIndex: 'standardStatus_dictText'
           },
           {
             title: '瑙勮寖鐗堟湰',
             align: 'center',
             dataIndex: 'standardVersion',
-            width: 100
           }
         ],
         url: {
@@ -357,13 +367,28 @@
           })
       },
 
+      /**
+       * 鐐瑰嚮鍗囩増鏃惰Е鍙戞椂瑙﹀彂
+       * @param record
+       */
       handleUpgrade(record) {
-        //鍗囩増
         this.$refs.modalForm.upgrade(record)
         this.$refs.modalForm.title = '鍗囩増'
         this.$refs.modalForm.disableSubmit = false
       },
 
+      /**
+       * 鐐瑰嚮璇︽儏鏃惰Е鍙戞椂瑙﹀彂
+       * @param record
+       */
+      handleDetail(record) {
+        this.selectedRowData = Object.assign({}, record)
+        this.$refs.maintenanceStandardApprovalModal.title = '璇︽儏'
+        this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
+        this.$refs.maintenanceStandardApprovalModal.visible = true
+        this.$refs.maintenanceStandardApprovalModal.handleDetail(record)
+      },
+
       batchDel() {
         var ids = ''
         for (var a = 0; a < this.selectedRowKeys.length; a++) {

--
Gitblit v1.9.3