fix: status restart can't change status
This commit is contained in:
parent
e099e5a091
commit
ecba1afa75
3 changed files with 23 additions and 4 deletions
|
|
@ -121,6 +121,7 @@ defineProps<{
|
||||||
Pending: 'waitReceive',
|
Pending: 'waitReceive',
|
||||||
Accept: 'receiveTask',
|
Accept: 'receiveTask',
|
||||||
Submit: 'sentTask',
|
Submit: 'sentTask',
|
||||||
|
Restart: 'status.Restart',
|
||||||
}[status] ?? 'waitReceive'
|
}[status] ?? 'waitReceive'
|
||||||
}`,
|
}`,
|
||||||
)
|
)
|
||||||
|
|
@ -130,6 +131,7 @@ defineProps<{
|
||||||
Pending: '--info-bg',
|
Pending: '--info-bg',
|
||||||
Accept: '--info-bg',
|
Accept: '--info-bg',
|
||||||
Submit: '--positive-bg',
|
Submit: '--positive-bg',
|
||||||
|
Restart: '--negative-bg',
|
||||||
}[status] ?? '--info-bg'
|
}[status] ?? '--info-bg'
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -978,12 +978,21 @@ watch([currentFormData.value.taskStatus], () => {
|
||||||
>
|
>
|
||||||
<template #append="{ props: subProps }">
|
<template #append="{ props: subProps }">
|
||||||
<TaskStatusComponent
|
<TaskStatusComponent
|
||||||
|
:key="subProps.row.id"
|
||||||
:no-action="view !== TaskOrderStatus.Validate"
|
:no-action="view !== TaskOrderStatus.Validate"
|
||||||
type="order"
|
type="order"
|
||||||
:readonly="
|
:readonly="
|
||||||
fullTaskOrder?.userTask.find(
|
(() => {
|
||||||
(l) => l.userId === v.responsibleUser.id,
|
const _userStatus =
|
||||||
)?.userTaskStatus !== UserTaskStatus.Submit
|
fullTaskOrder?.userTask.find(
|
||||||
|
(l) => l.userId === v.responsibleUser.id,
|
||||||
|
)?.userTaskStatus;
|
||||||
|
console.log(_userStatus);
|
||||||
|
return (
|
||||||
|
_userStatus !== UserTaskStatus.Submit &&
|
||||||
|
_userStatus !== UserTaskStatus.Restart
|
||||||
|
);
|
||||||
|
})()
|
||||||
"
|
"
|
||||||
:status="subProps.row.taskStatus"
|
:status="subProps.row.taskStatus"
|
||||||
@click-failed="
|
@click-failed="
|
||||||
|
|
@ -1070,7 +1079,14 @@ watch([currentFormData.value.taskStatus], () => {
|
||||||
<SaveButton
|
<SaveButton
|
||||||
v-if="state.mode !== 'create' && view === TaskOrderStatus.Validate"
|
v-if="state.mode !== 'create' && view === TaskOrderStatus.Validate"
|
||||||
:disabled="
|
: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="
|
@click="
|
||||||
dialogWarningClose(t, {
|
dialogWarningClose(t, {
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@ export enum UserTaskStatus {
|
||||||
Pending = 'Pending',
|
Pending = 'Pending',
|
||||||
Accept = 'Accept',
|
Accept = 'Accept',
|
||||||
Submit = 'Submit',
|
Submit = 'Submit',
|
||||||
|
Restart = 'Restart',
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SetTaskStatusPayload {
|
export interface SetTaskStatusPayload {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue