diff --git a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
index 0ebf1eca0..1fe9096e3 100644
--- a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
@@ -20,7 +20,9 @@ async function onSubmit(data: any) {
     .post(config.API.complaintAdd(), data)
     .then((res) => {
       success($q, "บันทึกข้อมูลสำเร็จ");
-      router.push(`/discipline/complaints/${res.data.result}`);
+      setTimeout(() => {
+        router.push(`/discipline/complaints/${res.data.result}`);
+      }, 1200);
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 4bd067213..a51ce72f3 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -381,10 +381,10 @@ watch(props.data, async () => {
 onMounted(async () => {
   mainStore.rowsAdd = [];
   try {
-    showLoader();
+    route.name == "disciplineComplaintsAdd" && showLoader();
     await Promise.all([getActive(), getListChannel()]);
   } finally {
-    hideLoader();
+    route.name == "disciplineComplaintsAdd" && hideLoader();
   }
 });
 </script>
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 28bd4e0a9..331a94f24 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1029,7 +1029,7 @@ onMounted(async () => {
                               class="text-center"
                             >
                               <q-btn
-                                v-if="props.row.disciplineRejectDoc.length > 0"
+                                v-if="props.row.disciplineRejectDoc && props.row.disciplineRejectDoc.length > 0"
                                 flat
                                 round
                                 dense
diff --git a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
index 21e649bfa..948947abc 100644
--- a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
+++ b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
@@ -262,7 +262,6 @@ function updateLevel(val: string) {
     const listData: any = posTypeMainOp.value.find(
       (item: PosType) => item.id == val
     );
-    console.log(listData);
     if (employeeClass.value === "officer") {
       posLevelMainOp.value = listData ? listData.posLevels : [];
     } else {
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index 3112e53d7..f79e0dcf3 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -3,7 +3,7 @@ import { defineStore } from "pinia";
 import type { QTableProps } from "quasar";
 
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
-import type { FaultTypeOption } from "@/modules/11_discipline/interface/request/Result";
+import type { FaultTypeOption } from "@/modules/11_discipline/interface/request/result";
 import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
 
 export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
@@ -736,7 +736,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
    * @param data ข้อมูลรายการบุคคล
    */
   async function fetchData(data: ArrayPersonAdd[], type?: string) {
-    console.log("🚀 ~ fetchData ~ data:", data);
     const dataList: any = data.map((item: any) => ({
       profileType: item.profileType
         ? item.profileType