diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue index 6d6e644..b97b8de 100644 --- a/src/components/SecondDev/OpinionDialog.vue +++ b/src/components/SecondDev/OpinionDialog.vue @@ -74,6 +74,7 @@ label: item['F_RealName'] }; }); + formState.assignees = selected; } } if (action === 'reject') { @@ -89,10 +90,15 @@ } function onClickOK() { + const nextTaskUser = {}; + if (_nextNodes.length === 1) { + nextTaskUser[_nextNodes[0].activityId] = formState.assignees.join(','); + } if (_callback && typeof _callback === 'function') { _callback({ opinion: formState.opinion, - rejectNodeId: rejectNodeId.value + rejectNodeId: rejectNodeId.value, + nextTaskUser }); } isOpen.value = false; diff --git a/src/views/secondDev/approveFlowPage.vue b/src/views/secondDev/approveFlowPage.vue index 957a29c..f67655a 100644 --- a/src/views/secondDev/approveFlowPage.vue +++ b/src/views/secondDev/approveFlowPage.vue @@ -96,7 +96,8 @@ approvedContent: '', rejectNodeActivityId: '', rejectNodeActivityIds: [], - circulateConfigs: [] + circulateConfigs: [], + nextTaskUser: {} // 格式为taskKey: 用户id(逗号分隔) }); let approvedType = ref(ApproveType.AGREE); @@ -114,7 +115,12 @@ approvalData.approvedResult = ApproveCode.AGREE; opinionDlg.value.toggleDialog({ action: 'agree', - nextNodes + nextNodes, + callback: (args) => { + approvalData.approvedContent = args.opinion; + approvalData.nextTaskUser = args.nextTaskUser; + onFinish({}); + } }); } @@ -128,6 +134,7 @@ callback: (args) => { approvalData.approvedContent = args.opinion; approvalData.rejectNodeActivityId = args.rejectNodeId; + approvalData.nextTaskUser = args.nextTaskUser; onFinish({}); } }); @@ -237,7 +244,8 @@ circulateConfigs: approvalData.circulateConfigs, /*stampId: values.stampId, stampPassword: values.password,*/ - isOldSystem: system + isOldSystem: system, + nextTaskUser: approvalData.nextTaskUser }; }