From 26c0cdaef6f48c790be720cfc41b6a4a9a797e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Thu, 9 May 2024 15:10:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20workflow=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8E=20system=20=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=A7=A3=E8=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/task/index.ts               | 24 +++++++++
 src/api/workflow/workflowUser/index.ts       | 53 --------------------
 src/components/Process/multiInstanceUser.vue | 22 +++++---
 3 files changed, 39 insertions(+), 60 deletions(-)
 delete mode 100644 src/api/workflow/workflowUser/index.ts

diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts
index 8260e69..714b883 100644
--- a/src/api/workflow/task/index.ts
+++ b/src/api/workflow/task/index.ts
@@ -238,3 +238,27 @@ export const delegateTask = (data: any) => {
     data: data
   });
 };
+
+/**
+ * 查询工作流任务用户选择加签人员
+ * @param taskId
+ * @returns {*}
+ */
+export const getTaskUserIdsByAddMultiInstance = (taskId: string) => {
+  return request({
+    url: '/workflow/user/getTaskUserIdsByAddMultiInstance/' + taskId,
+    method: 'get'
+  });
+};
+
+/**
+ * 查询工作流选择减签人员
+ * @param taskId
+ * @returns {*}
+ */
+export const getListByDeleteMultiInstance = (taskId: string) => {
+  return request({
+    url: '/workflow/task/getListByDeleteMultiInstance/' + taskId,
+    method: 'get'
+  });
+};
diff --git a/src/api/workflow/workflowUser/index.ts b/src/api/workflow/workflowUser/index.ts
deleted file mode 100644
index 7822715..0000000
--- a/src/api/workflow/workflowUser/index.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { UserVO } from '@/api/system/user/types';
-
-/**
- * 分页查询工作流选择加签人员
- * @param query
- * @returns {*}
- */
-export const getPageByAddMultiInstance = (query: object) => {
-  return request({
-    url: '/workflow/user/getPageByAddMultiInstance',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询工作流选择减签人员
- * @param query
- * @returns {*}
- */
-export const getListByDeleteMultiInstance = (taskId: string) => {
-  return request({
-    url: '/workflow/user/getListByDeleteMultiInstance/' + taskId,
-    method: 'get'
-  });
-};
-
-/**
- * 按照用户id查询用户
- * @param userIdList
- * @returns {*}
- */
-export const getUserListByIds = (userIdList: any[]): AxiosPromise<UserVO[]> => {
-  return request({
-    url: '/workflow/user/getUserListByIds/' + userIdList,
-    method: 'get'
-  });
-};
-
-/**
- * 分页查询用户
- * @param query
- * @returns {*}
- */
-export const getPageByUserList = (query: object) => {
-  return request({
-    url: '/workflow/user/getPageByUserList',
-    method: 'get',
-    params: query
-  });
-};
diff --git a/src/components/Process/multiInstanceUser.vue b/src/components/Process/multiInstanceUser.vue
index a2d37bf..b2039b9 100644
--- a/src/components/Process/multiInstanceUser.vue
+++ b/src/components/Process/multiInstanceUser.vue
@@ -81,9 +81,13 @@
 </template>
 
 <script setup name="User" lang="ts">
-import { deptTreeSelect } from '@/api/system/user';
-import { getPageByAddMultiInstance, getListByDeleteMultiInstance, getUserListByIds } from '@/api/workflow/workflowUser';
-import { addMultiInstanceExecution, deleteMultiInstanceExecution } from '@/api/workflow/task';
+import { deptTreeSelect, listUser, optionSelect } from '@/api/system/user';
+import {
+  addMultiInstanceExecution,
+  deleteMultiInstanceExecution,
+  getTaskUserIdsByAddMultiInstance,
+  getListByDeleteMultiInstance
+} from '@/api/workflow/task';
 import { UserVO } from '@/api/system/user/types';
 import { DeptVO } from '@/api/system/dept/types';
 import { ComponentInternalInstance } from 'vue';
@@ -149,12 +153,14 @@ const getAddMultiInstanceList = async (taskId: string, userIdList: Array<number
   visible.value = true;
   queryParams.value.taskId = taskId;
   loading.value = true;
-  const res = await getPageByAddMultiInstance(queryParams.value);
+  const res1 = await getTaskUserIdsByAddMultiInstance(taskId);
+  queryParams.value.excludeUserIds = res1.data;
+  const res = await listUser(queryParams.value);
   loading.value = false;
   userList.value = res.rows;
   total.value = res.total;
   if (userList.value && userIds.value.length > 0) {
-    const data = await getUserListByIds(userIds.value);
+    const data = await optionSelect(userIds.value);
     if (data.data && data.data.length > 0) {
       chooseUserList.value = data.data;
       data.data.forEach((user: UserVO) => {
@@ -171,12 +177,14 @@ const getAddMultiInstanceList = async (taskId: string, userIdList: Array<number
 
 const getList = async () => {
   loading.value = true;
-  const res = await getPageByAddMultiInstance(queryParams.value);
+  const res1 = await getTaskUserIdsByAddMultiInstance(queryParams.value.taskId);
+  queryParams.value.excludeUserIds = res1.data;
+  const res = await listUser(queryParams.value);
   loading.value = false;
   userList.value = res.rows;
   total.value = res.total;
   if (userList.value && userIds.value.length > 0) {
-    const data = await getUserListByIds(userIds.value);
+    const data = await optionSelect(userIds.value);
     if (data.data && data.data.length > 0) {
       chooseUserList.value = data.data;
       data.data.forEach((user: UserVO) => {