diff --git a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx index c1ea792..6c0a99f 100644 --- a/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx +++ b/src/components/dashboard/damages/operator/Actions/create/Forms/DamageItem.jsx @@ -87,7 +87,9 @@ const DamageItem = ({ baseOnChange, baseDamageItems }) => { `${option.title} - بروزرسانی: ${option.update_time ? moment(option.update_time).locale("fa").format("YYYY/MM/DD") : ""}` } + getOptionLabel={(option) => + `${option.title} - بروزرسانی: ${option.update_time ? moment(option.update_time).locale("fa").format("YYYY/MM/DD") : ""}` + } isOptionEqualToValue={(option, value) => option.id === value.id} loading={loadingDamageItemList} renderInput={(params) => ( diff --git a/src/components/dashboard/damages/operator/RowActions/ChangeStatus/Form.jsx b/src/components/dashboard/damages/operator/RowActions/ChangeStatus/Form.jsx index 3f30c68..370587c 100644 --- a/src/components/dashboard/damages/operator/RowActions/ChangeStatus/Form.jsx +++ b/src/components/dashboard/damages/operator/RowActions/ChangeStatus/Form.jsx @@ -44,59 +44,53 @@ const ChangeStatusForm = ({ setOpen, mutate, row }) => { .catch((error) => {}); }; - return ( - - - - - - ( - - )} - /> - + return ( + + + + + + ( + + )} + /> - - - - - - - - ); + + + + + + + + + ); }; export default ChangeStatusForm; diff --git a/src/components/dashboard/damages/operator/RowActions/index.jsx b/src/components/dashboard/damages/operator/RowActions/index.jsx index 1c735db..61cc5dc 100644 --- a/src/components/dashboard/damages/operator/RowActions/index.jsx +++ b/src/components/dashboard/damages/operator/RowActions/index.jsx @@ -13,7 +13,7 @@ const RowActions = ({ row, mutate }) => { const hasChangeStatusPermission = userPermissions.some((item) => ["change-accident-status"].includes(item)); const hasDeletePermission = userPermissions.some((item) => ["delete-receipt"].includes(item)); const hasDeleteProvincePermission = userPermissions.some((item) => ["delete-receipt-province"].includes(item)); - const hasEditPermission = userPermissions.some((item) => ["edit-receipt", "edit-receipt-province"].includes(item)); + const hasEditPermission = userPermissions.some((item) => ["edit-receipt", "edit-receipt-province"].includes(item)); return ( {[4, 5].includes(row.original?.status) && } diff --git a/src/components/dashboard/roadItems/operator/OperatorList.jsx b/src/components/dashboard/roadItems/operator/OperatorList.jsx index ff5fe03..7b4597a 100644 --- a/src/components/dashboard/roadItems/operator/OperatorList.jsx +++ b/src/components/dashboard/roadItems/operator/OperatorList.jsx @@ -138,8 +138,8 @@ const OperatorList = () => { props.dependencyFieldValue.value === "" ? "empty" : loadingSubItemsList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> diff --git a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx index d2e169d..69cc288 100644 --- a/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/roadItems/supervisor/SupervisorList.jsx @@ -138,8 +138,8 @@ const SupervisorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -238,8 +238,8 @@ const SupervisorList = () => { props.dependencyFieldValue.value === "" ? "empty" : loadingSubItemsList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} /> @@ -336,7 +336,7 @@ const SupervisorList = () => { filterMode: "between", grow: false, size: 100, - } + }, ], }, { diff --git a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx index fd0e3c6..075f80e 100644 --- a/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx +++ b/src/components/dashboard/roadMissions/transportation/RowActions/Allocation/Form/MachinesDialog/MachineList/RowActions/Allocate/index.jsx @@ -9,7 +9,12 @@ const Allocate = ({ row, setMachine, setOpenMachinesDialog }) => { return ( <> - diff --git a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx index 47b3c01..b32b0ff 100644 --- a/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx +++ b/src/components/dashboard/roadPatrols/supervisor/SupervisorList.jsx @@ -128,8 +128,8 @@ const SupervisorList = () => { props.dependencyFieldValue?.value === "" ? "empty" : loadingEdaratList - ? "loading" - : props.filterParameters.value + ? "loading" + : props.filterParameters.value } columnSelectOption={getColumnSelectOptions} />