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

fix: task receive => update user task status retrieval logic

Browse source
This commit is contained in:
puriphatt 2024-12-26 17:08:11 +07:00
parent 5df57063cd
commit 305f0dfc4a
1 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,8 +102,11 @@ async function fetchStatus() {
{ {
title: 'receive', title: 'receive',
status: getStatus( status: getStatus(
fullTaskOrder.value?.userTask[0]?.userTaskStatus || fullTaskOrder.value.userTask.find(
UserTaskStatus.Pending, (l) =>
l.userId ===
fullTaskOrder.value?.taskList[0].requestWorkStep.responsibleUserId,
)?.userTaskStatus || UserTaskStatus.Pending,
2, 2,
-1, -1,
), ),
@ -115,8 +118,11 @@ async function fetchStatus() {
{ {
title: 'sendTaskOrder', title: 'sendTaskOrder',
status: getStatus( status: getStatus(
fullTaskOrder.value?.userTask[0]?.userTaskStatus || fullTaskOrder.value.userTask.find(
UserTaskStatus.Pending, (l) =>
l.userId ===
fullTaskOrder.value?.taskList[0].requestWorkStep.responsibleUserId,
)?.userTaskStatus || UserTaskStatus.Pending,
2, 2,
2, 2,
), ),
@ -465,10 +471,14 @@ watch([currentFormData.value.taskStatus], () => {
fullTaskOrder.taskList[0].requestWorkStep.responsibleUser?.email fullTaskOrder.taskList[0].requestWorkStep.responsibleUser?.email
" "
:status=" :status="
fullTaskOrder.userTask[0]?.userTaskStatus || fullTaskOrder.userTask.find(
UserTaskStatus.Pending (l) =>
l.userId ===
fullTaskOrder?.taskList[0].requestWorkStep.responsibleUserId,
)?.userTaskStatus || UserTaskStatus.Pending
" "
/> />
<InfoProductExpansion <InfoProductExpansion
:code="currentFormData.code" :code="currentFormData.code"
:task-name="currentFormData.taskName" :task-name="currentFormData.taskName"
@ -486,8 +496,11 @@ watch([currentFormData.value.taskStatus], () => {
:contact-tel="currentFormData.contactTel" :contact-tel="currentFormData.contactTel"
:contact-name="currentFormData.contactName" :contact-name="currentFormData.contactName"
:userTaskStatus=" :userTaskStatus="
fullTaskOrder?.userTask[0]?.userTaskStatus || fullTaskOrder?.userTask.find(
UserTaskStatus.Pending (l) =>
l.userId ===
fullTaskOrder?.taskList[0].requestWorkStep.responsibleUserId,
)?.userTaskStatus || UserTaskStatus.Pending
" "
> >
<div <div
@ -571,17 +584,19 @@ watch([currentFormData.value.taskStatus], () => {
<div class="q-pa-md full-width"> <div class="q-pa-md full-width">
<TableEmployee <TableEmployee
:checkbox-on=" :checkbox-on="
fullTaskOrder.taskOrderStatus !== fullTaskOrder.taskList.every(
TaskOrderStatus.Pending && (v) =>
fullTaskOrder.userTask.every( v.taskStatus === TaskStatus.InProgress ||
(v) => v.userTaskStatus !== UserTaskStatus.Submit, v.taskStatus === TaskStatus.Success ||
v.taskStatus === TaskStatus.Failed,
) )
" "
:check-all=" :check-all="
fullTaskOrder.taskOrderStatus !== fullTaskOrder.taskList.every(
TaskOrderStatus.Pending && (v) =>
fullTaskOrder.userTask.every( v.taskStatus === TaskStatus.InProgress ||
(v) => v.userTaskStatus !== UserTaskStatus.Submit, v.taskStatus === TaskStatus.Success ||
v.taskStatus === TaskStatus.Failed,
) )
" "
step-on step-on
@ -593,8 +608,13 @@ watch([currentFormData.value.taskStatus], () => {
<TaskStatusComponent <TaskStatusComponent
type="receive" type="receive"
:readonly=" :readonly="
fullTaskOrder.taskOrderStatus === (fullTaskOrder?.userTask.find(
TaskOrderStatus.Pending (l) =>
l.userId ===
fullTaskOrder?.taskList[0].requestWorkStep
.responsibleUserId,
)?.userTaskStatus || UserTaskStatus.Pending) ===
UserTaskStatus.Pending
" "
:status="subProps.row.taskStatus" :status="subProps.row.taskStatus"
@click-failed=" @click-failed="