【代码评审】BPM:下一个审批人

This commit is contained in:
YunaiV 2025-03-06 09:43:22 +08:00
parent 202d4b6795
commit 0e452aa1a7
2 changed files with 5 additions and 3 deletions

View File

@ -117,7 +117,6 @@ const activityNodes = ref<ProcessInstanceApi.ApprovalNodeInfo[]>([]) // 审批
/** 设置表单信息、获取流程图数据 **/ /** 设置表单信息、获取流程图数据 **/
const initProcessInfo = async (row: any, formVariables?: any) => { const initProcessInfo = async (row: any, formVariables?: any) => {
// //
startUserSelectTasks.value = [] startUserSelectTasks.value = []
startUserSelectAssignees.value = {} startUserSelectAssignees.value = {}
@ -144,7 +143,7 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
id: row.id, id: row.id,
processVariablesStr: JSON.stringify(formVariables) processVariablesStr: JSON.stringify(formVariables)
}) })
// }
// //
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(row.id) const processDefinitionDetail = await DefinitionApi.getProcessDefinition(row.id)
if (processDefinitionDetail) { if (processDefinitionDetail) {

View File

@ -729,11 +729,12 @@ const initNextAssigneesFormField = async () => {
}) })
if (data && data.length > 0) { if (data && data.length > 0) {
data.forEach((node: any) => { data.forEach((node: any) => {
//
if ( if (
//
(isEmpty(node.tasks) && (isEmpty(node.tasks) &&
isEmpty(node.candidateUsers) && isEmpty(node.candidateUsers) &&
CandidateStrategy.START_USER_SELECT === node.candidateStrategy) || CandidateStrategy.START_USER_SELECT === node.candidateStrategy) ||
//
CandidateStrategy.APPROVE_USER_SELECT === node.candidateStrategy CandidateStrategy.APPROVE_USER_SELECT === node.candidateStrategy
) { ) {
nextAssigneesActivityNode.value.push(node) nextAssigneesActivityNode.value.push(node)
@ -748,11 +749,13 @@ const selectNextAssigneesConfirm = (id: string, userList: any[]) => {
} }
/** 审批通过时,校验每个自选审批人的节点是否都已配置了审批人 */ /** 审批通过时,校验每个自选审批人的节点是否都已配置了审批人 */
const validateNextAssignees = () => { const validateNextAssignees = () => {
// TODO @ Object.keys(nextAssigneesActivityNode.value).length === 0) return true
// //
if (Object.keys(nextAssigneesActivityNode.value).length > 0) { if (Object.keys(nextAssigneesActivityNode.value).length > 0) {
// //
for (const item of nextAssigneesActivityNode.value) { for (const item of nextAssigneesActivityNode.value) {
if (isEmpty(approveReasonForm.nextAssignees[item.id])) { if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
// TODO @
message.warning('下一个节点的审批人不能为空!') message.warning('下一个节点的审批人不能为空!')
return false return false
} }