From 7d9ddd469898f37419bc1aa50bdadfff89455fb5 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Tue, 17 Dec 2024 15:08:31 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=A1=E6=89=B9=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E5=BD=93=E5=89=8D=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/workflow/components/approval-modal.vue | 2 +- .../views/workflow/components/approval-panel.vue | 14 ++++++++++++-- .../components/approval-rejection-modal.vue | 2 +- .../src/views/workflow/task/myDocument.vue | 5 ++++- .../src/views/workflow/task/taskWaiting.vue | 5 ++++- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apps/web-antd/src/views/workflow/components/approval-modal.vue b/apps/web-antd/src/views/workflow/components/approval-modal.vue index fd899f1c..285634ad 100644 --- a/apps/web-antd/src/views/workflow/components/approval-modal.vue +++ b/apps/web-antd/src/views/workflow/components/approval-modal.vue @@ -125,8 +125,8 @@ async function handleSubmit() { variables: {}, } as CompleteTaskReqData; await completeTask(requestData); - emit('complete'); modalApi.close(); + emit('complete'); } catch (error) { console.error(error); } finally { diff --git a/apps/web-antd/src/views/workflow/components/approval-panel.vue b/apps/web-antd/src/views/workflow/components/approval-panel.vue index 2e1ab83f..e830867f 100644 --- a/apps/web-antd/src/views/workflow/components/approval-panel.vue +++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue @@ -43,6 +43,11 @@ defineOptions({ // eslint-disable-next-line no-use-before-define const props = defineProps<{ task?: TaskInfo; type: ApprovalType }>(); +/** + * 下面按钮点击后会触发的事件 + */ +const emit = defineEmits<{ reload: [] }>(); + const currentTask = ref(); /** * 是否显示 加签/减签操作 @@ -142,6 +147,7 @@ function handleTermination() { okButtonProps: { danger: true }, onOk: async () => { await terminationTask({ taskId: props.task!.id }); + emit('reload'); }, }); } @@ -179,6 +185,7 @@ function handleDelegation(userList: User[]) { { taskId: props.task!.id, userId: current!.userId }, 'delegateTask', ); + emit('reload'); }, }); } @@ -201,6 +208,7 @@ function handleTransfer(userList: User[]) { { taskId: props.task!.id, userId: current!.userId }, 'transferTask', ); + emit('reload'); }, }); } @@ -217,6 +225,7 @@ function handleAddSignature(userList: User[]) { centered: true, onOk: async () => { await taskOperation({ taskId: props.task!.id, userIds }, 'addSignature'); + emit('reload'); }, }); } @@ -236,6 +245,7 @@ function handleReductionSignature(userList: User[]) { { taskId: props.task!.id, userIds }, 'reductionSignature', ); + emit('reload'); }, }); } @@ -357,8 +367,8 @@ function handleReductionSignature(userList: User[]) { 其他 - - + + diff --git a/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue b/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue index b12524f4..36f57217 100644 --- a/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue +++ b/apps/web-antd/src/views/workflow/components/approval-rejection-modal.vue @@ -113,8 +113,8 @@ async function handleSubmit() { const data = cloneDeep(await formApi.getValues()); console.log(data); await backProcess(data); - emit('complete'); modalApi.close(); + emit('complete'); } catch (error) { console.error(error); } finally { diff --git a/apps/web-antd/src/views/workflow/task/myDocument.vue b/apps/web-antd/src/views/workflow/task/myDocument.vue index 5a1804bc..f648c011 100644 --- a/apps/web-antd/src/views/workflow/task/myDocument.vue +++ b/apps/web-antd/src/views/workflow/task/myDocument.vue @@ -5,6 +5,7 @@ import type { TaskInfo } from '#/api/workflow/task/model'; import { computed, onMounted, ref } from 'vue'; import { Page } from '@vben/common-ui'; +import { useTabs } from '@vben/hooks'; import { Empty, InputSearch } from 'ant-design-vue'; import { debounce } from 'lodash-es'; @@ -77,6 +78,8 @@ async function handleCardClick(item: TaskInfo) { const resp = await flowInfo(businessId); currentInstance.value = resp; } + +const { refreshTab } = useTabs(); diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue index e7454d28..2258ad5a 100644 --- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue +++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue @@ -5,6 +5,7 @@ import type { TaskInfo } from '#/api/workflow/task/model'; import { computed, onMounted, ref } from 'vue'; import { Page } from '@vben/common-ui'; +import { useTabs } from '@vben/hooks'; import { Empty, InputSearch } from 'ant-design-vue'; import { debounce } from 'lodash-es'; @@ -78,6 +79,8 @@ async function handleCardClick(item: TaskInfo) { const resp = await flowInfo(businessId); currentInstance.value = resp; } + +const { refreshTab } = useTabs();