From 6170da08702e97f8cfe111615c9fd0ddd89a9d48 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Sat, 8 Mar 2025 12:08:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/workflow/task/index.ts | 14 ++++ .../web-antd/src/api/workflow/task/model.d.ts | 27 +++++++ .../workflow/components/approval-modal.vue | 80 ++++++++++++++++++- .../workflow/components/approval-panel.vue | 8 +- .../workflow/components/copy-component.vue | 29 +++++-- .../workflow/components/user-select-modal.vue | 23 ++++-- .../src/views/workflow/task/myDocument.vue | 2 +- .../src/views/workflow/task/taskCopyList.vue | 2 +- .../src/views/workflow/task/taskFinish.vue | 2 +- .../src/views/workflow/task/taskWaiting.vue | 2 +- 10 files changed, 167 insertions(+), 22 deletions(-) diff --git a/apps/web-antd/src/api/workflow/task/index.ts b/apps/web-antd/src/api/workflow/task/index.ts index ae4cc407..e3689c4f 100644 --- a/apps/web-antd/src/api/workflow/task/index.ts +++ b/apps/web-antd/src/api/workflow/task/index.ts @@ -1,5 +1,6 @@ import type { CompleteTaskReqData, + NextNodeInfo, StartWorkFlowReqData, TaskInfo, TaskOperationData, @@ -156,3 +157,16 @@ export function getBackTaskNode(definitionId: string, nodeCode: string) { export function currentTaskAllUser(taskId: ID) { return requestClient.get(`/workflow/task/currentTaskAllUser/${taskId}`); } + +/** + * 获取下一节点 + * @param data data + * @param data.taskId taskId + * @returns NextNodeInfo + */ +export function getNextNodeList(data: { taskId: string }) { + return requestClient.post( + '/workflow/task/getNextNodeList', + data, + ); +} diff --git a/apps/web-antd/src/api/workflow/task/model.d.ts b/apps/web-antd/src/api/workflow/task/model.d.ts index 6cd4ba95..5f638a8f 100644 --- a/apps/web-antd/src/api/workflow/task/model.d.ts +++ b/apps/web-antd/src/api/workflow/task/model.d.ts @@ -45,6 +45,8 @@ export interface CompleteTaskReqData { variables: any; // 附件ID 1,2,3,4形式 fileId?: string; + // 选人 key为节点code value为用户ID join(,) + assigneeMap: { [key: string]: string }; } export interface StartWorkFlowReqData { @@ -79,3 +81,28 @@ export type TaskOperationType = | 'delegateTask' | 'reductionSignature' | 'transferTask'; + +export interface NextNodeInfo { + skipList: string[]; + id: string; + createTime: string; + updateTime: string; + tenantId: string; + delFlag: string; + nodeType: number; + definitionId: string; + nodeCode: string; + nodeName: string; + permissionFlag: string; + nodeRatio: string; + coordinate: string; + version: string; + anyNodeSkip: any; + listenerType: any; + listenerPath: any; + handlerType: any; + handlerPath: any; + formCustom: string; + formPath: any; + ext: string; +} 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 becb97f0..28418617 100644 --- a/apps/web-antd/src/views/workflow/components/approval-modal.vue +++ b/apps/web-antd/src/views/workflow/components/approval-modal.vue @@ -1,14 +1,21 @@