diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue index 12c6d9049..b955d7a24 100644 --- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue +++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue @@ -354,7 +354,8 @@ async function initNextAssigneesFormField() { BpmCandidateStrategyEnum.START_USER_SELECT === node.candidateStrategy) || // 情况二:当前节点是审批人自选 - BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy + (isEmpty(node.candidateUsers) && + BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy) ) { nextAssigneesActivityNode.value.push(node); } @@ -396,7 +397,7 @@ function validateNextAssignees() { } // 如果需要自选审批人,则校验每个节点是否都已配置审批人 for (const item of nextAssigneesActivityNode.value) { - if (isEmpty(approveReasonForm.nextAssignees[item.id])) { + if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) { message.warning('下一个节点的审批人不能为空!'); return false; } @@ -875,9 +876,10 @@ defineExpose({ loadTodoTask }); name="nextAssignees" v-if="nextAssigneesActivityNode.length > 0" > -
+
(), { showStatusIcon: true, // 默认值为 true enableApproveUserSelect: false, // 默认值为 false + embedded: false, // 默认值为 false }, ); @@ -246,7 +248,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });