From 53c269711fcb59f48fd2acd7e825bebfd31d09e5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 四月 2025 16:33:10 +0800
Subject: [PATCH] 点检工单修改，修改指派设备问题

---
 src/views/flowable/workflow/FlowLedger.vue |   68 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index f483a9a..20eed95 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -87,8 +87,11 @@
       </a-table>
     </div>
 
-    <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq>
+    <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
 
+    <DispatchFileXq ref="modalFormDispatchFileXq"  :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
+
+    <InspectionOrderXq ref="modalFormInspectionOrderXq"  :selectShenpiData="selectInspectionOrderXqData"></InspectionOrderXq>
   </a-card>
 </template>
 
@@ -98,14 +101,18 @@
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
-import FlowXq from '@views/flowable/workflow/FlowXq.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
+import InspectionOrderXq from '@views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue'
 
 export default {
   name: 'NcDeviceCharactersList',
   mixins:[JeecgListMixin, mixinDevice],
   components: {
-    FlowXq,
+    DispatchFileXq,
+    AssignFileStreamXq: AssignFileStreamXq,
     JDictSelectTag,
+    InspectionOrderXq
   },
   data () {
     return {
@@ -116,7 +123,6 @@
           title: '搴忓彿',
           dataIndex: '',
           key:'rowIndex',
-          width:200,
           align:"center",
           customRender:function (t,r,index) {
             return parseInt(index)+1;
@@ -144,17 +150,12 @@
           dataIndex: 'proposer_dictText'
         },
         {
-          title:'娴佺▼鐘舵�佽鏄�',
-          align:"center",
-          dataIndex: 'actStatus'
+          title: '鍓嶉┍鑺傜偣',
+          align: "center",
+          dataIndex: 'preNode',
         },
         {
-          title:'褰撳墠鐨勪换鍔d',
-          align:"center",
-          dataIndex: 'taskId'
-        },
-        {
-          title:'褰撳墠鐨勮妭鐐�',
+          title:'褰撳墠鑺傜偣',
           align:"center",
           dataIndex: 'taskName'
         },
@@ -169,7 +170,12 @@
           dataIndex: 'endTime'
         },
         {
-          title:'浠诲姟浜�',
+          title:'澶勭悊鏃堕暱',
+          align:"center",
+          dataIndex: 'duration'
+        },
+        {
+          title:'褰撳墠浠诲姟浜�',
           align:"center",
           dataIndex: 'todoUsers_dictText'
         },
@@ -188,10 +194,12 @@
         }
       ],
       url: {
-        list: "nc/assign/flow/list",
+        list: "/assign/flow/list",
       },
       dictOptions:{},
       selectShenpiData: {},
+      selectDispatchFileXqData:{},
+      selectInspectionOrderXqData:{}
     }
   },
   created() {
@@ -206,15 +214,23 @@
       console.log('鐐瑰嚮浜嗚鎯�')
       console.log('item----->', item)
       console.log('index----->', index)
-      let approcesstype = this.splitAprocessType(item.title)
+      let approcesstype = this.splitAprocessType(item.category)
       console.log('approcesstype--->', approcesstype)
       switch (approcesstype) {
-        case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
+        case 'drApproval':
           item.description=item.title
           this.handDrDetial(item)
           break
+        case 'ggApproval':
+          item.description=item.title
+          this.handDispatchFileDetial(item)
+          break
+        case 'sbdjApproval':
+          item.description=item.title
+          this.handInspectionOrderDetial(item)
+          break
         default:
-          alert('娌℃壘鍒拌瀹℃壒')
+          alert('娌℃壘鍒拌娴佺▼')
       }
     },
     splitAprocessType(title) {
@@ -227,6 +243,22 @@
       this.$refs.modalFormApproval.clearTableSource()
       this.$refs.modalFormApproval.getAllApproveData(item)
     },
+    handDispatchFileDetial(item){
+      this.selectDispatchFileXqData = item
+      this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+      this.selectDispatchFileXqData.createTime=item.startTime
+      this.selectDispatchFileXqData.procInstId=item.processInstanceId
+      this.$refs.modalFormDispatchFileXq.clearTableSource()
+      this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+    },
+    handInspectionOrderDetial(item){
+      this.selectInspectionOrderXqData = item
+      this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
+      this.selectInspectionOrderXqData.createTime=item.startTime
+      this.selectInspectionOrderXqData.procInstId=item.processInstanceId
+      this.$refs.modalFormInspectionOrderXq.clearTableSource()
+      this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
+    }
   }
 }
 </script>

--
Gitblit v1.9.3