Skip to content

Commit 0e452aa

Browse files
committed
【代码评审】BPM:下一个审批人
1 parent 202d4b6 commit 0e452aa

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ const activityNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([]) // 审批
117117
118118
/** 设置表单信息、获取流程图数据 **/
119119
const initProcessInfo = async (row: any, formVariables?: any) => {
120-
121120
// 重置指定审批人
122121
startUserSelectTasks.value = []
123122
startUserSelectAssignees.value = {}
@@ -144,7 +143,7 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
144143
id: row.id,
145144
processVariablesStr: JSON.stringify(formVariables)
146145
})
147-
// }
146+
148147
// 加载流程图
149148
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(row.id)
150149
if (processDefinitionDetail) {

src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -729,11 +729,12 @@ const initNextAssigneesFormField = async () => {
729729
})
730730
if (data && data.length > 0) {
731731
data.forEach((node: any) => {
732-
// 如果是发起人自选,并且没有审批人 或者 是审批人自选
733732
if (
733+
// 情况一:当前节点没有审批人,并且是发起人自选
734734
(isEmpty(node.tasks) &&
735735
isEmpty(node.candidateUsers) &&
736736
CandidateStrategy.START_USER_SELECT === node.candidateStrategy) ||
737+
// 情况二:当前节点是审批人自选
737738
CandidateStrategy.APPROVE_USER_SELECT === node.candidateStrategy
738739
) {
739740
nextAssigneesActivityNode.value.push(node)
@@ -748,11 +749,13 @@ const selectNextAssigneesConfirm = (id: string, userList: any[]) => {
748749
}
749750
/** 审批通过时,校验每个自选审批人的节点是否都已配置了审批人 */
750751
const validateNextAssignees = () => {
752+
// TODO @小北:可以考虑 Object.keys(nextAssigneesActivityNode.value).length === 0) return true;减少括号层级
751753
// 如果需要自选审批人,则校验自选审批人
752754
if (Object.keys(nextAssigneesActivityNode.value).length > 0) {
753755
// 校验每个节点是否都已配置审批人
754756
for (const item of nextAssigneesActivityNode.value) {
755757
if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
758+
// TODO @小北:可以打印下节点名,嘿嘿。
756759
message.warning('下一个节点的审批人不能为空!')
757760
return false
758761
}

0 commit comments

Comments
 (0)