diff --git a/saber3/src/api/workflow/index.js b/saber3/src/api/workflow/index.js index 4358438..c60dc95 100644 --- a/saber3/src/api/workflow/index.js +++ b/saber3/src/api/workflow/index.js @@ -42,13 +42,21 @@ export const getTodoList = (current, size, params) => { * 对应接口: GET /blade-zhaocai/zcProcess/getDonePageList */ export const getDoneList = (current, size, params) => { + const { keyWord, processName, processId, userCode, ...rest } = params; + const zcProcessQueryTask = JSON.stringify({ + keyWord: keyWord || '', + processName: processName || '', + processId: processId || '', + userCode: userCode || '', + }); return request({ url: '/blade-zhaocai/zcProcess/getDonePageList', method: 'get', params: { - ...params, + ...rest, pageNo: current, pageSize: size, + zcProcessQueryTask, }, }); }; @@ -58,13 +66,21 @@ export const getDoneList = (current, size, params) => { * 对应接口: GET /blade-zhaocai/zcProcess/getAppliedPageList */ export const getMyList = (current, size, params) => { + const { keyWord, processName, processId, userCode, ...rest } = params; + const zcProcessQueryTask = JSON.stringify({ + keyWord: keyWord || '', + processName: processName || '', + processId: processId || '', + userCode: userCode || '', + }); return request({ url: '/blade-zhaocai/zcProcess/getAppliedPageList', method: 'get', params: { - ...params, + ...rest, pageNo: current, pageSize: size, + zcProcessQueryTask, }, }); }; diff --git a/saber3/src/views/workflow/done.vue b/saber3/src/views/workflow/done.vue index 7c2f06d..387b848 100644 --- a/saber3/src/views/workflow/done.vue +++ b/saber3/src/views/workflow/done.vue @@ -90,7 +90,8 @@