From f7a2949ad106045cda1d5d16371abbdbbcd64fd5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Feb 2025 08:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E3=80=91BPM=EF=BC=9A=E5=8A=9E=E7=90=86=E4=BA=BA=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/nodes-config/UserTaskNodeConfig.vue | 14 +++++--------- .../src/nodes/UserTaskNode.vue | 3 ++- .../detail/ProcessInstanceOperationButton.vue | 11 +++++------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index b6ce9ed3..32ad6a06 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -679,12 +679,12 @@ const { const userTaskListenerRef = ref() -// 节点类型名称 +/** 节点类型名称 */ const nodeTypeName = computed(() => { return currentNode.value.type === NodeType.TRANSACTOR_NODE ? '办理' : '审批' }) -// 保存配置 +/** 保存配置 */ const saveConfig = async () => { // activeTabName.value = 'user' // 设置审批节点名称 @@ -770,7 +770,7 @@ const saveConfig = async () => { return true } -// 显示审批节点配置, 由父组件传过来 +/** 显示审批节点配置, 由父组件传过来 */ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { nodeName.value = node.name // 1 审批类型 @@ -849,9 +849,7 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { defineExpose({ openDrawer, showUserTaskNodeConfig }) // 暴露方法给父组件 -/** - * @description 操作按钮设置 - */ +/** 操作按钮设置 */ function useButtonsSetting() { const buttonsSetting = ref() // 操作按钮显示名称可编辑 @@ -872,9 +870,7 @@ function useButtonsSetting() { } } -/** - * @description 审批人超时未处理配置 - */ +/** 审批人超时未处理配置 */ function useTimeoutHandler() { // 时间单位 const timeUnit = ref(TimeUnitType.HOUR) diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue index cbaa3e1a..ae1af6c2 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes/UserTaskNode.vue @@ -14,7 +14,8 @@ > + > + - + @@ -547,6 +547,7 @@ const returnList = ref([] as any) // 退回节点 const runningTask = ref() // 运行中的任务 const approveForm = ref({}) // 审批通过时,额外的补充信息 const approveFormFApi = ref({}) // approveForms 的 fAPi +const nodeTypeName = ref('审批') // 节点类型名称 // 审批通过意见表单 const reasonRequire = ref() @@ -560,7 +561,7 @@ const approveReasonForm = reactive({ const approveReasonRule = computed(() => { return { reason: [ - { required: reasonRequire.value, message: taskName + '意见不能为空', trigger: 'blur' } + { required: reasonRequire.value, message: nodeTypeName + '意见不能为空', trigger: 'blur' } ], signPicUrl: [{ required: true, message: '签名不能为空', trigger: 'change' }] } @@ -970,14 +971,12 @@ const getButtonDisplayName = (btnType: OperationButtonType) => { return displayName } -const taskName = ref('审批') - const loadTodoTask = (task: any) => { approveForm.value = {} approveFormFApi.value = {} runningTask.value = task reasonRequire.value = task?.reasonRequire ?? false - taskName.value = task?.nodeType === NodeType.TRANSACTOR_NODE ? '办理' : '审批' + nodeTypeName.value = task?.nodeType === NodeType.TRANSACTOR_NODE ? '办理' : '审批' // 处理 approve 表单. if (task && task.formId && task.formConf) { const tempApproveForm = {}