diff --git a/src/components/dashboard/fastReact/complaintList/Form/registerAction/index.jsx b/src/components/dashboard/fastReact/complaintList/Form/registerAction/index.jsx
index 7362f4b..ccf4e22 100644
--- a/src/components/dashboard/fastReact/complaintList/Form/registerAction/index.jsx
+++ b/src/components/dashboard/fastReact/complaintList/Form/registerAction/index.jsx
@@ -15,7 +15,6 @@ const RegisterAction = ({ rowId, mutate }) => {
         image_after_1: null,
     };
     const onBaseSubmit = async (result) => {
-        console.log(result);
         const formData = new FormData();
         const rmsLatLng = `${result.start_point.lat},${result.start_point.lng}`;
         if (result.rms_status === "1") {
@@ -35,7 +34,7 @@ const RegisterAction = ({ rowId, mutate }) => {
                 mutate();
                 setOpenRegisterActionDialog(false);
             })
-            .catch(() => {});
+            .catch(() => { });
     };
     return (
         <>
diff --git a/src/components/dashboard/fastReact/operator/Form/EditForm/EditController.jsx b/src/components/dashboard/fastReact/operator/Form/EditForm/EditController.jsx
index 5025d54..b95f106 100644
--- a/src/components/dashboard/fastReact/operator/Form/EditForm/EditController.jsx
+++ b/src/components/dashboard/fastReact/operator/Form/EditForm/EditController.jsx
@@ -31,7 +31,6 @@ const EditController = ({ rowId, mutate, setOpenEditDialog }) => {
         image_after_1: fastReactItemDetails?.image_after || null,
     };
     const HandleSubmit = async (result) => {
-        console.log("result", result);
         const formData = new FormData();
         const rmsLatLng = `${result.start_point.lat},${result.start_point.lng}`;
         if (result.rms_status === "1") {
@@ -53,7 +52,7 @@ const EditController = ({ rowId, mutate, setOpenEditDialog }) => {
                 mutate();
                 setOpenEditDialog(false);
             })
-            .catch(() => {});
+            .catch(() => { });
     };
     return (
         <>
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepOne/CreateFormContent.jsx b/src/components/dashboard/roadSafety/operator/Form/StepOne/CreateFormContent.jsx
index 3ff2907..1d3e4b1 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepOne/CreateFormContent.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepOne/CreateFormContent.jsx
@@ -27,7 +27,7 @@ function TabPanel(props) {
 const validationSchema = object({
     recognize_picture: mixed().nullable().required("لطفا عکس فعالیت را بارگذاری کنید!"),
     info_id: number().required("نوع آیتم را مشخص کنید!"),
-    axis_type_id: number().required("نوع محور را مشخص کنید!"),
+    axis_type_id: string().required("نوع محور را مشخص کنید!"),
     start_point: mixed()
         .test("start-point-required", "لطفاً نقطه شروع را مشخص کنید!", function (value) {
             return !!value; // چک می‌کند که مقدار موجود است
@@ -42,7 +42,7 @@ const CreateFormContent = ({ setOpen, mutate }) => {
     const [itemsList, setItemsList] = useState();
     const defaultValues = {
         info_id: null,
-        axis_type_id: null,
+        axis_type_id: '',
         recognize_picture: null,
         activity_date: "",
         activity_time: "",
@@ -95,7 +95,7 @@ const CreateFormContent = ({ setOpen, mutate }) => {
                 mutate();
                 setOpen(false);
             })
-            .catch((error) => {});
+            .catch((error) => { });
     };
 
     return (
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepOne/GetItemInfo.jsx b/src/components/dashboard/roadSafety/operator/Form/StepOne/GetItemInfo.jsx
index da3c533..ad9ef36 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepOne/GetItemInfo.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepOne/GetItemInfo.jsx
@@ -1,8 +1,7 @@
-import React from "react";
-import { Card, CardActionArea, Grid, LinearProgress, Typography } from "@mui/material";
-import Image from "next/image";
-import { Controller } from "react-hook-form";
+import DialogLoading from "@/core/components/DialogLoading";
 import useSafetyAndPrivacyGetItems from "@/lib/hooks/useSafetyAndPrivacyGetItems";
+import { Card, CardActionArea, Grid, Typography } from "@mui/material";
+import { Controller } from "react-hook-form";
 
 const GetItemInfo = ({ setItemsList, setTabState, control }) => {
     const { itemsList, loadingItemsList, errorItemsList } = useSafetyAndPrivacyGetItems();
@@ -14,7 +13,7 @@ const GetItemInfo = ({ setItemsList, setTabState, control }) => {
                     خطا در دریافت لیست آیتم ها
                 </Typography>
             ) : loadingItemsList ? (
-                <LinearProgress />
+                <DialogLoading />
             ) : (
                 <Grid container sx={{ justifyContent: "center" }} spacing={2}>
                     <Controller
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepThree/StepThreeContent.jsx b/src/components/dashboard/roadSafety/operator/Form/StepThree/StepThreeContent.jsx
index c0902c3..296ac53 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepThree/StepThreeContent.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepThree/StepThreeContent.jsx
@@ -34,11 +34,11 @@ const StepThreeContent = ({ setOpen, mutate, rowId }) => {
                 mutate();
                 setOpen(false);
             })
-            .catch((error) => {});
+            .catch((error) => { });
     };
     return (
         <StyledForm onSubmit={handleSubmit(onSubmit)}>
-            <DialogContent>
+            <DialogContent dividers>
                 <Stack spacing={2}>
                     <Controller
                         name="action_picture"
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepThree/index.jsx b/src/components/dashboard/roadSafety/operator/Form/StepThree/index.jsx
index a2bb0ad..8602d6e 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepThree/index.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepThree/index.jsx
@@ -20,7 +20,7 @@ const StepThree = ({ mutate, rowId }) => {
                     },
                 }}
                 dir="rtl"
-                maxWidth={"md"}
+                maxWidth={"sm"}
                 fullWidth
             >
                 <DialogTitle>بارگذاری تصویر اقدام</DialogTitle>
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepTwo/StepTwoContent.jsx b/src/components/dashboard/roadSafety/operator/Form/StepTwo/StepTwoContent.jsx
index b21be85..6276545 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepTwo/StepTwoContent.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepTwo/StepTwoContent.jsx
@@ -53,11 +53,11 @@ const StepTwoContent = ({ setOpenStepTwoDialog, mutate, rowId }) => {
                 mutate();
                 setOpenStepTwoDialog(false);
             })
-            .catch((error) => {});
+            .catch((error) => { });
     };
     return (
         <StyledForm onSubmit={handleSubmit(onSubmit)}>
-            <DialogContent>
+            <DialogContent dividers>
                 <Stack spacing={2}>
                     <Controller
                         control={control}
@@ -86,7 +86,9 @@ const StepTwoContent = ({ setOpenStepTwoDialog, mutate, rowId }) => {
                     <Chip variant="outlined" label="لیست مستندات قضایی" />
                 </Divider>
                 {selectedDamageItemList.length === 0 && (
-                    <Box sx={{ my: 4, width: "100%", textAlign: "center" }}>
+                    <Box sx={{
+                        my: 4, width: "100%", textAlign: "center"
+                    }}>
                         <Typography variant="h6" sx={{ letterSpacing: "2px", color: "#606060" }}>
                             فایل موردنظر را بارگذاری کنید.
                         </Typography>
diff --git a/src/components/dashboard/roadSafety/operator/Form/StepTwo/index.jsx b/src/components/dashboard/roadSafety/operator/Form/StepTwo/index.jsx
index 2308d02..5bdfe20 100644
--- a/src/components/dashboard/roadSafety/operator/Form/StepTwo/index.jsx
+++ b/src/components/dashboard/roadSafety/operator/Form/StepTwo/index.jsx
@@ -21,7 +21,7 @@ const StepTwo = ({ mutate, rowId }) => {
                     },
                 }}
                 dir="rtl"
-                maxWidth={"md"}
+                maxWidth={"sm"}
                 fullWidth
             >
                 <DialogTitle>بارگذاری مستندات قضایی</DialogTitle>
diff --git a/src/components/dashboard/roadSafety/operator/OperatorList.jsx b/src/components/dashboard/roadSafety/operator/OperatorList.jsx
index e64dc79..70fd413 100644
--- a/src/components/dashboard/roadSafety/operator/OperatorList.jsx
+++ b/src/components/dashboard/roadSafety/operator/OperatorList.jsx
@@ -133,8 +133,8 @@ const OperatorList = () => {
                                 props.dependencyFieldValue?.value === ""
                                     ? "empty"
                                     : loadingEdaratList
-                                      ? "loading"
-                                      : props.filterParameters.value
+                                        ? "loading"
+                                        : props.filterParameters.value
                             }
                             columnSelectOption={getColumnSelectOptions}
                         />
@@ -181,7 +181,7 @@ const OperatorList = () => {
                             }));
                         },
                         Cell: ({ row }) =>
-                            row.original?.axis_type_name ? <>{row.original.axis_type_name}</> : <>بدون محور</>,
+                            row.original?.axis_type_name ? <>{row.original.axis_type_name}</> : <>-</>,
                     },
                     {
                         accessorKey: "location",
@@ -244,7 +244,7 @@ const OperatorList = () => {
                                     <RecognizePictureDialog image={renderedCellValue} />
                                 </Stack>
                             ) : (
-                                <>بدون تصویر</>
+                                <>-</>
                             );
                         },
                     },
@@ -253,7 +253,7 @@ const OperatorList = () => {
                             row.activity_date_time ? (
                                 moment(row.activity_date_time).locale("fa").format("HH:mm | yyyy/MM/DD")
                             ) : (
-                                <>بدون تاریخ</>
+                                <>-</>
                             ),
                         header: "تاریخ بازدید",
                         id: "activity_date_time",
@@ -294,7 +294,9 @@ const OperatorList = () => {
                         Cell: ({ row }) => {
                             return (
                                 <Stack alignItems={"center"} justifyContent={"center"}>
-                                    <JudiciaryDocumentDialog rowId={row.getValue("id")} />
+                                    {row.original.judiciary_document_upload_date !== "0000-00-00 00:00:00" ? (
+                                        <JudiciaryDocumentDialog rowId={row.getValue("id")} />
+                                    ) : (<>-</>)}
                                 </Stack>
                             );
                         },
@@ -303,12 +305,12 @@ const OperatorList = () => {
                         accessorFn: (row) => {
                             const date = row.judiciary_document_upload_date;
                             if (!date || date === "0000-00-00 00:00:00") {
-                                return <>بدون تاریخ</>;
+                                return <>-</>;
                             }
                             return moment(date, "YYYY-MM-DD HH:mm:ss").locale("fa").format("HH:mm | yyyy/MM/DD");
                         },
 
-                        header: "تاریخ مستندات قضایی",
+                        header: "تاریخ بارگذاری مستندات",
                         id: "judiciary_document_upload_date",
                         enableColumnFilter: true,
                         datatype: "date",
@@ -351,7 +353,7 @@ const OperatorList = () => {
                                     <ActionPictureDialog image={renderedCellValue} />
                                 </Stack>
                             ) : (
-                                <>بدون تصویر</>
+                                <>-</>
                             );
                         },
                     },
@@ -362,7 +364,7 @@ const OperatorList = () => {
                                     .locale("fa")
                                     .format("HH:mm | yyyy/MM/DD")
                             ) : (
-                                <>بدون تاریخ</>
+                                <>-</>
                             ),
                         header: "تاریخ اقدام",
                         id: "action_picture_document_upload_date",
diff --git a/src/components/dashboard/roadSafety/operator/RowActions/JudiciaryDocumentDialog/index.jsx b/src/components/dashboard/roadSafety/operator/RowActions/JudiciaryDocumentDialog/index.jsx
index 0ff10cc..575d4c5 100644
--- a/src/components/dashboard/roadSafety/operator/RowActions/JudiciaryDocumentDialog/index.jsx
+++ b/src/components/dashboard/roadSafety/operator/RowActions/JudiciaryDocumentDialog/index.jsx
@@ -25,7 +25,7 @@ const JudiciaryDocumentDialog = ({ rowId }) => {
                 fullWidth
             >
                 <DialogTitle>مشاهده مستندات قضایی</DialogTitle>
-                <DialogContent>
+                <DialogContent dividers>
                     <JudiciaryDocumentController rowId={rowId} />
                 </DialogContent>
                 <DialogActions>
diff --git a/src/components/dashboard/roadSafety/operator/RowActions/index.jsx b/src/components/dashboard/roadSafety/operator/RowActions/index.jsx
index 1a9fb7c..8513aac 100644
--- a/src/components/dashboard/roadSafety/operator/RowActions/index.jsx
+++ b/src/components/dashboard/roadSafety/operator/RowActions/index.jsx
@@ -2,13 +2,18 @@ import { Box } from "@mui/material";
 import DeleteForm from "./DeleteDialog";
 import StepTwo from "../Form/StepTwo";
 import StepThree from "../Form/StepThree";
+import { usePermissions } from "@/lib/hooks/usePermissions";
 
 const RowActions = ({ row, mutate }) => {
+    const { data: userPermissions } = usePermissions();
+    const hasDeletePermission = userPermissions?.includes("delete-safety-and-privacy");
     return (
         <Box sx={{ display: "flex", gap: 1 }}>
             {row.original?.step === 1 && <StepTwo mutate={mutate} rowId={row.getValue("id")} />}
             {row.original?.step === 2 && <StepThree mutate={mutate} rowId={row.getValue("id")} />}
-            <DeleteForm rowId={row.getValue("id")} mutate={mutate} />
+            {hasDeletePermission && (
+                <DeleteForm rowId={row.getValue("id")} mutate={mutate} />
+            )}
         </Box>
     );
 };