fixed bugs

This commit is contained in:
AmirHossein Mahmoodi
2025-02-25 17:04:58 +03:30
parent 0498c3022d
commit 3756bfd7a0
4 changed files with 143 additions and 103 deletions

View File

@@ -16,83 +16,6 @@ const DamageInfo = ({ control, setValue, errors }) => {
return ( return (
<Stack> <Stack>
<Grid sx={{ mt: 1 }} container spacing={2}>
<Grid item xs={12} md={4}>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<MuiDatePicker
name="accident_date"
error={error}
value={field.value}
placeholder={"تاریخ تصادف را وارد کنید"}
label={"تاریخ تصادف"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
name={"accident_date"}
/>
</Grid>
<Grid item xs={12} md={4}>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="accident_time"
error={error}
value={field.value}
placeholder={"زمان تصادف را وارد کنید"}
label={"زمان تصادف"}
setFieldValue={(name, value) => field.onChange(value || null)}
helperText={error ? error.message : null}
/>
);
}}
name={"accident_time"}
/>
</Grid>
<Grid item xs={12} md={4}>
<Controller
name="accident_type"
control={control}
render={({ field, fieldState: { error } }) => {
return (
<SelectBox
value={field.value}
label="نوع خسارت"
selectors={[
{
id: 1,
value: "1",
name: "خسارتی",
},
{
id: 2,
value: "2",
name: "جرحی",
},
{
id: 3,
value: "3",
name: "فوتی",
},
]}
schema={{ name: "name", value: "value" }}
error={error}
onChange={field.onChange}
helperText={error?.message}
isLoading={false}
errorEcured={false}
/>
);
}}
/>
</Grid>
</Grid>
<Grid sx={{ mt: 2 }} container spacing={2}> <Grid sx={{ mt: 2 }} container spacing={2}>
<Grid item xs={12} md={4}> <Grid item xs={12} md={4}>
<Controller <Controller
@@ -184,12 +107,13 @@ const DamageInfo = ({ control, setValue, errors }) => {
} }
field.onChange(inputValue); field.onChange(inputValue);
}} }}
label="کد ملی" label="کد ملی راننده"
placeholder={"کد ملی را وارد کنید"} placeholder={"کد ملی راننده را وارد کنید"}
fullWidth fullWidth
size="small" size="small"
error={error} error={error}
helperText={error?.message} helperText={error?.message}
InputLabelProps={{ shrink: true }}
/> />
)} )}
/> />
@@ -218,12 +142,13 @@ const DamageInfo = ({ control, setValue, errors }) => {
} }
field.onChange(inputValue); field.onChange(inputValue);
}} }}
label="شماره تماس" label="شماره موبایل راننده"
placeholder={"شماره تماس را وارد کنید"} placeholder={"شماره موبایل راننده را وارد کنید"}
fullWidth fullWidth
size="small" size="small"
error={error} error={error}
helperText={error?.message} helperText={error?.message}
InputLabelProps={{ shrink: true }}
/> />
)} )}
/> />
@@ -232,6 +157,83 @@ const DamageInfo = ({ control, setValue, errors }) => {
<PlateNumber control={control} /> <PlateNumber control={control} />
</Grid> </Grid>
</Grid> </Grid>
<Grid sx={{ mt: 1 }} container spacing={2}>
<Grid item xs={12} md={4}>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<MuiDatePicker
name="accident_date"
error={error}
value={field.value}
placeholder={"تاریخ تصادف را وارد کنید"}
label={"تاریخ تصادف"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
name={"accident_date"}
/>
</Grid>
<Grid item xs={12} md={4}>
<Controller
control={control}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="accident_time"
error={error}
value={field.value}
placeholder={"زمان تصادف را وارد کنید"}
label={"زمان تصادف"}
setFieldValue={(name, value) => field.onChange(value || null)}
helperText={error ? error.message : null}
/>
);
}}
name={"accident_time"}
/>
</Grid>
<Grid item xs={12} md={4}>
<Controller
name="accident_type"
control={control}
render={({ field, fieldState: { error } }) => {
return (
<SelectBox
value={field.value}
label="نوع خسارت"
selectors={[
{
id: 1,
value: "1",
name: "خسارتی",
},
{
id: 2,
value: "2",
name: "جرحی",
},
{
id: 3,
value: "3",
name: "فوتی",
},
]}
schema={{ name: "name", value: "value" }}
error={error}
onChange={field.onChange}
helperText={error?.message}
isLoading={false}
errorEcured={false}
/>
);
}}
/>
</Grid>
</Grid>
<Grid sx={{ mt: 2 }} container spacing={2}> <Grid sx={{ mt: 2 }} container spacing={2}>
<Grid item xs={12} md={6}> <Grid item xs={12} md={6}>
<Controller <Controller

View File

