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 }); diff --git a/src/api/workflow/task/index.ts b/src/api/workflow/task/index.ts index 8260e69..d29de30 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/task/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/bpmn/panel/TaskPanel.vue b/src/bpmn/panel/TaskPanel.vue index 253d3f9..bc037ee 100644 --- a/src/bpmn/panel/TaskPanel.vue +++ b/src/bpmn/panel/TaskPanel.vue @@ -50,7 +50,7 @@ - + @@ -283,24 +283,23 @@ const dueDateRef = ref>(); const isMultiple = ref(true); const openUserSelect = () => { - if (!formData.value.candidateUsers) { - formData.value.candidateUsers = '-1'; - } userSelectRef.value.open(); }; const openSingleUserSelect = () => { + if (formData.value.assignee.includes('$')) { + formData.value.assignee = ''; + } singleUserSelectRef.value.open(); }; const openRoleSelect = () => { - if (!formData.value.candidateGroups) { - formData.value.candidateGroups = '-1'; - } roleSelectRef.value.open(); }; const openDueDate = (e) => { dueDateRef.value.openDialog(); }; - +const blurAssignee = (assignee) => { + updateProperties({ 'flowable:assignee': assignee ? assignee : undefined }); +}; const singleUserSelectCallBack = (data: UserVO[]) => { const user: UserVO = data.length !== 0 ? data[0] : undefined; updateProperties({ 'flowable:assignee': user?.userId }); 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; 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 @@