diff --git a/src/api/workflow/instance/index.ts b/src/api/workflow/instance/index.ts index 42d748d..fde16a2 100644 --- a/src/api/workflow/instance/index.ts +++ b/src/api/workflow/instance/index.ts @@ -31,9 +31,9 @@ export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise { +export const flowHisTaskList = (businessId: string | number) => { return request({ - url: `/workflow/instance/flowImage/${businessId}` + '?t' + Math.random(), + url: `/workflow/instance/flowHisTaskList/${businessId}` + '?t' + Math.random(), method: 'get' }); }; diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index 696312e..0f5ce1b 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -8,8 +8,7 @@ export default { query: { id: routerJumpVo.businessId, type: routerJumpVo.type, - taskId: routerJumpVo.taskId, - instanceId: routerJumpVo.instanceId + taskId: routerJumpVo.taskId } }); } diff --git a/src/api/workflow/workflowCommon/types.ts b/src/api/workflow/workflowCommon/types.ts index 2d09115..3e7a71d 100644 --- a/src/api/workflow/workflowCommon/types.ts +++ b/src/api/workflow/workflowCommon/types.ts @@ -4,7 +4,6 @@ export interface RouterJumpVo { type: string; formCustom: string; formPath: string; - instanceId: string | number; } export interface StartProcessBo { diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue index 96108f7..2413f08 100644 --- a/src/components/Process/approvalRecord.vue +++ b/src/components/Process/approvalRecord.vue @@ -3,7 +3,7 @@ - +
@@ -59,7 +59,7 @@
+ diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index bebb1f9..24aca86 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -270,7 +270,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => { }; //审批记录 const handleApprovalRecord = () => { - approvalRecordRef.value.init(form.value.id, routeParams.value.instanceId); + approvalRecordRef.value.init(form.value.id); }; //提交回调 const submitCallback = async () => { @@ -291,11 +291,6 @@ const submitButtonShow = computed(() => { ); }); -//校验审批按钮是否显示 -const approvalButtonShow = computed(() => { - return routeParams.value.type === 'approval' && form.value.status && form.value.status === 'waiting'; -}); - onMounted(() => { nextTick(async () => { routeParams.value = proxy.$route.query; diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index 9776722..9265c52 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -159,7 +159,7 @@ @@ -371,8 +371,7 @@ const handleView = (row) => { taskId: row.id, type: 'view', formCustom: row.formCustom, - formPath: row.formPath, - instanceId: row.instanceId + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue index c7cfcd7..18f3c39 100644 --- a/src/views/workflow/task/myDocument.vue +++ b/src/views/workflow/task/myDocument.vue @@ -80,7 +80,7 @@ 撤销撤销 @@ -239,8 +239,7 @@ const handleOpen = async (row, type) => { taskId: row.id, type: type, formCustom: row.formCustom, - formPath: row.formPath, - instanceId: row.instanceId + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue index 9df0921..673960f 100644 --- a/src/views/workflow/task/taskCopyList.vue +++ b/src/views/workflow/task/taskCopyList.vue @@ -125,8 +125,7 @@ const handleView = (row) => { taskId: row.id, type: 'view', formCustom: row.formCustom, - formPath: row.formPath, - instanceId: row.instanceId + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue index 79f25e5..786202a 100644 --- a/src/views/workflow/task/taskFinish.vue +++ b/src/views/workflow/task/taskFinish.vue @@ -158,8 +158,7 @@ const handleView = (row: FlowTaskVO) => { taskId: row.id, type: 'view', formCustom: row.formCustom, - formPath: row.formPath, - instanceId: row.instanceId + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); }; diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index 4a26afa..31feb90 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -160,8 +160,7 @@ const handleOpen = async (row: FlowTaskVO) => { taskId: row.id, type: 'approval', formCustom: row.formCustom, - formPath: row.formPath, - instanceId: row.instanceId + formPath: row.formPath }); workflowCommon.routerJump(routerJumpVo, proxy); };