@@ -121,14 +121,13 @@ const RegisterInsuranceContent = ({ setOpenRegisterInsuranceDialog, row, mutate,
formData.append("deposit_insurance_amount", data.deposit_insurance_amount); formData.append("deposit_insurance_amount", data.deposit_insurance_amount);
formData.append("deposit_insurance_image", data.deposit_insurance_image); formData.append("deposit_insurance_image", data.deposit_insurance_image);
} }
requestServer(`${CONFIRM_PAYMENT_INFO}/${rowId}`, "post", { try {
data: formData, await requestServer(`${CONFIRM_PAYMENT_INFO}/${rowId}`, "post", {
}) data: formData,
.then(() => { });
mutate(); mutate();
setOpenRegisterInsuranceDialog(false); setOpenRegisterInsuranceDialog(false);
}) } catch (error) {}
.catch(() => {});
}; };
return ( return (
<StyledForm onSubmit={handleSubmit(onSubmitBase)}> <StyledForm onSubmit={handleSubmit(onSubmitBase)}>
@@ -178,6 +177,7 @@ const RegisterInsuranceContent = ({ setOpenRegisterInsuranceDialog, row, mutate,
type="button" type="button"
onClick={handleNext} onClick={handleNext}
variant="contained" variant="contained"
key={"handleNext"}
size="large" size="large"
endIcon={<KeyboardDoubleArrowLeftIcon />} endIcon={<KeyboardDoubleArrowLeftIcon />}
> >
@@ -190,6 +190,7 @@ const RegisterInsuranceContent = ({ setOpenRegisterInsuranceDialog, row, mutate,
variant="contained" variant="contained"
size="large" size="large"
disabled={isSubmitting} disabled={isSubmitting}
key={"submit"}
endIcon={<BeenhereIcon />} endIcon={<BeenhereIcon />}
> >
{isSubmitting ? "در حال ثبت" : "ثبت"} {isSubmitting ? "در حال ثبت" : "ثبت"}

View File

@@ -17,6 +17,7 @@ import DamageReportDialog from "./RowActions/DamageReport";
const OperatorList = () => { const OperatorList = () => {
const statusOptions = [ const statusOptions = [
{ value: "", label: "همه وضعیت ها" },
{ value: 0, label: "بدون اقدام" }, { value: 0, label: "بدون اقدام" },
{ value: 1, label: "صدور نامه بیمه و کارشناسی داغی" }, { value: 1, label: "صدور نامه بیمه و کارشناسی داغی" },
{ value: 2, label: "فیش ها ثبت شده است" }, { value: 2, label: "فیش ها ثبت شده است" },
@@ -109,7 +110,7 @@ const OperatorList = () => {
return [{ value: "error", label: "خطا در بارگذاری" }]; return [{ value: "error", label: "خطا در بارگذاری" }];
} }
return [ return [
{ value: "", label: "شهر" }, { value: "", label: "کل شهر ها" },
...edaratList.map((edare) => ({ ...edaratList.map((edare) => ({
value: edare.id, value: edare.id,
label: edare.name_fa, label: edare.name_fa,
@@ -149,6 +150,54 @@ const OperatorList = () => {
grow: false, grow: false,
size: 120, size: 120,
}, },
{
accessorKey: "driver_name",
header: "نام راننده",
id: "driver_name",
enableColumnFilter: true,
enableSorting: true,
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
grow: false,
size: 120,
},
{
accessorKey: "driver_national_code",
header: "کد ملی راننده",
id: "driver_national_code",
enableColumnFilter: true,
enableSorting: true,
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
grow: false,
size: 120,
},
{
accessorKey: "driver_phone_number",
header: "شماره موبایل راننده",
id: "driver_phone_number",
enableColumnFilter: true,
enableSorting: true,
datatype: "text",
filterMode: "equals",
columnFilterModeOptions: ["equals", "contains"],
grow: false,
size: 120,
},
{
accessorKey: "plaque",
header: "پلاک",
id: "plaque",
enableColumnFilter: false,
datatype: "text",
filterMode: "equals",
enableSorting: false,
grow: false,
size: 100,
Cell: ({ renderedCellValue }) => <ShowPlate plate={renderedCellValue} />,
},
{ {
accessorKey: "accident_type", accessorKey: "accident_type",
header: "نوع تصادف", // Value header: "نوع تصادف", // Value
@@ -238,18 +287,6 @@ const OperatorList = () => {
); );
}, },
}, },
{
accessorKey: "plaque",
header: "پلاک",
id: "plaque",
enableColumnFilter: true,
datatype: "text",
filterMode: "equals",
sortDescFirst: true,
grow: false,
size: 100,
Cell: ({ renderedCellValue }) => <ShowPlate plate={renderedCellValue} />,
},
], ],
}, },
{ {

View File

@@ -17,7 +17,7 @@ const DamageReportContent = ({ damageReportDetails }) => {
icon={<PaymentIcon />} icon={<PaymentIcon />}
label={ label={
<Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}> <Typography variant="body2" sx={{ fontWeight: 600, color: "grey.700" }}>
گزارش دهنده نوع گزارش
</Typography> </Typography>
} }
/> />