fix: status restart can't change status

This commit is contained in:
Thanaphon Frappet 2025-01-09 14:41:54 +07:00
parent e099e5a091
commit ecba1afa75
3 changed files with 23 additions and 4 deletions

View file

@ -121,6 +121,7 @@ defineProps<{
Pending: 'waitReceive',
Accept: 'receiveTask',
Submit: 'sentTask',
Restart: 'status.Restart',
}[status] ?? 'waitReceive'
}`,
)
@ -130,6 +131,7 @@ defineProps<{
Pending: '--info-bg',
Accept: '--info-bg',
Submit: '--positive-bg',
Restart: '--negative-bg',
}[status] ?? '--info-bg'
"
/>

View file

@ -978,12 +978,21 @@ watch([currentFormData.value.taskStatus], () => {
>
<template #append="{ props: subProps }">
<TaskStatusComponent
:key="subProps.row.id"
:no-action="view !== TaskOrderStatus.Validate"
type="order"
:readonly="
fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus !== UserTaskStatus.Submit
(() => {
const _userStatus =
fullTaskOrder?.userTask.find(
(l) => l.userId === v.responsibleUser.id,
)?.userTaskStatus;
console.log(_userStatus);
return (
_userStatus !== UserTaskStatus.Submit &&
_userStatus !== UserTaskStatus.Restart
);
})()
"
:status="subProps.row.taskStatus"
@click-failed="
@ -1070,7 +1079,14 @@ watch([currentFormData.value.taskStatus], () => {
<SaveButton
v-if="state.mode !== 'create' && view === TaskOrderStatus.Validate"
:disabled="
fullTaskOrder?.taskOrderStatus === TaskOrderStatus.Complete
!fullTaskOrder?.taskList.some((t) =>
[
TaskStatus.Complete,
TaskStatus.Redo,
TaskStatus.Canceled,
TaskStatus.Validate,
].includes(t.taskStatus),
) || fullTaskOrder?.taskOrderStatus === TaskOrderStatus.Complete
"
@click="
dialogWarningClose(t, {

View file

@ -198,6 +198,7 @@ export enum UserTaskStatus {
Pending = 'Pending',
Accept = 'Accept',
Submit = 'Submit',
Restart = 'Restart',
}
export interface SetTaskStatusPayload {