diff --git a/src/components/information/Information.vue b/src/components/information/Information.vue
index 8446b07d1..b7fc1e159 100644
--- a/src/components/information/Information.vue
+++ b/src/components/information/Information.vue
@@ -73,7 +73,7 @@
             :borderless="!edit"
             v-model="informaData.firstname"
             :rules="[(val:string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
-            :label="`${'ชื่อ'}`"
+            :label="`${'ชื่อ(ภาษาไทย)'}`"
           />
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
@@ -87,7 +87,7 @@
             :borderless="!edit"
             v-model="informaData.lastname"
             :rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
-            :label="`${'นามสกุล'}`"
+            :label="`${'นามสกุล(ภาษาไทย)'}`"
           />
         </div>
         <div class="col-xs-6 col-sm-2 col-md-2">
@@ -116,7 +116,11 @@
                 lazy-rules
                 :readonly="!edit"
                 :borderless="!edit"
-                :model-value="informaData.birthDate ? date2Thai(informaData.birthDate) : null"
+                :model-value="
+                  informaData.birthDate
+                    ? date2Thai(informaData.birthDate)
+                    : null
+                "
                 :rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`]"
                 :label="`${'วัน/เดือน/ปี เกิด'}`"
               >
@@ -1054,7 +1058,9 @@ const editData = async () => {
     nationality: informaData.value.nationality,
     race: informaData.value.ethnicity,
     religionId: informaData.value.religionId,
-    birthDate: informaData.value.birthDate ? dateToISO(informaData.value.birthDate) : dateToISO(new Date()),
+    birthDate: informaData.value.birthDate
+      ? dateToISO(informaData.value.birthDate)
+      : dateToISO(new Date()),
     bloodGroupId: informaData.value.bloodId,
     relationshipId: informaData.value.statusId,
     telephoneNumber: informaData.value.tel,
diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 2e0f66e5a..a0b52f8d0 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -252,7 +252,7 @@ const menuList = readonly<any[]>([
       },
       {
         key: 6.8,
-        label: "รายการแต่งตั้งลูกจ้างประจำ",
+        label: "ปรับระดับชั้นงาน-ย้ายลูกจ้าง",
         path: "appoint-employee",
         role: "placement",
       },
@@ -374,25 +374,25 @@ const menuList = readonly<any[]>([
     activeIcon: "mdi-calendar",
     label: "การลา",
     path: "leave",
-    role: "coin",
+    role: "leave",
     children: [
       {
         key: 9.1,
         label: "รายการลงเวลาปฏิบัติงาน",
         path: "/work-list",
-        role: "coin",
+        role: "leave",
       },
       {
         key: 9.2,
         label: "รายการลา",
         path: "/leave-list",
-        role: "coin",
+        role: "leave",
       },
       {
         key: 9.3,
         label: "รายงานสถิติ",
         path: "/statistics-report",
-        role: "coin",
+        role: "leave",
       },
     ],
   },
@@ -402,53 +402,53 @@ const menuList = readonly<any[]>([
     activeIcon: "mdi-calendar",
     label: "วินัย",
     path: "/discipline",
-    role: "coin",
+    role: "discipline",
     children: [
       {
         key: 11.1,
         label: "เรื่องร้องเรียน",
         path: "/discipline-complaints",
-        role: "coin",
+        role: "discipline",
       },
       {
         key: 11.2,
         label: "สืบสวนข้อเท็จจริง",
         path: "/discipline-investigatefacts",
-        role: "coin",
+        role: "discipline",
       },
       {
         key: 11.3,
         label: "สอบสวนความผิดวินัย",
         path: "/discipline-disciplinary",
-        role: "coin",
+        role: "discipline",
       },
       {
         key: 11.4,
         label: "ออกคำสั่ง",
         path: "/disciplineorder",
-        role: "coin",
+        role: "discipline",
       },
       {
         key: 11.5,
         label: "รายงาน",
         path: "/discipline-report",
-        role: "coin",
+        role: "discipline",
       },
       {
         label: "ข้อมูลพื้นฐาน",
         path: "",
         key: 11.6,
-        role: "coin",
+        role: "discipline",
         children: [
           {
             label: "กรรมการ",
             path: "/discipline-director",
-            role: "coin",
+            role: "discipline",
           },
           {
             label: "ช่องทางการร้องเรียน",
             path: "/discipline-channel",
-            role: "coin",
+            role: "discipline",
           },
         ],
       },
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index 6654062ef..27c3e23f9 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -1,51 +1,19 @@
 <template>
   <div class="q-px-md q-pb-md">
-    <q-card
-      bordered
-      flat
-      class="col-12 row q-py-sm items-center bg-grey-1"
-      v-show="statusPayment"
-    >
+    <q-card bordered flat class="col-12 row q-py-sm items-center bg-grey-1" v-show="statusPayment">
       <div class="col-12 row q-col-gutter-sm">
         <span class="text-subtitle1">{{ titleText }}</span>
-        <q-select
-          dense
-          outlined
-          :model-value="inputvisibleFilter"
-          :options="optionsFilter"
-          option-value="id"
-          option-label="name"
-          map-options
-          class="col-xs-12 col-sm-3"
-          label="สถานะ"
-          emit-value
-          @update:model-value="updateVisibleFilter"
-          v-if="optionsFilter != undefined && optionsFilter.length > 0"
-        />
-        <q-file
-          v-model="files"
-          dense
-          :label="setSeat == false ? 'อัปโหลดที่นั่งสอบ' : 'อัปโหลดคะแนนสอบ'"
-          outlined
-          use-chips
-          multiple
-          class="col-xs-12 col-sm-4"
-          v-if="statusPayment"
-        >
+        <q-select dense outlined :model-value="inputvisibleFilter" :options="optionsFilter" option-value="id"
+          option-label="name" map-options class="col-xs-12 col-sm-3" label="สถานะ" emit-value
+          @update:model-value="updateVisibleFilter" v-if="optionsFilter != undefined && optionsFilter.length > 0" />
+        <q-file v-model="files" dense :label="setSeat == false ? 'อัปโหลดที่นั่งสอบ' : 'อัปโหลดคะแนนสอบ'" outlined
+          use-chips multiple class="col-xs-12 col-sm-4" v-if="statusPayment">
           <template v-slot:prepend>
             <q-icon name="attach_file" color="blue" />
           </template>
         </q-file>
         <div>
-          <q-btn
-            size="md"
-            icon="mdi-upload"
-            round
-            flat
-            color="blue"
-            v-if="statusPayment"
-            @click="uploadFile"
-          >
+          <q-btn size="md" icon="mdi-upload" round flat color="blue" v-if="statusPayment" @click="uploadFile">
             <q-tooltip v-if="setSeat == false">อัปโหลดที่นั่งสอบ</q-tooltip>
             <q-tooltip v-if="setSeat == true">อัปโหลดคะแนนสอบ</q-tooltip>
           </q-btn>
@@ -54,34 +22,15 @@
     </q-card>
     <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
       <div class="col-xs-12 col-sm-3" v-show="!statusPayment">
-        <q-select
-          dense
-          outlined
-          :model-value="inputvisibleFilter"
-          :options="optionsFilter"
-          option-value="id"
-          option-label="name"
-          map-options
-          class=""
-          label="สถานะ"
-          emit-value
-          @update:model-value="updateVisibleFilter"
-          v-if="optionsFilter != undefined && optionsFilter.length > 0"
-        />
+        <q-select dense outlined :model-value="inputvisibleFilter" :options="optionsFilter" option-value="id"
+          option-label="name" map-options class="" label="สถานะ" emit-value @update:model-value="updateVisibleFilter"
+          v-if="optionsFilter != undefined && optionsFilter.length > 0" />
       </div>
       <div>
-        <q-btn
-          size="md"
-          icon="mdi-playlist-check"
-          round
-          flat
-          color="primary"
-          @click="candidateCheckProfileDialog"
-          :disabled="
-            attrs.rows.filter((r) => r.status == 'checkRegister').length == 0 ||
+        <q-btn size="md" icon="mdi-playlist-check" round flat color="primary" @click="candidateCheckProfileDialog"
+          :disabled="attrs.rows.filter((r: any) => r.status == 'checkRegister').length == 0 ||
             selected.length == 0
-          "
-        >
+            ">
           <q-tooltip>ตรวจสอบข้อมูล/ได้รับใบสมัครแล้ว</q-tooltip>
         </q-btn>
       </div>
@@ -93,21 +42,11 @@
               <q-item clickable v-close-popup @click="downloadFileDashboard">
                 <q-item-section>ดาวน์โหลดสรุปข้อมูลสมัครสอบ</q-item-section>
               </q-item>
-              <q-item
-                clickable
-                v-close-popup
-                @click.stop.prevent="clickCandidateList()"
-              >
+              <q-item clickable v-close-popup @click.stop.prevent="clickCandidateList()">
                 <q-item-section>ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ</q-item-section>
               </q-item>
-              <q-item
-                clickable
-                v-close-popup
-                @click.stop.prevent="clickPassExam()"
-              >
-                <q-item-section
-                  >ดาวน์โหลดรายชื่อผู้สอบคัดเลือกได้</q-item-section
-                >
+              <q-item clickable v-close-popup @click.stop.prevent="clickPassExam()">
+                <q-item-section>ดาวน์โหลดรายชื่อผู้สอบคัดเลือกได้</q-item-section>
               </q-item>
               <q-item clickable v-close-popup @click="downloadFile()">
                 <q-item-section>ดาวน์โหลดจัดการรายชื่อผู้สมัคร</q-item-section>
@@ -120,88 +59,35 @@
         </q-btn>
       </div>
       <div>
-        <q-btn
-          size="md"
-          icon="mdi-content-save-move-outline"
-          round
-          flat
-          color="indigo"
-          v-if="statusPayment && setSeat == true"
-          @click="candidateToPlacement"
-        >
+        <q-btn size="md" icon="mdi-content-save-move-outline" round flat color="indigo"
+          v-if="statusPayment && setSeat == true" @click="candidateToPlacement">
           <q-tooltip>บรรจุผู้ผ่านการคัดเลือก</q-tooltip>
         </q-btn>
       </div>
       <q-space />
       <div class="items-center gt-xs" style="display: flex">
         <!-- ค้นหาข้อความใน table -->
-        <q-input
-          standout
-          dense
-          :model-value="inputfilter"
-          ref="filterRef"
-          @update:model-value="updateInput"
-          outlined
-          debounce="300"
-          placeholder="ค้นหา"
-          style="max-width: 200px"
-          class="q-ml-sm"
-        >
+        <q-input standout dense :model-value="inputfilter" ref="filterRef" @update:model-value="updateInput" outlined
+          debounce="300" placeholder="ค้นหา" style="max-width: 200px" class="q-ml-sm">
           <template v-slot:append>
             <q-icon v-if="inputfilter == ''" name="search" />
-            <q-icon
-              v-if="inputfilter !== ''"
-              name="clear"
-              class="cursor-pointer"
-              @click="resetFilter"
-            />
+            <q-icon v-if="inputfilter !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
           </template>
         </q-input>
         <!-- แสดงคอลัมน์ใน table -->
-        <q-select
-          :model-value="inputvisible"
-          @update:model-value="updateVisible"
-          :display-value="$q.lang.table.columns"
-          multiple
-          outlined
-          dense
-          :options="attrs.columns"
-          options-dense
-          option-value="name"
-          map-options
-          emit-value
-          style="min-width: 150px"
-          class="q-ml-sm"
-        />
+        <q-select :model-value="inputvisible" @update:model-value="updateVisible" :display-value="$q.lang.table.columns"
+          multiple outlined dense :options="attrs.columns" options-dense option-value="name" map-options emit-value
+          style="min-width: 150px" class="q-ml-sm" />
       </div>
     </div>
-    <q-table
-      ref="table"
-      flat
-      bordered
-      class="custom-header-table"
-      v-bind="attrs"
-      virtual-scroll
-      :virtual-scroll-sticky-size-start="48"
-      dense
-      :pagination-label="paginationLabel"
-      :pagination="initialPagination"
-      :rows-per-page-options="paging == true ? [25, 50, 100, 500] : []"
-      row-key="id"
-      selection="multiple"
-      v-model:selected="selected"
-    >
+
+    <q-table ref="table" flat bordered class="custom-header-table" v-bind="attrs" virtual-scroll
+      :virtual-scroll-sticky-size-start="48" dense :pagination="initialPagination"
+      :rows-per-page-options="paging == true ? [25, 50, 100, 500] : []" row-key="id" selection="multiple"
+      v-model:selected="selected" @update:pagination="updatePagination">
       <template v-slot:pagination="scope">
-        <q-pagination
-          v-model="pagination.page"
-          active-color="primary"
-          color="dark"
-          :max="scope.pagesNumber"
-          :max-pages="5"
-          size="sm"
-          boundary-links
-          direction-links
-        ></q-pagination>
+        ทั้งหมด {{ props.total }} รายการ
+        <q-pagination v-model="currentPage" active-color="primary" color="dark" :max-pages="5" size="sm" boundary-links direction-links :max="props.maxPage < 1 ? 1 : props.maxPage"></q-pagination>
       </template>
       <template v-slot:header="props">
         <q-tr :props="props">
@@ -212,12 +98,8 @@
           <q-th v-for="col in props.cols" :key="col.name" :props="props">
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-          <q-th
-            auto-width
-            v-if="
-              editvisible == true || nextPageVisible == true || history == true
-            "
-          />
+          <q-th auto-width v-if="editvisible == true || nextPageVisible == true || history == true
+            " />
         </q-tr>
       </template>
       <template #body="props">
@@ -227,7 +109,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, useAttrs } from "vue";
+import { ref, useAttrs, watch, watchEffect } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -251,12 +133,6 @@ const selected = ref<string[]>([]);
 const { messageError, showLoader, hideLoader } = mixin;
 
 const dateFilter = ref<[Date, Date]>([new Date(), new Date()]); //วันที่เลือกค้นหา
-const pagination = ref({
-  // sortBy: "desc",
-  descending: false,
-  page: 1,
-  rowsPerPage: 10,
-});
 const props = defineProps({
   inputfilter: String,
   inputvisible: Array,
@@ -287,6 +163,22 @@ const props = defineProps({
     type: Boolean,
     defualt: false,
   },
+  pageSize: {
+    type: Number,
+    defualt: 25
+  },
+  page: {
+    type: Number,
+    defualt: 1
+  },
+  maxPage: {
+    type: Number,
+    defualt: 1
+  },
+  total: {
+    type: Number,
+    defualt: 0
+  },
   nornmalData: {
     type: Boolean,
     defualt: false,
@@ -337,11 +229,32 @@ const props = defineProps({
     type: Function,
     default: () => console.log("not function"),
   },
+  changePage: {
+    type: Function,
+    default: () => console.log("not function"),
+  }
 });
+
+// Pagination - page & change page & get new data
+const currentPage = ref<number>(1)
+watch(currentPage, () => {
+  props.changePage(currentPage.value, props.pageSize, true);
+});
+
+// Pagination - initial pagination
 const initialPagination = ref<any>({
-  rowsPerPage: props.paging == true ? 25 : 0,
+  sortBy: null,
+  descending: false,
+  page: 1,
+  rowsPerPage: props.pageSize,
 });
 
+// Pagination - update rowsPerPage 
+async function updatePagination(newPagination: any) {
+  props.changePage(1, newPagination.rowsPerPage, true);
+  initialPagination.value = newPagination
+}
+
 const emit = defineEmits([
   "update:inputfilter",
   "update:inputvisible",
@@ -350,8 +263,14 @@ const emit = defineEmits([
   "update:inputvisibleFilter",
 ]);
 
-const updateInput = (value: any) => {
-  emit("update:inputfilter", value);
+const updateInput = async (value: any) => {
+  await emit("update:inputfilter", value);
+
+  // search & get new data by keyword
+  if (value.length > 3) {
+    props.changePage(1, props.pageSize);
+    currentPage.value = 1
+  }
 };
 const updateVisible = (value: any) => {
   emit("update:inputvisible", value);
@@ -360,12 +279,6 @@ const updateVisibleFilter = (value: any) => {
   emit("update:inputvisibleFilter", value);
 };
 
-const paginationLabel = (start: string, end: string, total: string) => {
-  if (props.paging == true)
-    return " " + start + " ถึง " + end + " จากจำนวน " + total + " รายการ";
-  else return start + "-" + end + " ใน " + total;
-};
-
 const uploadFile = async () => {
   if (files.value.length > 0) {
     if (props.setSeat == false) {
@@ -406,8 +319,8 @@ const candidateToPlacement = async () => {
           router.go(-1);
         });
     })
-    .onCancel(() => {})
-    .onDismiss(() => {});
+    .onCancel(() => { })
+    .onDismiss(() => { });
 };
 
 const uploadDataSeat = async () => {
@@ -486,7 +399,7 @@ const downloadFileDetail = async () => {
 };
 
 const checkCandidates = async () => {
-  var _selected = [];
+  var _selected: any[] = [];
   selected.value.map((r: any) => {
     _selected.push(r.id.toString());
   });
@@ -568,6 +481,10 @@ const resetFilter = () => {
   // reset ค่าที่ค้นหาเมื่อกดปุ่ม X ในกล่องค้นหา
   emit("update:inputfilter", "");
   filterRef.value.focus();
+
+  // clear keyword & get new data
+  props.changePage(1, props.pageSize);
+  currentPage.value = 1
 };
 
 const downloadFileDashboard = async () => {
@@ -633,11 +550,14 @@ const clickCandidateList = async () => {
 .icon-color {
   color: #4154b3;
 }
+
 .custom-header-table {
   max-height: 64vh;
+
   .q-table tr:nth-child(odd) td {
     background: white;
   }
+
   .q-table tr:nth-child(even) td {
     background: #f8f8f8;
   }
@@ -650,11 +570,13 @@ const clickCandidateList = async () => {
     position: sticky;
     z-index: 1;
   }
+
   /* this will be the loading indicator */
   .q-table thead tr:last-child th {
     /* height of all previous header rows */
     top: 48px;
   }
+
   .q-table thead tr:first-child th {
     top: 0;
   }
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 892b92a51..ef9998c41 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -1,35 +1,16 @@
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="router.go(-1)"
-    />
+    <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="router.go(-1)" />
     {{ name }}
     {{
-      `ครั้งที่${round == null ? "" : round}/${
-        yearly == null ? "" : yearly + 543
-      }`
+      `ครั้งที่${round == null ? "" : round}/${yearly == null ? "" : yearly + 543
+        }`
     }}
     <q-space />
-    <q-btn
-      @click="visible = !visible"
-      dense
-      round
-      size="13px"
-      :style="
-        visible == false
+    <q-btn @click="visible = !visible" dense round size="13px" :style="visible == false
           ? 'transform: rotate(90deg);transition-duration: 0.8s;'
           : 'transform: rotate(0);transition-duration: 0.8s;'
-      "
-      icon="mdi-pin"
-      flat
-    ></q-btn>
+        " icon="mdi-pin" flat></q-btn>
   </div>
   <q-slide-transition>
     <q-card class="row col-12 q-mb-sm" v-show="visible">
@@ -39,23 +20,16 @@
           <div class="col-12 row">
             <div class="col-12">
               <div class="row col-12 q-col-gutter-sm fit">
-                <div
-                  style="width: 25%"
-                  v-for="(num, index) in dataNum"
-                  :key="index"
-                >
+                <div style="width: 25%" v-for="(num, index) in dataNum" :key="index">
                   <q-card bordered flat class="row fit cardNum items-center">
                     <div class="col-12 row items-center q-pa-sm">
-                      <div
-                        :class="
-                          'col-12 text-h5 text-weight-bold text-' +
-                          `${num.color}`
-                        "
-                      >
+                      <div :class="'col-12 text-h5 text-weight-bold text-' +
+                        `${num.color}`
+                        ">
                         {{
                           num.count != null
-                            ? num.count.toLocaleString("en-US")
-                            : ""
+                          ? num.count.toLocaleString("en-US")
+                          : ""
                         }}
                       </div>
                       <div class="col-12 text-dark ellipsis">
@@ -72,53 +46,27 @@
     </q-card>
   </q-slide-transition>
   <q-card flat bordered class="col-12 q-pt-sm">
-    <TableCandidate
-      style="max-height: 80vh"
-      :rows="rows"
-      :columns="columns"
-      :filter="filter"
-      :visible-columns="visibleColumns"
-      v-model:inputfilter="filter"
-      v-model:inputvisible="visibleColumns"
-      v-model:inputvisibleFilter="status"
-      v-model:optionsFilter="optionsStatus"
-      :pagination="initialPagination"
-      :nornmalData="true"
-      :paging="true"
-      :titleText="''"
-      :statusPayment="statusPayment"
-      :setSeat="setSeat"
-      :fetchData="fetchDataCom"
-      :history="true"
-    >
+    <TableCandidate style="max-height: 80vh" :rows="rows" :columns="columns" :filter="filter"
+      :visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
+      v-model:inputvisibleFilter="status" v-model:optionsFilter="optionsStatus"
+      :nornmalData="true" :paging="true" :titleText="''" :statusPayment="statusPayment" :setSeat="setSeat"
+      :fetchData="fetchDataCom" :history="true" :page-size="page_size" :total="total" :page="page" :changePage="changePage" :max-page="maxPage">
       <template #columns="props">
         <q-tr :props="props" class="cursor-pointer">
           <q-td auto-width>
             <q-checkbox v-model="props.selected" />
           </q-td>
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="viewDetail(props.row.id, props.row.status)"
-          >
+          <q-td v-for="col in props.cols" :key="col.name" :props="props"
+            @click="viewDetail(props.row.id, props.row.status)">
             <div v-if="col.name == 'no'" class="table_ellipsis">
               {{ props.rowIndex + 1 }}
             </div>
             <div v-else-if="col.name == 'fullname'">
               <div class="row col-12 items-center">
-                <img
-                  v-if="props.row.avatar == ''"
-                  src="@/assets/avatar_user.jpg"
-                  class="q-mr-sm col-4"
-                  style="width: 28px; height: 28px; border-radius: 50%"
-                />
-                <img
-                  v-else
-                  :src="props.row.avatar"
-                  class="q-mr-sm col-4"
-                  style="width: 28px; height: 28px; border-radius: 50%"
-                />
+                <img v-if="props.row.avatar == ''" src="@/assets/avatar_user.jpg" class="q-mr-sm col-4"
+                  style="width: 28px; height: 28px; border-radius: 50%" />
+                <img v-else :src="props.row.avatar" class="q-mr-sm col-4"
+                  style="width: 28px; height: 28px; border-radius: 50%" />
                 <div class="col-4">
                   <div class="text-weight-medium">
                     {{ props.row.fullname }}
@@ -151,17 +99,13 @@
                 </div>
               </div>
             </div>
-            <div
-              v-else-if="col.name == 'status'"
-              :class="
-                props.row.status == 'checkRegister' ||
+            <div v-else-if="col.name == 'status'" :class="props.row.status == 'checkRegister' ||
                 props.row.status == 'checkPayment' ||
                 props.row.status == 'checkSeat' ||
                 props.row.status == 'checkPoint'
-                  ? 'text-blue'
-                  : ''
-              "
-            >
+                ? 'text-blue'
+                : ''
+              ">
               {{ statusCandidate(props.row.status) }}
             </div>
             <div v-else-if="col.name == 'registerDate'" class="table_ellipsis">
@@ -172,16 +116,8 @@
             </div>
           </q-td>
           <q-td auto-width>
-            <q-btn
-              color="primary"
-              flat
-              dense
-              round
-              size="14px"
-              icon="mdi-file-chart-outline"
-              v-if="props.row.status == 'done'"
-              @click="clickPointRow(props.row)"
-            >
+            <q-btn color="primary" flat dense round size="14px" icon="mdi-file-chart-outline"
+              v-if="props.row.status == 'done'" @click="clickPointRow(props.row)">
               <q-tooltip>ผลสอบ</q-tooltip>
             </q-btn>
           </q-td>
@@ -194,14 +130,7 @@
       <q-card-section class="row items-center q-py-sm">
         <div class="text-bold">ใบทานสอบข้อมูล</div>
         <q-space />
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          v-close-popup
-          style="color: #ff8080; background-color: #ffdede"
-        />
+        <q-btn icon="close" unelevated round dense v-close-popup style="color: #ff8080; background-color: #ffdede" />
       </q-card-section>
       <q-separator />
       <q-card-section class="row items-center">
@@ -253,9 +182,6 @@ const visible = ref(true); //เปิดปิด card สรุปข้อม
 const dataNum = ref<DataNumObject[]>([]); //จำนวนสรุปจำนวนข้อมูลหลัก
 const rows = ref<any>([]);
 const checkProfile = ref<any>([]);
-const initialPagination = ref<Pagination>({
-  rowsPerPage: 0,
-});
 const visibleColumns = ref<String[]>([
   //   "check",
   "no",
@@ -467,12 +393,26 @@ const fetchDataCom = async () => {
   await fetchData();
 };
 
-const fetchData = async () => {
-  showLoader();
+// paging
+const page = ref<number>(1)
+const page_size = ref<number>(5)
+const total = ref<number>(0)
+const maxPage = ref<number>(1)
+
+async function changePage(pageVal: number, pageSizeVal: number, loading: boolean = false) {
+  page.value = await pageVal
+  page_size.value = await pageSizeVal
+  fetchData(loading)
+}
+
+const fetchData = async (loading: boolean = true) => {
+  loading === true ?? showLoader()
   await http
-    .get(config.API.candidateOfPeriodExam(status.value, examId.value))
+    .get(config.API.candidateOfPeriodExam(status.value, examId.value) + `?page=${page.value}&pageSize=${page_size.value}&keyword=${filter.value}`)
     .then((res) => {
       const data = res.data.result;
+      total.value = data.total
+      maxPage.value = Math.ceil(data.total / page_size.value)
       rows.value = [];
       data.data.map((r: any) => {
         rows.value.push({
@@ -499,7 +439,7 @@ const fetchData = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      loading === true ?? hideLoader();
     });
 };
 
diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue
index 48a3fe0c4..e05076839 100644
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@@ -296,7 +296,8 @@
           <q-menu>
             <q-list style="min-width: 100px">
               <q-item clickable v-close-popup @click="clickKp7()">
-                <q-item-section class="text-blue">ก.พ.7/ก.ก.1</q-item-section>
+                <q-item-section v-if="profileType == 'officer'" class="text-blue">ก.พ.7/ก.ก.1</q-item-section>
+                <q-item-section v-else class="text-blue">ทะเบียนประวัติ</q-item-section>
               </q-item>
               <q-item clickable v-close-popup @click="clickKp7Short()">
                 <q-item-section class="text-primary"
diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue
index e404fe7e6..80b878a66 100644
--- a/src/modules/05_placement/components/AppointEmployee/Detail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue
@@ -154,7 +154,7 @@ onMounted(async () => {
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm"
       @click="router.push(`/appoint-employee`)" />
-    รายละเอียดการแต่งตั้งลูกจ้างประจำ {{ title.fullname }}
+    รายละเอียดการปรับระดับชั้นงานลูกจ้าง {{ title.fullname }}
   </div>
   <q-card bordered class="row col-12 text-dark">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
diff --git a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
index ab3cc028b..e29c52cf1 100644
--- a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
@@ -68,7 +68,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "organizationName",
     align: "left",
-    label: "หน่วยงานที่รับการแต่งตั้ง-เลื่อน",
+    label: "หน่วยงานที่รับการปรับระดับชั้นงาน",
     sortable: true,
     field: "organizationName",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/05_placement/components/AppointEmployee/Main.vue b/src/modules/05_placement/components/AppointEmployee/Main.vue
index 8a8ec2312..c2e5c2af4 100644
--- a/src/modules/05_placement/components/AppointEmployee/Main.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Main.vue
@@ -205,7 +205,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "organizationName",
     align: "left",
-    label: "หน่วยงานที่รับการแต่งตั้ง",
+    label: "หน่วยงานที่รับการปรับระดับชั้นงาน",
     sortable: true,
     field: "organizationName",
     headerStyle: "font-size: 14px",
@@ -476,7 +476,7 @@ const savePosition = async () => {
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    รายการแต่งตั้งลูกจ้างประจำ
+    รายการปรับระดับชั้นงานลูกจ้าง
   </div>
   <q-card flat bordered class="col-12 q-mt-sm">
     <q-separator />
@@ -628,7 +628,7 @@ const savePosition = async () => {
                   <q-btn
                     v-if="
                       props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
-                      props.row.status !== 'ออกคำสั่งแล้ว'
+                      props.row.status !== 'ออกคำสั่งเสร็จแล้ว'
                     "
                     icon="mdi-dots-vertical"
                     size="12px"
diff --git a/src/modules/05_placement/components/AppointEmployee/Modal.vue b/src/modules/05_placement/components/AppointEmployee/Modal.vue
index 87fa0f99a..b7cc4ce2c 100644
--- a/src/modules/05_placement/components/AppointEmployee/Modal.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Modal.vue
@@ -382,7 +382,7 @@ function findByPerson(element: any): any {
   <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <q-form ref="myFormPosition">
-        <DialogHeader title="เลือกหน่วยงานที่แต่งตั้ง - เลื่อน" :close="closeModal" />
+        <DialogHeader title="เลือกหน่วยงาน" :close="closeModal" />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
new file mode 100644
index 000000000..5d853ee25
--- /dev/null
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
@@ -0,0 +1,288 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue";
+import { useCounterMixin } from "@/stores/mixin";
+import { useQuasar } from "quasar";
+
+import type { QTableProps } from "quasar";
+import type {
+  FormEmployment,
+  FormEmploymentRef,
+} from "@/modules/08_registryEmployee/interface/response/Main";
+
+const $q = useQuasar();
+const maxin = useCounterMixin();
+const { date2Thai, dialogConfirm } = maxin;
+
+const rows = ref<any[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "dateEmployment",
+    align: "left",
+    label: "วันที่จ้าง",
+    sortable: false,
+    field: "dateEmployment",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "orderEmployment",
+    align: "left",
+    label: "คำสั่งจ้าง",
+    sortable: false,
+    field: "orderEmployment",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>(["dateEmployment", "orderEmployment"]);
+const filter = ref<string>();
+// เพิ่มข้อมูลการจ้าง
+const modal = ref<boolean>(false);
+const formData = reactive<FormEmployment>({
+  dateEmployment: null,
+  orderEmployment: "",
+});
+const dateEmploymentRef = ref<object | null>();
+const orderEmploymentRef = ref<object | null>();
+const formDataRef: FormEmploymentRef = {
+  dateEmployment: dateEmploymentRef,
+  orderEmployment: orderEmploymentRef,
+};
+
+function onClickAdd() {
+  modal.value = true;
+  formData.dateEmployment = null;
+  formData.orderEmployment = "";
+}
+function colsePopup() {
+  modal.value = false;
+}
+function validateForm() {
+  const hasError = [];
+  for (const key in formDataRef) {
+    if (Object.prototype.hasOwnProperty.call(formDataRef, key)) {
+      const property = formDataRef[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  } else {
+    console.log("ไม่ผ่าน ");
+  }
+}
+function onSubmit() {
+  dialogConfirm(
+    $q,
+    async () => {
+      console.log(formData);
+      colsePopup();
+    },
+    "ยืนยันการบันทึกข้อมูล",
+    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+  );
+}
+
+const pagination = ref({
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
+</script>
+
+<template>
+  <q-card flat bordered class="col-12 q-px-lg q-py-md">
+    <div class="flex items-center">
+      <div class="flex items-center">
+        <q-icon
+          name="mdi-clipboard"
+          size="1.5em"
+          color="grey-5"
+          class="q-mr-md"
+        />
+
+        <div class="text-bold text-subtitle2 col-12 row items-center">
+          ข้อมูลการจ้าง
+        </div>
+      </div>
+      <div class="q-gutter-sm q-mx-sm">
+        <q-btn
+          size="12px"
+          flat
+          round
+          color="primary"
+          @click="onClickAdd"
+          icon="mdi-plus"
+        >
+          <q-tooltip>เพิ่มข้อมูลการจ้าง</q-tooltip>
+        </q-btn>
+      </div>
+
+      <q-space />
+      <div class="q-gutter-sm" style="display: flex">
+        <q-input
+          outlined
+          dense
+          v-model="filter"
+          label="ค้นหา"
+          style="min-width: 150px"
+        />
+
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+        />
+      </div>
+    </div>
+    <div class="q-mt-sm">
+      <d-table
+        flat
+        bordered
+        id="table"
+        ref="table"
+        :columns="columns"
+        :rows="rows"
+        :filter="filter"
+        row-key="dateEmployment"
+        :paging="true"
+        dense
+        :visible-columns="visibleColumns"
+        v-model:pagination="pagination"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer" style="height: 40px">
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div>
+                {{ col.value }}
+              </div>
+            </q-td>
+          </q-tr>
+        </template>
+      </d-table>
+    </div>
+  </q-card>
+
+  <q-dialog v-model="modal">
+    <q-card style="width: 700px; max-width: 80vw">
+      <q-toolbar>
+        <q-toolbar-title class="text-subtitle1 text-weight-bold">
+          <span style="margin-right: 0"> เพิ่มข้อมูลการจ้าง </span>
+        </q-toolbar-title>
+        <q-btn
+          for="closeDialog"
+          icon="close"
+          unelevated
+          round
+          dense
+          style="color: #eb0505; background-color: #ffdede"
+          @click="colsePopup"
+        />
+      </q-toolbar>
+      <form @submit.prevent="validateForm">
+        <q-card-section class="q-pt-none">
+          <div class="col-12 row q-pa-md">
+            <div
+              class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs"
+            >
+              <div class="col-xs-12 col-sm-6">
+                <datepicker
+                  menu-class-name="modalfix"
+                  v-model="formData.dateEmployment"
+                  :locale="'th'"
+                  autoApply
+                  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
+                      for="inputdateEmployment"
+                      ref="dateEmploymentRef"
+                      outlined
+                      dense
+                      class="full-width datepicker"
+                      :model-value="
+                        formData.dateEmployment != null
+                          ? date2Thai(formData.dateEmployment)
+                          : null
+                      "
+                      label="วันที่จ้าง"
+                      :rules="[(val) => !!val || `${'กรุณาเลือกวันที่จ้าง'}`]"
+                      lazy-rules
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+
+              <div class="col-xs-12 col-sm-6">
+                <q-input
+                  for="inputOrderEmployment"
+                  ref="orderEmploymentRef"
+                  dense
+                  outlined
+                  v-model="formData.orderEmployment"
+                  label="คำสั่งจ้าง"
+                  :rules="[(val) => !!val || `${'กรุณากรอกคำสั่งจ้าง'}`]"
+                  lazy-rules
+                />
+              </div>
+            </div>
+          </div>
+          <div class="row col-12">
+            <q-space />
+          </div>
+        </q-card-section>
+        <q-separator />
+        <q-card-actions align="right" class="bg-white text-teal">
+          <q-btn
+            for="ButtonOnSubmit"
+            id="onSubmit"
+            flat
+            round
+            color="secondary"
+            icon="mdi-content-save-outline"
+            type="submit"
+            ><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
+          >
+        </q-card-actions>
+      </form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/08_registryEmployee/interface/response/Main.ts b/src/modules/08_registryEmployee/interface/response/Main.ts
index 272bbb5e5..9cb23c57b 100644
--- a/src/modules/08_registryEmployee/interface/response/Main.ts
+++ b/src/modules/08_registryEmployee/interface/response/Main.ts
@@ -46,5 +46,14 @@ interface employeePosition {
   positionEmployeePositionSides: ObjectNameId[];
   use: boolean;
 }
+interface FormEmployment {
+  dateEmployment: Date | null
+  orderEmployment: string
+}
+interface FormEmploymentRef {
+  dateEmployment: Object | null
+  orderEmployment: Object | null
+  [key: string]: any;
+};
 
-export type { employeePosition };
+export type { employeePosition, FormEmployment, FormEmploymentRef };
diff --git a/src/modules/08_registryEmployee/views/EditDetail.vue b/src/modules/08_registryEmployee/views/EditDetail.vue
index 975c6cf6c..fc830579b 100644
--- a/src/modules/08_registryEmployee/views/EditDetail.vue
+++ b/src/modules/08_registryEmployee/views/EditDetail.vue
@@ -20,6 +20,7 @@ import Information from "@/modules/08_registryEmployee/components/EditEmployee/I
 import TempInformation from "@/modules/08_registryEmployee/components/EditEmployee/Information/Tempinformation.vue";
 import Address from "@/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue";
 import Family from "@/modules/08_registryEmployee/components/EditEmployee/Information/Family.vue";
+import Employment from "@/modules/08_registryEmployee/components/EditEmployee/Employment.vue";
 
 import type { DataOption } from "@/modules/04_registry/interface/index/Main";
 import http from "@/plugins/http";
@@ -409,9 +410,13 @@ const Retire = async () => {
       <div id="tempInformation" name="19" class="row col-12">
         <TempInformation v-model:statusEdit="statusEdit" :statusAdd="false" />
       </div>
+
+      <div id="Employment" name="20" class="row col-12 q-mt-md">
+        <Employment v-model:statusEdit="statusEdit" :statusAdd="false" />
+      </div>
       <div id="address" name="17" class="row col-12">
         <Address v-model:statusEdit="statusEdit" :statusAdd="false" />
-      </div>  
+      </div>
       <div id="family" name="18" class="row col-12">
         <Family v-model:statusEdit="statusEdit" :statusAdd="false" />
       </div>
diff --git a/src/modules/09_leave/components/2_Leave/ToolBar.vue b/src/modules/09_leave/components/2_Leave/ToolBar.vue
index 0eda4c01f..3cdb35df5 100644
--- a/src/modules/09_leave/components/2_Leave/ToolBar.vue
+++ b/src/modules/09_leave/components/2_Leave/ToolBar.vue
@@ -10,6 +10,7 @@ const { searchDataFn, filterOption } = leaveStore;
   <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
     <div class="col-2">
       <q-select
+        for="selectYear"
         emit-value
         map-options
         outlined
@@ -23,6 +24,7 @@ const { searchDataFn, filterOption } = leaveStore;
     </div>
     <div class="col-3">
       <q-select
+        for="selectType"
         emit-value
         map-options
         outlined
@@ -50,6 +52,7 @@ const { searchDataFn, filterOption } = leaveStore;
     </div>
     <div class="col-2">
       <q-select
+        for="selectStatus"
         v-if="leaveStore.tab == '2'"
         emit-value
         map-options
@@ -72,10 +75,17 @@ const { searchDataFn, filterOption } = leaveStore;
     </div>
     <q-space />
     <div class="col-2">
-      <q-input dense outlined v-model="leaveStore.filterTable" label="ค้นหา" />
+      <q-input
+        for="filterTable"
+        dense
+        outlined
+        v-model="leaveStore.filterTable"
+        label="ค้นหา"
+      />
     </div>
     <div class="col-2">
       <q-select
+        for="visibleColumns"
         v-model="leaveStore.visibleColumns"
         multiple
         outlined
diff --git a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
index 11699dbce..1dc60ed39 100644
--- a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
@@ -214,6 +214,7 @@ function onSubmit() {
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn
+      for="backMainPageButton"
       icon="mdi-arrow-left"
       unelevated
       round
@@ -234,7 +235,7 @@ function onSubmit() {
           >
             <div class="col-xs-12 col-sm-2" id="complainantType">
               <q-select
-                for="complainantType"
+                for="SelectcomplainantType"
                 ref="complainantTypeRef"
                 dense
                 outlined
@@ -271,7 +272,7 @@ function onSubmit() {
               v-if="formData.complainantType === '0'"
             >
               <q-select
-                for="complainant"
+                for="selectComplainant"
                 ref="complainantRef"
                 dense
                 outlined
@@ -303,7 +304,7 @@ function onSubmit() {
               id="office"
             >
               <q-input
-                for="office"
+                for="inputOffice"
                 name="office"
                 ref="officeRef"
                 dense
@@ -317,7 +318,7 @@ function onSubmit() {
             <div class="col-xs-12 col-sm-2" id="agency">
               <q-select
                 ref="agencyRef"
-                for="agency"
+                for="selectAgency"
                 dense
                 outlined
                 v-model="formData.agency"
@@ -345,7 +346,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-12" id="topicComplaint">
               <q-input
-                for="topicComplaint"
+                for="inputTopicComplaint"
                 ref="topicComplaintRef"
                 dense
                 outlined
@@ -359,7 +360,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-12" id="detail">
               <q-input
-                for="detail"
+                for="inputDetail"
                 ref="detailRef"
                 dense
                 outlined
@@ -389,7 +390,7 @@ function onSubmit() {
                 </template>
                 <template #trigger>
                   <q-input
-                    for="datereceive"
+                    for="inputDatereceive"
                     ref="datereceiveRef"
                     outlined
                     dense
@@ -435,7 +436,7 @@ function onSubmit() {
                 </template>
                 <template #trigger>
                   <q-input
-                    for="dateconsideration"
+                    for="inputDateconsideration"
                     ref="dateconsiderationRef"
                     outlined
                     dense
@@ -465,7 +466,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-2" id="offenseDescription">
               <q-select
-                for="offenseDescription"
+                for="selectOffenseDescription"
                 ref="offenseDescriptionRef"
                 dense
                 outlined
@@ -482,7 +483,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-2" id="considerationLevel">
               <q-select
-                for="considerationLevel"
+                for="selectConsiderationLevel"
                 ref="considerationLevelRef"
                 dense
                 outlined
@@ -517,7 +518,7 @@ function onSubmit() {
                 </template>
                 <template #trigger>
                   <q-input
-                    for="datewarn"
+                    for="inputDatewarn"
                     ref="datewarnRef"
                     outlined
                     dense
@@ -548,7 +549,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-2" id="receivecomplaints">
               <q-select
-                for="receivecomplaints"
+                for="selectReceivecomplaints"
                 ref="receivecomplaintsRef"
                 dense
                 outlined
@@ -566,7 +567,7 @@ function onSubmit() {
             <div class="col-xs-12 col-sm-6"></div>
             <div class="col-xs-12 col-sm-4" id="petitioner">
               <q-input
-                id="petitioner"
+                for="inputPetitioner"
                 ref="petitionerRef"
                 dense
                 outlined
@@ -578,7 +579,7 @@ function onSubmit() {
             </div>
             <div class="col-xs-12 col-sm-4" id="files">
               <q-file
-                for="files"
+                for="inputFiles"
                 ref="filesRef"
                 class="col-xs-12 col-sm-10"
                 outlined
@@ -603,6 +604,7 @@ function onSubmit() {
         <div class="row col-12 q-pa-sm">
           <q-space />
           <q-btn
+            for="ButtonOnSubmit"
             id="onSubmit"
             flat
             round
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index ef5f5b7ff..2c1333e99 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -63,53 +63,54 @@ function redirectToPageadd() {
 <template>
   <div class="toptitle text-dark col-12 row items-center">เรื่องร้องเรียน</div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-      <div class="row col-12 q-col-gutter-sm q-mb-sm">
-          <div>
-            <q-btn
-              id="addComplaints"
-              size="12px"
-              flat
-              round
-              color="primary"
-              icon="mdi-plus"
-              @click="redirectToPageadd()"
-              ><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
-            >
-          </div>
-          <q-space />
-          <q-input
-            class="col-xs-12 col-sm-3 col-md-2"
-            id="filterTable"
-            for="filterTable"
-            dense
-            outlined
-            v-model="filterTable"
-            label="ค้นหา"
-          >
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-          </q-input>
-          <q-select
-            id="visibleColumns"
-            for="visibleColumns"
-            v-model="complainstStore.visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="complainstStore.columns"
-            option-value="name"
-            options-cover
-            class="col-xs-12 col-sm-3 col-md-2"
-          />
-      </div>
-      <div class="col-12">
-        <TableComplaint :filterTable="filterTable" />
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div>
+        <q-btn
+          id="addComplaints"
+          for="addComplaints"
+          size="12px"
+          flat
+          round
+          color="primary"
+          icon="mdi-plus"
+          @click="redirectToPageadd()"
+          ><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
+        >
       </div>
+      <q-space />
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        id="filterTable"
+        for="filterTable"
+        dense
+        outlined
+        v-model="filterTable"
+        label="ค้นหา"
+      >
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+      <q-select
+        id="visibleColumns"
+        for="visibleColumns"
+        v-model="complainstStore.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="complainstStore.columns"
+        option-value="name"
+        options-cover
+        class="col-xs-12 col-sm-3 col-md-2"
+      />
+    </div>
+    <div class="col-12">
+      <TableComplaint :filterTable="filterTable" />
+    </div>
   </q-card>
 </template>
 
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
index 9a9b1d17c..7f89d01d1 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, onMounted, reactive } from "vue";
 import { useQuasar, QForm } from "quasar";
 import { useRouter, useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import Dialogbody from "@/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue";
 import Table from "@/modules/11_discipline/components/3_InvestigateDisciplinary/DirectorTable.vue";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
-
+import type {
+  FormData,
+  disciplinaryRef,
+} from "@/modules/11_discipline/interface/request/disciplinary";
 const investigateDis = useInvestigateDisStore();
 const { fecthDirector } = investigateDis;
 
@@ -36,42 +39,107 @@ const popup = () => {
 };
 
 const mixin = useCounterMixin();
-const { date2Thai, hideLoader } = mixin;
-
-const initialPagination = ref<any>({
-  rowsPerPage: 0,
-});
-
+const { date2Thai, hideLoader, dialogConfirm } = mixin;
 const router = useRouter();
 const route = useRoute();
 const rows = ref([]);
 const modal = ref<boolean>(false);
 const $q = useQuasar();
 const id = ref<string>(route.params.id as string);
+const type = ref<string>("");
 const myForm = ref<QForm | null>(null); //form data input
 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 typefault = ref<string>("");
-const faultLevel = ref<string>("");
-const type = ref<string>("");
-const Complaint = ref<string>("");
-const trueDetail = ref<string>("");
-const evidence = ref<string>("");
-const recordAccuser = ref<string>("");
-const witnesses = ref<string>("");
-const InvestResults = ref<string>("");
-const files = ref<File>();
-const filesEvidence = ref<File>();
-const filesRecordAccuser = ref<File>();
-const filesWitnesses = ref<File>();
-const filesEtc = ref<File>();
+const complaintRef = 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 fileDocDataUpload = ref<File[]>([]);
-const refRaw = ref<string>("");
-const casefault = ref<string>("");
-const whereInvestigate = ref<string>("");
+const initialPagination = ref<any>({
+  rowsPerPage: 0,
+});
+
+const formData = reactive<FormData>({
+  Complaint: "",
+  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,
+});
+
+const objectdisciplinary: disciplinaryRef = {
+  Complaint: complaintRef,
+  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,
+};
+
+function validateForm() {
+  const hasError = [];
+  for (const key in objectdisciplinary) {
+    if (Object.prototype.hasOwnProperty.call(objectdisciplinary, key)) {
+      const property = objectdisciplinary[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  } else {
+    console.log("ไม่ผ่าน ");
+    console.log(hasError);
+  }
+}
 
 const routeName = router.currentRoute.value.name;
 
@@ -90,7 +158,16 @@ const fileUploadDoc = async (files: any) => {
 };
 
 // คลิกบันทึก
-const checkSave = () => {};
+function onSubmit() {
+  dialogConfirm(
+    $q,
+    async () => {
+      console.log(formData);
+    },
+    "ยืนยันการบันทึกข้อมูล",
+    "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+  );
+}
 
 const deleteData = async (id: string) => {
   console.log("delete");
@@ -115,7 +192,7 @@ const clickBack = () => {
       />
       {{ "เพิ่มการสอบสวนความผิดทางวินัย" }}
     </div>
-    <q-form ref="myForm">
+    <form @submit.prevent="validateForm">
       <div class="col-12">
         <q-card bordered>
           <div class="col-12 row q-col-gutter-md q-pa-md">
@@ -126,7 +203,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="Complaint"
+                  v-model="formData.Complaint"
+                  for="#Complaint"
+                  ref="complaintRef"
                   label="เรื่องร้องเรียน"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกเรื่องร้องเรียน'}`]"
