From 15e22fc7a5b6ee006ff88e0eb0d1bd36f14d683f Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 01 四月 2025 15:21:28 +0800 Subject: [PATCH] 修改审签工作流 --- src/views/flowable/workflow/FlowLedger.vue | 47 +++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue index f483a9a..2974c83 100644 --- a/src/views/flowable/workflow/FlowLedger.vue +++ b/src/views/flowable/workflow/FlowLedger.vue @@ -87,8 +87,9 @@ </a-table> </div> - <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq> + <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq> + <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq> </a-card> </template> @@ -98,13 +99,15 @@ 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' export default { name: 'NcDeviceCharactersList', mixins:[JeecgListMixin, mixinDevice], components: { - FlowXq, + DispatchFileXq, + AssignFileStreamXq: AssignFileStreamXq, JDictSelectTag, }, data () { @@ -116,7 +119,6 @@ title: '搴忓彿', dataIndex: '', key:'rowIndex', - width:200, align:"center", customRender:function (t,r,index) { return parseInt(index)+1; @@ -144,17 +146,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 +166,12 @@ dataIndex: 'endTime' }, { - title:'浠诲姟浜�', + title:'澶勭悊鏃堕暱', + align:"center", + dataIndex: 'duration' + }, + { + title:'褰撳墠浠诲姟浜�', align:"center", dataIndex: 'todoUsers_dictText' }, @@ -188,10 +190,11 @@ } ], url: { - list: "nc/assign/flow/list", + list: "/assign/flow/list", }, dictOptions:{}, selectShenpiData: {}, + selectDispatchFileXqData:{} } }, created() { @@ -206,12 +209,16 @@ console.log('鐐瑰嚮浜嗚鎯�') console.log('item----->', item) console.log('index----->', index) - let approcesstype = this.splitAprocessType(item.title) + let approcesstype = this.splitAprocessType(item.category_dictText) console.log('approcesstype--->', approcesstype) switch (approcesstype) { case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�': item.description=item.title this.handDrDetial(item) + break + case 'NC绋嬪簭绛炬淳': + item.description=item.title + this.handDispatchFileDetial(item) break default: alert('娌℃壘鍒拌瀹℃壒') @@ -227,6 +234,14 @@ 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) + } } } </script> -- Gitblit v1.9.3