diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts index 50816952..8a5829e3 100644 --- a/src/api/bpm/task/index.ts +++ b/src/api/bpm/task/index.ts @@ -75,12 +75,12 @@ export const getTaskListByProcessInstanceId = async (processInstanceId: string) }) } -// 获取所有可回退的节点 +// 获取所有可退回的节点 export const getTaskListByReturn = async (id: string) => { return await request.get({ url: '/bpm/task/list-by-return', params: { id } }) } -// 回退 +// 退回 export const returnTask = async (data: any) => { return await request.put({ url: '/bpm/task/return', data }) } diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index c51053ce..3611ef91 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -177,7 +177,7 @@ export enum ApproveMethodType { export type RejectHandler = { // 审批拒绝类型 type: RejectHandlerType - // 回退节点 Id + // 退回节点 Id returnNodeId?: string } @@ -359,7 +359,7 @@ export enum OperationButtonType { */ ADD_SIGN = 5, /** - * 回退 + * 退回 */ RETURN = 6, /** @@ -516,7 +516,7 @@ export const DEFAULT_BUTTON_SETTING: ButtonSetting[] = [ { id: OperationButtonType.TRANSFER, displayName: '转办', enable: true }, { id: OperationButtonType.DELEGATE, displayName: '委派', enable: true }, { id: OperationButtonType.ADD_SIGN, displayName: '加签', enable: true }, - { id: OperationButtonType.RETURN, displayName: '回退', enable: true } + { id: OperationButtonType.RETURN, displayName: '退回', enable: true } ] // 发起人的按钮权限。暂时定死,不可以编辑 @@ -526,7 +526,7 @@ export const START_USER_BUTTON_SETTING: ButtonSetting[] = [ { 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 } + { id: OperationButtonType.RETURN, displayName: '退回', enable: false } ] export const MULTI_LEVEL_DEPT: DictDataVO = [ diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index 57b96654..899d7045 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -134,12 +134,7 @@ prop="userIds" span="24" > - + - + {{ item.label }} @@ -552,7 +544,7 @@ const approveMethodChanged = () => { } formRef.value.clearValidate('approveRatio') } -// 审批拒绝 可回退的节点 +// 审批拒绝 可退回的节点 const returnTaskList = ref([]) // 审批人超时未处理设置 const { diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index fb181cf3..3451f604 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -282,9 +282,12 @@ const importXML = async (xml: string) => { /** 高亮流程 */ const setProcessStatus = (view: any) => { // 设置相关变量 + if (!view || !view.processInstance) { + return + } processInstance.value = view.processInstance tasks.value = view.tasks - if (isLoading.value || !processInstance.value || !bpmnViewer.value) { + if (isLoading.value || !bpmnViewer.value) { return } const { diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue index f2d5e02e..f792dbf4 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue @@ -8,7 +8,7 @@ placement="top-end" :width="420" trigger="click" - v-if=" runningTask && isHandleTaskStatus() && isShowButton(OperationButtonType.APPROVE)" + v-if="runningTask && isHandleTaskStatus() && isShowButton(OperationButtonType.APPROVE)" >