From 0c4e7ea6e347db2f2749bf9446ac0ed215bdecd5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 14 四月 2025 13:33:02 +0800
Subject: [PATCH] 修改审签工作流

---
 src/views/flowable/workflow/FlowCompleted.vue |   69 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e83eee4..78c8c5b 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -48,6 +48,11 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+        <span slot="description" slot-scope="text">
+          <j-ellipsis :value="text" :length="25" />
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -75,7 +80,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>
@@ -86,18 +95,22 @@
 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,
+    InspectionOrderXq,
+    DispatchFileXq,
+    AssignFileStreamXq: AssignFileStreamXq,
     JDictSelectTag,
   },
   data () {
     return {
-      description: '璁惧鐗规畩瀛楃绠＄悊椤甸潰',
+      description: '宸ヤ綔娴�-宸插姙',
       // 琛ㄥご
       columns: [
         {
@@ -123,10 +136,11 @@
           width: 200,
         },
         {
-          title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
-          align: "center",
+          title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
+          align:"center",
           dataIndex: 'description',
-          width:300
+          width:300,
+          scopedSlots: {customRender: 'description'},
         },
         {
           title: '娴佺▼鍙戣捣浜哄悕绉�',
@@ -143,7 +157,7 @@
         {
           title: '鎿嶄綔鏃堕棿',
           align: "center",
-          dataIndex: 'createTime',
+          dataIndex: 'finishTime',
           width:300
         },
         {
@@ -156,10 +170,12 @@
         }
       ],
       url: {
-        list: "/nc/assign/flow/finishedList",
+        list: "/assign/flow/finishedList",
       },
       dictOptions:{},
       selectShenpiData: {},
+      selectDispatchFileXqData:{},
+      selectInspectionOrderXqData:{}
     }
   },
   created() {
@@ -174,14 +190,20 @@
       console.log('鐐瑰嚮浜嗚鎯�')
       console.log('item----->', item)
       console.log('index----->', index)
-      let approcesstype = this.splitAprocessType(item.description)
+      let approcesstype = this.splitAprocessType(item.category)
       console.log('approcesstype--->', approcesstype)
       switch (approcesstype) {
-        case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
+        case 'drApproval':
           this.handDrDetial(item)
           break
+        case 'ggApproval':
+          this.handDispatchFileDetial(item)
+          break
+        case 'sbdjApproval':
+          this.handInspectionOrder(item)
+          break
         default:
-          alert('娌℃壘鍒拌瀹℃壒')
+          alert('娌℃壘鍒拌娴佺▼')
       }
     },
     splitAprocessType(title) {
@@ -191,9 +213,32 @@
     },
     handDrDetial(item) {
       this.selectShenpiData = item
+      this.selectShenpiData.assignee_dictText=item.todoUsers_dictText
+      this.selectShenpiData.procInstId=item.procInsId
+      this.selectShenpiData.title=item.description
       this.$refs.modalFormApproval.clearTableSource()
       this.$refs.modalFormApproval.getAllApproveData(item)
     },
+    handDispatchFileDetial(item){
+      console.log('item----->', item)
+      this.selectDispatchFileXqData = item
+      this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+      this.selectDispatchFileXqData.procInstId=item.procInsId
+      this.selectDispatchFileXqData.processInstanceId=item.procInsId
+      this.selectDispatchFileXqData.title=item.description
+      this.$refs.modalFormDispatchFileXq.clearTableSource()
+      this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+    },
+    handInspectionOrder(item) {
+      console.log('item----->', item)
+      this.selectInspectionOrderXqData = item
+      this.selectInspectionOrderXqData.assignee_dictText=item.todoUsers_dictText
+      this.selectInspectionOrderXqData.procInstId=item.procInsId
+      this.selectInspectionOrderXqData.processInstanceId=item.procInsId
+      this.selectInspectionOrderXqData.title=item.description
+      this.$refs.modalFormInspectionOrderXq.clearTableSource()
+      this.$refs.modalFormInspectionOrderXq.getAllApproveData(item)
+    }
   }
 }
 </script>

--
Gitblit v1.9.3