diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index 2951e57ac..e419b80dc 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -8,7 +8,12 @@ export default {
   logRecord: () => `${leave}/log-record`,
   timeRecord: () => `${leave}/time-record`,
   timeRecordById: (id: string) => `${leave}/time-record/${id}`,
+  /** เปลี่ยนแปลงลงเวลา*/
   leaveSearch: () => `${leave}/search`,
   leaveRound: () => `${leave}/round`,
   leaveRoundById: (id: string) => `${leave}/round/${id}`,
+  /**ลงเวลาพิเศษ */
+  specialTime: () => `${leave}/admin/edit`,
+  specialTimeApprove: (id: string) => `${leave}/admin/edit/approve/${id}`,
+  specialTimeReject: (id: string) => `${leave}/admin/edit/reject/${id}`,
 };
diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts
index fa3e31437..514d615b2 100644
--- a/src/api/11_discipline/api.discipline.ts
+++ b/src/api/11_discipline/api.discipline.ts
@@ -1,6 +1,6 @@
 import env from "../index";
 const discipline = `${env.API_URI}/discipline`;
-const investigate = `${env.API_URI}/discipline/investigate`
+const investigate = `${env.API_URI}/discipline/investigate`;
 
 export default {
   directorList: (page: number, pageSize: number, keyword: string) =>
@@ -14,33 +14,35 @@ export default {
   /**ลบ ช่องทางการร้องเรียน
    * @param id type
    */
-  complaintChannelbyId:(id:string) => `${discipline}/complaint_Channel/${id}`,
-  complaintAdd:() => `${discipline}/complaint`,
-  complaintbyId:(id:string) => `${discipline}/complaint/${id}`,
-  complaintReject:(id:string) => `${discipline}/complaint/reject/${id}`,
-  complaintResume:(id:string) => `${discipline}/complaint/resume/${id}`,
-  complaintList:(page:number,pageSize:number,keyword:string) => `${discipline}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
-  complaintFileUpload:(id:string) => `${discipline}/complaint/file/${id}`,
-  complaintFileDelete:(id:string,docId:string) => `${discipline}/complaint/file/${id}/${docId}`,
-  complaintApprove:(id:string) => `${discipline}/complaint/approve/${id}`,
-
+  complaintChannelbyId: (id: string) => `${discipline}/complaint_Channel/${id}`,
+  complaintAdd: () => `${discipline}/complaint`,
+  complaintbyId: (id: string) => `${discipline}/complaint/${id}`,
+  complaintReject: (id: string) => `${discipline}/complaint/reject/${id}`,
+  complaintResume: (id: string) => `${discipline}/complaint/resume/${id}`,
+  complaintList: (page: number, pageSize: number, keyword: string) =>
+    `${discipline}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
+  complaintFileUpload: (id: string) => `${discipline}/complaint/file/${id}`,
+  complaintFileDelete: (id: string, docId: string) =>
+    `${discipline}/complaint/file/${id}/${docId}`,
+  complaintApprove: (id: string) => `${discipline}/complaint/approve/${id}`,
 
   /** API  สืบสวนข้อเท็จจริง*/
-  investigateMain:(page:number,pageSize:number,keyword:string) =>`${investigate}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
-  investigateById:(id:string) => `${investigate}/${id}`,
+  investigateMain: (page: number, pageSize: number, keyword: string) =>
+    `${investigate}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`,
+  investigateById: (id: string) => `${investigate}/${id}`,
 
+  investigateRelevantUploadFile: (id: string) =>
+    `${investigate}/relevant/file/${id}`,
+  investigateRelevantFileDelete: (id: string, docId: string) =>
+    `${investigate}/relevant/file/${id}/${docId}`,
 
+  investigateUploadFile: (id: string) => `${investigate}/file/${id}`,
+  investigateFileDelete: (id: string, docId: string) =>
+    `${investigate}/file/${id}/${docId}`,
 
-
-  investigateRelevantUploadFile:(id:string) => `${investigate}/relevant/file/${id}`,
-  investigateRelevantFileDelete:(id:string,docId:string) => `${investigate}/relevant/file/${id}/${docId}`,
-  
-  investigateUploadFile:(id:string) => `${investigate}/file/${id}`,
-  investigateFileDelete:(id:string,docId:string) => `${investigate}/file/${id}/${docId}`,
-
-  investigateReject:(id:string) => `${investigate}/reject/${id}`,
-  investigateResume:(id:string) => `${investigate}/resume/${id}`,
-  investigateApprove:(id:string) => `${investigate}/approve/${id}`,
+  investigateReject: (id: string) => `${investigate}/reject/${id}`,
+  investigateResume: (id: string) => `${investigate}/resume/${id}`,
+  investigateApprove: (id: string) => `${investigate}/approve/${id}`,
 
   /** ระบบวินัยเรื่องสอบสวน */
   disciplineDisciplinary: () => `${discipline}/disciplinary`,
@@ -50,4 +52,5 @@ export default {
     `${discipline}/disciplinary/investigate/${id}`,
   disciplineComplaintsById: (id: string) =>
     `${discipline}/disciplinary/complaint/${id}`,
+  disciplineDirector: () => `${discipline}/director`,
 };
diff --git a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
index 7afec33c1..b107d52e3 100644
--- a/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
@@ -91,8 +91,8 @@ async function changeRound() {
     .post(config.API.leaveRound(), {
       profileId: props.personId,
       roundId: formData.round,
-      effectDate: formData.effectiveDate,
-      remark: formData.round,
+      effectiveDate: formData.effectiveDate,
+      remark: formData.reson,
     })
     .then(() => {
       success($q, "บันทึกข้อมูลเปลี่ยนรอบเวลา");
@@ -306,6 +306,7 @@ watch(
             dense
             class="custom-header-table"
             :visible-columns="dataStore.visibleColumnsHistory"
+            :rows-per-page-options="[10, 25, 50, 100]"
           >
             <template v-slot:header="props">
               <q-tr :props="props">
diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
index 82c31b234..5d0615ac3 100644
--- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
+++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
@@ -8,11 +8,20 @@ import DialogHeader from "@/components/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import { useSpecialTimeStore } from "@/modules/09_leave/stores/SpecialTimeStore";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 const SpecialTimeStore = useSpecialTimeStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogConfirm, date2Thai } = mixin;
+const {
+  dialogConfirm,
+  date2Thai,
+  showLoader,
+  success,
+  messageError,
+  hideLoader,
+} = mixin;
 const currentDate = ref<Date | null>(new Date());
 const checkInRef = ref<Object | null>(null);
 const checkOutRef = ref<Object | null>(null);
@@ -51,25 +60,54 @@ function validateForm() {
     console.log(hasError);
   }
 }
-function onSubmit() {
-  dialogConfirm(
-    $q,
-    async () => {
-      props.closeDialog?.();
-    },
-    "ยืนยันการบันทึกข้อมูล",
-    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
-  );
-}
+
 const props = defineProps({
   modal: { type: Boolean, default: "" },
   editCheck: { type: String, default: "" },
   date: { type: String, default: "" },
   dateFix: { type: String, default: "" },
+  id: { type: String, default: "" },
   closeDialog: { type: Function, default: () => {} },
   detailData: Object,
 });
 
+function onSubmit() {
+  dialogConfirm(
+    $q,
+    async () => {
+      props.closeDialog?.();
+      await approveData();
+    },
+    "ยืนยันการบันทึกข้อมูล",
+    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+  );
+  console.log(props.dateFix);
+  console.log(props.id);
+}
+
+const approveData = async () => {
+  showLoader();
+  const body = {
+    checkInTime: formData.checkIn,
+    checkOutTime: formData.checkOut,
+    checkInStatus: SpecialTimeStore.checkInStatus,
+    checkOutStatus: SpecialTimeStore.checkOutStatus,
+    reason: formData.note,
+  };
+  await http
+    .put(config.API.specialTimeApprove(props.id), body)
+    .then((res) => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+      hideLoader();
+    })
+    .finally(async () => {
+      hideLoader();
+    });
+};
+
 function close() {
   if (props.closeDialog) {
     props.closeDialog();
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 5e9ed17d4..395a66fff 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -185,7 +185,6 @@ export const useChangeRoundDataStore = defineStore(
     }
 
     async function fetchDatainHistory() {
-      console.log("tes");
       console.log(profileId.value);
       showLoader();
       await http
@@ -232,6 +231,7 @@ export const useChangeRoundDataStore = defineStore(
       fetchDataForCardId,
       checkCilck,
       setProfileId,
+      changePage,
     };
   }
 );
diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 76f3c3fbc..9578387b0 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -1,45 +1,58 @@
 import { defineStore } from "pinia";
-import { ref } from "vue";
+import { ref, watch, defineEmits } from "vue";
 import type { QTableProps } from "quasar";
 import type { DataRows } from "@/modules/09_leave/interface/response/specialTime";
 import type { ListData } from "@/modules/09_leave/interface/request/specialTime";
 import { useCounterMixin } from "@/stores/mixin";
 import type { DataOption } from "@/modules/09_leave/interface/index/Main";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useQuasar } from "quasar";
+
+const $q = useQuasar();
 const mixin = useCounterMixin();
-const { date2Thai } = mixin;
+const {
+  date2Thai,
+  messageError,
+  showLoader,
+  dialogMessageNotify,
+  dialogConfirm,
+  success,
+  hideLoader,
+} = mixin;
 
 export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   const rows = ref<any[]>([]);
   const selectDate = ref<Date | null>(new Date());
   const fiscalYear = ref<string | null>("0");
   const DataMainOrig = ref<DataRows[]>([]); // ข้อมูลหลักดั้งเดิม
-  async function fecthList(data: ListData[]) {
-    let datalist: DataRows[] = data.map((e: ListData) => ({
-      id: e.id,
-      fullname: e.fullname,
-      date: date2Thai(new Date(e.date), false, true),
-      dateFix: date2Thai(new Date(e.dateFix)),
-      timeMorning:
-        e.startTimeMorning == null
-          ? "-"
-          : e.startTimeMorning + " - " + e.endTimeMorning,
-      timeAfternoon:
-        e.startTimeAfternoon == null
-          ? "-"
-          : e.startTimeAfternoon + " - " + e.endTimeAfternoon,
-      startTimeMorning: e.startTimeMorning,
-      endTimeMorning: e.endTimeMorning,
-      startTimeAfternoon: e.startTimeAfternoon,
-      endTimeAfternoon: e.endTimeAfternoon,
-      checkIn: e.checkOut,
-      checkOut: e.checkOut,
-      status: e.status,
-      checkInStatus: convertStatus(e.checkInStatus),
-      checkOutStatus: convertStatus(e.checkOutStatus),
-    }));
-    rows.value = datalist;
-    DataMainOrig.value = datalist;
-  }
+  // async function fecthList(data: ListData[]) {
+  //   let datalist: DataRows[] = data.map((e: ListData) => ({
+  //     id: e.id,
+  //     fullname: e.fullname,
+  //     date: date2Thai(new Date(e.date), false, true),
+  //     dateFix: date2Thai(new Date(e.dateFix)),
+  //     timeMorning:
+  //       e.startTimeMorning == null
+  //         ? "-"
+  //         : e.startTimeMorning + " - " + e.endTimeMorning,
+  //     timeAfternoon:
+  //       e.startTimeAfternoon == null
+  //         ? "-"
+  //         : e.startTimeAfternoon + " - " + e.endTimeAfternoon,
+  //     startTimeMorning: e.startTimeMorning,
+  //     endTimeMorning: e.endTimeMorning,
+  //     startTimeAfternoon: e.startTimeAfternoon,
+  //     endTimeAfternoon: e.endTimeAfternoon,
+  //     checkIn: e.checkOut,
+  //     checkOut: e.checkOut,
+  //     status: e.status,
+  //     checkInStatus: convertStatus(e.checkInStatus),
+  //     checkOutStatus: convertStatus(e.checkOutStatus),
+  //   }));
+  //   rows.value = datalist;
+  //   DataMainOrig.value = datalist;
+  // }
   const DataMainUpdate = ref<DataRows[]>([]); // ข้อมูลเปลี่ยนแปลง
   const DataMain = (val: DataRows[]) => (DataMainOrig.value = val);
   const DataUpdate = (filterYear: string) => {
@@ -51,6 +64,105 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   const checkInStatus = ref<String>("ปกติ");
   const checkOutStatus = ref<String>("ปกติ");
 
+  // paging
+  const year = ref<number>(2023);
+  const month = ref<number>(11);
+  const page = ref<number>(1);
+  const pageSize = ref<number>(10);
+  const filter = ref<string>(""); //search data table
+
+  // Pagination - update rowsPerPage
+  async function updatePagination(newPagination: any) {
+    initialPagination.value = newPagination;
+    // currentPage.value = 1;
+    console.log("updatePagination");
+  }
+
+  // Pagination - initial pagination
+  const initialPagination = ref<any>({
+    sortBy: null,
+    descending: false,
+    page: 1,
+    // rowsPerPage: pageSize,
+  });
+
+  // Pagination - page & change page & get new data
+  // const currentPage = ref<number>(1);
+  // watch(
+  //   [() => currentPage.value, () => initialPagination.value.rowsPerPage],
+  //   () => {
+  //     emit(
+  //       "update:change-page",
+  //       currentPage.value,
+  //       initialPagination.value.rowsPerPage,
+  //       true
+  //     );
+  //   }
+  // );
+
+  // const emit = defineEmits(["update:change-page"]);
+  /**
+   * ฟังก์ชั่น api เปลี่ยนหน้า
+   * @param pageVal page
+   * @param pageSizeVal pagesize
+   */
+  async function changePage(pageVal: number, pageSizeVal: number) {
+    page.value = await pageVal;
+    pageSize.value = await pageSizeVal;
+    console.log("changePage");
+    fetchData();
+  }
+
+  /**
+   * ฟังชั้นเรียกดูข้อมูล
+   */
+  const fetchData = async () => {
+    showLoader();
+    await http
+      .get(
+        config.API.specialTime() +
+          `?year=${year.value}&month=${month.value}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
+      )
+      .then((res) => {
+        let data = res.data.result;
+        data.map((e: any) => {
+          rows.value.push({
+            id: e.id,
+            fullname: e.fullname,
+            date: date2Thai(new Date(e.checkDate), false, true),
+            dateFix: date2Thai(new Date(e.createdAt)),
+            timeMorning:
+              e.startTimeMorning == null
+                ? "-"
+                : e.startTimeMorning + " - " + e.endTimeMorning,
+            timeAfternoon:
+              e.startTimeAfternoon == null
+                ? "-"
+                : e.startTimeAfternoon + " - " + e.endTimeAfternoon,
+            startTimeMorning: e.startTimeMorning,
+            endTimeMorning: e.endTimeMorning,
+            startTimeAfternoon: e.startTimeAfternoon,
+            endTimeAfternoon: e.endTimeAfternoon,
+            checkIn: e.checkInTime,
+            checkOut: e.checkOutTime,
+            status: e.status,
+            checkInStatus: convertStatus(e.checkInStatus),
+            checkOutStatus: convertStatus(e.checkOutStatus),
+            reason: e.reason,
+            description: e.description,
+            checkInEdit: e.checkInEdit,
+            checkOutEdit: e.checkOutEdit,
+          });
+        });
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  };
+
   //--------------|ฟิลเตอร์|--------------------------------------//
   const searchFilterTable = async (searchDate: any) => {
     rows.value = [];
@@ -175,7 +287,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   }
 
   return {
-    fecthList,
+    // fecthList,
     rows,
     visibleColumns,
     columns,
@@ -185,5 +297,9 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     checkInStatus,
     checkOutStatus,
     optionStatus,
+    fetchData,
+    changePage,
+    initialPagination,
+    updatePagination,
   };
 });
