diff --git a/app/project/detail/components/DispatchModal.tsx b/app/project/detail/components/DispatchModal.tsx index 7e860c1..84083af 100644 --- a/app/project/detail/components/DispatchModal.tsx +++ b/app/project/detail/components/DispatchModal.tsx @@ -3,15 +3,7 @@ import { taskDispatch } from "@/components/label/api/task" import { Task } from "@/components/label/api/task/typing" import { usePermissionStore } from "@/components/label/store/auth" -import { - Button, - Group, - Modal, - Select, - Stack, - Switch, - Text, -} from "@mantine/core" +import { Badge, Button, Group, Modal, Select, Stack, Text } from "@mantine/core" import { useForm } from "@mantine/form" import { notifications } from "@mantine/notifications" import { useEffect } from "react" @@ -30,7 +22,6 @@ export default function DispatchModal(props: { const form = useForm({ initialValues: { - reject: false, task_status_dst: "", uid_dst: "", }, @@ -41,7 +32,6 @@ export default function DispatchModal(props: { const resetFormState = () => { form.setValues({ - reject: false, task_status_dst: "", uid_dst: "", }) @@ -61,6 +51,7 @@ export default function DispatchModal(props: { const taskStatusSrc = dispatchData?.status ?? 0 const taskStatusSrcLabel = dispatchOpts[taskStatusSrc]?.label ?? "-" + const taskRejected = Boolean(dispatchData?.reject) const dstOptions = dispatchOpts[taskStatusSrc]?.opts?.map((o) => ({ label: o.label, @@ -116,7 +107,7 @@ export default function DispatchModal(props: { try { await taskDispatch({ operation_uid: opUid, - reject: values.reject, + reject: taskRejected, task_ids: task_ids.map((item) => item.id), task_status_src: taskStatusSrc, task_status_dst: taskStatusDst, @@ -143,9 +134,16 @@ export default function DispatchModal(props: { 当前任务: {task_ids.map((item) => item.project_name).join("、") ?? "-"} - - (源状态:{taskStatusSrcLabel}) - + + + (源状态:{taskStatusSrcLabel}) + + {taskRejected ? ( + + 返工 + + ) : null} +