From 3db6d5c4d17ab9942a5c89a167c1f06ca485f355 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 16 七月 2025 21:21:14 +0800
Subject: [PATCH] 二保工单审批调整

---
 src/views/flowable/workflow/FlowTodo.vue |   63 +++++++++++++++++++------------
 1 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 3270b82..0929294 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -80,7 +80,7 @@
 
       <a-table ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination'
                :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
-               :scroll='{x:getTableColumnsTotalWidth,y:465}' bordered rowKey='id' size='middle'
+               :scroll="{x:'max-content',y:465}" bordered rowKey='id' size='middle'
                @change='handleTableChange'>
         <span slot='action' slot-scope='text, record'>
           <a @click='handelDetail(record,text)'>鎵ц/瀹℃壒</a>
@@ -96,22 +96,35 @@
 
     <technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"
                                                 @modalFormOk="modalFormOk"/>
+
+    <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
+                                       @modalFormOk="modalFormOk"/>
+
+    <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
+                                      @modalFormOk="modalFormOk"/>
   </a-card>
 </template>
 
 <script>
-  import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@api/manage'
   import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal'
   import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
   import TechnicalStatusEvaluationApprovalModal
     from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
+  import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
+  import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
 
   export default {
     name: 'NcDeviceCharactersList',
-    mixins: [JeecgListMixin, mixinDevice],
-    components: { TechnicalStatusEvaluationApprovalModal, InspectionOrderHandle, MaintenanceStandardApprovalModal },
+    mixins: [JeecgListMixin],
+    components: {
+      ThirdMaintenanceApprovalModal,
+      SecondMaintenanceApprovalModal,
+      TechnicalStatusEvaluationApprovalModal,
+      InspectionOrderHandle,
+      MaintenanceStandardApprovalModal
+    },
     data() {
       return {
         description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
@@ -192,9 +205,6 @@
     computed: {
       importExcelUrl: function() {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      },
-      getTableColumnsTotalWidth() {
-        return this.columns.reduce((total, item) => total + item.width, 0)
       }
     },
     methods: {
@@ -249,9 +259,19 @@
        */
       handleTechnicalStatusEvaluation(record) {
         this.selectedRowData = Object.assign({}, record)
-        this.$refs.technicalStatusApprovalModal.visible = true
         this.$refs.technicalStatusApprovalModal.title = record.name
         this.$refs.technicalStatusApprovalModal.handleDetail(record)
+      },
+
+      /**
+       * 鐐瑰嚮浜屼繚娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+       * @param record
+       */
+      handleSecondMaintenance(record) {
+        this.selectedRowData = Object.assign({}, record)
+        this.$refs.secondMaintenanceApprovalModal.visible = true
+        this.$refs.secondMaintenanceApprovalModal.title = record.name
+        this.$refs.secondMaintenanceApprovalModal.handleDetail(record)
       },
 
       /**
@@ -268,6 +288,17 @@
       },
 
       /**
+       * 鐐瑰嚮涓変繚宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+       * @param record
+       */
+      handleThirdMaintenance(record) {
+        this.selectedRowData = Object.assign({}, record)
+        this.$refs.thirdMaintenanceApprovalModal.visible = true
+        this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+        this.$refs.thirdMaintenanceApprovalModal.title = record.name
+      },
+
+      /**
        * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
        * @param record
        */
@@ -277,22 +308,6 @@
         this.$refs.repairOrderApprovalModal.title = record.name
         this.$refs.repairOrderApprovalModal.getAllApproveData(record)
         this.$refs.repairOrderApprovalModal.getBasicInformation(record)
-      },
-      handleSecondMaintenance(item) {
-        if (item && item.dataId) {
-          this.selectSecondMaintenanceData = Object.assign({}, item)
-          this.$refs.secondMaintenanceApprovalModal.handleDetail(item)
-          this.$refs.secondMaintenanceApprovalModal.title = item.name
-          this.$refs.secondMaintenanceApprovalModal.disableSubmit = false
-        }
-      },
-      handleThirdMaintenance(item) {
-        if (item && item.dataId) {
-          this.selectThirdMaintenanceData = Object.assign({}, item)
-          this.$refs.thirdMaintenanceApprovalModal.handleDetail(item)
-          this.$refs.thirdMaintenanceApprovalModal.title = item.name
-          this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false
-        }
       },
 
       batchHandle() {

--
Gitblit v1.9.3