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/FlowTodo.vue | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue index 83bc4b1..8db64e3 100644 --- a/src/views/flowable/workflow/FlowTodo.vue +++ b/src/views/flowable/workflow/FlowTodo.vue @@ -89,7 +89,9 @@ </a-table> </div> - <FlowNcZpi ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowNcZpi> + <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle> + <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData" @searchReset="searchReset"></DispatchFileHandle> + </a-card> </template> @@ -99,16 +101,15 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' -import store from '@/store' -import { getAction } from '@api/manage' -import FlowNcZpi from '@views/flowable/workflow/FlowNcZpi.vue' - +import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue' +import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue' export default { name: 'NcDeviceCharactersList', mixins:[JeecgListMixin, mixinDevice], components: { - FlowNcZpi, + AssignFileStreamHandle, JDictSelectTag, + DispatchFileHandle }, data () { return { @@ -146,13 +147,13 @@ { title: '涓婁竴姝ュ鐞嗕汉', align: "center", - dataIndex: 'variables.INITIATOR', + dataIndex: 'preNodeAssignee_dictText', width:200 }, { - title: '涓婁竴姝ヨ妭鐐�', + title: '鍓嶉┍鑺傜偣', align: "center", - dataIndex: 'actStatus', + dataIndex: 'preNode', width:200 }, { @@ -177,10 +178,11 @@ } ], url: { - list: '/nc/assign/flow/toTaskBySelf', + list: '/assign/flow/toTaskBySelf', }, dictOptions:{}, selectShenpiData: {}, + selectDispatchFileXqData:{} } }, created() { @@ -195,11 +197,14 @@ 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鏂囨。鍒拌澶囨祦绋�': this.handDrDetial(item) + break + case 'NC绋嬪簭绛炬淳': + this.handDispatchFileDetial(item) break default: alert('娌℃壘鍒拌瀹℃壒') @@ -215,6 +220,16 @@ this.$refs.modalFormApproval.clearTableSource() this.$refs.modalFormApproval.getAllApproveData(item) }, + searchReset() { + this.queryParam = {} + this.loadData(1); + }, + handDispatchFileDetial(item){ + console.log('item----->', item) + this.selectDispatchFileXqData = item + this.$refs.modalFormDispatchFileXq.clearTableSource() + this.$refs.modalFormDispatchFileXq.getAllApproveData(item) + } } } </script> -- Gitblit v1.9.3