chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

feat: include Canceled and Pending statuses in task status checks & update submitTaskOrder to accept user ID

Browse source
This commit is contained in:
puriphatt 2024-12-26 15:15:07 +07:00
parent 1aedfe742f
commit fc804afd58
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pages/09_task-order/receive_view/MainPage.vue
View file

@ -205,11 +205,15 @@ async function sendTask() {
!fullTaskOrder.value.taskList.every( !fullTaskOrder.value.taskList.every(
(t) => (t) =>
t.taskStatus === TaskStatus.Success || t.taskStatus === TaskStatus.Success ||
t.taskStatus === TaskStatus.Failed, t.taskStatus === TaskStatus.Failed ||
t.taskStatus === TaskStatus.Canceled,
) )
) )
return; return;
await useTaskOrderStore().submitTaskOrder(fullTaskOrder.value.id); await useTaskOrderStore().submitTaskOrder(
fullTaskOrder.value.id,
getUserId(),
);
await taskOrderFormStore.assignFormData( await taskOrderFormStore.assignFormData(
fullTaskOrder.value.id, fullTaskOrder.value.id,
'info', 'info',
@ -288,7 +292,11 @@ function taskStatusCount(index: number, id: string) {
(t) => t.requestWorkStep.requestWork.productService.productId === id, (t) => t.requestWorkStep.requestWork.productService.productId === id,
); );
if (index === 1) { 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) { } else if (index === 2) {
return task?.filter( return task?.filter(
(t) => (t) =>
@ -670,7 +678,8 @@ watch([currentFormData.value.taskStatus], () => {
!fullTaskOrder.taskList.every( !fullTaskOrder.taskList.every(
(t) => (t) =>
t.taskStatus === TaskStatus.Success || t.taskStatus === TaskStatus.Success ||
t.taskStatus === TaskStatus.Failed, t.taskStatus === TaskStatus.Failed ||
t.taskStatus === TaskStatus.Canceled,
) )
" "
@click=" @click="

6
src/stores/task-order/index.ts
View file

@ -130,8 +130,10 @@ export const useTaskOrderStore = defineStore('taskorder-store', () => {
return null; return null;
} }
async function submitTaskOrder(id: string) { async function submitTaskOrder(id: string, submitUserId?: string) {
const res = await api.post<TaskOrder>(`/task-order/${id}/submit`); const res = await api.post<TaskOrder>(`/task-order/${id}/submit`, {
params: { submitUserId },
});
if (res.status < 400) { if (res.status < 400) {
return true; return true;