From 7ca161ed75dd8b5cd8eb3d2698d1741c7272f34b Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Sat, 21 Dec 2024 15:07:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/workflow/task/index.ts | 7 ++++--- .../src/views/workflow/components/approval-panel.vue | 3 ++- .../views/workflow/components/approval-rejection-modal.vue | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/web-antd/src/api/workflow/task/index.ts b/apps/web-antd/src/api/workflow/task/index.ts index c09dc91a..5591cde4 100644 --- a/apps/web-antd/src/api/workflow/task/index.ts +++ b/apps/web-antd/src/api/workflow/task/index.ts @@ -141,11 +141,12 @@ export function backProcess(data: any) { /** * 获取可驳回节点 - * @param instanceId 实例id + * @param definitionId 流程定义ID + * @param nodeCode 当前节点编码 */ -export function getBackTaskNode(instanceId: string) { +export function getBackTaskNode(definitionId: string, nodeCode: string) { return requestClient.get<{ nodeCode: string; nodeName: string }[]>( - `/workflow/task/getBackTaskNode/${instanceId}`, + `/workflow/task/getBackTaskNode/${definitionId}/${nodeCode}`, ); } 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 dd873b40..450ae0b6 100644 --- a/apps/web-antd/src/views/workflow/components/approval-panel.vue +++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue @@ -200,7 +200,8 @@ const [RejectionModal, rejectionModalApi] = useVbenModal({ function handleRejection() { rejectionModalApi.setData({ taskId: props.task?.id, - instanceId: props.task?.instanceId, + definitionId: props.task?.definitionId, + nodeCode: props.task?.nodeCode, }); rejectionModalApi.open(); } 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 36f57217..c7b6855a 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 @@ -63,7 +63,8 @@ const [BasicForm, formApi] = useVbenForm({ interface ModalProps { taskId: string; - instanceId: string; + definitionId: string; + nodeCode: string; } const [BasicModal, modalApi] = useVbenModal({ @@ -78,10 +79,10 @@ const [BasicModal, modalApi] = useVbenModal({ } modalApi.modalLoading(true); - const { taskId, instanceId } = modalApi.getData() as ModalProps; + const { taskId, definitionId, nodeCode } = modalApi.getData() as ModalProps; await formApi.setFieldValue('taskId', taskId); - const resp = await getBackTaskNode(instanceId); + const resp = await getBackTaskNode(definitionId, nodeCode); const options = resp.map((item) => ({ label: item.nodeName, value: item.nodeCode,