From a19ac2d4ca1b8da191f920b9b190c5c442663bcf Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Mon, 6 May 2024 20:59:41 +0800 Subject: [PATCH 1/7] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E4=BC=9A?= =?UTF-8?q?=E7=AD=BE=E4=BA=BA=E5=91=98=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/leave/leaveEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index a57614a..e978ad8 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -228,8 +228,8 @@ const handleStartWorkFlow = async (data: LeaveVO) => { taskVariables.value = { entity: data, leaveDays: data.leaveDays, - userList: [1, 2], - userList2: [1, 2] + userList: [1, 3], + userList2: [1, 3] }; submitFormData.value.variables = taskVariables.value; const resp = await startWorkFlow(submitFormData.value); From 935a199f7179d5df78eadbd1765b489aa267c758 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Mon, 6 May 2024 22:19:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Process/approvalRecord.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index c24b8a4..1610f27 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -5,14 +5,14 @@ - +
- + @@ -71,7 +71,7 @@ const bpmnViewRef = ref(); const init = async (instanceId: string) => { visible.value = true; loading.value = true; - tabActiveName.value = 'bpmn' + tabActiveName.value = 'bpmn'; historyList.value = []; processApi.getHistoryRecord(instanceId).then((resp) => { historyList.value = resp.data.historyRecordList; From 907dc4efb4ef6ef556549ba9a30da2ffa57d9901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=97=AD=E6=B9=98?= <3423729430@qq.com> Date: Tue, 7 May 2024 09:39:43 +0000 Subject: [PATCH 3/7] =?UTF-8?q?update=20src/layout/components/AppMain.vue.?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB=E5=B7=A6=E8=BE=B9?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=B6=E9=A1=B5=E9=9D=A2=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E6=88=96=E8=80=85=E5=88=B7=E6=96=B0=E6=95=B4=E4=B8=AA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周旭湘 <3423729430@qq.com> --- src/layout/components/AppMain.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 9e3dde4..d634935 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -2,9 +2,12 @@
- - - +
+ + + + +
From e7dc8e94c705e39796c13aa3726cdfdbf460b117 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: Wed, 8 May 2024 15:33:31 +0800 Subject: [PATCH 4/7] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=B7=9F?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9B=B8=E5=85=B3=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=85=B3=E9=97=AD=E9=98=B2=E9=87=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.ts | 6 ++++-- src/api/system/tenant/index.ts | 3 ++- src/api/system/user/index.ts | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/api/login.ts b/src/api/login.ts index 100a5e9..b6955de 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -20,7 +20,8 @@ export function login(data: LoginData): AxiosPromise { url: '/auth/login', headers: { isToken: false, - isEncrypt: true + isEncrypt: true, + repeatSubmit: false }, method: 'post', data: params @@ -38,7 +39,8 @@ export function register(data: any) { url: '/auth/register', headers: { isToken: false, - isEncrypt: true + isEncrypt: true, + repeatSubmit: false }, method: 'post', data: params diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 4531a0a..4380dbe 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -25,7 +25,8 @@ export function addTenant(data: TenantForm) { url: '/system/tenant', method: 'post', headers: { - isEncrypt: true + isEncrypt: true, + repeatSubmit: false }, data: data }); diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 61a58f6..25c7884 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -86,7 +86,8 @@ export const resetUserPwd = (userId: string | number, password: string) => { url: '/system/user/resetPwd', method: 'put', headers: { - isEncrypt: true + isEncrypt: true, + repeatSubmit: false }, data: data }); @@ -145,7 +146,8 @@ export const updateUserPwd = (oldPassword: string, newPassword: string) => { url: '/system/user/profile/updatePwd', method: 'put', headers: { - isEncrypt: true + isEncrypt: true, + repeatSubmit: false }, data: data }); 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 5/7] =?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 => { - 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 @@