diff --git a/src/views/workflow/process/DefaultNodeProps.js b/src/views/workflow/process/DefaultNodeProps.js index 7ab000e..0afbc80 100644 --- a/src/views/workflow/process/DefaultNodeProps.js +++ b/src/views/workflow/process/DefaultNodeProps.js @@ -10,6 +10,9 @@ export const APPROVAL_PROPS = { }, matrixApproval: true, dstiMatrix: false, + generalManager: true, + president: true, + duplicateApproval: false, skipSelf: true, timeLimit: { //边界事件 timeout: { //超时提醒时间 diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue index 475e30c..55457e1 100644 --- a/src/views/workflow/process/config/ApprovalNodeConfig.vue +++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue @@ -102,17 +102,31 @@ - + + - - - - + + + + + + + + + + + + + + + + @@ -254,6 +268,8 @@ const approvalTypes = reactive([ // {name: "主管", type: "LEADER"}, // {name: "角色", type: "ROLE"}, {name: "发起人自己", type: "SELF"}, + {name: "下属企业领导", type: "SUB_LEADER"}, + {name: "下属企业科创部对接人", type: "DSTI_CONTACT_PERSON"}, // {name: "表单内联系人", type: "FORM_USER"}, // {name: "矩阵审批", type: "MATRIX_APPROVAL"}, ]) diff --git a/src/views/workflow/process/nodes/ApprovalNode.vue b/src/views/workflow/process/nodes/ApprovalNode.vue index ebe9e94..a650e49 100644 --- a/src/views/workflow/process/nodes/ApprovalNode.vue +++ b/src/views/workflow/process/nodes/ApprovalNode.vue @@ -69,6 +69,12 @@ const content = computed(() => { return '发起人自己' case "DSTI_MATRIX": return '科创部用户跳过' + case "NO_USER_SKIP": + return '无用户审批,跳过' + case "DSTI_CONTACT_PERSON": + return '下属企业科创部对接人' + case "SUB_LEADER": + return '下属企业领导' case "SELF_SELECT": return config.selfSelect.multiple ? '发起人自选多人' : '发起人自选一人' case "LEADER_TOP": @@ -115,6 +121,8 @@ const validate = (err) => { case "SELF_SELECT": showError.value = !validate_SELF_SELECT(err); break; + case "DSTI_CONTACT_PERSON": + case "SUB_LEADER": case "LEADER_TOP": showError.value = !validate_LEADER_TOP(err); break;