diff --git a/src/pages/09_task-order/receive_view/MainPage.vue b/src/pages/09_task-order/receive_view/MainPage.vue index 655f18bd..55c87d73 100644 --- a/src/pages/09_task-order/receive_view/MainPage.vue +++ b/src/pages/09_task-order/receive_view/MainPage.vue @@ -205,11 +205,15 @@ async function sendTask() { !fullTaskOrder.value.taskList.every( (t) => t.taskStatus === TaskStatus.Success || - t.taskStatus === TaskStatus.Failed, + t.taskStatus === TaskStatus.Failed || + t.taskStatus === TaskStatus.Canceled, ) ) return; - await useTaskOrderStore().submitTaskOrder(fullTaskOrder.value.id); + await useTaskOrderStore().submitTaskOrder( + fullTaskOrder.value.id, + getUserId(), + ); await taskOrderFormStore.assignFormData( fullTaskOrder.value.id, 'info', @@ -288,7 +292,11 @@ function taskStatusCount(index: number, id: string) { (t) => t.requestWorkStep.requestWork.productService.productId === id, ); if (index === 1) { - return task?.filter((t) => t.taskStatus === TaskStatus.InProgress).length; + return task?.filter( + (t) => + t.taskStatus === TaskStatus.InProgress || + t.taskStatus === TaskStatus.Pending, + ).length; } else if (index === 2) { return task?.filter( (t) => @@ -670,7 +678,8 @@ watch([currentFormData.value.taskStatus], () => { !fullTaskOrder.taskList.every( (t) => t.taskStatus === TaskStatus.Success || - t.taskStatus === TaskStatus.Failed, + t.taskStatus === TaskStatus.Failed || + t.taskStatus === TaskStatus.Canceled, ) " @click=" diff --git a/src/stores/task-order/index.ts b/src/stores/task-order/index.ts index 18bf19c8..8bd532b4 100644 --- a/src/stores/task-order/index.ts +++ b/src/stores/task-order/index.ts @@ -130,8 +130,10 @@ export const useTaskOrderStore = defineStore('taskorder-store', () => { return null; } - async function submitTaskOrder(id: string) { - const res = await api.post(`/task-order/${id}/submit`); + async function submitTaskOrder(id: string, submitUserId?: string) { + const res = await api.post(`/task-order/${id}/submit`, { + params: { submitUserId }, + }); if (res.status < 400) { return true;