diff --git a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx
index c7f516d..72fc54b 100644
--- a/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx
+++ b/src/components/dashboard/roadMissions/control/RowActions/StartMission/StartMissionContent.jsx
@@ -11,6 +11,7 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => {
const validationSchema = object().shape({
code: string().length(6, "کد خروج باید 6 رقم باشد").required("لطفاً کد خروج را وارد کنید."),
+ km: string().required("لطفاً کیلومتر را وارد کنید."),
});
const {
@@ -20,6 +21,7 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => {
} = useForm({
defaultValues: {
code: "",
+ km : ""
},
resolver: yupResolver(validationSchema),
mode: "all",
@@ -29,6 +31,7 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => {
requestServer(`${START_MISSION}/${rowId}`, "post", {
data: {
code: values.code,
+ km: values.km,
},
hasSidebarUpdate: true,
})
@@ -69,6 +72,27 @@ const StartMissionContent = ({ rowId, mutate, setOpenStartMissionDialog }) => {
)}
/>
+
+ (
+ {
+ if (isNaN(Number(e.target.value))) return;
+ field.onChange(e.target.value)
+ }}
+ size="small"
+ fullWidth
+ label="کیلومتر خودرو / ساعت کار"
+ InputLabelProps={{ shrink: true }}
+ />
+ )}
+ />
+
diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx
index f5d4395..eb591e8 100644
--- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx
+++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/index.jsx
@@ -22,16 +22,14 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => {
const requestServer = useRequest({ notificationSuccess: true });
const [machine, setMachine] = useState();
const [driver, setDriver] = useState();
- const [kilometer, setKilometer] = useState();
const [isSubmitting, setIsSubmitting] = useState(false);
- const handleSubmit = async (_machine, _driver, _kilometer) => {
+ const handleSubmit = async (_machine, _driver) => {
setIsSubmitting(true);
await requestServer(`${ALLOCATE_REQUEST_MISSION}/${row.id}`, "post", {
data: {
- machines: [_machine.id],
+ machines: _machine.id,
driver: _driver.id,
- km: kilometer,
},
hasSidebarUpdate: true,
})
@@ -110,23 +108,7 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => {
)}
)}
- {driver && (
-
- {
- if (isNaN(Number(e.target.value))) return;
- setKilometer(e.target.value);
- }}
- size="small"
- fullWidth
- label="کیلومتر خودرو"
- InputLabelProps={{ shrink: true }}
- />
-
- )}
+
@@ -208,10 +190,10 @@ const AllocationForm = ({ row, mutate, setOpenAllocationDialog }) => {