@@ -134,6 +213,8 @@ const clickBack = () => {
                 <datepicker
                   menu-class-name="modalfix"
                   v-model="dateInvestigate"
+                  ref="dateInvestigateRef"
+                  for="#dateInvestigate"
                   :locale="'th'"
                   autoApply
                   class="col-xs-12 col-sm-4"
@@ -173,6 +254,8 @@ const clickBack = () => {
                 </datepicker>
                 <datepicker
                   menu-class-name="modalfix"
+                  ref="dateAllegationRef"
+                  for="#dateAllegation"
                   v-model="dateAllegation"
                   class="col-xs-12 col-sm-4"
                   :locale="'th'"
@@ -216,6 +299,8 @@ const clickBack = () => {
                 </datepicker>
                 <datepicker
                   menu-class-name="modalfix"
+                  ref="dateEvidentRef"
+                  for="#dateEvident"
                   v-model="dateEvident"
                   :locale="'th'"
                   autoApply
@@ -318,7 +403,9 @@ const clickBack = () => {
                   class="col-xs-12 col-sm-6"
                   dense
                   outlined
-                  v-model="casefault"
+                  ref="casefaultRef"
+                  v-model="formData.casefault"
+                  for="#casefault"
                   label="กรณีมีความผิด"
                   :rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]"
                   lazy-rules
@@ -327,7 +414,9 @@ const clickBack = () => {
                   class="col-xs-12 col-sm-6"
                   dense
                   outlined
-                  v-model="whereInvestigate"
+                  for="#whereInvestigate"
+                  ref="whereInvestigateRef"
+                  v-model="formData.whereInvestigate"
                   label="สอบสวนที่"
                   :rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
                   lazy-rules
@@ -336,7 +425,9 @@ const clickBack = () => {
                   dense
                   class="col-xs-12 col-sm-3"
                   outlined
-                  v-model="typefault"
+                  for="#typefault"
+                  ref="typefaultRef"
+                  v-model="formData.typefault"
                   option-label="name"
                   option-value="id"
                   :options="investigateDis.optionsTypefault"
@@ -346,7 +437,9 @@ const clickBack = () => {
                   dense
                   class="col-xs-12 col-sm-3"
                   outlined
-                  v-model="faultLevel"
+                  for="#faultLevel"
+                  ref="faultLevelRef"
+                  v-model="formData.faultLevel"
                   option-label="name"
                   option-value="id"
                   :options="investigateDis.optionsfaultLevel"
@@ -355,8 +448,10 @@ const clickBack = () => {
                 <q-input
                   class="col-xs-12 col-sm-6 q-pb-md"
                   dense
+                  for="#refLaw"
                   outlined
-                  v-model="refRaw"
+                  ref="refLawRef"
+                  v-model="formData.refLaw"
                   label="อ้างอิงมาตราตามกฎหมาย"
                   :rules="[
                     (val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
@@ -367,7 +462,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="Complaint"
+                  for="#detailComplaint"
+                  ref="detailComplaintRef"
+                  v-model="formData.detailComplaint"
                   label="รายละเอียดเรื่องร้องเรียน"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกรายละเอียดเรื่องร้องเรียน'}`]"
@@ -376,7 +473,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="trueDetail"
+                  for="#trueDetail"
+                  ref="trueDetailRef"
+                  v-model="formData.trueDetail"
                   label="รายละเอียดสืบสวนข้อเท็จจริง"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกรายละเอียดสืบสวนข้อเท็จจริง'}`]"
@@ -385,7 +484,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="evidence"
+                  for="#evidence"
+                  ref="evidenceRef"
+                  v-model="formData.evidence"
                   label="สรุปพยานหลักฐานสนับสนุนข้อกล่าวหา"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกสรุปพยานหลักฐานสนับสนุนข้อกล่าวหา'}`]"
@@ -394,7 +495,9 @@ const clickBack = () => {
                   class="col-12 q-pb-md"
                   outlined
                   dense
-                  v-model="filesEvidence"
+                  ref="filesEvidenceRef"
+                  for="#filesEvidence"
+                  v-model="formData.filesEvidence"
                   @added="fileUploadDoc"
                   label="ไฟล์เอกสารหลักฐานสรุปพยานหลักฐานสนับสนุนข้อกล่าวหา"
                   hide-bottom-space
@@ -409,7 +512,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="recordAccuser"
+                  ref="recordAccuserRef"
+                  for="#recordAccuser"
+                  v-model="formData.recordAccuser"
                   label="บันทึกถ้อยคำของผู้กล่าวหา"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกบันทึกถ้อยคำของผู้กล่าวหา'}`]"
@@ -418,7 +523,9 @@ const clickBack = () => {
                   class="col-12 q-pb-md"
                   outlined
                   dense
-                  v-model="filesRecordAccuser"
+                  ref="filesRecordAccuserRef"
+                  for="#filesRecordAccuser"
+                  v-model="formData.filesRecordAccuser"
                   @added="fileUploadDoc"
                   label="ไฟล์เอกสารบันทึกถ้อยคำของผู้กล่าวหา"
                   hide-bottom-space
@@ -433,7 +540,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="witnesses"
+                  for="#witnesses"
+                  ref="witnessesRef"
+                  v-model="formData.witnesses"
                   label="พยานและการบันทึกถ้อยคำ"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกพยานและการบันทึกถ้อยคำ'}`]"
@@ -442,7 +551,9 @@ const clickBack = () => {
                   class="col-12 q-pb-md"
                   outlined
                   dense
-                  v-model="filesWitnesses"
+                  ref="filesWitnessesRef"
+                  for="#filesWitnesses"
+                  v-model="formData.filesWitnesses"
                   @added="fileUploadDoc"
                   label="ไฟล์เอกสารพยานและการบันทึกถ้อยคำ"
                   hide-bottom-space
@@ -457,7 +568,9 @@ const clickBack = () => {
                   class="col-12"
                   dense
                   outlined
-                  v-model="InvestResults"
+                  for="#InvestResults"
+                  ref="InvestResultsRef"
+                  v-model="formData.InvestResults"
                   label="ผลการสอบสวน"
                   type="textarea"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกผลการสอบสวน'}`]"
@@ -466,7 +579,9 @@ const clickBack = () => {
                   class="col-12"
                   outlined
                   dense
-                  v-model="filesEtc"
+                  ref="filesEtcRef"
+                  for="#filesEtc"
+                  v-model="formData.filesEtc"
                   @added="fileUploadDoc"
                   label="ไฟล์เอกสารหลักฐานอื่น ๆ"
                   hide-bottom-space
@@ -485,18 +600,18 @@ const clickBack = () => {
           <div class="row col-12 q-pa-sm">
             <q-space />
             <q-btn
+              id="onSubmit"
+              type="submit"
               flat
               round
-              color="public"
-              @click="checkSave"
+              color="secondary"
               icon="mdi-content-save-outline"
+              ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
             >
-              <q-tooltip>{{ edit ? "แก้ไขข้อมูล" : "บันทึกข้อมูล" }}</q-tooltip>
-            </q-btn>
           </div>
         </q-card>
       </div>
-    </q-form>
+    </form>
   </div>
   <Dialogbody
     v-model:Modal="modal"
diff --git a/src/modules/11_discipline/components/4_Order/MainPage.vue b/src/modules/11_discipline/components/4_Order/MainPage.vue
index 3a4b330d2..88d819187 100644
--- a/src/modules/11_discipline/components/4_Order/MainPage.vue
+++ b/src/modules/11_discipline/components/4_Order/MainPage.vue
@@ -61,52 +61,52 @@ function redirectToPageadd() {
     รายการออกคำสั่งลงโทษทางวินัย
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-      <div class="row col-12 q-col-gutter-sm q-mb-sm">
-          <div>
-            <q-btn
-              id="addDisciplineOrder"
-              flat
-              size="12px"
-              round
-              color="primary"
-              icon="mdi-plus"
-              @click="redirectToPageadd()"
-              ><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
-            >
-          </div>
-          <q-space />
-          <q-input
-            class="col-xs-12 col-sm-3 col-md-2"
-            for="filterTable"
-            dense
-            outlined
-            v-model="filterTable"
-            label="ค้นหา"
-          >
-            <template v-slot:append>
-              <q-icon name="search" />
-            </template>
-          </q-input>
-          <q-select
-            for="visibleColumns"
-            class="col-xs-12 col-sm-3 col-md-2"
-            v-model="OrderStore.visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="OrderStore.columns"
-            option-value="name"
-            options-cover
-          />
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div>
+        <q-btn
+          for="buttonAddDisciplineOrder"
+          flat
+          size="12px"
+          round
+          color="primary"
+          icon="mdi-plus"
+          @click="redirectToPageadd()"
+          ><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
+        >
       </div>
-      <div class="col-12">
-        <tableOrder :filterTable="filterTable" />
-      </div>
-    </q-card>
+      <q-space />
+      <q-input
+        class="col-xs-12 col-sm-3 col-md-2"
+        for="inputFilterTable"
+        dense
+        outlined
+        v-model="filterTable"
+        label="ค้นหา"
+      >
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
+      <q-select
+        for="selectVisibleColumns"
+        class="col-xs-12 col-sm-3 col-md-2"
+        v-model="OrderStore.visibleColumns"
+        multiple
+        outlined
+        dense
+        options-dense
+        :display-value="$q.lang.table.columns"
+        emit-value
+        map-options
+        :options="OrderStore.columns"
+        option-value="name"
+        options-cover
+      />
+    </div>
+    <div class="col-12">
+      <tableOrder :filterTable="filterTable" />
+    </div>
+  </q-card>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/11_discipline/components/4_Order/OrderPage.vue b/src/modules/11_discipline/components/4_Order/OrderPage.vue
index c94842daf..8b691c503 100644
--- a/src/modules/11_discipline/components/4_Order/OrderPage.vue
+++ b/src/modules/11_discipline/components/4_Order/OrderPage.vue
@@ -25,6 +25,7 @@ const previousStep = async () => {
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn
+      for="buttonBackToMain"
       icon="mdi-arrow-left"
       unelevated
       round
@@ -39,6 +40,7 @@ const previousStep = async () => {
   <div class="col-12 q-mt-sm">
     <q-card flat bordered>
       <q-stepper
+        for="myStepper"
         v-model="step"
         ref="stepper"
         animated
diff --git a/src/modules/11_discipline/components/4_Order/Step01.vue b/src/modules/11_discipline/components/4_Order/Step01.vue
index ec09b0c1d..d0c8942a8 100644
--- a/src/modules/11_discipline/components/4_Order/Step01.vue
+++ b/src/modules/11_discipline/components/4_Order/Step01.vue
@@ -116,7 +116,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           ประเภทคำสั่ง
           <q-select
-            for="orderType"
+            for="selectOrderType"
             ref="orderTypeRef"
             dense
             outlined
@@ -134,7 +134,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           คำสั่งโดย
           <q-select
-            for="orderBy"
+            for="selectOrderBy"
             ref="orderByRef"
             dense
             outlined
@@ -152,7 +152,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           เลือกรายการสอบสวนความผิดทางวินัย
           <q-select
-            for="listInvestigation"
+            for="selectListInvestigation"
             ref="listInvestigationRef"
             dense
             outlined
@@ -172,7 +172,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           ผู้มีอำนาจลงนาม
           <q-input
-            for="authority"
+            for="inputAuthority"
             ref="authorityRef"
             dense
             outlined
@@ -186,7 +186,7 @@ function onSubmit() {
           <div class="col-6">
             คำสั่งที่
             <q-input
-              for="orderNumber"
+              for="inputOrderNumber"
               ref="orderNumberRef"
               outlined
               dense
@@ -215,6 +215,7 @@ function onSubmit() {
               }}</template>
               <template #trigger>
                 <q-input
+                  for="inputDateYear"
                   ref="dateYearRef"
                   :model-value="
                     formData.dateYear ? formData.dateYear + 543 : null
@@ -247,7 +248,7 @@ function onSubmit() {
             </template>
             <template #trigger>
               <q-input
-                for="date"
+                for="inputDate"
                 ref="dateRef"
                 outlined
                 dense
@@ -272,7 +273,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           ตำแหน่งผู้มีอำนาจลงนาม
           <q-input
-            for="authorityPosition"
+            for="inputAuthorityPosition"
             ref="authorityPositionRef"
             dense
             outlined
@@ -285,7 +286,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-6">
           คำสั่งเรื่อง
           <q-input
-            for="subject"
+            for="inputSubject"
             ref="subjectRef"
             dense
             outlined
@@ -298,7 +299,7 @@ function onSubmit() {
         <div class="col-xs-12 col-sm-12">
           รายละเอียดการกระทำความผิด
           <q-input
-            for="mistakeDetail"
+            for="inputMistakeDetail"
             ref="mistakeDetailRef"
             dense
             outlined
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/AddPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/AddPage.vue
index 0a6c0eccb..9e6ef04f0 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Channel/AddPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/AddPage.vue
@@ -22,139 +22,22 @@ const myForm = ref<QForm | null>(null); //form data input
 const edit = ref<boolean>(false);
 const channel = ref<string>("");
 
-onMounted(async () => {
-  //   if (route.params.id) {
-  //     // มี params id ให้ เรียกข้อมูลของรอบการเสนอขอ
-  //     await fetchData();
-  //   }
-});
+onMounted(async () => {});
 // เรียกข้อมูลของรอบการเสนอขอ
-const fetchData = async () => {
-  //   edit.value = true;
-  //   showLoader();
-  //   await http
-  //     .get(config.API.getRoundInsignia(id.value))
-  //     .then((res) => {
-  //       const data = res.data.result;
-  //       id.value = data.period_id;
-  //       roundInsig.value =
-  //         options.value.filter((r: any) => r.value == data.period_round).length >
-  //         0
-  //           ? options.value.filter((r: any) => r.value == data.period_round)[0]
-  //           : null;
-  //       yearly.value = data.period_year;
-  //       datelast.value = data.period_amount;
-  //       dateStart.value = new Date(data.period_start);
-  //       dateEnd.value = new Date(data.period_end);
-  //       files.value = data.period_doc;
-  //     })
-  //     .catch((e) => {
-  //       messageError($q, e);
-  //     })
-  //     .finally(() => {
-  //       hideLoader();
-  //     });
-};
+const fetchData = async () => {};
 
-const deleteData = async (id: string) => {
-  //   showLoader();
-  //   await http
-  //     .delete(config.API.periodExamId(id))
-  //     .then((res) => {
-  //       success($q, "ลบข้อมูลสำเร็จ");
-  //     })
-  //     .catch((e) => {
-  //       messageError($q, e);
-  //     })
-  //     .finally(async () => {
-  //       hideLoader();
-  //     });
-};
+const deleteData = async (id: string) => {};
 
 // แก้ไขข้อมูล
 
 // คลิกบันทึก
-const checkSave = () => {
-  //   if (myForm.value !== null) {
-  //     myForm.value.validate().then(async (success) => {
-  //       if (success) {
-  //         dialogConfirm($q, () => SaveData());
-  //       } else if (Number(datelast.value) !== 0) {
-  //         dialogMessageNotify($q, "กรุณาเลือกรอบการเสนอขอพระราชทานเครื่องราชฯ");
-  //       }
-  //     });
-  //   }
-};
+const checkSave = () => {};
 // บันทึกข้อมูล
-const SaveData = async () => {
-  //   if (edit.value) {
-  //     await editData(id.value);
-  //   } else {
-  //     await addData();
-  //     clickBack();
-  //   }
-};
+const SaveData = async () => {};
 // เพิ่มข้อมูลรอบการเสนอขอพระราชทานเครื่องราชฯ
-const addData = async () => {
-  //   const formData = new FormData();
-  //   const name = `รอบการเสนอขอพระราชทานเครื่องราชรอบที่ ${
-  //     roundInsig.value.value
-  //   }  ปี ${yearly.value + 543} `;
-  //   formData.append("name", name);
-  //   formData.append("year", yearly.value.toString());
-  //   formData.append("amount", datelast.value.toString());
-  //   formData.append("round", roundInsig.value.value);
-  //   if (dateStart.value !== null) {
-  //     formData.append("startDate", dateToISO(dateStart.value));
-  //   }
-  //   if (dateEnd.value !== null) {
-  //     formData.append("endDate", dateToISO(dateEnd.value));
-  //   }
-  //   formData.append("file", files.value);
-  //   showLoader();
-  //   await http
-  //     .post(config.API.listRoundInsignia(), formData)
-  //     .then(() => {
-  //       success($q, "บันทึกข้อมูลสำเร็จ");
-  //     })
-  //     .catch((e) => {
-  //       messageError($q, e);
-  //     })
-  //     .finally(async () => {
-  //       hideLoader();
-  //     });
-};
+const addData = async () => {};
 // แก้ไขข้อมูล
-const editData = async (id: string) => {
-  //   const formData = new FormData();
-  //   const name = `รอบการเสนอขอพระราชทานเครื่องราชรอบที่ ${
-  //     roundInsig.value.value
-  //   } ปี ${yearly.value + 543}`;
-  //   formData.append("name", name);
-  //   formData.append("year", yearly.value.toString());
-  //   formData.append("amount", datelast.value.toString());
-  //   formData.append("round", roundInsig.value.value);
-  //   if (dateStart.value !== null) {
-  //     formData.append("startDate", dateToISO(dateStart.value));
-  //   }
-  //   if (dateEnd.value !== null) {
-  //     formData.append("endDate", dateToISO(dateEnd.value));
-  //   }
-  //   formData.append("file", files.value);
-  //   showLoader();
-  //   await http
-  //     .put(config.API.editRoundInsignia(id), formData)
-  //     .then(() => {
-  //       success($q, "แก้ไขข้อมูลสำเร็จ");
-  //     })
-  //     .catch((e) => {
-  //       messageError($q, e);
-  //     })
-  //     .finally(async () => {
-  //       hideLoader();
-  //       clickBack();
-  //     });
-};
+const editData = async (id: string) => {};
 
 const clickBack = () => {
   router.push(`/discipline/channel`);
@@ -187,6 +70,7 @@ const clickBack = () => {
                   dense
                   outlined
                   v-model="channel"
+                  for="channel"
                   label="กรอกชื่อช่องทาง"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกชื่อช่องทาง'}`]"
                 />
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
index d801be5f7..7a15f1330 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
@@ -132,6 +132,7 @@ onMounted(() => {});
         dense
         v-model="filterKeyword"
         ref="filterRef"
+        for="filterKeyword"
         outlined
         debounce="300"
         placeholder="ค้นหา"
@@ -150,6 +151,7 @@ onMounted(() => {});
       <q-select
         v-model="visibleColumns"
         multiple
+        for="visibleColumns"
         outlined
         dense
         options-dense
@@ -204,18 +206,6 @@ onMounted(() => {});
             </q-td>
           </q-tr>
         </template>
-        <!-- <template v-slot:pagination="scope">
-          <q-pagination
-            v-model="pagination.page"
-            active-color="primary"
-            color="dark"
-            :max="scope.pagesNumber"
-            :max-pages="5"
-            size="sm"
-            boundary-links
-            direction-links
-          ></q-pagination>
-        </template> -->
       </d-table>
     </div>
   </q-card>
diff --git a/src/modules/11_discipline/interface/request/disciplinary.ts b/src/modules/11_discipline/interface/request/disciplinary.ts
new file mode 100644
index 000000000..29a27ff6b
--- /dev/null
+++ b/src/modules/11_discipline/interface/request/disciplinary.ts
@@ -0,0 +1,46 @@
+interface FormData {
+  Complaint: 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;
+}
+
+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;
+  [key: string]: any;
+}
+
+export type { FormData, disciplinaryRef };