diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue index b3f62340..c97f77de 100644 --- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue +++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue @@ -15,6 +15,12 @@
审批人
+
+
+ +
+
办理人
+
@@ -114,13 +120,13 @@ const addNode = (type: number) => { } popoverShow.value = false - if (type === NodeType.USER_TASK_NODE) { + if (type === NodeType.USER_TASK_NODE || type === NodeType.TRANSACTOR_NODE) { const id = 'Activity_' + generateUUID() const data: SimpleFlowNode = { id: id, - name: NODE_DEFAULT_NAME.get(NodeType.USER_TASK_NODE) as string, + name: NODE_DEFAULT_NAME.get(type) as string, showText: '', - type: NodeType.USER_TASK_NODE, + type: type, approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE, // 超时处理 rejectHandler: { diff --git a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue index 048764c1..cdb54032 100644 --- a/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue +++ b/src/components/SimpleProcessDesignerV2/src/ProcessNodeTree.vue @@ -6,7 +6,11 @@ /> () NODE_DEFAULT_NAME.set(NodeType.USER_TASK_NODE, '审批人') @@ -515,6 +521,7 @@ NODE_DEFAULT_NAME.set(NodeType.START_USER_NODE, '发起人') NODE_DEFAULT_NAME.set(NodeType.DELAY_TIMER_NODE, '延迟器') NODE_DEFAULT_NAME.set(NodeType.ROUTER_BRANCH_NODE, '路由分支') NODE_DEFAULT_NAME.set(NodeType.TRIGGER_NODE, '触发器') +NODE_DEFAULT_NAME.set(NodeType.TRANSACTOR_NODE, '办理人') // 候选人策略。暂时不从字典中取。 后续可能调整。控制显示顺序 export const CANDIDATE_STRATEGY: DictDataVO[] = [ @@ -627,6 +634,16 @@ export const DEFAULT_BUTTON_SETTING: ButtonSetting[] = [ { id: OperationButtonType.RETURN, displayName: '退回', enable: true } ] +// 办理人默认的按钮权限设置 +export const TRANSACTOR_DEFAULT_BUTTON_SETTING: ButtonSetting[] = [ + { id: OperationButtonType.APPROVE, displayName: '办理', enable: true }, + { id: OperationButtonType.REJECT, displayName: '拒绝', enable: false }, + { id: OperationButtonType.TRANSFER, displayName: '转办', enable: false }, + { id: OperationButtonType.DELEGATE, displayName: '委派', enable: false }, + { id: OperationButtonType.ADD_SIGN, displayName: '加签', enable: false }, + { id: OperationButtonType.RETURN, displayName: '退回', enable: false } +] + // 发起人的按钮权限。暂时定死，不可以编辑 export const START_USER_BUTTON_SETTING: ButtonSetting[] = [ { id: OperationButtonType.APPROVE, displayName: '提交', enable: true }, diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index 407fd483..e415dc12 100644 --- a/src/components/SimpleProcessDesignerV2/src/node.ts +++ b/src/components/SimpleProcessDesignerV2/src/node.ts @@ -201,7 +201,7 @@ export function useNodeForm(nodeType: NodeType) { const deptTreeOptions = inject('deptTree', ref()) // 部门树 const formFields = inject>('formFields', ref([])) // 流程表单字段 const configForm = ref() - if (nodeType === NodeType.USER_TASK_NODE) { + if (nodeType === NodeType.USER_TASK_NODE || nodeType === NodeType.TRANSACTOR_NODE) { configForm.value = { candidateStrategy: CandidateStrategy.USER, approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE, diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index ca55e3b9..01a3c990 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -25,7 +25,7 @@
-
+
审批类型 : - 审批人拒绝时 - - -
-
- +
+ 审批人拒绝时 + + +
+
+ +
-
- - - - - - - - - 审批人超时未处理时 - - - - - + + - - - - - 当超过 - - + + + +
+ +
+ 审批人超时未处理时 + + - - - - 未处理 - - - - + + + + + + 当超过 + + + + + + + 未处理 + + + + +
审批人为空时 @@ -348,30 +357,44 @@ - 审批人与提交人为同一人时 - - -
-
- +
+ 审批人与提交人为同一人时 + + +
+
+ +
-
- - + + +
- 是否需要签名 - - - +
+ 是否需要签名 + + + +
- 审批意见 - - - +
+ 审批意见 + + + +
- +
操作按钮
@@ -485,7 +508,8 @@ import { ASSIGN_EMPTY_HANDLER_TYPES, AssignEmptyHandlerType, FieldPermissionType, - ProcessVariableEnum + ProcessVariableEnum, + TRANSACTOR_DEFAULT_BUTTON_SETTING } from '../consts' import { @@ -588,7 +612,7 @@ const { handleCandidateParam, parseCandidateParam, getShowText -} = useNodeForm(NodeType.USER_TASK_NODE) +} = useNodeForm(currentNode.value.type) const configForm = tempConfigForm as Ref // 改变审批人设置策略 @@ -733,13 +757,13 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { configForm.value.approveRatio = node.approveRatio! } // 2.3 设置审批拒绝处理 - configForm.value.rejectHandlerType = node.rejectHandler!.type + configForm.value.rejectHandlerType = node.rejectHandler?.type configForm.value.returnNodeId = node.rejectHandler?.returnNodeId const matchNodeList = [] emits('find:returnTaskNodes', matchNodeList) returnTaskList.value = matchNodeList // 2.4 设置审批超时处理 - configForm.value.timeoutHandlerEnable = node.timeoutHandler!.enable + configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) { const strTimeDuration = node.timeoutHandler.timeDuration let parseTime = strTimeDuration.slice(2, strTimeDuration.length - 1) @@ -755,7 +779,11 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { // 2.6 设置用户任务的审批人与发起人相同时 configForm.value.assignStartUserHandlerType = node.assignStartUserHandlerType // 3. 操作按钮设置 - buttonsSetting.value = cloneDeep(node.buttonsSetting) || DEFAULT_BUTTON_SETTING + buttonsSetting.value = + cloneDeep(node.buttonsSetting) || + (node.type === NodeType.TRANSACTOR_NODE + ? TRANSACTOR_DEFAULT_BUTTON_SETTING + : DEFAULT_BUTTON_SETTING) // 4. 表单字段权限配置 getNodeConfigFormFields(node.fieldsPermission) // 5. 监听器 @@ -773,7 +801,7 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { header: node.taskAssignListener?.header ?? [], body: node.taskAssignListener?.body ?? [] } - // 5.3 完成任务 + // 5.3 完成任务 configForm.value.taskCompleteListenerEnable = node.taskCompleteListener?.enable configForm.value.taskCompleteListenerPath = node.taskCompleteListener?.path configForm.value.taskCompleteListener = { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue index 47ef540c..eac24ce8 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue @@ -28,7 +28,7 @@ {{ currentNode.showText }}
- {{ NODE_DEFAULT_TEXT.get(NodeType.USER_TASK_NODE) }} + {{ NODE_DEFAULT_TEXT.get(currentNode.type) }}