RMS/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.com/witel-front-end/rms into feature/gasht_submit

Browse Source
This commit is contained in:
Mohammad Jalali
2025-01-05 13:25:25 +03:30
parent cc7daf036a 1559f98a01
commit 6a7677ec5c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
View File

@@ -1,7 +1,7 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { yupResolver } from "@hookform/resolvers/yup"; import { yupResolver } from "@hookform/resolvers/yup";
import { array, mixed, object, string } from "yup"; import { array, mixed, number, object, string } from "yup";
import { useTheme } from "@emotion/react"; import { useTheme } from "@emotion/react";
import useRequest from "@/lib/hooks/useRequest"; import useRequest from "@/lib/hooks/useRequest";
import { Box, Button, DialogActions, DialogContent, Tab, Tabs, useMediaQuery } from "@mui/material"; import { Box, Button, DialogActions, DialogContent, Tab, Tabs, useMediaQuery } from "@mui/material";
@@ -40,8 +40,8 @@ const defaultValues = {
end_point: "", end_point: "",
}; };
const validationSchema = object({ const validationSchema = object({
item_id: string().required("نوع آیتم را مشخص کنید!"), item_id: number().required("نوع آیتم را مشخص کنید!"),
sub_item_id: string().required("موضوع مشاهده شده را مشخص کنید!"), sub_item_id: number().required("موضوع مشاهده شده را مشخص کنید!"),
amount: string().required("وارد کردن مقدار الزامیست!"), amount: string().required("وارد کردن مقدار الزامیست!"),
cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"), cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"),
rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"), // بررسی حداقل یک آیتم, rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"), // بررسی حداقل یک آیتم,
@@ -133,7 +133,6 @@ const CreateFormContent = ({ setOpen, onSubmit }) => {
mode: "onBlur", mode: "onBlur",
context: { subItemsList }, context: { subItemsList },
}); });
const onSubmitBase = (data) => { const onSubmitBase = (data) => {
let result = { ...data }; let result = { ...data };
@@ -177,6 +176,7 @@ const CreateFormContent = ({ setOpen, onSubmit }) => {
...data, ...data,
item_name: itemsList.name, item_name: itemsList.name,
sub_item_name: subItemsList.name, sub_item_name: subItemsList.name,
unit_fa: subItemsList.unit,
}, },
}); });
}; };

1
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
View File

@@ -46,6 +46,7 @@ const EditFormContent = ({setOpenEditDialog, onSubmit, defaultData}) => {
...data, ...data,
item_name: subItem.item_str, item_name: subItem.item_str,
sub_item_name: subItemsList.name, sub_item_name: subItemsList.name,
unit_fa: subItemsList.unit,
}, },
}); });
}; };