yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [bpm] 并行分支后的审批人自选问题修复,https://t.zsxq.com/daxv1

pull/368/head
jason 2026-06-20 13:45:19 +08:00
parent 8f9bd94f58
commit e2185793c3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
View File

@ -354,7 +354,8 @@ async function initNextAssigneesFormField() {
BpmCandidateStrategyEnum.START_USER_SELECT === BpmCandidateStrategyEnum.START_USER_SELECT ===
node.candidateStrategy) || node.candidateStrategy) ||
// 情况二：当前节点是审批人自选 // 情况二：当前节点是审批人自选
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy (isEmpty(node.candidateUsers) &&
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
) { ) {
nextAssigneesActivityNode.value.push(node); nextAssigneesActivityNode.value.push(node);
} }
@ -396,7 +397,7 @@ function validateNextAssignees() {
} }
// 如果需要自选审批人，则校验每个节点是否都已配置审批人 // 如果需要自选审批人，则校验每个节点是否都已配置审批人
for (const item of nextAssigneesActivityNode.value) { for (const item of nextAssigneesActivityNode.value) {
if (isEmpty(approveReasonForm.nextAssignees[item.id])) { if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
message.warning('下一个节点的审批人不能为空!'); message.warning('下一个节点的审批人不能为空!');
return false; return false;
} }

5
apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
View File

@ -335,7 +335,8 @@ async function initNextAssigneesFormField() {
BpmCandidateStrategyEnum.START_USER_SELECT === BpmCandidateStrategyEnum.START_USER_SELECT ===
node.candidateStrategy) || node.candidateStrategy) ||
// 情况二：当前节点是审批人自选 // 情况二：当前节点是审批人自选
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy (isEmpty(node.candidateUsers) &&
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
) { ) {
nextAssigneesActivityNode.value.push(node); nextAssigneesActivityNode.value.push(node);
} }
@ -377,7 +378,7 @@ function validateNextAssignees() {
} }
// 如果需要自选审批人，则校验每个节点是否都已配置审批人 // 如果需要自选审批人，则校验每个节点是否都已配置审批人
for (const item of nextAssigneesActivityNode.value) { for (const item of nextAssigneesActivityNode.value) {
if (isEmpty(approveReasonForm.nextAssignees[item.id])) { if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
message.warning('下一个节点的审批人不能为空!'); message.warning('下一个节点的审批人不能为空!');
return false; return false;
} }

5
apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
View File

@ -364,7 +364,8 @@ async function initNextAssigneesFormField() {
BpmCandidateStrategyEnum.START_USER_SELECT === BpmCandidateStrategyEnum.START_USER_SELECT ===
node.candidateStrategy) || node.candidateStrategy) ||
// 情况二：当前节点是审批人自选 // 情况二：当前节点是审批人自选
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy (isEmpty(node.candidateUsers) &&
BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
) { ) {
nextAssigneesActivityNode.value.push(node); nextAssigneesActivityNode.value.push(node);
} }
@ -406,7 +407,7 @@ function validateNextAssignees() {
} }
// 如果需要自选审批人，则校验每个节点是否都已配置审批人 // 如果需要自选审批人，则校验每个节点是否都已配置审批人
for (const item of nextAssigneesActivityNode.value) { for (const item of nextAssigneesActivityNode.value) {
if (isEmpty(approveReasonForm.nextAssignees[item.id])) { if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
ElMessage.warning('下一个节点的审批人不能为空!'); ElMessage.warning('下一个节点的审批人不能为空!');
return false; return false;
} }