diff --git a/src/modules/09_leave/views/ChangeRoundMain.vue b/src/modules/09_leave/views/ChangeRoundMain.vue
index c2b7deebb..309748fd7 100644
--- a/src/modules/09_leave/views/ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/ChangeRoundMain.vue
@@ -201,6 +201,7 @@ onMounted(() => {
     :editCheck="editCheck"
     :DataRow="DataRow"
     :personId="DataRow == null ? '' : DataRow.profileId"
+    @update:change-page="dataStore.changePage"
   />
 </template>
 <style scoped lang="scss">
diff --git a/src/modules/09_leave/views/SpecialTimeMain.vue b/src/modules/09_leave/views/SpecialTimeMain.vue
index 93b42e65c..d74bc1100 100644
--- a/src/modules/09_leave/views/SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/SpecialTimeMain.vue
@@ -1,40 +1,56 @@
 <script setup lang="ts">
-import { onMounted, ref, useAttrs } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 import { useSpecialTimeStore } from "@/modules/09_leave/stores/SpecialTimeStore";
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
 import DialogApprove from "@/modules/09_leave/components/4_specialTime/DialogApprove.vue";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
 import { useRouter } from "vue-router";
+import { identity } from "@fullcalendar/core/internal";
 const dataSpecialTime = useSpecialTimeStore();
-const { fecthList } = dataSpecialTime;
 const $q = useQuasar(); // show dialog
 const mixin = useCounterMixin();
 const router = useRouter();
-const { hideLoader, monthYear2Thai } = mixin;
+const { hideLoader, monthYear2Thai, messageError, showLoader, success } = mixin;
 const modalUnapprove = ref(false);
 const modalApprove = ref(false);
 const detailData = ref<any>();
 const editCheck = ref<string>("");
+
 const pagination = ref({
   // sortBy: "desc",
   descending: false,
   page: 1,
   rowsPerPage: 10,
 });
+
 const dialogTitle = ref<string>("");
 const dialogDesc = ref<string>("");
 const name = ref<string>("");
+const id = ref<string>("");
+const reasonNote = ref<string>("");
 const dateDialog = ref<string>("");
 const dateFixDialog = ref<string>("");
-const unapprove = async (fullname: string) => {
+const unapprove = async (fullname: string, personId: string) => {
+  id.value = personId;
   dialogTitle.value = " ไม่อนุมัติการลงเวลาพิเศษของ" + fullname;
   name.value = fullname;
   modalUnapprove.value = true;
+  // rejectData();
 };
-function openModal(data: any, check: string, date: string, dateFix: string) {
+function openModal(
+  data: any,
+  check: string,
+  date: string,
+  dateFix: string,
+  personId: string
+) {
+  id.value = personId;
+  console.log(personId);
   modalApprove.value = true;
   dateDialog.value = date;
   dateFixDialog.value = dateFix;
@@ -49,9 +65,25 @@ const closeDialog = () => {
   modalApprove.value = false;
   editCheck.value = "PENDING";
 };
-const clickSave = () => {
+
+/** API reject */
+const clickSave = async (reason: string) => {
   modalUnapprove.value = false;
+  const body = {
+    reason: reason,
+  };
+  await http
+    .put(config.API.specialTimeReject(id.value), body)
+    .then((res) => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {});
+  console.log(reason);
 };
+
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
 const filterRef = ref<HTMLInputElement | null>(null);
@@ -63,53 +95,54 @@ const resetFilter = () => {
 };
 
 onMounted(async () => {
-  fecthList([
-    {
-      id: "00000000-0000-0000-0000-000000000000",
-      fullname: "นางสาวณัฐกา ชมสิน",
-      date: "2023-11-01 08:54",
-      dateFix: "2023-10-30",
-      startTimeMorning: "08:00",
-      endTimeMorning: "12:00",
-      startTimeAfternoon: "08:00",
-      endTimeAfternoon: "12:00",
-      status: "PENDING",
-      checkInStatus: "normal",
-      checkOutStatus: "late",
-      checkIn: "08:00",
-      checkOut: "12.00",
-    },
-    {
-      id: "00000000-0000-0000-0000-000000000000",
-      fullname: "นางสาวรัชภรณ์ ภักดี",
-      date: "2023-10-30 08:55",
-      dateFix: "2023-10-29",
-      startTimeMorning: "08:00",
-      endTimeMorning: "12:00",
-      startTimeAfternoon: null,
-      endTimeAfternoon: null,
-      status: "APPROVE",
-      checkInStatus: "normal",
-      checkOutStatus: "late",
-      checkIn: "08:00",
-      checkOut: "12.00",
-    },
-    {
-      id: "00000000-0000-0000-0000-000000000000",
-      fullname: "นางสาวภาพรรณ ลออ",
-      date: "2023-10-31 18:54",
-      dateFix: "2023-10-30",
-      startTimeMorning: null,
-      endTimeMorning: null,
-      startTimeAfternoon: "13:00",
-      endTimeAfternoon: "16:30",
-      status: "REJECT",
-      checkInStatus: "normal",
-      checkOutStatus: "late",
-      checkIn: "08:00",
-      checkOut: "12.00",
-    },
-  ]);
+  // fecthList([
+  //   {
+  //     id: "eefa2f4f-c507-4a42-8567-4fadb8dc1f50",
+  //     fullname: "นางสาวณัฐกา ชมสิน",
+  //     date: "2023-11-01 08:54",
+  //     dateFix: "2023-10-30",
+  //     startTimeMorning: "08:00",
+  //     endTimeMorning: "12:00",
+  //     startTimeAfternoon: "08:00",
+  //     endTimeAfternoon: "12:00",
+  //     status: "PENDING",
+  //     checkInStatus: "normal",
+  //     checkOutStatus: "late",
+  //     checkIn: "08:00",
+  //     checkOut: "12.00",
+  //   },
+  //   {
+  //     id: "00000000-0000-0000-0000-000000000000",
+  //     fullname: "นางสาวรัชภรณ์ ภักดี",
+  //     date: "2023-10-30 08:55",
+  //     dateFix: "2023-10-29",
+  //     startTimeMorning: "08:00",
+  //     endTimeMorning: "12:00",
+  //     startTimeAfternoon: null,
+  //     endTimeAfternoon: null,
+  //     status: "APPROVE",
+  //     checkInStatus: "normal",
+  //     checkOutStatus: "late",
+  //     checkIn: "08:00",
+  //     checkOut: "12.00",
+  //   },
+  //   {
+  //     id: "00000000-0000-0000-0000-000000000000",
+  //     fullname: "นางสาวภาพรรณ ลออ",
+  //     date: "2023-10-31 18:54",
+  //     dateFix: "2023-10-30",
+  //     startTimeMorning: null,
+  //     endTimeMorning: null,
+  //     startTimeAfternoon: "13:00",
+  //     endTimeAfternoon: "16:30",
+  //     status: "REJECT",
+  //     checkInStatus: "normal",
+  //     checkOutStatus: "late",
+  //     checkIn: "08:00",
+  //     checkOut: "12.00",
+  //   },
+  // ]);
+  dataSpecialTime.fetchData();
 });
 
 const selectedDate = ref<string>("");
@@ -213,8 +246,10 @@ const monthYearThai = (val: any) => {
         bordered
         :paging="true"
         dense
-        v-model:pagination="pagination"
+        :pagination="dataSpecialTime.initialPagination"
         :visible-columns="dataSpecialTime.visibleColumns"
+        :rows-per-page-options="[1, 10, 25, 50, 100]"
+        @update:pagination="dataSpecialTime.updatePagination"
       >
         <template v-slot:header="props">
           <q-tr :props="props">
@@ -241,7 +276,7 @@ const monthYearThai = (val: any) => {
                 class="q-px-md"
                 dense
                 unelevated
-                @click="unapprove(props.row.fullname)"
+                @click="unapprove(props.row.fullname, props.row.id)"
                 >ไม่อนุมัติ</q-btn
               >
 
@@ -256,7 +291,8 @@ const monthYearThai = (val: any) => {
                     props.row,
                     'PENDING',
                     props.row.date,
-                    props.row.dateFix
+                    props.row.dateFix,
+                    props.row.id
                   )
                 "
                 >อนุมัติ</q-btn
@@ -294,6 +330,7 @@ const monthYearThai = (val: any) => {
     :closeDialog="closeDialog"
     :date="dateDialog"
     :dateFix="dateFixDialog"
+    :id="id"
     :editCheck="editCheck"
     :detailData="detailData"
   />
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 070f98757..1b6b4b63b 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -948,9 +948,7 @@ onMounted(() => {
   </div>
   <div class="col-12 q-mt-sm q-mb-lg" v-if="props.data">
     <q-card flat bordered>
-      <div
-        class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
-      >
+      <div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
         {{
           formData.status === "NEW"
             ? "อัปโหลดไฟล์เอกสารหลักฐาน"
@@ -959,7 +957,7 @@ onMounted(() => {
       </div>
       <div class="col-12"><q-separator /></div>
       <div
-        class="row q-ma-sm q-col-gutter-x-sm"
+        class="col-xs-12 q-px-md q-py-sm row"
         v-if="formData.status === 'NEW'"
       >
         <div class="col-11" id="documentFile">
@@ -996,7 +994,7 @@ onMounted(() => {
           >
         </div>
       </div>
-      <div class="q-pa-md" v-if="fileList.length > 0">
+      <div class="q-px-md q-py-sm" v-if="fileList.length > 0">
         <q-list bordered separator v-for="data in fileList" :key="data.id">
           <q-item clickable v-ripple class="items-center">
             <q-item-section>{{ data.fileName }}</q-item-section>
@@ -1007,7 +1005,6 @@ onMounted(() => {
               round
               dense
               color="blue"
-              class="q-ml-sm"
               icon="mdi-download"
               @click="downloadFile(data.pathName)"
               ><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
@@ -1027,11 +1024,9 @@ onMounted(() => {
           </q-item>
         </q-list>
       </div>
-      <div v-if="fileList.length === 0">
-        <q-card class="bg-grey-4 q-ma-sm q-py-md" bordered>
-          <p class="text-subtitle1 text-center q-ma-none text-bold">
+      <div class="q-px-md q-py-sm" v-if="fileList.length === 0">
+        <q-card class="q-pa-md" bordered>
             ไม่มีรายการเอกสาร
-          </p>
         </q-card>
       </div>
     </q-card>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
index 1ce82d199..2b3933bea 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, computed, watchEffect, watch, onMounted } from "vue";
 import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
 import type { directorType } from "@/modules/11_discipline/interface/index/Main";
 
 import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
-import http from "@/plugins/http";
-import config from "@/app.config";
 
 const $q = useQuasar();
 const selected = ref<directorType[]>([]);
@@ -60,17 +60,7 @@ const columns2 = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "duty",
-    align: "left",
-    label: "หน้าที่",
-    sortable: true,
-    field: "duty",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
+
   {
     name: "email",
     align: "left",
@@ -93,17 +83,6 @@ const columns2 = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-  {
-    name: "role",
-    align: "left",
-    label: "จำนวนเรื่องสืบสวน",
-    sortable: true,
-    field: "role",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
 ]);
 
 /** รับ props มาจากหน้าหลัก */
@@ -139,7 +118,6 @@ const checkSelected = computed(() => {
   if (selected.value.length === 0) {
     return true;
   }
-  console.log(checkSelected.value);
 });
 
 /** popup ยืนยันส่งัว */
@@ -154,14 +132,14 @@ function saveDirector() {
 
 /** ส่งไปออกคำสั่ง */
 async function DirectorSave() {
-  emit('returnDirector',selected.value);
+  emit("returnDirector", selected.value);
 }
 
 const emit = defineEmits([
   "update:filterKeyword2",
   "update:selected",
   "update:pagination",
-  "returnDirector"
+  "returnDirector",
 ]);
 
 function updateInput(value: any) {
@@ -244,7 +222,17 @@ watch(
           :visible-columns="visibleColumns2"
           selection="multiple"
           v-model:selected="selected"
+          :rows-per-page-options="[10, 25, 50, 100]"
+          v-model:pagination="pagination"
         >
+          <template v-slot:header-selection="scope">
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
+          </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index 302fab8d3..4237b22f2 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -13,49 +13,53 @@ import { useQuasar } from "quasar";
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const store = useInvestigateDisStore();
-const { dialogConfirm } = mixin;
+const { dialogConfirm, success } = mixin;
 const router = useRouter();
 const route = useRoute();
 const id = ref<string>(route.params.id as string);
 
 /** ข้อมูล v-model ของฟอร์ม */
-const data = reactive<FormData>({
-  complaint: "",
-  respondentType: "",
-  dateInvestigate: null,
-  dateAllegation: null,
-  dateEvident: null,
-  casefault: "",
-  typefault: "",
-  faultLevel: "",
-  refLaw: "",
-  detailComplaint: "",
-  whereInvestigate: "",
-  trueDetail: "",
-  evidence: "",
-  recordAccuser: "",
-  witnesses: "",
-  InvestResults: "",
-  filesEvidence: null,
-  filesRecordAccuser: null,
-  filesWitnesses: null,
-  filesEtc: null,
-  complaintStatus: "NEW",
-  organizationId: "",
-  consideredAgency: "",
-});
+// const data = reactive<FormData>({
+//   complaint: "",
+//   respondentType: "",
+//   dateInvestigate: null,
+//   dateAllegation: null,
+//   dateEvident: null,
+//   casefault: "",
+//   typefault: "",
+//   faultLevel: "",
+//   refLaw: "",
+//   detailComplaint: "",
+//   whereInvestigate: "",
+//   trueDetail: "",
+//   evidence: "",
+//   recordAccuser: "",
+//   witnesses: "",
+//   InvestResults: "",
+//   filesEvidence: null,
+//   filesRecordAccuser: null,
+//   filesWitnesses: null,
+//   filesEtc: null,
+//   complaintStatus: "NEW",
+//   organizationId: "",
+//   consideredAgency: "",
+// });
 
+const data = ref<object>();
+
+/** function fetchData สอบสวนคาวมผิดทางวินัย*/
 async function fetchDetailDisciplinary() {
   await http
     .get(config.API.disciplineDisciplinaryById(id.value))
     .then((res) => {
-      console.log(res);
+      data.value = res.data.result;
     })
     .catch((err) => {
       console.log(err);
     });
 }
 
+/** function fetchData สืบสวนข้อเท็จจริง*/
 async function fetchDetailInvestigate() {
   await http
     .get(config.API.disciplineInvestigateById(id.value))
@@ -67,6 +71,7 @@ async function fetchDetailInvestigate() {
     });
 }
 
+/** function fetchData เรื่องร้องเรียน*/
 async function fetchDetailComplaints() {
   await http
     .get(config.API.disciplineComplaintsById(id.value))
@@ -78,28 +83,19 @@ async function fetchDetailComplaints() {
     });
 }
 
-/** จำลองข้อมูลจาก api */
-const fetchData = async () => {
-  data.complaint = "test1";
-  data.dateInvestigate = new Date("2023-11-08T14:58:00");
-  data.dateAllegation = new Date("2023-11-08T14:58:00");
-  data.dateEvident = new Date("2023-11-08T14:58:00");
-  data.casefault = "test1";
-  data.typefault = "2";
-  data.faultLevel = "2";
-  data.refLaw = "test";
-  data.detailComplaint = "รายละเอียด";
-  data.whereInvestigate = "ที่ไหน";
-  data.trueDetail = "รายละเอียด";
-  data.evidence = "รายละเอียด";
-  data.recordAccuser = "รายละเอียด";
-  data.witnesses = "รายละเอียด";
-  data.InvestResults = "รายละเอียด";
-  data.filesEvidence = null;
-  data.filesRecordAccuser = null;
-  data.filesWitnesses = null;
-  data.filesEtc = null;
-};
+async function onSubmitDisciplinary(data: any) {
+  console.log(data);
+
+  await http
+    .put(config.API.disciplineDisciplinaryById(id.value), data)
+    .then(() => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((err) => {})
+    .finally(async () => {
+      await fetchDetailDisciplinary();
+    });
+}
 
 /**
  * บันทึกข้อมูลที่เเก้ไข
@@ -157,7 +153,7 @@ function confirmCancelInvestigate() {
 
 /** โหลดข้อมูลเมื่อเข้าหน้านี้ */
 onMounted(async () => {
-  store.tabMenu = 'disciplinary'
+  store.tabMenu = "disciplinary";
   await fetchDetailDisciplinary();
 });
 
@@ -200,7 +196,7 @@ watch(
       <div class="q-ma-none">แก้ไขการสอบสวนความผิดทางวินัย</div>
       <q-space />
       <div class="q-gutter-x-sm">
-        <q-btn
+        <!-- <q-btn
           v-if="data.complaintStatus === 'NEW'"
           label="ส่งไปสรุปผลการพิจารณา"
           color="public"
@@ -217,7 +213,7 @@ watch(
           label="ยกเลิกการยุติเรื่อง"
           color="red-7"
           @click="cancelInvestigate"
-        />
+        /> -->
       </div>
     </div>
     <q-card flat class="col-12">
@@ -244,7 +240,11 @@ watch(
           <FormInvestigatefacts :on-submit="onSubmit" :data="data" />
         </q-tab-panel>
         <q-tab-panel name="disciplinary">
-          <FormDisciplinary :on-submit="onSubmit" :data="data" />
+          <FormDisciplinary
+            :on-submit="onSubmit"
+            :data="data"
+            @submit:disciplinary="onSubmitDisciplinary"
+          />
         </q-tab-panel>
       </q-tab-panels>
     </q-card>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index ef8ec6f6a..03add8caa 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -4,30 +4,41 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar, QForm } from "quasar";
 import { useRouter, useRoute } from "vue-router";
+
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
 
+import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import Dialogbody from "@/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue";
 import Table from "@/modules/11_discipline/components/3_InvestigateDisciplinary/DirectorTable.vue";
 import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
 
+import type { QTableProps } from "quasar";
 import type {
   FormData,
-  disciplinaryRef,
+  DisciplinaryRef,
+  Persons,
+  Director,
 } from "@/modules/11_discipline/interface/request/disciplinary";
-import type { FileLists } from "../../interface/index/Main";
+import type {
+  DataOption,
+  FileLists,
+  responseType,
+  directorType,
+} from "@/modules/11_discipline/interface/index/Main";
+import type { DataOptionRes } from "@/modules/11_discipline/interface/response/Main";
 
 const complainstStore = useComplainstDataStore();
 const investigateDis = useInvestigateDisStore();
-const { fecthDirector } = investigateDis;
+// const { fecthDirector } = investigateDis;
 const { selectComplainantTpye, filterSelector } = complainstStore; // function จาก store complainstStore
 
 const mixin = useCounterMixin();
-const { date2Thai, hideLoader, dialogConfirm } = mixin;
+const { date2Thai, showLoader, hideLoader, dialogConfirm } = mixin;
 const router = useRouter();
 const route = useRoute();
-const rows = ref([]);
+const rows = ref<Director[]>([]);
 const modal = ref<boolean>(false);
 const $q = useQuasar();
 const id = ref<string>(route.params.id as string);
@@ -37,31 +48,151 @@ const edit = ref<boolean>(false);
 const dateInvestigate = ref<Date>(new Date());
 const dateAllegation = ref<Date>(new Date());
 const dateEvident = ref<Date>(new Date());
-const filterKeyword2 = ref<string>("");
+
 const fileDocDataUpload = ref<File[]>([]);
 
+const modalPerson = ref<boolean>(false);
+function toggleModal() {
+  modalPerson.value = !modalPerson.value;
+}
+
+/** หัวตาราง */
+const columnsPerson = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "idcard",
+    align: "left",
+    label: "เลขบัตรประชาชน",
+    sortable: true,
+    field: "idcard",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ - นามสกุล",
+    sortable: true,
+    field: "name",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ระดับ",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "salary",
+    align: "left",
+    label: "เงินเดือน",
+    sortable: true,
+    field: "salary",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "organization",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+const formData = reactive<FormData>({
+  respondentType: "",
+  organizationId: "",
+  consideredAgency: "",
+  disciplinaryDateAllegation: null, //*วันที่รับทราบข้อกล่าวหา
+  disciplinaryDateEvident: null, //*วันที่สรุปพยานหลักฐาน
+  disciplinaryCaseFault: "", // กรณีความผิด
+  disciplinaryInvestigateAt: "", // สอบสวนที่
+  disciplinaryFaultLevel: "", // ระดับโทษความผิด
+  disciplinaryRefLaw: "", // อ้างอิงมาตราตามกฎหมาย
+  disciplinarySummaryEvidence: "", // สรุปพยานหลักฐานสนับสนุนข้อกล่าวหา
+  disciplinaryRecordAccuser: "", // บันทึกถ้อยคำของผู้กล่าวหา
+  disciplinaryWitnesses: "", // พยานและบันทึกถ้อยคำพยาน
+  result: "", // ผลการสอบสวน
+  directors: [],
+  persons: [],
+  // detailComplaint: "",
+  // whereInvestigate: "",
+  // trueDetail: "",
+  // evidence: "",
+  // recordAccuser: "",
+  // witnesses: "",
+  // InvestResults: "",
+  // complaintStatus: "",
+  // filesEvidence: null,
+  // filesRecordAccuser: null,
+  // filesWitnesses: null,
+  // filesEtc: null,
+  // organizationId: "",
+  // consideredAgency: "",
+});
+
 /** ตัวแปร ref สำหรับแสดง validate */
-const complaintRef = ref<Object | null>(null);
 const respondentTypeRef = ref<Object | null>(null);
-const dateInvestigateRef = ref<Object | null>(null);
-const dateAllegationRef = ref<Object | null>(null);
-const dateEvidentRef = ref<Object | null>(null);
-const casefaultRef = ref<Object | null>(null);
-const refLawRef = ref<Object | null>(null);
-const typefaultRef = ref<Object | null>(null);
-const faultLevelRef = ref<Object | null>(null);
-const detailComplaintRef = ref<Object | null>(null);
-const whereInvestigateRef = ref<Object | null>(null);
-const witnessesRef = ref<Object | null>(null);
-const InvestResultsRef = ref<Object | null>(null);
-const filesEvidenceRef = ref<Object | null>(null);
-const filesRecordAccuserRef = ref<Object | null>(null);
-const filesWitnessesRef = ref<Object | null>(null);
-const filesEtcRef = ref<Object | null>(null);
-const trueDetailRef = ref<Object | null>(null);
-const evidenceRef = ref<Object | null>(null);
-const recordAccuserRef = ref<Object | null>(null);
-const complaintsOptions = ref<any>([]);
+const organizationIdRef = ref<Object | null>(null);
+const consideredAgencyRef = ref<Object | null>(null);
+const disciplinaryDateAllegationRef = ref<Object | null>(null);
+const disciplinaryDateEvidentRef = ref<Object | null>(null);
+const disciplinaryCaseFaultRef = ref<Object | null>(null);
+const disciplinaryInvestigateAtRef = ref<Object | null>(null);
+const disciplinaryFaultLevelRef = ref<Object | null>(null);
+const disciplinaryRefLawRef = ref<Object | null>(null);
+const disciplinarySummaryEvidenceRef = ref<Object | null>(null);
+const disciplinaryRecordAccuserRef = ref<Object | null>(null);
+const disciplinaryWitnessesRef = ref<Object | null>(null);
+const resultRef = ref<Object | null>(null);
+
+// const typefaultRef = ref<Object | null>(null);
+// const faultLevelRef = ref<Object | null>(null);
+// const detailComplaintRef = ref<Object | null>(null);
+// const whereInvestigateRef = ref<Object | null>(null);
+// const witnessesRef = ref<Object | null>(null);
+// const InvestResultsRef = ref<Object | null>(null);
+// const filesEvidenceRef = ref<Object | null>(null);
+// const filesRecordAccuserRef = ref<Object | null>(null);
+// const filesWitnessesRef = ref<Object | null>(null);
+// const filesEtcRef = ref<Object | null>(null);
+// const trueDetailRef = ref<Object | null>(null);
+// const evidenceRef = ref<Object | null>(null);
+// const recordAccuserRef = ref<Object | null>(null);
+// const complaintsOptions = ref<any>([]);
 
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
@@ -74,80 +205,59 @@ const props = defineProps({
     default: () => "",
   },
 });
+const emit = defineEmits(["submit:disciplinary"]);
 
 const initialPagination = ref<any>({
   rowsPerPage: 0,
 });
 
 /** ข้อมูล v-model ของฟอร์ม */
-const formData = reactive<FormData>({
-  complaint: "",
-  respondentType: "",
-  dateInvestigate: null,
-  dateAllegation: null,
-  dateEvident: null,
-  casefault: "",
-  typefault: "",
-  faultLevel: "",
-  refLaw: "",
-  detailComplaint: "",
-  whereInvestigate: "",
-  trueDetail: "",
-  evidence: "",
-  recordAccuser: "",
-  witnesses: "",
-  InvestResults: "",
-  complaintStatus: "",
-  filesEvidence: null,
-  filesRecordAccuser: null,
-  filesWitnesses: null,
-  filesEtc: null,
-  organizationId: "",
-  consideredAgency: "",
-});
-const filesEvidence = ref<any>([
-  { fileName: "ชื่อไฟล" },
-  { fileName: "ชื่อไฟล" },
-]);
-const filesRecordAccuser = ref<any>([
-  { fileName: "ชื่อไฟล" },
-  { fileName: "ชื่อไฟล" },
-]);
-const filesWitnesses = ref<any>([
-  { fileName: "ชื่อไฟล" },
-  { fileName: "ชื่อไฟล" },
-]);
-const filesEtc = ref<any>([{ fileName: "ชื่อไฟล" }, { fileName: "ชื่อไฟล" }]);
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
-const objectdisciplinary: disciplinaryRef = {
-  complaint: complaintRef,
+const objectdisciplinary: DisciplinaryRef = {
   respondentType: respondentTypeRef,
-  dateInvestigate: dateInvestigateRef,
-  dateAllegation: dateAllegationRef,
-  dateEvident: dateEvidentRef,
-  casefault: casefaultRef,
-  typefault: typefaultRef,
-  faultLevel: faultLevelRef,
-  refLaw: refLawRef,
-  detailComplaint: detailComplaintRef,
-  whereInvestigate: whereInvestigateRef,
-  trueDetail: trueDetailRef,
-  evidence: evidenceRef,
-  recordAccuser: recordAccuserRef,
-  witnesses: witnessesRef,
-  InvestResults: InvestResultsRef,
-  filesEvidence: filesEvidenceRef,
-  filesRecordAccuser: filesRecordAccuserRef,
-  filesWitnesses: filesWitnessesRef,
-  filesEtc: filesEtcRef,
+  organizationId: organizationIdRef,
+  consideredAgency: consideredAgencyRef,
+  disciplinaryDateAllegation: disciplinaryDateAllegationRef,
+  disciplinaryDateEvident: disciplinaryDateEvidentRef,
+  disciplinaryCaseFault: disciplinaryCaseFaultRef,
+  disciplinaryInvestigateAt: disciplinaryInvestigateAtRef,
+  disciplinaryFaultLevel: disciplinaryFaultLevelRef,
+  disciplinaryRefLaw: disciplinaryRefLawRef,
+  disciplinarySummaryEvidence: disciplinarySummaryEvidenceRef,
+  disciplinaryRecordAccuser: disciplinaryRecordAccuserRef,
+  disciplinaryWitnesses: disciplinaryWitnessesRef,
+  result: resultRef,
+  // typefault: typefaultRef,
+  // faultLevel: faultLevelRef,
+  // refLaw: refLawRef,
+  // detailComplaint: detailComplaintRef,
+  // whereInvestigate: whereInvestigateRef,
+  // trueDetail: trueDetailRef,
+  // evidence: evidenceRef,
+  // recordAccuser: recordAccuserRef,
+  // witnesses: witnessesRef,
+  // InvestResults: InvestResultsRef,
+  // filesEvidence: filesEvidenceRef,
+  // filesRecordAccuser: filesRecordAccuserRef,
+  // filesWitnesses: filesWitnessesRef,
+  // filesEtc: filesEtcRef,
 };
 
+const disciplineDisciplinary_DocSummaryEvidences = ref<FileLists[]>([]);
+const disciplineDisciplinary_DocRecordAccusers = ref<FileLists[]>([]);
+const disciplineDisciplinary_DocWitnessess = ref<FileLists[]>([]);
+const disciplineDisciplinary_DocOthers = ref<FileLists[]>([]);
+
 /** เปิด dialog */
 function popup() {
   modal.value = true;
   filterKeyword2.value = "";
 }
+/** ฟังชั่นปิด dialog */
+function clickClose() {
+  modal.value = false;
+}
 
 /** ฟังชั่นตรวจสอบความถูกต้องก่อน บันทึก */
 function validateForm() {
@@ -165,24 +275,18 @@ function validateForm() {
     onSubmit();
   } else {
     console.log("ไม่ผ่าน ");
-    console.log(hasError);
   }
 }
 /**  search data table*/
 const filter = ref<string>("");
 const routeName = router.currentRoute.value.name;
 
-/** ฟังชั่นปิด dialog */
-function clickClose() {
-  modal.value = false;
-}
-
-async function fileUploadDoc(files: any) {
-  files.forEach((file: any) => {
-    fileDocDataUpload.value.push(file);
-  });
-  console.log(fileDocDataUpload.value);
-}
+// async function fileUploadDoc(files: any) {
+//   files.forEach((file: any) => {
+//     fileDocDataUpload.value.push(file);
+//   });
+//   console.log(fileDocDataUpload.value);
+// }
 
 /**
  * ฟังก์ชั่นสำหรับบันทึกข้อมูล ระบบจะแสดง dialog ให้ยืนยันการบันทึก
@@ -193,8 +297,7 @@ function onSubmit() {
   dialogConfirm(
     $q,
     async () => {
-      console.log(formData);
-      props.onSubmit();
+      emit("submit:disciplinary", formData);
     },
     "ยืนยันการบันทึกข้อมูล",
     "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
@@ -206,57 +309,160 @@ async function deleteData(id: string) {
   console.log("delete");
 }
 
-// async function fetvhDatadetail() {
-//   formData.complaint = props.data.complaint;
-//   formData.dateInvestigate = props.data.dateInvestigate;
-//   formData.dateAllegation = props.data.dateAllegation;
-//   formData.dateEvident = props.data.dateEvident;
-//   formData.casefault = props.data.casefault;
-//   formData.typefault = props.data.typefault;
-//   formData.faultLevel = props.data.faultLevel;
-//   formData.refLaw = props.data.refLaw;
-//   formData.detailComplaint = props.data.detailComplaint;
-//   formData.whereInvestigate = props.data.whereInvestigate;
-//   formData.trueDetail = props.data.trueDetail;
-//   formData.evidence = props.data.evidence;
-//   formData.recordAccuser = props.data.recordAccuser;
-//   formData.witnesses = props.data.witnesses;
-//   formData.InvestResults = props.data.InvestResults;
-//   formData.filesEvidence = props.data.filesEvidence;
-//   formData.filesRecordAccuser = props.data.filesRecordAccuser;
-//   formData.filesWitnesses = props.data.filesWitnesses;
-//   formData.filesEtc = props.data.filesEtc;
-//   console.log(formData);
-// }
+async function fetchDatadetail() {
+  if (props.data) {
+    console.log(props.data);
+    formData.respondentType = props.data.respondentType;
+    formData.organizationId = props.data.organizationId;
+    formData.consideredAgency = props.data.consideredAgency;
+    formData.disciplinaryDateAllegation = props.data.disciplinaryDateAllegation;
+    formData.disciplinaryDateEvident = props.data.disciplinaryDateEvident;
+    formData.disciplinaryCaseFault = props.data.disciplinaryCaseFault;
+    formData.disciplinaryInvestigateAt = props.data.disciplinaryInvestigateAt;
+    formData.disciplinaryFaultLevel = props.data.disciplinaryFaultLevel;
+    formData.disciplinaryRefLaw = props.data.disciplinaryRefLaw;
+    formData.disciplinarySummaryEvidence =
+      props.data.disciplinarySummaryEvidence;
+    formData.disciplinaryRecordAccuser = props.data.disciplinaryRecordAccuser;
+    formData.disciplinaryWitnesses = props.data.disciplinaryWitnesses;
+    formData.result = props.data.result;
+    formData.directors = props.data.director ?? [];
+    formData.persons = props.data.persons ?? [];
+    disciplineDisciplinary_DocSummaryEvidences.value =
+      props.data.disciplineDisciplinary_DocSummaryEvidences;
+    disciplineDisciplinary_DocRecordAccusers.value =
+      props.data.disciplineDisciplinary_DocRecordAccusers;
+    disciplineDisciplinary_DocWitnessess.value =
+      props.data.disciplineDisciplinary_DocWitnessess;
+    disciplineDisciplinary_DocOthers.value =
+      props.data.disciplineDisciplinary_DocOthers;
+    // formData.InvestResults = props.data.InvestResults;
+    // formData.filesEvidence = props.data.filesEvidence;
+    // formData.filesRecordAccuser = props.data.filesRecordAccuser;
+    // formData.filesWitnesses = props.data.filesWitnesses;
+    // formData.filesEtc = props.data.filesEtc;
+    let datalistDirector: responseType[] = formData.directors.map(
+      (e: directorType) => ({
+        id: e.id,
+        directorId: e.directorId,
+        name: `${e.prefix}${e.firstName} ${e.lastName}`,
+        prefix: e.prefix,
+        firstName: e.firstName,
+        lastName: e.lastName,
+        position: e.position,
+        email: e.email,
+        phone: e.phone,
+        total: e.total,
+        duty: e.duty,
+      })
+    );
+    rows.value = datalistDirector;
+  }
+
+  // console.log(formData);
+}
+
+async function addPerson(data: Persons[]) {
+  if (!data) {
+    return;
+  }
+  const newPerson: Persons[] = Array.from(data).map((e) => ({
+    personId: e.personId, //id อ้างอิง profile
+    idcard: e.idcard, //รหัสบัตรประชาชน
+    prefix: e.prefix, //คำนำหน้า
+    firstName: e.firstName, //ชื่อ
+    lastName: e.lastName, //นามสกุล
+    posNo: e.posNo, //เลขที่ตำแหน่ง
+    position: e.position, //ตำแหน่ง
+    positionLevel: e.positionLevel, //ระดับ
+    salary: e.salary, //เงินเดือน
+    organization: e.organization, //สังกัด
+    name: `${e.prefix}${e.firstName}  ${e.lastName}`,
+  }));
+  const mergedArray = [...formData.persons, ...newPerson];
+  formData.persons = mergedArray;
+  toggleModal();
+}
+function handleSave(returnData: any) {
+  addPerson(returnData);
+}
+
 /**
  * เช็คข้อมูลจาก props
  * เมื่อมีข้อมูล
  * เก็บข้อมูลลง formData
  */
-watch(props.data, async () => {
-  // formData.complaint = props.data.complaint;
-  // formData.dateInvestigate = props.data.dateInvestigate;
-  // formData.dateAllegation = props.data.dateAllegation;
-  // formData.dateEvident = props.data.dateEvident;
-  // formData.casefault = props.data.casefault;
-  // formData.typefault = props.data.typefault;
-  // formData.faultLevel = props.data.faultLevel;
-  // formData.refLaw = props.data.refLaw;
-  // formData.detailComplaint = props.data.detailComplaint;
-  // formData.whereInvestigate = props.data.whereInvestigate;
-  // formData.trueDetail = props.data.trueDetail;
-  // formData.evidence = props.data.evidence;
-  // formData.recordAccuser = props.data.recordAccuser;
-  // formData.witnesses = props.data.witnesses;
-  // formData.InvestResults = props.data.InvestResults;
-  // formData.filesEvidence = props.data.filesEvidence;
-  // formData.filesRecordAccuser = props.data.filesRecordAccuser;
-  // formData.filesWitnesses = props.data.filesWitnesses;
-  // formData.filesEtc = props.data.filesEtc;
-});
+watch(
+  () => props.data,
+  async () => {
+    await fetchDatadetail();
+  }
+);
 
-function uploadData() {
-  console.log("อัปโหลไฟล");
+const organizationOption = ref<DataOption[]>([]);
+async function fetchOrganization() {
+  await http
+    .get(config.API.typeOc())
+    .then((res) => {
+      const data = res.data.result;
+      organizationOption.value = data.map((e: DataOptionRes) => ({
+        id: e.organizationId,
+        name: e.organizationName,
+      }));
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+}
+
+const page = ref<number>(1);
+const rowsPerPage = ref<number>(10);
+const maxPage = ref<number>(1);
+const filterKeyword2 = ref<string>("");
+const listDirector = ref<any>([]);
+async function fetchDListDirector() {
+  showLoader();
+  await http
+    .get(
+      config.API.disciplineDirector() +
+        `?page=${page.value}&pageSize=${rowsPerPage.value}&keyword=${filterKeyword2.value}`
+    )
+    .then((res) => {
+      maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
+      const data = res.data.result.data;
+      let datalistDirector: responseType[] = data.map((e: directorType) => ({
+        id: e.id,
+        directorId: e.directorId,
+        name: `${e.prefix}${e.firstName} ${e.lastName}`,
+        prefix: e.prefix,
+        firstName: e.firstName,
+        lastName: e.lastName,
+        position: e.position,
+        email: e.email,
+        phone: e.phone,
+        total: e.total,
+        duty: e.duty,
+      }));
+      listDirector.value = datalistDirector;
+    })
+    .catch((err) => {
+      console.log(err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+async function updatePaging(rpp: number, p: number) {
+  page.value = p;
+  rowsPerPage.value = rpp;
+}
+
+async function returnDirector(data: any) {
+  const dataList = data.map((item: any) => item.id);
+  formData.directors.push(dataList);
+  rows.value.push(...data);
+  clickClose();
 }
 
 async function selectComplainant(val: string) {
@@ -295,41 +501,11 @@ async function fetchOffice() {}
  * ส่งข้อมูลจำลองไปยัง store
  */
 onMounted(async () => {
-  // await fetvhDatadetail();
-  await fecthDirector([
-    {
-      nameDirector: "นาง เกสินี เจียรสุมัย",
-      position: "ครู",
-      duty: "ประธาน",
-      email: "e@email.com",
-      telephone: "0800808080",
-      role: "4",
-    },
-    {
-      nameDirector: "นาย สรวิชญ์ พลสิทธิ์",
-      position: "ทดลองงาน",
-      duty: "เลขานุการ",
-      email: "g@gmail.com",
-      telephone: "0614565145",
-      role: "6",
-    },
-  ]);
-  await hideLoader();
+  await fetchOrganization();
 });
-
-const files = ref<FileLists[]>([
-  { id: "1", fileName: "test", pathName: "xxx" },
-]);
 </script>
 <template>
   <div class="col-xs-12 col-sm-12 col-md-11">
-    <!-- <UploadFile
-      title="อัปโหลดเอกสาร"
-      label="เลือกเอกสาร"
-      :files="files"
-      id="xx"
-    /> -->
-
     <form @submit.prevent="validateForm">
       <div class="col-12">
         <q-card>
@@ -368,6 +544,29 @@ const files = ref<FileLists[]>([
                   </template>
                 </q-select>
               </div>
+              <div
+                class="col-xs-12 col-sm-3"
+                v-if="formData.respondentType === 'ORGANIZATION'"
+                id="organizationId"
+              >
+                <q-select
+                  for="inputOffice"
+                  name="organizationId"
+                  ref="organizationIdRef"
+                  dense
+                  hide-bottom-space
+                  outlined
+                  option-label="name"
+                  option-value="id"
+                  emit-value
+                  map-options
+                  v-model="formData.organizationId"
+                  :options="organizationOption"
+                  label="เลือกสำนักงาน"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
+                  lazy-rules
+                />
+              </div>
               <div class="col-xs-12 col-sm-3" id="consideredAgency">
                 <q-select
                   ref="consideredAgencyRef"
@@ -375,7 +574,7 @@ const files = ref<FileLists[]>([
                   dense
                   outlined
                   v-model="formData.consideredAgency"
-                  :options="complainstStore.consideredAgencytoptions"
+                  :options="organizationOption"
                   label="หน่วยงานที่พิจารณา"
                   option-value="id"
                   option-label="name"
@@ -398,29 +597,7 @@ const files = ref<FileLists[]>([
                   </template>
                 </q-select>
               </div>
-              <div
-                class="col-xs-12 col-sm-3"
-                v-if="formData.respondentType === 'ORGANIZATION'"
-                id="organizationId"
-              >
-                <q-select
-                  for="inputOffice"
-                  name="organizationId"
-                  ref="organizationIdRef"
-                  dense
-                  hide-bottom-space
-                  outlined
-                  option-label="name"
-                  option-value="id"
-                  emit-value
-                  map-options
-                  v-model="formData.organizationId"
-                  :options="complainstStore.organizationIdOp"
-                  label="เลือกสำนักงาน"
-                  :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
-                  lazy-rules
-                />
-              </div>
+
               <div
                 v-if="formData.respondentType !== 'ORGANIZATION'"
                 class="col-6"
@@ -446,6 +623,7 @@ const files = ref<FileLists[]>([
                       color="add"
                       class="q-ml-sm"
                       icon="mdi-plus"
+                      @click="toggleModal"
                     >
                       <q-tooltip>เพิ่มผู้ถูกร้องเรียน</q-tooltip>
                     </q-btn>
@@ -454,15 +632,14 @@ const files = ref<FileLists[]>([
                   <div class="col-xs-12 q-pa-sm">
                     <d-table
                       ref="table"
-                      :columns="complainstStore.columns"
-                      :rows="complainstStore.rowsAdd"
-                      row-key="idcard"
+                      :columns="columnsPerson"
+                      :rows="formData.persons"
+                      row-key="personId"
                       flat
                       bordered
                       :paging="true"
                       dense
                       class="custom-header-table"
-                      :visible-columns="complainstStore.visibleColumns"
                     >
                       <template v-slot:header="props">
                         <q-tr :props="props">
@@ -499,55 +676,10 @@ const files = ref<FileLists[]>([
                 </q-card>
               </div>
 
-              <!-- <datepicker
-                menu-class-name="modalfix"
-                v-model="dateInvestigate"
-                ref="dateInvestigateRef"
-                for="#dateInvestigate"
-                :locale="'th'"
-                autoApply
-                class="col-xs-12 col-sm-4"
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-              >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    outlined
-                    dense
-                    class="full-width datepicker"
-                    hide-bottom-space
-                    :model-value="
-                      dateInvestigate != null
-                        ? date2Thai(dateInvestigate)
-                        : null
-                    "
-                    :label="`${'วันที่สอบสวน'}`"
-                    :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สอบสวน'}`]"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon
-                        name="event"
-                        class="cursor-pointer"
-                        style="color: var(--q-primary)"
-                      >
-                      </q-icon>
-                    </template>
-                  </q-input>
-                </template>
-              </datepicker> -->
-
               <datepicker
                 menu-class-name="modalfix"
-                ref="dateAllegationRef"
                 for="#dateAllegation"
-                v-model="dateAllegation"
+                v-model="formData.disciplinaryDateAllegation"
                 class="col-xs-12 col-sm-6"
                 :locale="'th'"
                 autoApply
@@ -563,18 +695,22 @@ const files = ref<FileLists[]>([
                 </template>
                 <template #trigger>
                   <q-input
+                    ref="disciplinaryDateAllegationRef"
                     outlined
                     dense
                     class="col-xs-12 col-sm-4"
                     hide-bottom-space
                     :model-value="
-                      dateAllegation != null ? date2Thai(dateAllegation) : null
+                      formData.disciplinaryDateAllegation != null
+                        ? date2Thai(formData.disciplinaryDateAllegation)
+                        : null
                     "
                     :label="`${'วันที่รับทราบข้อกล่าวหา'}`"
                     :rules="[
                       (val) =>
                         !!val || `${'กรุณาเลือกวันที่รับทราบข้อกล่าวหา'}`,
                     ]"
+                    lazy-rules
                   >
                     <template v-slot:prepend>
                       <q-icon
@@ -590,9 +726,8 @@ const files = ref<FileLists[]>([
 
               <datepicker
                 menu-class-name="modalfix"
-                ref="dateEvidentRef"
                 for="#dateEvident"
-                v-model="dateEvident"
+                v-model="formData.disciplinaryDateEvident"
                 :locale="'th'"
                 autoApply
                 class="col-xs-12 col-sm-6"
@@ -608,17 +743,21 @@ const files = ref<FileLists[]>([
                 </template>
                 <template #trigger>
                   <q-input
+                    ref="disciplinaryDateEvidentRef"
                     outlined
                     dense
                     class="full-width datepicker"
                     hide-bottom-space
                     :model-value="
-                      dateEvident != null ? date2Thai(dateEvident) : null
+                      formData.disciplinaryDateEvident != null
+                        ? date2Thai(formData.disciplinaryDateEvident)
+                        : null
                     "
                     :label="`${'วันที่สรุปพยานหลักฐาน'}`"
                     :rules="[
                       (val) => !!val || `${'กรุณาเลือกวันที่สรุปพยานหลักฐาน'}`,
                     ]"
+                    lazy-rules
                   >
                     <template v-slot:prepend>
                       <q-icon
@@ -713,8 +852,8 @@ const files = ref<FileLists[]>([
                 class="col-xs-12 col-sm-3"
                 dense
                 outlined
-                ref="casefaultRef"
-                v-model="formData.casefault"
+                ref="disciplinaryCaseFaultRef"
+                v-model="formData.disciplinaryCaseFault"
                 for="#casefault"
                 label="กรณีมีความผิด"
                 hide-bottom-space
@@ -728,36 +867,20 @@ const files = ref<FileLists[]>([
                 hide-bottom-space
                 outlined
                 for="#whereInvestigate"
-                ref="whereInvestigateRef"
-                v-model="formData.whereInvestigate"
+                ref="disciplinaryInvestigateAtRef"
+                v-model="formData.disciplinaryInvestigateAt"
                 label="สอบสวนที่"
                 :rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
                 lazy-rules
               />
 
-              <!-- <q-select
-                dense
-                class="col-xs-12 col-sm-3"
-                outlined
-                for="#typefault"
-                ref="typefaultRef"
-                v-model="formData.typefault"
-                option-label="name"
-                option-value="id"
-                emit-value
-                map-options
-                hide-bottom-space
-                :options="investigateDis.optionsTypefault"
-                label="ลักษณะความผิด"
-              /> -->
-
               <q-select
                 dense
                 class="col-xs-12 col-sm-3"
                 outlined
                 for="#faultLevel"
-                ref="faultLevelRef"
-                v-model="formData.faultLevel"
+                ref="disciplinaryFaultLevelRef"
+                v-model="formData.disciplinaryFaultLevel"
                 option-label="name"
                 option-value="id"
                 emit-value
@@ -765,6 +888,8 @@ const files = ref<FileLists[]>([
                 hide-bottom-space
                 :options="investigateDis.optionsfaultLevel"
                 label="ระดับโทษความผิด"
+                :rules="[(val) => !!val || `${'กรุณาเลือกระดับโทษความผิด'}`]"
+                lazy-rules
               />
 
               <q-input
@@ -773,8 +898,8 @@ const files = ref<FileLists[]>([
                 for="#refLaw"
                 hide-bottom-space
                 outlined
-                ref="refLawRef"
-                v-model="formData.refLaw"
+                ref="disciplinaryRefLawRef"
+                v-model="formData.disciplinaryRefLaw"
                 label="อ้างอิงมาตราตามกฎหมาย"
                 :rules="[
                   (val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
@@ -782,56 +907,32 @@ const files = ref<FileLists[]>([
                 lazy-rules
               />
 
-              <!-- <q-input
-                class="col-12"
-                dense
-                outlined
-                hide-bottom-space
-                for="#detailComplaint"
-                ref="detailComplaintRef"
-                v-model="formData.detailComplaint"
-                label="รายละเอียดเรื่องร้องเรียน"
-                type="textarea"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกรายละเอียดเรื่องร้องเรียน'}`]"
-              /> -->
-
-              <!-- <q-input
-                class="col-12"
-                dense
-                outlined
-                hide-bottom-space
-                for="#trueDetail"
-                ref="trueDetailRef"
-                v-model="formData.trueDetail"
-                label="รายละเอียดสืบสวนข้อเท็จจริง"
-                type="textarea"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกรายละเอียดสืบสวนข้อเท็จจริง'}`]"
-              /> -->
-
               <q-input
                 class="col-xs-12 col-sm-6"
                 dense
                 outlined
                 for="#evidence"
-                ref="evidenceRef"
+                ref="disciplinarySummaryEvidenceRef"
                 hide-bottom-space
-                v-model="formData.evidence"
+                v-model="formData.disciplinarySummaryEvidence"
                 label="สรุปพยานหลักฐานสนับสนุนข้อกล่าวหา"
                 type="textarea"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกสรุปพยานหลักฐานสนับสนุนข้อกล่าวหา'}`]"
+                lazy-rules
               />
 
               <q-input
                 class="col-xs-12 col-sm-6"
                 dense
                 outlined
-                ref="recordAccuserRef"
+                ref="disciplinaryRecordAccuserRef"
                 for="#recordAccuser"
-                v-model="formData.recordAccuser"
+                v-model="formData.disciplinaryRecordAccuser"
                 label="บันทึกถ้อยคำของผู้กล่าวหา"
                 hide-bottom-space
                 type="textarea"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกบันทึกถ้อยคำของผู้กล่าวหา'}`]"
+                lazy-rules
               />
 
               <q-input
@@ -839,12 +940,13 @@ const files = ref<FileLists[]>([
                 dense
                 outlined
                 for="#witnesses"
-                ref="witnessesRef"
-                v-model="formData.witnesses"
+                ref="disciplinaryWitnessesRef"
+                v-model="formData.disciplinaryWitnesses"
                 label="พยานและการบันทึกถ้อยคำ"
                 hide-bottom-space
                 type="textarea"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกพยานและการบันทึกถ้อยคำ'}`]"
+                lazy-rules
               />
 
               <q-input
@@ -852,12 +954,13 @@ const files = ref<FileLists[]>([
                 dense
                 outlined
                 for="#InvestResults"
-                ref="InvestResultsRef"
-                v-model="formData.InvestResults"
+                ref="resultRef"
+                v-model="formData.result"
                 label="ผลการสอบสวน"
                 hide-bottom-space
                 type="textarea"
                 :rules="[(val:string) => !!val || `${'กรุณากรอกผลการสอบสวน'}`]"
+                lazy-rules
               />
             </div>
           </div>
@@ -878,400 +981,53 @@ const files = ref<FileLists[]>([
         <UploadFile
           title="อัปโหลดหลักฐานสนับสนุนข้อกล่าวหา"
           label="ไฟล์เอกสารหลักฐานสรุปพยานหลักฐานสนับสนุนข้อกล่าวหา"
-          :files="filesEvidence"
-          id="xx"
+          :files="disciplineDisciplinary_DocSummaryEvidences"
+          :id="id"
         />
         <UploadFile
           title="อัปโหลดบันทึกถ้อยคำของผู้กล่าวหา"
           label="ไฟล์เอกสารบันทึกถ้อยคำของผู้กล่าวหา"
-          :files="filesRecordAccuser"
-          id="xx"
+          :files="disciplineDisciplinary_DocRecordAccusers"
+          :id="id"
         />
         <UploadFile
           title="อัปโหลดพยานและการบันทึกถ้อยคำ"
           label="ไฟล์เอกสารพยานและการบันทึกถ้อยคำ"
-          :files="filesWitnesses"
-          id="xx"
+          :files="disciplineDisciplinary_DocWitnessess"
+          :id="id"
         />
         <UploadFile
           title="อัปโหลดไฟล์เอกสารหลักฐานอื่น ๆ"
           label="ไฟล์เอกสารหลักฐานอื่น ๆ"
-          :files="filesEtc"
-          id="xx"
+          :files="disciplineDisciplinary_DocOthers"
+          :id="id"
         />
-
-        <!-- <q-card flat class="q-pa-md q-mt-sm">
-          <div class="col-12 row q-col-gutter-md">
-            <div class="row col-12">
-              <q-card
-                bordered
-                class="row col-12"
-                style="border: 1px solid #d6dee1"
-              >
-                <div
-                  class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                >
-                  อัปโหลดหลักฐานสนับสนุนข้อกล่าวหา
-                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-file
-                    class="col-11 q-mt-sm"
-                    outlined
-                    dense
-                    ref="filesEvidenceRef"
-                    for="#filesEvidence"
-                    v-model="formData.filesEvidence"
-                    @added="fileUploadDoc"
-                    label="ไฟล์เอกสารหลักฐานสรุปพยานหลักฐานสนับสนุนข้อกล่าวหา"
-                    hide-bottom-space
-                    lazy-rules
-                    accept=".pdf,.xlsx,.doc"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
-                  <div class="col-1 self-center">
-                    <q-btn
-                      size="14px"
-                      flat
-                      round
-                      dense
-                      color="add"
-                      class="q-ml-sm q-mt-sm"
-                      icon="mdi-upload"
-                      ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
-                    >
-                  </div>
-                </div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-list bordered separator class="full-width">
-                    <q-item
-                      clickable
-                      v-ripple
-                      v-for="(file, index) in filesEvidence"
-                      :key="index"
-                    >
-                      <q-item-section>{{
-                        file.name + (index + 1)
-                      }}</q-item-section>
-                      <q-item-section avatar>
-                        <div class="row">
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="blue"
-                              icon="mdi-download-outline"
-                            >
-                              <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
-                            </q-btn>
-                          </div>
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="red"
-                              icon="mdi-delete-outline"
-                              ><q-tooltip>ลบเอกสารหลักฐาน</q-tooltip></q-btn
-                            >
-                          </div>
-                        </div>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </div>
-              </q-card>
-            </div>
-          </div>
-        </q-card> -->
-
-        <!-- <q-card flat class="q-pa-md q-mt-sm">
-          <div class="col-12 row q-col-gutter-md">
-            <div class="row col-12">
-              <q-card
-                bordered
-                class="row col-12"
-                style="border: 1px solid #d6dee1"
-              >
-                <div
-                  class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                >
-                  อัปโหลดบันทึกถ้อยคำของผู้กล่าวหา
-                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-file
-                    class="col-11 q-mt-sm"
-                    outlined
-                    dense
-                    ref="filesRecordAccuserRef"
-                    for="#filesRecordAccuser"
-                    v-model="filesRecordAccuser"
-                    @added="fileUploadDoc"
-                    label="ไฟล์เอกสารบันทึกถ้อยคำของผู้กล่าวหา"
-                    hide-bottom-space
-                    lazy-rules
-                    accept=".pdf,.xlsx,.doc"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
-                  <div class="col-1 self-center">
-                    <q-btn
-                      size="14px"
-                      flat
-                      round
-                      dense
-                      color="add"
-                      class="q-ml-sm q-mt-sm"
-                      icon="mdi-upload"
-                      ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
-                    >
-                  </div>
-                </div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-list bordered separator class="full-width">
-                    <q-item
-                      clickable
-                      v-ripple
-                      v-for="(file, index) in filesRecordAccuser"
-                      :key="index"
-                    >
-                      <q-item-section>{{
-                        file.name + (index + 1)
-                      }}</q-item-section>
-                      <q-item-section avatar>
-                        <div class="row">
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="blue"
-                              icon="mdi-download-outline"
-                            >
-                              <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
-                            </q-btn>
-                          </div>
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="red"
-                              icon="mdi-delete-outline"
-                              ><q-tooltip>ลบเอกสารหลักฐาน</q-tooltip></q-btn
-                            >
-                          </div>
-                        </div>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </div>
-              </q-card>
-            </div>
-          </div>
-        </q-card> -->
-
-        <!-- <q-card flat class="q-pa-md q-mt-sm">
-          <div class="col-12 row q-col-gutter-md">
-            <div class="row col-12">
-              <q-card
-                bordered
-                class="row col-12"
-                style="border: 1px solid #d6dee1"
-              >
-                <div
-                  class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                >
-                  อัปโหลดพยานและการบันทึกถ้อยคำ
-                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-file
-                    class="col-11 q-mt-sm"
-                    outlined
-                    dense
-                    ref="filesWitnessesRef"
-                    for="#filesWitnesses"
-                    v-model="formData.filesWitnesses"
-                    @added="fileUploadDoc"
-                    label="ไฟล์เอกสารพยานและการบันทึกถ้อยคำ"
-                    hide-bottom-space
-                    lazy-rules
-                    accept=".pdf,.xlsx,.doc"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
-                  <div class="col-1 self-center">
-                    <q-btn
-                      size="14px"
-                      flat
-                      round
-                      dense
-                      color="add"
-                      class="q-ml-sm q-mt-sm"
-                      icon="mdi-upload"
-                      ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
-                    >
-                  </div>
-                </div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-list bordered separator class="full-width">
-                    <q-item
-                      clickable
-                      v-ripple
-                      v-for="(file, index) in filesWitnesses"
-                      :key="index"
-                    >
-                      <q-item-section>{{
-                        file.name + (index + 1)
-                      }}</q-item-section>
-                      <q-item-section avatar>
-                        <div class="row">
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="blue"
-                              icon="mdi-download-outline"
-                            >
-                              <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
-                            </q-btn>
-                          </div>
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="red"
-                              icon="mdi-delete-outline"
-                              ><q-tooltip>ลบเอกสารหลักฐาน</q-tooltip></q-btn
-                            >
-                          </div>
-                        </div>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </div>
-              </q-card>
-            </div>
-          </div>
-        </q-card> -->
-
-        <!-- <q-card flat class="q-pa-md q-mt-sm">
-          <div class="col-12 row q-col-gutter-md">
-            <div class="row col-12">
-              <q-card
-                bordered
-                class="row col-12"
-                style="border: 1px solid #d6dee1"
-              >
-                <div
-                  class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
-                >
-                  อัปโหลดไฟล์เอกสารหลักฐานอื่น ๆ
-                </div>
-                <div class="col-12"><q-separator /></div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-file
-                    class="col-11 q-mt-sm"
-                    outlined
-                    dense
-                    ref="filesEtcRef"
-                    for="#filesEtc"
-                    v-model="formData.filesEtc"
-                    @added="fileUploadDoc"
-                    label="ไฟล์เอกสารหลักฐานอื่น ๆ"
-                    hide-bottom-space
-                    lazy-rules
-                    accept=".pdf,.xlsx,.doc"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
-                  <div class="col-1 self-center">
-                    <q-btn
-                      size="14px"
-                      flat
-                      round
-                      dense
-                      color="add"
-                      class="q-ml-sm q-mt-sm"
-                      icon="mdi-upload"
-                      ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
-                    >
-                  </div>
-                </div>
-                <div class="col-xs-12 q-pa-sm row">
-                  <q-list bordered separator class="full-width">
-                    <q-item
-                      clickable
-                      v-ripple
-                      v-for="(file, index) in filesEtc"
-                      :key="index"
-                    >
-                      <q-item-section>{{
-                        file.name + (index + 1)
-                      }}</q-item-section>
-                      <q-item-section avatar>
-                        <div class="row">
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="blue"
-                              icon="mdi-download-outline"
-                            >
-                              <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
-                            </q-btn>
-                          </div>
-                          <div>
-                            <q-btn
-                              dense
-                              flat
-                              round
-                              size="12px"
-                              color="red"
-                              icon="mdi-delete-outline"
-                              ><q-tooltip>ลบเอกสารหลักฐาน</q-tooltip></q-btn
-                            >
-                          </div>
-                        </div>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </div>
-              </q-card>
-            </div>
-          </div>
-        </q-card> -->
       </div>
     </form>
   </div>
+
+  <DialogAddPersonal
+    title="ผู้ถูกร้องเรียน"
+    :checkId="formData.persons"
+    :modal="modalPerson"
+    btn-title="เพิ่มรายชื่อผู้ถูกสอบสวน"
+    :close="toggleModal"
+    :save="addPerson"
+    @returnData="handleSave"
+  />
+
   <Dialogbody
     v-model:Modal="modal"
     :clickClose="clickClose"
-    :rows2="investigateDis.rows2"
+    :rows2="listDirector"
     v-model:filterKeyword2="filterKeyword2"
     v-model:type="type"
+    :get-list="fetchDListDirector"
+    :rowsPerPage="rowsPerPage"
+    :page="page"
+    :maxPage="maxPage"
+    @update:pagination="updatePaging"
+    @returnDirector="returnDirector"
   />
   <!-- :fecthlistappointment="fecthlistappointment" -->
 </template>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
index c98a50e73..f52cdf2b9 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -40,7 +40,6 @@ async function fetchListDisciplinary() {
         res.data.result.total / initialPagination.value.rowsPerPage
       );
       fetchList(data);
-      console.log(data);
     })
     .catch((err) => {
       console.log(err);
diff --git a/src/modules/11_discipline/components/UploadFile.vue b/src/modules/11_discipline/components/UploadFile.vue
index 636cd3083..23c7f9ca2 100644
--- a/src/modules/11_discipline/components/UploadFile.vue
+++ b/src/modules/11_discipline/components/UploadFile.vue
@@ -34,6 +34,8 @@ const props = defineProps({
  * อัปโหลดหลักฐานสนับสนุนข้อกล่าวหา
  */
 function uploadFile() {
+  console.log("test");
+
   //   const Data = new FormData();
   //   Data.append("file", file.value);
   //   showLoader();
@@ -96,7 +98,7 @@ function removeFile(id: string) {
             </div>
           </div>
 
-          <div class="col-xs-12 q-pa-sm row">
+          <div class="col-xs-12 q-pa-sm row" v-if="props.files">
             <q-list
               v-if="props.files.length > 0"
               bordered
diff --git a/src/modules/11_discipline/interface/index/Main.ts b/src/modules/11_discipline/interface/index/Main.ts
index b570ca98d..716b0a8f9 100644
--- a/src/modules/11_discipline/interface/index/Main.ts
+++ b/src/modules/11_discipline/interface/index/Main.ts
@@ -9,14 +9,14 @@ interface DataNumberOption {
 }
 
 interface InvestigatefactsDataRowType {
-  id:string,
+  id: string;
   title: string;
   respondentType: string;
-  offenseDetails: string,
-  investigationDetail: string,
-  dateInvestigate: string,
-  investigationStatusResult: string,
-  status: string
+  offenseDetails: string;
+  investigationDetail: string;
+  dateInvestigate: string;
+  investigationStatusResult: string;
+  status: string;
 }
 
 interface investigateDisDataRowType {
@@ -32,23 +32,29 @@ interface investigateDisDataRowType {
 }
 
 interface directorType {
-  id:string
-  prefix:string
-  firstName:string
-  lastName:string
+  id: string;
+  directorId: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
   position: string;
   email: string;
   phone: string;
+  total: number;
+  duty: string;
 }
 interface responseType {
-  id:string
-  name:string
-  prefix:string
-  firstName:string
-  lastName:string
-  position:string
-  email:string
-  phone:string
+  id: string;
+  directorId: string;
+  name: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  position: string;
+  email: string;
+  phone: string;
+  total: number;
+  duty: string;
 }
 
 interface FileLists {
diff --git a/src/modules/11_discipline/interface/request/disciplinary.ts b/src/modules/11_discipline/interface/request/disciplinary.ts
index 0affe1d0d..1bb6f8eb5 100644
--- a/src/modules/11_discipline/interface/request/disciplinary.ts
+++ b/src/modules/11_discipline/interface/request/disciplinary.ts
@@ -1,50 +1,104 @@
+interface Persons {
+  personId: string; //id อ้างอิง profile
+  idcard: string; //รหัสบัตรประชาชน
+  prefix: string; //คำนำหน้า
+  firstName: string; //ชื่อ
+  lastName: string; //นามสกุล
+  posNo: string; //เลขที่ตำแหน่ง
+  position: string; //ตำแหน่ง
+  positionLevel: string; //ระดับ
+  salary: number; //เงินเดือน
+  organization: string; //สังกัด
+  name: string;
+}
+interface Director {
+  directorId: string;
+  duty: string;
+  email: string;
+  firstName: string;
+  id: string;
+  lastName: string;
+  phone: string;
+  position: string;
+  prefix: string;
+  total: number;
+}
+// interface Persons {
+//   personId: string; //id อ้างอิง profile
+//   idcard: string; //รหัสบัตรประชาชน
+//   prefix: string; //คำนำหน้า
+//   firstName: string; //ชื่อ
+//   lastName: string; //นามสกุล
+//   posNo: string; //เลขที่ตำแหน่ง
+//   position: string; //ตำแหน่ง
+//   positionLevel: string; //ระดับ
+//   salary: number; //เงินเดือน
+//   organization: string; //สังกัด
+// }
+
 interface FormData {
-  complaint: string;
   respondentType: string;
-  dateInvestigate: Date | null;
-  dateAllegation: Date | null;
-  dateEvident: Date | null;
-  filesEvidence: File | null;
-  filesRecordAccuser: File | null;
-  filesWitnesses: File | null;
-  filesEtc: File | null;
-  casefault: string;
-  typefault: string;
-  faultLevel: string;
-  refLaw: string;
-  detailComplaint: string;
-  whereInvestigate: string;
-  trueDetail: string;
-  evidence: string;
-  recordAccuser: string;
-  witnesses: string;
-  InvestResults: string;
-  complaintStatus: string;
   organizationId: string;
   consideredAgency: string;
+  disciplinaryDateAllegation: Date | null;
+  disciplinaryDateEvident: Date | null;
+  disciplinaryCaseFault: string;
+  disciplinaryInvestigateAt: string;
+  disciplinaryFaultLevel: string;
+  disciplinaryRefLaw: string;
+  disciplinarySummaryEvidence: string;
+  disciplinaryRecordAccuser: string;
+  disciplinaryWitnesses: string;
+  result: string;
+  directors: Director[];
+  persons: Persons[];
+
+  // filesWitnesses: File | null;
+  // filesEtc: File | null;
+  // casefault: string;
+  // typefault: string;
+  // faultLevel: string;
+  // refLaw: string;
+  // detailComplaint: string;
+  // whereInvestigate: string;
+  // trueDetail: string;
+  // evidence: string;
+  // recordAccuser: string;
+  // witnesses: string;
+  // InvestResults: string;
+  // complaintStatus: string;
+
+  // consideredAgency: string;
 }
 
-interface disciplinaryRef {
-  complaint: object | null;
-  dateInvestigate: object | null;
-  dateAllegation: object | null;
-  dateEvident: object | null;
-  filesEvidence: object | null;
-  filesRecordAccuser: object | null;
-  filesWitnesses: object | null;
-  filesEtc: object | null;
-  casefault: object | null;
-  typefault: object | null;
-  faultLevel: object | null;
-  refLaw: object | null;
-  detailComplaint: object | null;
-  whereInvestigate: object | null;
-  trueDetail: object | null;
-  evidence: object | null;
-  recordAccuser: object | null;
-  witnesses: object | null;
-  InvestResults: object | null;
+interface DisciplinaryRef {
+  respondentType: object | null;
+  organizationId: object | null;
+  disciplinaryDateAllegation: object | null;
+  disciplinaryDateEvident: object | null;
+  disciplinaryCaseFault: object | null;
+  disciplinaryInvestigateAt: object | null;
+  disciplinaryFaultLevel: object | null;
+  disciplinaryRefLaw: object | null;
+  disciplinarySummaryEvidence: object | null;
+  disciplinaryRecordAccuser: object | null;
+  disciplinaryWitnesses: object | null;
+  result: object | null;
+  // filesRecordAccuser: object | null;
+  // filesWitnesses: object | null;
+  // filesEtc: object | null;
+  // casefault: object | null;
+  // typefault: object | null;
+  // faultLevel: object | null;
+  // refLaw: object | null;
+  // detailComplaint: object | null;
+  // whereInvestigate: object | null;
+  // trueDetail: object | null;
+  // evidence: object | null;
+  // recordAccuser: object | null;
+  // witnesses: object | null;
+  // InvestResults: object | null;
   [key: string]: any;
 }
 
-export type { FormData, disciplinaryRef };
+export type { FormData, DisciplinaryRef, Persons, Director };
diff --git a/src/modules/11_discipline/interface/response/Main.ts b/src/modules/11_discipline/interface/response/Main.ts
new file mode 100644
index 000000000..10683a468
--- /dev/null
+++ b/src/modules/11_discipline/interface/response/Main.ts
@@ -0,0 +1,6 @@
+interface DataOptionRes {
+  organizationId: string;
+  organizationName: string;
+}
+
+export type { DataOptionRes };
diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts
index 8d07eaa54..ca15b4095 100644
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@@ -9,7 +9,7 @@ import type {
   DataAdd,
   ocListType,
 } from "@/modules/11_discipline/interface/response/complaint";
-import type { ArrayPerson } from '@/modules/11_discipline/interface/request/complaint'
+import type { ArrayPerson } from "@/modules/11_discipline/interface/request/complaint";
 import type { QTableProps } from "quasar";
 
 const mixin = useCounterMixin();
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index 7b3cc5560..f2c818b91 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -5,7 +5,7 @@ import type {
   investigateDisDataRowType,
   DataOption,
   directorType,
-  responseType
+  responseType,
 } from "@/modules/11_discipline/interface/index/Main";
 import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin();
@@ -24,20 +24,20 @@ export const useInvestigateDisStore = defineStore(
       { id: "2", name: "ไม่ร้ายแรง" },
     ]);
     const optionsfaultLevel = ref<DataOption[]>([
-      { id: "0", name: "ไม่ร้ายแรง" },
-      { id: "1", name: "ภาคทัณฑ์" },
-      { id: "2", name: "ตัดเงินเดือน" },
-      { id: "3", name: "ลดขั้นเงินเดือน" },
-      { id: "4", name: "ร้ายแรง" },
-      { id: "5", name: "ปลดออก" },
-      { id: "6", name: "ไล่ออก" },
+      // { id: "0", name: "ไม่ร้ายแรง" },
+      // { id: "1", name: "ภาคทัณฑ์" },
+      // { id: "2", name: "ตัดเงินเดือน" },
+      // { id: "3", name: "ลดขั้นเงินเดือน" },
+      // { id: "4", name: "ร้ายแรง" },
+      // { id: "5", name: "ปลดออก" },
+      // { id: "6", name: "ไล่ออก" },
     ]);
     async function fetchList(data: investigateDisDataRowType[]) {
       let datalist: any[] = data.map((e: any) => ({
         id: e.id,
         title: e.title,
-        respondentType: e.respondentType,
-        offenseDetails: e.offenseDetails,
+        respondentType: convertRespondentType(e.respondentType),
+        offenseDetails: convertFault(e.offenseDetails),
         disciplinaryFaultLevel: e.disciplinaryFaultLevel,
         disciplinaryCaseFault: e.disciplinaryCaseFault,
         status: e.status,
@@ -46,28 +46,40 @@ export const useInvestigateDisStore = defineStore(
 
       rows.value = datalist;
     }
-    async function fecthDirector(data: directorType[]) {
-      let datalistDirector: responseType[] = data.map((e: directorType) => ({
-        id: e.id,
-        name: `${e.prefix}${e.firstName} ${e.lastName}`,
-        prefix:e.prefix,
-        firstName:e.firstName,
-        lastName:e.lastName,
-        position: e.position,
-        email: e.email,
-        phone: e.phone,
-      }));
-      rows2.value = datalistDirector;
-      selected.value = rows2.value;
-      // console.log(rows2.value);
+    // async function fecthDirector(data: directorType[]) {
+    //   let datalistDirector: responseType[] = data.map((e: directorType) => ({
+    //     id: e.id,
+    //     name: `${e.prefix}${e.firstName} ${e.lastName}`,
+    //     prefix: e.prefix,
+    //     firstName: e.firstName,
+    //     lastName: e.lastName,
+    //     position: e.position,
+    //     email: e.email,
+    //     phone: e.phone,
+    //   }));
+    //   rows2.value = datalistDirector;
+    //   selected.value = rows2.value;
+    //   // console.log(rows2.value);
+    // }
+
+    function convertRespondentType(val: string) {
+      switch (val) {
+        case "PERSON":
+          return "บุคคล";
+        case "ORGANIZATION":
+          return "หน่วยงาน";
+        case "BANGKOK":
+          return "กรุงเทพมหานคร";
+      }
     }
+
     function convertFault(val: string) {
       switch (val) {
-        case "0":
+        case "NOT_SPECIFIED":
           return "ความผิดวินัยยังไม่ระบุ";
-        case "1":
+        case "NOT_DEADLY":
           return "ความผิดวินัยไม่ร้ายแรง";
-        case "2":
+        case "DEADLY":
           return "ความผิดวินัยร้ายแรง";
       }
     }
@@ -208,8 +220,8 @@ export const useInvestigateDisStore = defineStore(
       "position",
       "duty",
       "email",
-      "telephone",
-      "role",
+      "phone",
+      "total",
     ]);
     const columnsDirector = ref<QTableProps["columns"]>([
       {
@@ -258,24 +270,25 @@ export const useInvestigateDisStore = defineStore(
         style: "font-size: 14px",
       },
       {
-        name: "telephone",
+        name: "phone",
         align: "left",
         label: "เบอร์โทรศัพท์",
         sortable: true,
-        field: "telephone",
+        field: "phone",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
       {
-        name: "role",
+        name: "total",
         align: "left",
         label: "จำนวนเรื่องสืบสวน",
         sortable: true,
-        field: "role",
+        field: "total",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
     ]);
+
     return {
       tabMenu,
       fetchList,
@@ -283,7 +296,7 @@ export const useInvestigateDisStore = defineStore(
       rows2,
       optionsTypefault,
       optionsfaultLevel,
-      fecthDirector,
+      // fecthDirector,
       visibleColumns,
       columns,
       visibleColumnsDirector,