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

---
 src/views/flowable/workflow/FlowTodo.vue |  105 ++++++++++++++++++++++++++--------------------------
 1 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 3270b82..e42673d 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -11,36 +11,26 @@
         <a-row :gutter='24'>
           <a-col :lg='6' :md='8' :sm='24' :xl='4'>
             <a-form-item label='娴佺▼鍒嗙被'>
-              <j-dict-select-tag
-                v-model='queryParam.category'
-                dictCode='flow_type'
-                placeholder='璇烽�夋嫨娴佺▼鍒嗙被'
-              ></j-dict-select-tag>
+              <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type' placeholder='璇烽�夋嫨娴佺▼鍒嗙被'/>
             </a-form-item>
           </a-col>
           <a-col :lg='6' :md='8' :sm='24' :xl='4'>
             <a-form-item label='褰撳墠鑺傜偣'>
-              <a-input
-                v-model='queryParam.name'
-                placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'
-              ></a-input>
+              <a-input v-model='queryParam.name' placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'/>
             </a-form-item>
           </a-col>
           <a-col :lg='6' :md='8' :sm='24' :xl='4'>
             <a-form-item label='绠�瑕佹弿杩�'>
-              <a-input
-                v-model='queryParam.title'
-                placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'
-              ></a-input>
+              <a-input v-model='queryParam.title' placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'/>
             </a-form-item>
           </a-col>
           <a-col :lg='8' :md='12' :sm='24' :xl='8'>
             <a-form-item label='浠诲姟鏃堕棿鑼冨洿'>
               <j-date v-model='queryParam.startTime' :show-time='false' class='query-group-cust'
-                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨寮�濮嬫椂闂�'></j-date>
+                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨寮�濮嬫椂闂�'/>
               <span class='query-group-split-cust'></span>
               <j-date v-model='queryParam.endTime' :show-time='false' class='query-group-cust'
-                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨缁撴潫鏃堕棿'></j-date>
+                      date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨缁撴潫鏃堕棿'/>
             </a-form-item>
           </a-col>
 
@@ -80,7 +70,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'}" bordered rowKey='id' size='middle'
                @change='handleTableChange'>
         <span slot='action' slot-scope='text, record'>
           <a @click='handelDetail(record,text)'>鎵ц/瀹℃壒</a>
@@ -96,22 +86,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 },
+    name: 'FlowTodo',
+    mixins: [JeecgListMixin],
+    components: {
+      ThirdMaintenanceApprovalModal,
+      SecondMaintenanceApprovalModal,
+      TechnicalStatusEvaluationApprovalModal,
+      InspectionOrderHandle,
+      MaintenanceStandardApprovalModal
+    },
     data() {
       return {
         description: '宸ヤ綔娴�-鎴戠殑寰呭姙',
@@ -131,7 +134,7 @@
             title: '娴佺▼鍒嗙被',
             align: 'center',
             dataIndex: 'category_dictText',
-            width: 150
+            width: 200
           },
           {
             title: '娴佺▼鍚嶇О',
@@ -142,8 +145,7 @@
           {
             title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
             align: 'center',
-            dataIndex: 'description',
-            ellipsis: true
+            dataIndex: 'description'
           },
           {
             title: '涓婁竴姝ュ鐞嗕汉',
@@ -167,34 +169,26 @@
             title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
             align: 'center',
             dataIndex: 'createTime',
-            width: 150
+            width: 200
           },
           {
             title: '鎿嶄綔',
             dataIndex: 'action',
+            fixed: 'right',
             scopedSlots: { customRender: 'action' },
             align: 'center',
-            width: 150,
-            fixed: 'right'
+            width: 100
           }
         ],
         url: {
           list: '/assign/flow/toTaskBySelf'
         },
-        selectedRowData: {},
-        selectInspectionOrderData: {},
-        selectWeekMaintenanceData: {},
-        selectSecondMaintenanceData: {},
-        selectThirdMaintenanceData: {},
-        selectRepairOrderData: {}
+        selectedRowData: {}
       }
     },
     computed: {
       importExcelUrl: function() {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-      },
-      getTableColumnsTotalWidth() {
-        return this.columns.reduce((total, item) => total + item.width, 0)
       }
     },
     methods: {
@@ -255,16 +249,37 @@
       },
 
       /**
+       * 鐐瑰嚮浜屼繚娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+       * @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)
+      },
+
+      /**
        * 鐐瑰嚮鐐规宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
        * @param record
        */
       handInspectionOrder(record) {
-        console.log('record----->', record)
         this.selectedRowData = Object.assign({}, record)
         this.$refs.inspectionOrderHandle.visible = true
         this.$refs.inspectionOrderHandle.title = record.name
         this.$refs.inspectionOrderHandle.getAllApproveData(record)
         this.$refs.inspectionOrderHandle.getBasicInformation(record)
+      },
+
+      /**
+       * 鐐瑰嚮涓変繚宸ュ崟娴佺▼鎵ц瀹℃壒鏃惰Е鍙�
+       * @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
       },
 
       /**
@@ -277,22 +292,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() {
@@ -332,4 +331,4 @@
       }
     }
   }
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3