From 306d8c35a1a160f6f500a0ebaa475ba9e043567f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 17 Dec 2024 15:05:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC=E6=9C=AA=E6=94=B9=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/leave/leaveEdit.vue | 4 ++++ src/views/workflow/processInstance/index.vue | 4 +++- src/views/workflow/task/allTaskWaiting.vue | 6 +++--- src/views/workflow/task/myDocument.vue | 4 +++- src/views/workflow/task/taskCopyList.vue | 4 +++- src/views/workflow/task/taskFinish.vue | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 8b438ef..2892634 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -107,6 +107,10 @@ const flowCodeOptions = [ { value: 'leave4', label: '请假申请-会签' + }, + { + value: 'leave5', + label: '请假申请-并行会签网关' } ]; diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 83d8c41..53dc06c 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -371,7 +371,9 @@ const handleView = (row) => { const routerJumpVo = reactive({ businessKey: row.businessId, taskId: row.id, - type: 'view' + type: 'view', + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue index c54e435..37010c8 100644 --- a/src/views/workflow/task/allTaskWaiting.vue +++ b/src/views/workflow/task/allTaskWaiting.vue @@ -231,11 +231,11 @@ const submitCallback = async (data) => { /** 查看按钮操作 */ const handleView = (row) => { const routerJumpVo = reactive({ - wfDefinitionConfigVo: row.wfDefinitionConfigVo, - wfNodeConfigVo: row.wfNodeConfigVo, businessKey: row.businessId, taskId: row.id, - type: 'view' + type: 'view', + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index ecc9c8a..3bba408 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -245,7 +245,9 @@ const handleOpen = async (row, type) => { const routerJumpVo = reactive({ businessKey: row.businessId, taskId: row.id, - type: type + type: type, + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 77e9b4c..5e1b346 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -122,7 +122,9 @@ const handleView = (row) => { const routerJumpVo = reactive({ businessKey: row.businessId, taskId: row.id, - type: 'view' + type: 'view', + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index 29f6c36..f66dbba 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -154,7 +154,9 @@ const handleView = (row: FlowTaskVO) => { const routerJumpVo = reactive({ businessKey: row.businessId, taskId: row.id, - type: 'view' + type: 'view', + formCustom: row.formCustom, + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); };