diff --git a/package.json b/package.json
index 75b2a4f43..6e2ddd2c2 100644
--- a/package.json
+++ b/package.json
@@ -30,13 +30,11 @@
     "axios": "^1.6.7",
     "bma-org-chart": "^0.0.8",
     "esri-loader": "^3.7.0",
-    "exceljs": "^4.4.0",
     "html-to-image": "^1.11.13",
     "keycloak-js": "^20.0.2",
     "moment": "^2.29.4",
     "pdf-lib": "^1.17.1",
     "pinia": "^2.0.29",
-    "pinia-plugin-persistedstate": "^3.2.3",
     "quasar": "^2.11.1",
     "socket.io-client": "^4.7.4",
     "structure-chart": "^0.0.9",
diff --git a/public/File/ข้อมูลผู้สมัครสอบ.xlsx b/public/File/ข้อมูลผู้สมัครสอบ.xlsx
index 8506e75b6..0611f9be0 100644
Binary files a/public/File/ข้อมูลผู้สมัครสอบ.xlsx and b/public/File/ข้อมูลผู้สมัครสอบ.xlsx differ
diff --git a/public/File/บัญชีรวมคะแนน.xlsx b/public/File/บัญชีรวมคะแนน.xlsx
index 9c555c814..3fda2b8dc 100644
Binary files a/public/File/บัญชีรวมคะแนน.xlsx and b/public/File/บัญชีรวมคะแนน.xlsx differ
diff --git a/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx b/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx
index 2e584fc57..3e012c58c 100644
Binary files a/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx and b/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx differ
diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index d370d9b29..bcb7e54d9 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -192,9 +192,6 @@ export default {
     `${orgProfile}/keycloak/permissionProfile/${rootId}`,
   profileidPosition: (type: string) =>
     `${orgProfile}${type}/profileid/position`,
-  uploadProfile: (type: string, id: string) =>
-    `${organization}/upload/${type}-profileSalaryTemp/${id}`,
-  sortOrderByDate: `${orgProfile}/salaryTemp/sort-order`,
 
   workflowCommanderOperate: `${workflow}/commander/operate`,
   workflowCommanderSign: `${workflow}/commander/sign`,
diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts
index b6459a850..a810db909 100644
--- a/src/api/05_placement/api.placement.ts
+++ b/src/api/05_placement/api.placement.ts
@@ -27,7 +27,6 @@ export default {
   placementDefermentInfo: (id: string) => `${placement}/pass/deferment/${id}`,
   placementDisclaimInfo: (id: string) => `${placement}/pass/disclaim/${id}`,
   placementUpdatePass: `${placement}/pass/update-status`,
-  placementUpdateDraftStatus: `${placement}/update/draft-status`,
 
   //personal
   placementPersonalId: (personalId: string) =>
diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index d0229b204..865db4ea6 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -61,6 +61,4 @@ export default {
 
   leaveReportAPI: (type: string) =>
     `${leave}/report/download/time-records/${type}`,
-
-  leaveTask: `${leave}/admin/leave-task/process`,
 };
diff --git a/src/api/recruiting/api.period-exam.ts b/src/api/recruiting/api.period-exam.ts
index bf777e193..0df5e58ed 100644
--- a/src/api/recruiting/api.period-exam.ts
+++ b/src/api/recruiting/api.period-exam.ts
@@ -96,8 +96,4 @@ export default {
 
   applicationFormPDF: (candidateId: string) =>
     `${env.API_URI}/placement/candidate/pdf/${candidateId}`,
-
-  downloadCandidateExam: (id: string) =>
-    `${periodExam}download/candidate-exam/${id}`,
-  downloadPassExam: (id: string) => `${periodExam}download/pass-exam/${id}`,
 };
diff --git a/src/api/recruiting/api.recruit.ts b/src/api/recruiting/api.recruit.ts
index 8bfda023b..3a9f220a8 100644
--- a/src/api/recruiting/api.recruit.ts
+++ b/src/api/recruiting/api.recruit.ts
@@ -23,7 +23,6 @@ export default {
   uploadCandidates: (id: string) => `${recruit}candidate/${id}`,
   uploadResult: (id: string) => `${recruit}result/${id}`,
   getImportHistory: (id: string) => `${recruit}history/${id}`,
-  getImportStatus: (jobId: string) => `${recruit}import/status/${jobId}`,
 
   //upload
   periodRecruitDoc: (examId: string) => `${recruit}doc/${examId}`,
diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index f3378e539..0cbfc086e 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -272,10 +272,4 @@ export default {
   profileAssistanceReturn: `${env.API_URI}/placement/repatriation`,
   profileAssistanceUpdateDelete: (type: string) =>
     `${registryNew}${type}/assistance/update-delete/`,
-
-   profileAbsentLate: (type: string) => `${registryNew}${type}/absent-late`,
-   profileAbsentLateUpdateDelete: (type: string) => `${registryNew}${type}/absent-late/update-delete`,
-   profileAbsentLateHistory: (id: string, type: string) =>
-     `${registryNew}${type}/absent-late/history/${id}`,
-
 };
diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index 2b90d2468..d6b9fe4cf 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -8,7 +8,6 @@ import config from "@/app.config";
 import type { PropType } from "vue";
 import type { FormProfile } from "@/interface/main";
 import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
-import avatarMain from "@/assets/avatar_user.jpg";
 
 /** importComponents*/
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
@@ -44,9 +43,9 @@ async function fetchDataProfile(data: DataProfile) {
     profile.avatar = data?.avatar ? data.avatar : "";
   }
   profile.id = data.profileId;
-  profile.fullName = `${data.rank ? data.rank : data.prefix ?? ""}${
-    data.firstName ?? ""
-  } ${data.lastName ?? ""} `;
+  profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${
+    data.lastName ?? ""
+  } `;
 
   if (data["posTypeNameOld"] !== undefined) {
     profile.position =
@@ -92,11 +91,8 @@ function fetchProfile(id: string, name: string) {
   if (profile.avatar === "") {
     http
       .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `${name}`))
-      .then((res) => {
+      .then(async (res) => {
         profile.avatar = res.data.downloadUrl;
-      })
-      .catch(() => {
-        profile.avatar = avatarMain;
       });
   }
 }
diff --git a/src/components/DialogHeader.vue b/src/components/DialogHeader.vue
index 19ee3f536..77d936c93 100644
--- a/src/components/DialogHeader.vue
+++ b/src/components/DialogHeader.vue
@@ -9,8 +9,6 @@
       round
       dense
       @click="close"
-      @keydown.enter.prevent
-      @keydown.space.prevent
       style="color: #ff8080; background-color: #ffdede"
     />
   </q-toolbar>
diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 89b5f803a..6003ace6f 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -305,7 +305,7 @@ watch(
               outlined
               option-label="name"
               option-value="id"
-              @update:model-value="(rows = []), (selected = [])"
+              @update:model-value="rows = []"
             />
           </div>
         </div>
@@ -332,7 +332,6 @@ watch(
               outlined
               dense
               label="คำค้น"
-              @keydown.enter.prevent="searchInput()"
             >
               <template v-slot:after>
                 <q-btn
diff --git a/src/components/Dialogs/DialogDebug.vue b/src/components/Dialogs/DialogDebug.vue
index 42230b6f4..94c5c349f 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -11,7 +11,6 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import FooterContact from "@/components/FooterContact.vue";
 
 const $q = useQuasar();
 const store = usePositionKeycloakStore();
@@ -354,11 +353,6 @@ function onClose() {
 
             <div class="col-12">
               <div class="row col-12 q-col-gutter-sm">
-                <div class="col-12">
-                  <div class="text-caption text-grey-8">
-                    ผู้ดูแลระบบจะติดต่อกลับผ่านทางอีเมลที่ท่านระบุ กรุณาตรวจสอบอีเมลของท่านเป็นระยะ
-                  </div>
-                </div>
                 <div class="col-xs-12 col-md-6 col-lg-6">
                   <q-input
                     dense
@@ -368,11 +362,10 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      (val: string) => !!val || 'กรุณากรอกที่อยู่อีเมล',
-                      (val: string) => {
-                        const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-                        return emailPattern.test(val) || 'กรุณากรอกที่อยู่อีเมลในรูปแบบที่ถูกต้อง';
-                      }
+                      () =>
+                        !!formData.email ||
+                        !!formData.phone ||
+                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
                     ]"
                   />
                 </div>
@@ -384,6 +377,12 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
+                    :rules="[
+                      () =>
+                        !!formData.email ||
+                        !!formData.phone ||
+                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                    ]"
                   />
                 </div>
               </div>
@@ -392,11 +391,7 @@ function onClose() {
         </q-card-section>
 
         <q-separator />
-        <q-card-actions class="q-px-sm items-center">
-          <div class="row items-center q-pa-sm">
-            <FooterContact />
-          </div>
-          <q-space />
+        <q-card-actions align="right">
           <q-btn
             type="submit"
             for="#submitForm"
diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index e0173febc..259d7154b 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -24,14 +24,14 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const props = defineProps({
   dataRows: {
     type: Object,
-    default: () => ({}),
+    require: true,
   },
   onSubmit: Function,
 });
 const $q = useQuasar();
 const route = useRoute();
 const storeTree = useStructureTree();
-const { fetchStructureTree } = storeTree;
+const { fetchStructureTree } = useStructureTree();
 const mixin = useCounterMixin();
 const {
   dialogConfirm,
@@ -47,10 +47,10 @@ const {
 /** props*/
 const modal = defineModel<boolean>("modal", { required: true });
 const title = defineModel<string>("title", { required: true });
-const type = defineModel<string | null>("type", { required: true });
-const posType = defineModel<string | null>("posType", { required: true });
-const posLevel = defineModel<string | null>("posLevel", { required: true });
-const position = defineModel<string | null>("position", { required: true });
+const type = defineModel<any>("type", { required: true });
+const posType = defineModel<any>("posType", { required: true });
+const posLevel = defineModel<any>("posLevel", { required: true });
+const position = defineModel<any>("position", { required: true });
 
 // const routeName = ref<string>(route?.name);
 const orgRevisionId = ref<string>("");
@@ -64,7 +64,7 @@ const itemTaps = ref<string[]>();
 const filters = ref<string>("");
 const positionId = ref<string>("");
 const selectedPos = ref<any[]>([]);
-const selectId = ref<string>("");
+const seletcId = ref<string>("");
 const datePos = ref<Date>(new Date());
 const rowsPosition = ref<Positions[]>([]);
 const positionData = ref<any[]>([]);
@@ -79,6 +79,7 @@ const formActive = reactive<FormActive>({
 });
 /** node */
 const nodes = ref<Array<OrgTree>>([]);
+const lazy = ref(nodes);
 const expanded = ref<string[]>([]);
 const nodeLevel = ref<number>(0);
 const nodeId = ref<string>(""); // id ของ Tree
@@ -149,7 +150,7 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const columnsPosition = ref<QTableProps["columns"]>([
+const columnsPostition = ref<QTableProps["columns"]>([
   {
     name: "no",
     align: "left",
@@ -180,7 +181,7 @@ const columnsPosition = ref<QTableProps["columns"]>([
   {
     name: "posTypeName",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ประเภทตำเเหน่ง",
     sortable: true,
     field: "posTypeName",
     headerStyle: "font-size: 14px",
@@ -243,16 +244,10 @@ function close() {
   expanded.value = [];
   nodeLevel.value = 0;
   nodeId.value = "";
-  positionData.value = [];
-  positionNo.value = [];
-  rowData.value = [];
 }
 
 async function getDataTable(id: string, level: number = 0) {
   showLoader();
-  positionData.value = [];
-  positionNo.value = [];
-  rowData.value = [];
   const body = {
     node: level,
     nodeId: id,
@@ -266,7 +261,7 @@ async function getDataTable(id: string, level: number = 0) {
 
   await http
     .post(config.API.orgPosPlacement, body)
-    .then(async (res) => {
+    .then((res) => {
       const dataMain: PositionMain[] = [];
       posMasterMain.value = res.data.result.data;
 
@@ -304,6 +299,7 @@ async function getDataTable(id: string, level: number = 0) {
 
       positionNo.value = listPosNo;
       rowData.value = listPosNo;
+      // positionData.value = listPosNo;
 
       if (props.dataRows?.posmasterId) {
         const newUse = positionUse.value.filter(
@@ -317,13 +313,14 @@ async function getDataTable(id: string, level: number = 0) {
           (e: any) => !positionUse.value.includes(e.id)
         );
       }
-      await onClickSelectPos(positionId.value);
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
     });
 }
 
@@ -334,11 +331,11 @@ async function getDataTable(id: string, level: number = 0) {
 function updateSelected(data: DataTree) {
   if (props?.dataRows?.nodeId === data.orgTreeId) {
     positionId.value = props?.dataRows?.posmasterId;
-    selectId.value = props?.dataRows?.positionId;
+    seletcId.value = props?.dataRows?.positionId;
     datePos.value = props?.dataRows?.reportingDate;
   } else {
     positionId.value = "";
-    selectId.value = "";
+    seletcId.value = "";
     selectedPos.value = [];
     datePos.value = new Date();
   }
@@ -385,9 +382,9 @@ async function onClickSelectPos(id: string) {
   // หาตำแหน่ง
   if (position) {
     rowsPosition.value = position.positions;
-    if (selectId.value) {
+    if (seletcId.value) {
       selectedPos.value = rowsPosition.value.filter(
-        (e) => e.id === selectId.value
+        (e) => e.id === seletcId.value
       );
     }
   }
@@ -406,19 +403,18 @@ async function fetchPosFind(level: number, id: string) {
   };
   await http
     .post(config.API.orgPosFind, body)
-    .then(async (res) => {
+    .then((res) => {
       const data = res.data.result;
       expanded.value = data;
       nodeId.value = id;
       positionId.value = props?.dataRows?.posmasterId;
-      selectId.value = props?.dataRows?.positionId;
+      seletcId.value = props?.dataRows?.positionId;
       datePos.value = props?.dataRows?.reportingDate;
-      await getDataTable(nodeId.value, level);
+
+      getDataTable(nodeId.value, level);
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
       hideLoader();
     });
 }
@@ -431,6 +427,11 @@ watch(
 
       if (props?.dataRows?.node !== null && props?.dataRows?.nodeId !== null) {
         await fetchPosFind(props?.dataRows?.node, props?.dataRows?.nodeId);
+        if (positionId.value) {
+          setTimeout(async () => {
+            await onClickSelectPos(positionId.value);
+          }, 200);
+        }
       } else {
         expanded.value = [];
       }
@@ -462,15 +463,19 @@ function fetchPositionUes() {
 
 watch(
   () => isAll.value,
-  () => {
-    getDataTable(nodeId.value, nodeLevel.value);
+  (value, oldVal) => {
+    if (value !== oldVal) {
+      getDataTable(nodeId.value, nodeLevel.value);
+    }
   }
 );
 
 watch(
   () => isBlank.value,
-  () => {
-    getDataTable(nodeId.value, nodeLevel.value);
+  (value, oldVal) => {
+    if (value !== oldVal) {
+      getDataTable(nodeId.value, nodeLevel.value);
+    }
   }
 );
 
@@ -486,44 +491,35 @@ function onSubmit() {
   const dataPosMaster = posMasterMain.value?.find(
     (e: any) => e.id === positionId.value
   );
-
-  if (!dataPosMaster) {
-    dialogMessageNotify($q, "ไม่พบข้อมูลตำแหน่ง");
-    return;
-  }
-
   if (selectedPos.value.length === 0) {
     dialogMessageNotify($q, "กรุณาเลือกตำแหน่ง");
-    return;
+  } else {
+    dialogConfirm($q, async () => {
+      const body = {
+        personalId: props?.dataRows?.id,
+        node: dataPosMaster.node,
+        nodeId: dataPosMaster.nodeId,
+        orgRevisionId: formActive.activeId,
+        positionId: selectedPos.value[0].id,
+        posMasterNo: dataPosMaster.posMasterNo, //ตำแหน่งเลขที่(เลขอย่่างเดียว)
+        positionName: selectedPos.value[0].positionName, //ชื่อตำแหน่ง
+        positionField: selectedPos.value[0].positionField, //ชื่อตำแหน่ง
+        posTypeId: selectedPos.value[0].posTypeId, //ชื่อตำแหน่ง
+        posTypeName: selectedPos.value[0].posTypeName, //ชื่อตำแหน่ง
+        posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
+        posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
+        posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
+        reportingDate: convertDateToAPI(datePos.value),
+        posmasterId: dataPosMaster.id,
+        typeCommand: type.value,
+        positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
+        positionArea: selectedPos.value[0].positionArea, //ด้าน/สาขา
+      };
+
+      await props.onSubmit?.(body);
+      close();
+    });
   }
-
-  dialogConfirm($q, async () => {
-    const body = {
-      personalId: props?.dataRows?.id,
-      node: dataPosMaster.node,
-      nodeId: dataPosMaster.nodeId,
-      orgRevisionId: formActive.activeId,
-      positionId: selectedPos.value[0].id,
-      posMasterNo: dataPosMaster.posMasterNo, //ตำแหน่งเลขที่(เลขอย่่างเดียว)
-      positionName: selectedPos.value[0].positionName, //ชื่อตำแหน่ง
-      positionField: selectedPos.value[0].positionField, //ชื่อตำแหน่ง
-      posTypeId: selectedPos.value[0].posTypeId, //ชื่อตำแหน่ง
-      posTypeName: selectedPos.value[0].posTypeName, //ชื่อตำแหน่ง
-      posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
-      posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
-      posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
-      posExecutiveId: selectedPos.value[0].posExecutiveId, //ชื่อตำแหน่ง
-      reportingDate: convertDateToAPI(datePos.value),
-      posmasterId: dataPosMaster.id,
-      typeCommand: type.value,
-      positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
-      positionArea: selectedPos.value[0].positionArea, //ด้าน/สาขา
-    };
-    console.log(body);
-
-    await props.onSubmit?.(body);
-    close();
-  });
 }
 
 function onSearch() {
@@ -538,7 +534,6 @@ onMounted(async () => {
   await fetchTree();
 });
 </script>
-
 <template>
   <q-dialog v-model="modal" persistent full-width>
     <q-card class="no-scroll">
@@ -570,7 +565,7 @@ onMounted(async () => {
             <q-tree
               class="q-pa-sm q-gutter-sm"
               dense
-              :nodes="nodes"
+              :nodes="lazy"
               node-key="orgTreeId"
               label-key="labelName"
               :filter="filter"
@@ -836,7 +831,7 @@ onMounted(async () => {
                             </q-toolbar>
                             <d-table
                               ref="table"
-                              :columns="columnsPosition"
+                              :columns="columnsPostition"
                               :rows="rowsPosition"
                               row-key="id"
                               flat
@@ -934,7 +929,6 @@ onMounted(async () => {
     </q-card>
   </q-dialog>
 </template>
-
 <style scoped>
 .my-list-link {
   color: rgb(118, 168, 222);
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index b9a7b1ee5..80d5950f4 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -232,8 +232,7 @@ function close() {
 
 async function getDataTable(id: string, level: number = 0) {
   showLoader();
-  positionNo.value = [];
-  rowsData.value = [];
+
   const body = {
     node: level,
     nodeId: id,
@@ -266,7 +265,6 @@ async function getDataTable(id: string, level: number = 0) {
         posMasterNo:
           e.orgShortname +
           (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
-          " " +
           e.posMasterNo +
           (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
         positionName: e.positionName,
@@ -304,7 +302,9 @@ async function getDataTable(id: string, level: number = 0) {
       messageError($q, err);
     })
     .finally(() => {
-      hideLoader();
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
     });
 }
 
diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index ffc275ee7..1b17f7efd 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -14,7 +14,6 @@ import type {
   GovermentEmpTemp,
 } from "@/components/information/interface/response/Government";
 import type { Avatar } from "@/components/information/interface/response/avatar";
-import avatarMain from "@/assets/avatar_user.jpg";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -168,9 +167,9 @@ async function fetchInformation(id: string) {
       avatar.position = data.position ? data.position : "-";
       //ถ้ามีรูปเรียก Function  fetchProfile เรียกข้อมูลรูปโปรไฟล์
       if (data.avatarName) {
-        fetchProfile(data.id as string, data.avatarName);
+        await fetchProfile(data.id as string, data.avatarName);
       } else {
-        avatar.avatar = avatarMain;
+        avatar.avatar = "";
       }
 
       if (props.id) {
@@ -261,14 +260,11 @@ async function fetchProfileGovTemp(id: string) {
  * @param id profileID
  * @param avatarName ชื่อไฟล์
  */
-function fetchProfile(id: string, avatarName: string) {
-  http
+async function fetchProfile(id: string, avatarName: string) {
+  await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
-    .then((res) => {
-      avatar.avatar = res.data.downloadUrl;
-    })
-    .catch(() => {
-      avatar.avatar = avatarMain;
+    .then(async (res) => {
+      avatar.avatar = await res.data.downloadUrl;
     });
 }
 
diff --git a/src/components/FooterContact.vue b/src/components/FooterContact.vue
deleted file mode 100644
index 45082f566..000000000
--- a/src/components/FooterContact.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div class="row items-center justify-center q-gutter-sm">
-    <q-icon name="support_agent" color="primary" size="sm" />
-    <span class="text-body2">
-      พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
-      <span class="text-weight-medium text-primary"
-        ><a href="tel:0882649800" style="text-decoration: none; color: inherit"
-          >088-264-9800</a
-        >
-      </span>
-    </span>
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped></style>
diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index baac6052f..80734855f 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -5,6 +5,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { getColumnLabel } from "@/utils/function";
 
 import type { QTableProps } from "quasar";
 
@@ -186,7 +187,6 @@ watch(modal, (val) => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
-                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
@@ -253,7 +253,7 @@ watch(modal, (val) => {
                 <q-th auto-width />
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">
-                    {{ col.label }}
+                    {{ getColumnLabel(col, isAct) }}
                   </span>
                 </q-th>
               </q-tr>
diff --git a/src/main.ts b/src/main.ts
index d75e834e2..570937672 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,7 +13,6 @@ import th from "quasar/lang/th";
 import "@vuepic/vue-datepicker/dist/main.css";
 import http from "./plugins/http";
 import { createPinia } from "pinia";
-import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
 
 // import './assets/main.css'
 
@@ -21,7 +20,6 @@ import filters from "./plugins/filters";
 
 const app = createApp(App);
 const pinia = createPinia();
-pinia.use(piniaPluginPersistedstate);
 
 // เพิ่ม Global Filters ลงใน App
 app.config.globalProperties.$filters = filters;
diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index eed16a660..4b9651bcf 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -213,9 +213,7 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
   return data.map((item) => ({
     ...item,
     fullname: item.firstName
-      ? `${item.prefix || ""}${item.firstName || ""} ${
-          item.lastName || ""
-        }`.trim()
+      ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
       : "ว่าง",
   }));
 }
@@ -277,7 +275,7 @@ watch(
                         (store.typeOrganizational === "draft" ||
                           store.typeOrganizational === "old")
                       ? "2 (ปัจจุบัน)"
-                      : props.rowIndex + 1
+                      : props.rowIndex + 1 
                   }}
                 </div>
 
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 7d8a2756b..91e1e5083 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -1004,6 +1004,7 @@ watch(
                 table-class="text-grey-9"
                 row-key="id"
                 dense
+                hide-bottom
                 bordered
                 separator="vertical"
                 class="custom-header-table-expand"
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index f5b1b2b21..883d9257c 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -365,7 +365,7 @@ async function downloadFileDashboard() {
 async function clickPassExam() {
   showLoader();
   await http
-    .get(config.API.downloadPassExam(examId.value))
+    .get(config.API.exportExamPassExamList(examId.value))
     .then(async (res) => {
       const data = res.data.result;
       data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
@@ -382,7 +382,7 @@ async function clickPassExam() {
 async function clickCandidateList() {
   showLoader();
   await http
-    .get(config.API.downloadCandidateExam(examId.value))
+    .get(config.API.exportExamCandidateList(examId.value))
     .then(async (res) => {
       const data = res.data.result;
       data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
@@ -397,6 +397,8 @@ async function clickCandidateList() {
 }
 
 async function onCheckShowExaminfo() {
+  console.log(props.isShowExaminfo);
+
   dialogMessage(
     $q,
     `ยืนยันการ${props.isShowExaminfo ? "ปิด" : "เปิด"}`,
diff --git a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
index de4c59ddc..d75dded2d 100644
--- a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
+++ b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
@@ -403,6 +403,16 @@ function clearFilter() {
       </div>
     </div>
   </q-form>
+
+  <div class="q-pa-sm q-gutter-sm">
+    <q-card flat bordered class="col-12">
+      <div class="row q-col-gutter-sm q-pa-sm">
+        <div class="row col-12 q-col-gutter-sm">
+          <q-space />
+        </div>
+      </div>
+    </q-card>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 925462154..d281f6d49 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -1,7 +1,7 @@
 <!-- page:จัดการรอบการสอบ สรรหา -->
 <script setup lang="ts">
 import type { QTableProps } from "quasar";
-import { onMounted, ref, watch } from "vue";
+import { onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 import genReport from "@/plugins/genreport";
@@ -11,9 +11,6 @@ import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { calculateFiscalYear } from "@/utils/function";
-import { useUploadProgressStore } from "@/stores/uploadProgress";
-import { useSocketStore } from "@/stores/socket";
-import { storeToRefs } from "pinia";
 
 import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 import type {
@@ -36,14 +33,9 @@ const {
   messageError,
   onSearchDataTable,
   dialogRemove,
-  dialogMessage,
 } = mixin;
 
 const router = useRouter();
-const uploadProgress = useUploadProgressStore();
-const socketStore = useSocketStore();
-const { notificationCounter } = storeToRefs(socketStore);
-
 const name = ref<string>("");
 const year = ref<number>(calculateFiscalYear(new Date()) + 543);
 const order = ref<number>(1);
@@ -57,11 +49,6 @@ const modalScore = ref<boolean>(false);
 const modalCandidate = ref<boolean>(false);
 const modalResult = ref<boolean>(false);
 const selected_row_id = ref<string>("");
-const jobStatus = ref<{
-  candidate?: "running" | "completed" | "failed";
-  score?: "running" | "completed" | "failed";
-  result?: "running" | "completed" | "failed";
-}>({});
 const rowsHistory = ref<ResponseHistoryObject[]>([]); //select data history
 const tittleHistory = ref<string>("ประวัติการนำเข้าข้อมูล"); //
 const filterHistory = ref<string>(""); //search data table history
@@ -75,54 +62,6 @@ const textTittle = ref<string>("");
 const textTittleScore = ref<string>("");
 const textTittleCandidate = ref<string>("");
 const textTittleResult = ref<string>("");
-
-// Dialog message constants
-const UPLOAD_RUNNING_DIALOG = {
-  title: "ไม่สามารถอัปโหลดไฟล์ได้",
-  message: "อยู่ระหว่างนำเข้าข้อมูล ระบบจะแจ้งผลให้ทราบทันทีเมื่อเสร็จสิ้น",
-  icon: "mdi-progress-alert",
-  btnLabel: "ตกลง",
-  color: "primary",
-};
-
-const UPLOAD_SUCCESS_DIALOG = {
-  title: "อัปโหลดไฟล์สำเร็จ",
-  message:
-    "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีเมื่อเสร็จสิ้น",
-  icon: "check",
-  btnLabel: "ตกลง",
-  color: "primary",
-};
-
-// Function to show upload running dialog
-function showUploadRunningDialog() {
-  dialogMessage(
-    $q,
-    UPLOAD_RUNNING_DIALOG.title,
-    UPLOAD_RUNNING_DIALOG.message,
-    UPLOAD_RUNNING_DIALOG.icon,
-    UPLOAD_RUNNING_DIALOG.btnLabel,
-    UPLOAD_RUNNING_DIALOG.color,
-    undefined,
-    undefined,
-    true
-  );
-}
-
-// Function to show upload success dialog
-function showUploadSuccessDialog() {
-  dialogMessage(
-    $q,
-    UPLOAD_SUCCESS_DIALOG.title,
-    UPLOAD_SUCCESS_DIALOG.message,
-    UPLOAD_SUCCESS_DIALOG.icon,
-    UPLOAD_SUCCESS_DIALOG.btnLabel,
-    UPLOAD_SUCCESS_DIALOG.color,
-    undefined,
-    undefined,
-    true
-  );
-}
 const rows = ref<ResponseRecruitPeriod[]>([]);
 const rowsData = ref<ResponseRecruitPeriod[]>([]);
 const initialPagination = ref<Pagination>({
@@ -396,15 +335,9 @@ function clickDetail(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickUpload(id: string) {
+  modalCandidate.value = true;
+  textTittleCandidate.value = "นำเข้าผู้สมัครสอบแข่งขัน";
   selected_row_id.value = id;
-  const isRunning = await checkJobStatus(id, "candidate");
-
-  if (isRunning) {
-    showUploadRunningDialog();
-  } else {
-    modalCandidate.value = true;
-    textTittleCandidate.value = "นำเข้าผู้สมัครสอบแข่งขัน";
-  }
 }
 
 /**
@@ -412,15 +345,9 @@ async function clickUpload(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickEdit(id: string) {
+  modalScore.value = true;
+  textTittleScore.value = "นำเข้าบัญชีรวมคะแนน";
   selected_row_id.value = id;
-  const isRunning = await checkJobStatus(id, "score");
-
-  if (isRunning) {
-    showUploadRunningDialog();
-  } else {
-    modalScore.value = true;
-    textTittleScore.value = "นำเข้าบัญชีรวมคะแนน";
-  }
 }
 
 /**
@@ -428,57 +355,9 @@ async function clickEdit(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickResult(id: string) {
+  modalResult.value = true;
+  textTittleResult.value = "นำเข้าไฟล์ผลการสอบ";
   selected_row_id.value = id;
-  const isRunning = await checkJobStatus(id, "result");
-
-  if (isRunning) {
-    showUploadRunningDialog();
-  } else {
-    modalResult.value = true;
-    textTittleResult.value = "นำเข้าไฟล์ผลการสอบ";
-  }
-}
-
-/**
- * ตรวจสอบสถานะการนำเข้าข้อมูล
- * @param id รอบสอบเเข่งขัน
- * @param type ประเภทไฟล์ที่ต้องการตรวจสอบ
- * @return true ถ้ากำลัง running, false ถ้าไม่มี job หรือ job เสร็จแล้ว
- */
-async function checkJobStatus(
-  id: string,
-  type: "candidate" | "score" | "result"
-): Promise<boolean> {
-  const uploads = uploadProgress.pendingUploads.filter(
-    (u) => u.periodId === id && u.type === type
-  );
-
-  let hasRunningJob = false;
-
-  for (const upload of uploads) {
-    try {
-      const res = await http.get(config.API.getImportStatus(upload.jobId));
-      const status = res.data.result.status.toLowerCase(); // 'running', 'completed', 'failed'
-
-      if (status === "completed" || status === "failed") {
-        status === "completed" && fetchData();
-        uploadProgress.removeUpload(upload.jobId);
-      } else if (status === "running") {
-        jobStatus.value[type] = "running";
-        hasRunningJob = true;
-      }
-    } catch (e) {
-      // if error, remove from pending
-      uploadProgress.removeUpload(upload.jobId);
-    }
-  }
-
-  // if no running jobs, clear status
-  if (!uploadProgress.isUploading(id, type)) {
-    jobStatus.value[type] = undefined;
-  }
-
-  return hasRunningJob;
 }
 
 /**
@@ -584,13 +463,11 @@ async function checkSaveCandidate() {
   await http
     .post(config.API.uploadCandidates(selected_row_id.value), fd)
     .then((res) => {
-      const jobId = res.data.result.jobId;
-      uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
-      success($q, UPLOAD_SUCCESS_DIALOG.message);
-
+      success($q, "นำเข้าข้อมูลผู้สมัครสอบสำเร็จ");
       modalCandidate.value = false;
       files_candidate.value = null;
       selected_row_id.value = "";
+      fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -600,7 +477,7 @@ async function checkSaveCandidate() {
     });
 }
 
-/** บันทึด คะเแนน */
+/** บันทึด คะเเนน */
 async function checkSaveScore() {
   const fd = new FormData();
   fd.append("attachment", files_score.value[0]);
@@ -608,12 +485,11 @@ async function checkSaveScore() {
   await http
     .post(config.API.saveScores(selected_row_id.value), fd)
     .then((res) => {
-      const jobId = res.data.result.jobId;
-      uploadProgress.addUpload(jobId, selected_row_id.value, "score");
-      success($q, UPLOAD_SUCCESS_DIALOG.message);
+      success($q, "นำเข้าข้อมูลผลคะแนนสอบสำเร็จ");
       modalScore.value = false;
       files_score.value = null;
       selected_row_id.value = "";
+      fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -631,12 +507,11 @@ async function checkSaveResult() {
   await http
     .post(config.API.uploadResult(selected_row_id.value), fd)
     .then((res) => {
-      const jobId = res.data.result.jobId;
-      uploadProgress.addUpload(jobId, selected_row_id.value, "result");
-      success($q, UPLOAD_SUCCESS_DIALOG.message);
+      success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
       modalResult.value = false;
       files_result.value = null;
       selected_row_id.value = "";
+      fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -657,9 +532,6 @@ async function checkSave() {
   await http
     .post(config.API.saveCandidates, fd)
     .then((res) => {
-      const jobId = res.data.result.jobId;
-      uploadProgress.addUpload(jobId, selected_row_id.value, "period");
-
       success($q, "นำเข้าข้อมูลผู้สมัครสอบแข่งขันสำเร็จ");
       modalAdd.value = false;
       fetchData();
@@ -685,18 +557,12 @@ onMounted(async () => {
   hideLoader();
   await fetchData();
 });
-
-/** Watch notification counter on socket */
-watch(notificationCounter, () => {
-  fetchData();
-});
 </script>
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     จัดการรอบสอบแข่งขัน
   </div>
-
   <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
     <div>
       <Table
@@ -803,16 +669,16 @@ watch(notificationCounter, () => {
               </div>
               <div v-else-if="col.name == 'examCount'" class="table_ellipsis2">
                 <q-btn
-                  v-if="
-                    (col.value == null || col.value == '0') &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
                   flat
                   dense
                   size="12px"
                   color="green"
                   round
                   @click.stop.prevent="clickUpload(props.row.id)"
+                  v-if="
+                    (col.value == null || col.value == '0') &&
+                    checkPermission($route)?.attrIsUpdate
+                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <q-tooltip>นำเข้าไฟล์ผู้สมัครสอบ</q-tooltip>
@@ -849,9 +715,6 @@ watch(notificationCounter, () => {
               </div>
               <div v-else-if="col.name == 'scoreCount'" class="table_ellipsis2">
                 <q-btn
-                  v-if="
-                    col.value == null && checkPermission($route)?.attrIsUpdate
-                  "
                   :disable="props.row.examCount == 0"
                   flat
                   dense
@@ -859,6 +722,9 @@ watch(notificationCounter, () => {
                   round
                   color="green"
                   @click.stop.prevent="clickEdit(props.row.id)"
+                  v-if="
+                    col.value == null && checkPermission($route)?.attrIsUpdate
+                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <!-- นำเข้าไฟล์ผลคะแนนสอบ -->
@@ -885,11 +751,6 @@ watch(notificationCounter, () => {
 
               <div v-else-if="col.name == 'result'" class="table_ellipsis2">
                 <q-btn
-                  v-if="
-                    (props.row.score == null ||
-                      props.row.score.resultCount == 0) &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
                   :disable="props.row.score == null"
                   flat
                   dense
@@ -897,6 +758,11 @@ watch(notificationCounter, () => {
                   color="green"
                   round
                   @click.stop.prevent="clickResult(props.row.id)"
+                  v-if="
+                    (props.row.score == null ||
+                      props.row.score.resultCount == 0) &&
+                    checkPermission($route)?.attrIsUpdate
+                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
@@ -1055,12 +921,12 @@ watch(notificationCounter, () => {
 
   <q-dialog v-model="modalCandidate" persistent>
     <q-card style="width: 600px">
-      <DialogHeadTemplate
-        :title="textTittleCandidate"
-        :close="clickCloseCandidate"
-        title-type="ข้อมูลผู้สมัครสอบ"
-      />
       <q-form ref="myFormScore">
+        <DialogHeadTemplate
+          :title="textTittleCandidate"
+          :close="clickCloseCandidate"
+          title-type="ข้อมูลผู้สมัครสอบ"
+        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
@@ -1099,12 +965,12 @@ watch(notificationCounter, () => {
 
   <q-dialog v-model="modalScore" persistent>
     <q-card style="width: 600px">
-      <DialogHeadTemplate
-        :title="textTittleScore"
-        :close="clickCloseScore"
-        title-type="บัญชีรวมคะแนน"
-      />
       <q-form ref="myFormScore">
+        <DialogHeadTemplate
+          :title="textTittleScore"
+          :close="clickCloseScore"
+          title-type="บัญชีรวมคะแนน"
+        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
@@ -1143,12 +1009,12 @@ watch(notificationCounter, () => {
 
   <q-dialog v-model="modalResult" persistent>
     <q-card style="width: 600px">
-      <DialogHeadTemplate
-        :title="textTittleResult"
-        :close="clickCloseResult"
-        title-type="ผลการสอบ (บัญชีรายชื่อ)"
-      />
       <q-form ref="myFormScore">
+        <DialogHeadTemplate
+          :title="textTittleResult"
+          :close="clickCloseResult"
+          title-type="ผลการสอบ (บัญชีรายชื่อ)"
+        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index d23684dea..15ecf3039 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -112,7 +112,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.year ? row.year + 543 : "-"}`;
+      return `${row.year + 543}`;
     },
     sort: (a: number, b: number) => b - a,
   },
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 2631acf53..6b54c2ac7 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -212,17 +212,17 @@ const columnsPosition = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 
-  // {
-  //   name: "type",
-  //   align: "left",
-  //   label: "ประเภทแบบฟอร์ม",
-  //   sortable: true,
-  //   field: "type",
-  //   headerStyle: "font-size: 14px",
-  //   style: "font-size: 14px",
-  //   sort: (a: string, b: string) =>
-  //     a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  // },
+  {
+    name: "type",
+    align: "left",
+    label: "ประเภทแบบฟอร์ม",
+    sortable: true,
+    field: "type",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 
 const shouldShowPaymentFields = computed(() => {
@@ -400,7 +400,7 @@ async function checkSave() {
 
     // เช็ค validation form ตำแหน่ง
     const isPositionFormValid = await myFormPosition.value?.validate();
-    if (!isPositionFormValid && announcementExam.value) return;
+    if (!isPositionFormValid) return;
 
     // เช็คการเพิ่มตำแหน่ง
     if (announcementExam.value && rowsPosition.value.length === 0) {
@@ -889,7 +889,7 @@ function fetchPosition(level: number) {
  * @param val ค่าประเภทตำแหน่ง 0 = ประเภททั่วไป ,1 = ประเภทวิชาการ
  * @param index ตำแหน่งของข้อมูล
  */
-function onUpdateHighDegree(val: string, index: number) {
+function onUpdateHighDegree(val: string, index: string) {
   rowsPosition.value[index].position = null;
   rowsPosition.value[index].level =
     val === "0" ? optionPosLevel1.value[0] : optionPosLevel2.value[0];
@@ -1476,7 +1476,7 @@ onMounted(async () => {
                       </div>
                     </q-td>
 
-                    <!-- <q-td key="type" :props="props">
+                    <q-td key="type" :props="props">
                       <selector
                         class=""
                         outlined
@@ -1490,7 +1490,7 @@ onMounted(async () => {
                         lazy-rules
                         :rules="[(val:any) => !!val || `${'กรุณาเลือกประเภทแบบฟอร์ม'}`]"
                       ></selector>
-                    </q-td> -->
+                    </q-td>
                   </q-tr>
                 </template>
               </ProfileTable>
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index badb61bf4..46f60a5cd 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -260,6 +260,7 @@ async function fetchData(loading: boolean = true) {
         total.value = data.total;
         maxPage.value = await Math.ceil(data.total / pageSize.value);
         maxPage.value = maxPage.value < 1 ? 1 : maxPage.value;
+
         rows.value = [];
         data.data.map((r: any) => {
           rows.value.push({
@@ -401,7 +402,6 @@ onMounted(async () => {
   await fetchDataCom();
 });
 </script>
-
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn
@@ -474,9 +474,9 @@ onMounted(async () => {
       </div>
     </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"
@@ -603,7 +603,6 @@ onMounted(async () => {
       </template>
     </TableCandidate>
   </q-card>
-
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 600px">
       <q-card-section class="row items-center q-py-sm">
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index e08b1a073..5da6c11e0 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -92,7 +92,7 @@ const baseColumns = ref<QTableColumn[]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => (v ? v + 543 : "-"),
+    format: (v) => v + 543,
     sort: (a: string, b: string) =>
       a
         .toString()
@@ -920,11 +920,9 @@ onMounted(async () => {
                 :locale="'th'"
                 :enableTimePicker="false"
               >
-                <template #year="{ year }">{{
-                  year ? year + 543 : "-"
-                }}</template>
+                <template #year="{ year }">{{ year + 543 }}</template>
                 <template #year-overlay-value="{ value }">{{
-                  value ? parseInt(value + 543) : "-"
+                  parseInt(value + 543)
                 }}</template>
                 <template #trigger>
                   <q-input
@@ -932,7 +930,7 @@ onMounted(async () => {
                     outlined
                     hide-bottom-space
                     class="inputgreen"
-                    :model-value="insigniaForm.year != null && insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
+                    :model-value="insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
                     :rules="[
                     (val:string) =>
                       !!val ||
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index edd6dea95..5da73bfb0 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -50,10 +50,18 @@ const formMain = reactive<FormMain>({
   workDate: null, //วันที่เริ่มปฏิบัติราชการ
   reasonSameDate: "",
   retireDate: null, //วันเกษียณอายุ
-  ageAll: "", //อายุราชการ
+  ageAll: {
+    year: 0,
+    month: 0,
+    day: 0,
+  }, //อายุราชการ
   absent: 0, //ขาดราชการ
   age: 0, //อายุราชการเกื้อกูล
-  govAgeBkk: "",
+  govAgeBkk:{
+    year: 0,
+    month: 0,
+    day: 0,
+  }
 });
 
 const modalEdit = ref<boolean>(false); //แสดง popup แก้ไขข้อมูลราชการ
@@ -157,22 +165,10 @@ async function getData() {
       formMain.reasonSameDate = data.reasonSameDate;
       formMain.retireDate = data.dateLeave;
       formMain.dateRetireLaw = data.dateRetireLaw;
-      formMain.ageAll = data.govAge
-        ? (
-            (data.govAge.year > 0 ? `${data.govAge.year} ปี ` : "") +
-            (data.govAge.month > 0 ? `${data.govAge.month} เดือน ` : "") +
-            (data.govAge.day > 0 ? `${data.govAge.day} วัน` : "")
-          ).trim() || "-"
-        : "-";
+      formMain.ageAll = data.govAge;
       formMain.absent = data.govAgeAbsent;
       formMain.age = data.govAgePlus;
-      formMain.govAgeBkk = data.govAgeBkk
-        ? (
-            (data.govAgeBkk.year > 0 ? `${data.govAgeBkk.year} ปี ` : "") +
-            (data.govAgeBkk.month > 0 ? `${data.govAgeBkk.month} เดือน ` : "") +
-            (data.govAgeBkk.day > 0 ? `${data.govAgeBkk.day} วัน` : "")
-          ).trim() || "-"
-        : "-";
+      formMain.govAgeBkk = data.govAgeBkk;
     })
     .catch((e) => {
       messageError($q, e);
@@ -459,19 +455,25 @@ onMounted(() => {
               <span class="text-grey-6 text-weight-medium">อายุราชการ</span>
             </div>
             <div class="col-12 col-sm-12 col-md-7">
-              <span>{{ formMain.ageAll }}</span>
+              <span>{{
+                formMain.ageAll
+                  ? `${formMain.ageAll.year} ปี ${formMain.ageAll.month} เดือน ${formMain.ageAll.day} วัน`
+                  : "-"
+              }}</span>
             </div>
           </div>
         </div>
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
             <div class="col-12 col-sm-12 col-md-5">
-              <span class="text-grey-6 text-weight-medium"
-                >อายุราชการ (กทม.)</span
-              >
+              <span class="text-grey-6 text-weight-medium">อายุราชการ (กทม.)</span>
             </div>
             <div class="col-12 col-sm-12 col-md-7">
-              <span>{{ formMain.govAgeBkk }}</span>
+                    <span>{{
+                formMain.govAgeBkk
+                  ? `${formMain.govAgeBkk.year} ปี ${formMain.govAgeBkk.month} เดือน ${formMain.govAgeBkk.day} วัน`
+                  : "-"
+              }}</span>
             </div>
           </div>
         </div>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
index 721542aba..726ed821a 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -202,17 +202,6 @@ const pagination = ref({
 const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
 const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
 
-/** รายการประเภทการลาของ ลาไปศึกษา ฝึกอบรม ปฎิบัติการวิจัย หรือดูงาน*/
-const leaveSubTypeName = ref<string>("");
-const optionSubTypeName = ref<string[]>([
-  "ศึกษาต่อ",
-  "ฝึกอบรม",
-  "ปฎิบัติการวิจัย",
-  "ดูงาน",
-]);
-
-const coupleDayLevelCountry = ref<string>("");
-
 /** function fetch ข้อมูลรายการลา*/
 async function getData() {
   showLoader();
@@ -224,7 +213,6 @@ async function getData() {
         ...item,
         id: item.id,
         typeLeave: item.leaveType.name,
-        codeLeave: item.leaveType.code,
         code: item.leaveType.refCommandDate,
         dateStartLeave: item.dateLeaveStart,
         dateEndLeave: item.dateLeaveEnd,
@@ -304,10 +292,8 @@ function openDialogEdit(props: DetailData) {
   typeLeave.value = {
     id: props.typeLeaveId,
     name: props.typeLeave,
-    code: props.codeLeave,
+    code: props.code,
   };
-  leaveSubTypeName.value = props.leaveSubTypeName;
-  coupleDayLevelCountry.value = props.coupleDayLevelCountry;
   statLeave.value = props.status;
   reason.value = props.reason;
   dateRange.value = [
@@ -330,10 +316,6 @@ function onSubmit() {
 
     const body = {
       leaveTypeId: typeLeave.value?.id,
-      leaveSubTypeName:
-        typeLeave.value?.code === "LV-008" ? leaveSubTypeName.value : undefined,
-      coupleDayLevelCountry:
-        typeLeave.value?.code === "LV-010" ? coupleDayLevelCountry.value : undefined,
       dateLeaveStart: dateToISO(dateRange.value[0]),
       dateLeaveEnd: dateToISO(dateRange.value[1]),
       leaveDays: numLeave.value,
@@ -469,8 +451,6 @@ function closeDialog() {
   dateRange.value = [new Date(), new Date()];
   numLeave.value = 1;
   numUsedLeave.value = 0;
-  leaveSubTypeName.value = "";
-  coupleDayLevelCountry.value = "";
 }
 
 function statusLeave(val: string) {
@@ -761,43 +741,6 @@ onMounted(() => {
                       ) "
               />
             </div>
-
-            <div
-              class="col-xs-6 col-sm-6 col-md-6"
-              v-if="
-                typeLeave?.code === 'LV-008' || typeLeave?.code === 'LV-010'
-              "
-            >
-              <q-select
-                v-if="typeLeave?.code === 'LV-008'"
-                ref="typeLeaveRef"
-                class="full-width inputgreen cursor-pointer"
-                outlined
-                dense
-                lazy-rules
-                :label="`${'ประเภท'}`"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือกประเภท'}`]"
-                v-model="leaveSubTypeName"
-                :options="optionSubTypeName"
-                option-value="id"
-                option-label="name"
-                emit-value
-                map-options
-                hide-bottom-space
-              />
-              <q-input
-                v-if="typeLeave?.code === 'LV-010'"
-                ref="numLeaveRef"
-                class="full-width inputgreen cursor-pointer"
-                outlined
-                dense
-                lazy-rules
-                v-model="coupleDayLevelCountry"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกประเทศที่ลาติดตามคู่สมรส'}`]"
-                hide-bottom-space
-                :label="`${'ประเทศที่ลาติดตามคู่สมรส'}`"
-              />
-            </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 :readonly="!typeLeave"
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index 71a7e3bd5..c97cbb2c3 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -866,8 +866,7 @@ onMounted(() => {
                     outlined
                     dense
                     :model-value="date2Thai(formData.dateEnd)"
-                    clearable
-                    @clear="formData.dateEnd = null"
+                    :rules="[(val:string) => !!val || `${'กรุณาเลือก วันที่สิ้นสุด'}`]"
                     hide-bottom-space
                     :label="`${'วันที่สิ้นสุด'}`"
                   >
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index e94467676..67062edde 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -402,7 +402,6 @@ const modalDialogSalary = ref<boolean>(false); //แสดง popup ตำแห
 const isStatusEdit = ref<boolean>(false); //สถานะแก้ไขข้อมูลตำแหน่งเงินเดือน
 const salaryId = ref<string>(""); //id ที่ต้องการแก้ไข
 const dataLevel = ref<DataPosType[]>([]); //รายการ ตำแหน่งเงินเดือน
-const idCommandId = ref<boolean>(false); //เช็คว่ามี commandId หรือไม่
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
 const posTypeOptions = ref<DataOption[]>(store.posTypeData); //รายการประเภทตำแหน่ง | กลุ่มงาน
@@ -659,7 +658,6 @@ async function onClickOpenDialog(
   } else {
     await fetchOptionGroup();
   }
-  idCommandId.value = statusEdit ? (data.commandId ? true : false) : false;
   commandCodeOptions.value = store.commandCodeData;
   posTypeOptions.value = store.posTypeData;
   posLevelOptions.value = store.posLevelData;
@@ -980,7 +978,6 @@ onMounted(async () => {
               <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
             </q-btn>
 
-            <!-- :disable="(props.row.commandId !== null && props.row.commandId !== '') || props.row.commandType === 'C-PM-47'" -->
             <q-btn
               v-if="
                 !isLeave &&
@@ -988,7 +985,11 @@ onMounted(async () => {
                 checkPermission($route)?.attrOwnership === 'OWNER'
               "
               flat
-              color="edit"
+              :disable="
+                (props.row.commandId !== null && props.row.commandId !== '') ||
+                props.row.commandType === 'C-PM-47'
+              "
+              :color="props.row.commandId ? 'grey' : 'edit'"
               dense
               round
               icon="edit"
@@ -1153,8 +1154,7 @@ onMounted(async () => {
               <div class="row q-col-gutter-sm">
                 <div class="col-6">
                   <q-input
-                    :class="classInput(!idCommandId)"
-                    :readonly="idCommandId"
+                    :class="classInput(true)"
                     outlined
                     dense
                     lazy-rules
@@ -1174,8 +1174,7 @@ onMounted(async () => {
                     autoApply
                     year-picker
                     :enableTimePicker="false"
-                    :class="classInput(!idCommandId)"
-                    :disabled="idCommandId"
+                    class="inputgreen"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -1192,8 +1191,6 @@ onMounted(async () => {
                             : formData.commandYear + 543
                         "
                         label="ปี พ.ศ."
-                        :class="classInput(!idCommandId)"
-                        :readonly="idCommandId"
                       >
                         <template v-slot:prepend>
                           <q-icon
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue
deleted file mode 100644
index 1ae40bde9..000000000
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue
+++ /dev/null
@@ -1,424 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, reactive } from "vue";
-import { useQuasar } from "quasar";
-
-import { useRoute } from "vue-router";
-import { checkPermission } from "@/utils/permissions";
-import { useCounterMixin } from "@/stores/mixin";
-import { useAbsentLateStore } from "@/modules/04_registryPerson/stores/AbsentLate";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import type { QTableColumn } from "quasar";
-import type { ResAbsentLateData} from "@/modules/04_registryPerson/interface/response/Government";
-
-import DialogAbsentLate from "@/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue";
-import DialogHistory from "@/modules/04_registryPerson/components/detail/DialogHistory.vue";
-
-const route = useRoute();
-const absentLateStore = useAbsentLateStore();
-const $q = useQuasar();
-const {
-  date2Thai,
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  pathRegistryEmp,
-  onSearchDataTable,
-  convertDateToAPI,
-  dialogRemove,
-} = useCounterMixin();
-
-const profileId = ref<string>(
-  route.params.id ? route.params.id.toString() : ""
-);
-const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
-
-const isLeave = defineModel<boolean>("isLeave", {
-  required: true,
-});
-
-const baseColumns = ref<QTableColumn[]>([
-  {
-    name: "status",
-    align: "left",
-    label: "มาสาย/ ขาดราชการ",
-    sortable: true,
-    field: "status",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      const status = absentLateStore.statusOps.find(
-        (option) => option.id === val
-      );
-      return status ? status.name : val;
-    },
-  },
-  {
-    name: "stampDate",
-    align: "left",
-    label: "วันที่ลงเวลา",
-    sortable: true,
-    field: "stampDate",
-    format: (v) => date2Thai(v),
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "stampType",
-    align: "left",
-    label: "ประเภทการลงเวลา",
-    sortable: true,
-    field: "stampType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val) {
-      const type = absentLateStore.stampTypeOps.find(
-        (option) => option.id === val
-      );
-      return type ? type.name : val;
-    },
-  },
-  {
-    name: "stampAmount",
-    align: "left",
-    label: "จำนวน",
-    sortable: true,
-    field: "stampAmount",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "remark",
-    align: "left",
-    label: "หมายเหตุ",
-    sortable: true,
-    field: "remark",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const baseVisibleColumns = ref<string[]>([
-  "status",
-  "stampDate",
-  "stampType",
-  "stampAmount",
-  "remark",
-]);
-
-/** Table*/
-const rows = ref<ResAbsentLateData[]>([]);
-const rowsMain = ref<ResAbsentLateData[]>([]);
-const mode = ref<string>("table"); //การแสดงผล Table card
-const filterKeyword = ref<string>(""); //คำค้นหา
-const columns = ref<QTableColumn[]>(
-  baseColumns.value.filter((e: QTableColumn) => e.name !== "lastUpdateFullName")
-);
-const visibleColumns = ref<string[]>(
-  baseVisibleColumns.value.filter((e: string) => e !== "lastUpdateFullName")
-);
-const pagination = ref({
-  sortBy: "lastUpdatedAt",
-});
-
-const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
-const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
-
-/** Dialog*/
-const isStatusEdit = ref<boolean>(false);
-const modal = ref<boolean>(false);
-const modalHistory = ref<boolean>(false);
-const rowId = ref<string>("");
-const dataAbsentLate = ref<ResAbsentLateData | null>(null);
-
-async function fetchData() {
-  showLoader();
-  try {
-    const res = await http.get(
-      config.API.profileAbsentLate(empType.value) + `/${profileId.value}`
-    );
-    const data = res.data.result;
-    rowsMain.value = data;
-    serchDataTable();
-  } catch (err) {
-    messageError($q, err);
-  } finally {
-    hideLoader();
-  }
-}
-
-/** function fetch ข้อมูลประวัติการแก้ไขข้อมูล*/
-async function fetchDataHistory() {
-  showLoader();
-  try {
-    const res = await http.get(
-      config.API.profileAbsentLateHistory(rowId.value, empType.value)
-    );
-    return res.data.result;
-  } catch (err) {
-    messageError($q, err);
-  } finally {
-    hideLoader();
-  }
-}
-
-function openEditDialog(data: any) {
-  modal.value = true;
-  isStatusEdit.value = true;
-  rowId.value = data.id;
-  dataAbsentLate.value = data;
-}
-
-function showHistoryDialog(id: string) {
-  modalHistory.value = true;
-  rowId.value = id;
-}
-
-/** ฟังก์ค้นหาข้อมูลขาดราชการ/มาสาย*/
-function serchDataTable() {
-  rows.value = onSearchDataTable(
-    filterKeyword.value,
-    rowsMain.value,
-    columns.value ? columns.value : []
-  );
-}
-
-function onDelete(rowId: string) {
-  dialogRemove($q, async () => {
-    showLoader();
-    try {
-      await http.patch(
-        config.API.profileAbsentLateUpdateDelete(empType.value) + `/${rowId}`
-      );
-      await fetchData();
-      await success($q, "ลบข้อมูลสำเร็จ");
-    } catch (err) {
-      messageError($q, err);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
-onMounted(() => {
-  fetchData();
-});
-</script>
-
-<template>
-  <div class="row items-center q-gutter-x-sm q-pb-sm">
-    <q-btn
-      v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
-      dense
-      color="primary"
-      icon="add"
-      flat
-      round
-      @click.stop.prevent="(modal = true), (isStatusEdit = false)"
-    >
-      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-    </q-btn>
-
-    <q-space />
-    <q-input
-      standout
-      dense
-      v-model="filterKeyword"
-      ref="filterRef"
-      outlined
-      placeholder="ค้นหา"
-      @keydown.enter.prevent="serchDataTable"
-    >
-      <template v-slot:append>
-        <q-icon name="search" />
-      </template>
-    </q-input>
-    <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"
-      style="min-width: 140px"
-    />
-    <q-btn-toggle
-      v-model="mode"
-      dense
-      class="no-shadow toggle-borderd"
-      toggle-color="grey-4"
-      :options="[
-        { value: 'table', slot: 'table' },
-        { value: 'card', slot: 'card' },
-      ]"
-    >
-      <template v-slot:table>
-        <q-icon
-          name="format_list_bulleted"
-          size="24px"
-          :style="{
-            color: mode === 'table' ? '#787B7C' : '#C9D3DB',
-          }"
-        />
-      </template>
-
-      <template v-slot:card>
-        <q-icon
-          name="mdi-view-grid-outline"
-          size="24px"
-          :style="{
-            color: mode === 'card' ? '#787B7C' : '#C9D3DB',
-          }"
-        />
-      </template>
-    </q-btn-toggle>
-  </div>
-
-  <d-table
-    :grid="mode === 'card'"
-    ref="table"
-    row-key="id"
-    flat
-    bordered
-    dense
-    :columns="columns"
-    :rows="rows"
-    :visible-columns="visibleColumns"
-    v-model:pagination="pagination"
-  >
-    >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th auto-width></q-th>
-        <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" v-if="mode === 'table'">
-      <q-tr :props="props">
-        <q-td auto-width>
-          <q-btn
-            flat
-            dense
-            round
-            color="deep-purple"
-            icon="mdi-history"
-            @click.stop.prevent="showHistoryDialog(props.row.id)"
-          >
-            <q-tooltip>ประวัติแก้ไขขาดราชการ/มาสาย</q-tooltip>
-          </q-btn>
-          <q-btn
-            v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
-            flat
-            dense
-            round
-            color="edit"
-            icon="edit"
-            @click.stop.prevent="openEditDialog(props.row)"
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-
-          <q-btn
-            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
-            flat
-            dense
-            round
-            color="red"
-            icon="delete"
-            @click.stop.prevent="onDelete(props.row.id)"
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
-      </q-tr>
-    </template>
-    <template v-slot:item="props" v-else>
-      <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
-        <q-card flat bordered>
-          <q-card-actions align="right" class="bg-grey-3">
-            <q-btn
-              color="deep-purple"
-              icon="mdi-history"
-              flat
-              round
-              @click.stop.prevent="showHistoryDialog(props.row.id)"
-            >
-              <q-tooltip>ประวัติแก้ไขขาดราชการ/มาสาย</q-tooltip>
-            </q-btn>
-
-            <q-btn
-              v-if="isLeave === false && checkPermission($route)?.attrIsUpdate"
-              :color="props.row.commandId ? 'grey-5' : 'edit'"
-              :disable="props.row.commandId !== null"
-              icon="edit"
-              flat
-              round
-              @click.stop.prevent="openEditDialog(props.row)"
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-
-            <q-btn
-              v-if="isLeave === false && checkPermission($route)?.attrIsDelete"
-              color="red"
-              icon="delete"
-              flat
-              round
-              @click.stop.prevent="onDelete(props.row.id)"
-            >
-              <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
-          </q-card-actions>
-          <q-separator />
-
-          <q-list>
-            <div
-              :class="`row q-pa-sm`"
-              :style="`background-color: ${index % 2 !== 0 ? '#FAFAFA' : ''}`"
-              v-for="(col, index) in props.cols"
-              :key="col.name"
-            >
-              <div class="col text-grey-6">
-                <div>{{ col.label }}</div>
-              </div>
-              <div class="col">
-                <div>{{ col.value ? col.value : "-" }}</div>
-              </div>
-            </div>
-          </q-list>
-        </q-card>
-      </div>
-    </template>
-  </d-table>
-
-  <DialogAbsentLate
-    v-model:modal="modal"
-    v-model:isStatusEdit="isStatusEdit"
-    :fetchData="fetchData"
-    :rowId="rowId"
-    :dataAbsentLate="dataAbsentLate"
-  />
-
-  <DialogHistory
-    v-model:modal="modalHistory"
-    :title="`ประวัติแก้ไขขาดราชการ/มาสาย`"
-    :columns="columnsHistory"
-    :visible-columns="visibleColumnsHistory"
-    :fetch-data="fetchDataHistory"
-  />
-</template>
-
-<style scoped></style>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
deleted file mode 100644
index 4d0311de3..000000000
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup lang="ts">
-import { reactive, ref, computed, watch } from "vue";
-import { useQuasar } from "quasar";
-
-import { useRoute } from "vue-router";
-import { useCounterMixin } from "@/stores/mixin";
-import { useAbsentLateStore } from "@/modules/04_registryPerson/stores/AbsentLate";
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-/** import components*/
-import DialogHeader from "@/components/DialogHeader.vue";
-
-//use
-const $q = useQuasar();
-const route = useRoute();
-const absentLateStore = useAbsentLateStore();
-const {
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  date2Thai,
-  convertDateToAPI,
-  dialogConfirm,
-  pathRegistryEmp,
-} = useCounterMixin();
-
-//props
-const modal = defineModel<boolean>("modal", { required: true });
-const isStatusEdit = defineModel<boolean>("isStatusEdit", { required: true });
-const rowId = defineModel<string>("rowId", { required: true });
-
-const props = defineProps<{
-  fetchData: () => Promise<void>;
-  dataAbsentLate: any;
-}>();
-
-const profileId = ref<string>(route.params.id?.toString() ?? ""); //ProfileId
-const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
-
-const form = reactive({
-  status: "",
-  stampDate: new Date(),
-  stampType: "FULL_DAY",
-  stampAmount: "1.0",
-  remark: "",
-});
-
-const tittle = computed(() => {
-  return isStatusEdit.value
-    ? "แก้ไขข้อมูลขาดราชการ/มาสาย"
-    : "เพิ่มข้อมูลขาดราชการ/มาสาย";
-});
-
-function onSubmit() {
-  dialogConfirm($q, async () => {
-    try {
-      showLoader();
-      const payload = {
-        ...form,
-        stampDate: convertDateToAPI(form.stampDate),
-        profileId:
-          !isStatusEdit.value && empType.value === ""
-            ? profileId.value
-            : undefined,
-        profileEmployeeId:
-          !isStatusEdit.value && empType.value !== ""
-            ? profileId.value
-            : undefined,
-      };
-      const method = isStatusEdit.value ? "patch" : "post";
-      const url = isStatusEdit.value
-        ? config.API.profileAbsentLate(empType.value) + `/${rowId.value}`
-        : config.API.profileAbsentLate(empType.value);
-      await http[method](url, payload);
-      success($q, "บันทึกข้อมูลสำเร็จ");
-      props.fetchData();
-      closeDialog();
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
-/** function ปิด popup*/
-function closeDialog() {
-  modal.value = false;
-}
-
-watch(
-  () => form.stampType,
-  (stampType) => {
-    if (stampType === "FULL_DAY") {
-      form.stampAmount = "1.0";
-    } else if (stampType === "MORNING" || stampType === "AFTERNOON") {
-      form.stampAmount = "0.5";
-    }
-  }
-);
-
-watch(
-  () => modal.value,
-  (newVal) => {
-    if (newVal) {
-      form.status = isStatusEdit.value ? props.dataAbsentLate.status : "";
-      form.stampDate = isStatusEdit.value
-        ? new Date(props.dataAbsentLate.stampDate)
-        : new Date();
-      form.stampType = isStatusEdit.value
-        ? props.dataAbsentLate.stampType
-        : "FULL_DAY";
-      form.stampAmount = isStatusEdit.value
-        ? props.dataAbsentLate.stampAmount
-        : "1.0";
-      form.remark = isStatusEdit.value ? props.dataAbsentLate.remark : "";
-    }
-  }
-);
-</script>
-
-<template>
-  <q-dialog v-model="modal" persistent>
-    <q-card style="min-width: 50vw">
-      <q-form greedy @submit.prevent="onSubmit">
-        <DialogHeader :tittle="tittle" :close="closeDialog" />
-        <q-separator />
-
-        <q-card-section class="q-pa-md">
-          <div class="col-12 row q-col-gutter-sm">
-            <div class="col-12 row">
-              <div class="col-md-4 col-sm-12">
-                <q-select
-                  class="full-width inputgreen cursor-pointer"
-                  outlined
-                  dense
-                  lazy-rules
-                  v-model="form.status"
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
-                  hide-bottom-space
-                  :label="`${'สถานะ'}`"
-                  map-options
-                  emit-value
-                  option-label="name"
-                  option-value="id"
-                  :options="absentLateStore.statusOps"
-                  use-input
-                  hide-selected
-                  fill-input
-                  input-debounce="0"
-                />
-              </div>
-            </div>
-
-            <div class="col-md-4 col-sm-12">
-              <datepicker
-                class="inputgreen"
-                menu-class-name="modalfix"
-                v-model="form.stampDate"
-                :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
-                    outlined
-                    dense
-                    hide-bottom-space
-                    class="full-width"
-                    :model-value="
-                      form.stampDate != null ? date2Thai(form.stampDate) : null
-                    "
-                    :label="`${'วันที่ลงเวลา'}`"
-                    :rules="[
-                              (val: string) =>
-                                !!val || `${'กรุณาเลือกวันที่ลงเวลา'}`,
-                            ]"
-                  >
-                    <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-md-4 col-xs-12">
-              <q-select
-                class="full-width inputgreen cursor-pointer"
-                outlined
-                dense
-                lazy-rules
-                v-model="form.stampType"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือกประเภทการลงเวลา'}`]"
-                hide-bottom-space
-                :label="`${'ประเภทการลงเวลา'}`"
-                map-options
-                emit-value
-                option-label="name"
-                :options="absentLateStore.stampTypeOps"
-                option-value="id"
-                use-input
-                hide-selected
-                fill-input
-                input-debounce="0"
-              />
-            </div>
-
-            <div class="col-md-4 col-xs-12">
-              <q-input
-                class="inputgreen"
-                dense
-                outlined
-                v-model="form.stampAmount"
-                label="จำนวน"
-                hide-bottom-space
-                readonly
-                :rules="[(val:string) => !!val ||
-              `${'กรุณากรอกจำนวน'}`]"
-                mask="#.#"
-              />
-            </div>
-
-            <div class="col-12">
-              <q-input
-                class="inputgreen"
-                dense
-                outlined
-                v-model="form.remark"
-                label="เหตุผล"
-                hide-bottom-space
-                type="textarea"
-              />
-            </div>
-          </div>
-        </q-card-section>
-        <q-separator />
-
-        <q-card-actions align="right">
-          <q-btn type="submit" :label="`บันทึก`" color="public">
-            <q-tooltip>บันทึก</q-tooltip>
-          </q-btn>
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
index 3f30cf12e..da7af1456 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
@@ -14,7 +14,6 @@ import PerformSpecialWork from "@/modules/04_registryPerson/components/detail/Go
 import ActingPos from "@/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue"; //รักษาการในตำแหน่ง
 import HelpGovernmentDetail from "@/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue"; //ช่วยราชการ
 import Postion from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue";
-import AbsentLate from "@/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@@ -48,7 +47,6 @@ const storeRegistry = useRegistryNewDataStore();
     <q-tab v-if="empType != '-employee'" name="6" label="ช่วยราชการ" />
     <q-tab name="2" label="วินัย" />
     <q-tab name="3" label="การลา" />
-    <q-tab name="8" label="ขาดราชการ/มาสาย" />
     <q-tab name="4" label="ปฏิบัติราชการพิเศษ" />
   </q-tabs>
   <q-separator />
@@ -78,9 +76,6 @@ const storeRegistry = useRegistryNewDataStore();
         :citizen-id="storeRegistry.citizenId"
       />
     </q-tab-panel>
-    <q-tab-panel name="8">
-      <AbsentLate :is-leave="storeRegistry.isLeave" />
-    </q-tab-panel>
     <q-tab-panel name="7">
       <Postion
         :is-leave="storeRegistry.isLeave"
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 1d686dfe8..8f54e02cd 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -406,13 +406,6 @@ function calculateMinDate() {
   return today;
 }
 
-function prefixRankRule() {
-  return [
-    () =>
-      !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
-  ];
-}
-
 /** ดูการเปลี่ยนแปลงของวันเกิดเมื่อมีการเปลี่ยนแปลงจะคำนวนอายูใหม่*/
 watch(
   () => formData.birthDate,
@@ -589,7 +582,6 @@ onMounted(() => {
 
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 use-input
@@ -604,10 +596,10 @@ onMounted(() => {
                 option-value="name"
                 v-model="formData.prefix"
                 clearable
+                class="inputgreen"
                 :options="store.Ops.prefixOps"
                 :label="dataLabel.prefix"
-                :rules="prefixRankRule()"
-                reactive-rules
+                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
                 @filter="(inputValue: string,
               doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
               )"
@@ -628,8 +620,7 @@ onMounted(() => {
                 input-debounce="0"
                 option-label="name"
                 option-value="name"
-                :rules="prefixRankRule()"
-                reactive-rules
+                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
                 v-model="formData.rank"
                 class="inputgreen"
                 :options="store.Ops.rankOps"
@@ -641,24 +632,24 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 lazy-rules
                 hide-bottom-space
                 v-model="formData.firstName"
+                class="inputgreen"
                 :label="dataLabel.firstName"
                 :rules="[(val: string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
               />
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 lazy-rules
                 hide-bottom-space
                 v-model="formData.lastName"
+                class="inputgreen"
                 :label="dataLabel.lastName"
                 :rules="[(val: string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
               />
@@ -722,7 +713,6 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 use-input
@@ -737,6 +727,7 @@ onMounted(() => {
                 option-label="name"
                 option-value="name"
                 v-model="formData.gender"
+                class="inputgreen"
                 :options="store.Ops.genderOps"
                 :label="dataLabel.gender"
                 @filter="(inputValue: string,
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 58205a802..46e93dfbe 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -66,7 +66,6 @@ const keyword = ref<string>(""); //คำค้นหา
 const modalCommand = ref<boolean>(false);
 const command = ref<string>("");
 const commandId = ref<string>("");
-const idCommandId = ref<boolean>(false); //สถานะการมีคำสั่ง
 const baseColumns = ref<QTableColumn[]>([
   {
     name: "commandDateAffect",
@@ -639,7 +638,6 @@ async function onClickOpenDialog(
   } else {
     await fetchOptionGroup();
   }
-  idCommandId.value = statusEdit && data.commandId ? true : false;
   commandCodeOptions.value = store.commandCodeData;
   posTypeOptions.value = store.posTypeData;
   posLevelOptions.value = store.posLevelData;
@@ -941,10 +939,6 @@ onMounted(async () => {
             >
               <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
             </q-btn>
-            <!-- :disable="
-              (props.row.commandId !== null && props.row.commandId !== '') ||
-              props.row.commandType === 'C-PM-47'
-            " -->
             <q-btn
               v-if="
                 !isLeave &&
@@ -952,7 +946,11 @@ onMounted(async () => {
                 checkPermission($route)?.attrOwnership === 'OWNER'
               "
               flat
-              color="edit"
+              :disable="
+                (props.row.commandId !== null && props.row.commandId !== '') ||
+                props.row.commandType === 'C-PM-47'
+              "
+              :color="props.row.commandId ? 'grey' : 'edit'"
               dense
               round
               icon="edit"
@@ -1121,8 +1119,7 @@ onMounted(async () => {
               <div class="row q-col-gutter-sm">
                 <div class="col-6">
                   <q-input
-                    :class="classInput(!idCommandId)"
-                    :readonly="idCommandId"
+                    :class="classInput(true)"
                     outlined
                     dense
                     lazy-rules
@@ -1142,8 +1139,7 @@ onMounted(async () => {
                     autoApply
                     year-picker
                     :enableTimePicker="false"
-                    :class="classInput(!idCommandId)"
-                    :disable="idCommandId"
+                    class="inputgreen"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -1160,8 +1156,6 @@ onMounted(async () => {
                             : formData.commandYear + 543
                         "
                         label="ปี พ.ศ."
-                        :class="classInput(!idCommandId)"
-                        :readonly="idCommandId"
                       >
                         <template v-slot:prepend>
                           <q-icon
diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts
index 283173e4c..b9796889c 100644
--- a/src/modules/04_registryPerson/interface/index/government.ts
+++ b/src/modules/04_registryPerson/interface/index/government.ts
@@ -13,8 +13,8 @@ interface FormMain {
   workDate: any;
   reasonSameDate: string;
   retireDate: any;
-  ageAll: GovAgeForm | string;
-  govAgeBkk: GovAgeForm | string;
+  ageAll: GovAgeForm;
+  govAgeBkk: GovAgeForm;
   absent: number;
   age: number;
   [key: string]: any;
diff --git a/src/modules/04_registryPerson/interface/index/leave.ts b/src/modules/04_registryPerson/interface/index/leave.ts
index fb9e48922..8de49f6f5 100644
--- a/src/modules/04_registryPerson/interface/index/leave.ts
+++ b/src/modules/04_registryPerson/interface/index/leave.ts
@@ -8,9 +8,6 @@ interface DetailData {
   reason: string;
   typeLeaveId: string;
   code: string;
-  codeLeave:string
-  leaveSubTypeName:string
-  coupleDayLevelCountry:string
 }
 
 interface FormFilter {
diff --git a/src/modules/04_registryPerson/interface/response/Edit.ts b/src/modules/04_registryPerson/interface/response/Edit.ts
index d9deaf0bb..8af17bae8 100644
--- a/src/modules/04_registryPerson/interface/response/Edit.ts
+++ b/src/modules/04_registryPerson/interface/response/Edit.ts
@@ -70,7 +70,6 @@ interface DataPosition {
   status: string;
   posNumCodeSitAbb: string;
   posNumCodeSit: string;
-  positionExecutiveField: string;
 }
 
 export type { DataSalaryPos, DataPosition };
diff --git a/src/modules/04_registryPerson/interface/response/Government.ts b/src/modules/04_registryPerson/interface/response/Government.ts
index 5fbad6012..bcdf39e50 100644
--- a/src/modules/04_registryPerson/interface/response/Government.ts
+++ b/src/modules/04_registryPerson/interface/response/Government.ts
@@ -44,21 +44,4 @@ interface ResFileData {
   pathname: string;
 }
 
-interface ResAbsentLateData {
-  createdAt: string;
-  createdFullName: string;
-  createdUserId: string;
-  id: string;
-  isDeleted: boolean;
-  lastUpdateFullName: string;
-  lastUpdateUserId: string;
-  lastUpdatedAt: string;
-  profileId: string;
-  remark: string;
-  stampAmount: string;
-  stampDate: string;
-  stampType: string;
-  status: string;
-}
-
-export type { ResActingPosData, ResAssistanceData, ResFileData, ResAbsentLateData };
+export type { ResActingPosData, ResAssistanceData, ResFileData };
diff --git a/src/modules/04_registryPerson/stores/AbsentLate.ts b/src/modules/04_registryPerson/stores/AbsentLate.ts
deleted file mode 100644
index 1247fa0f8..000000000
--- a/src/modules/04_registryPerson/stores/AbsentLate.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-
-import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
-
-export const useAbsentLateStore = defineStore("absentLate", () => {
-  const statusOps = ref<DataOption[]>([
-    { name: "ขาดราชการ", id: "ABSENT" },
-    { name: "มาสาย", id: "LATE" },
-  ]);
-
-  const stampTypeOps = ref<DataOption[]>([
-    { name: "เต็มวัน", id: "FULL_DAY" },
-    { name: "ครึ่งเช้า", id: "MORNING" },
-    { name: "ครึ่งบ่าย ", id: "AFTERNOON" },
-  ]);
-
-  return { statusOps, stampTypeOps };
-});
diff --git a/src/modules/04_registryPerson/utils/excelParser.ts b/src/modules/04_registryPerson/utils/excelParser.ts
deleted file mode 100644
index b954edfc0..000000000
--- a/src/modules/04_registryPerson/utils/excelParser.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import * as XLSX from "xlsx";
-
-export interface ExcelPreviewData {
-  fileName: string;
-  fileSize: number;
-  sheetNames: string[];
-  headers: string[];
-  rows: Array<Record<string, any>>;
-  totalRows: number;
-  previewRows: number;
-}
-
-export interface ParseOptions {
-  maxPreviewRows?: number;
-  sheetIndex?: number;
-}
-
-const DEFAULT_CONFIG = {
-  MAX_FILE_SIZE: 10 * 1024 * 1024, // 10MB
-  MAX_PREVIEW_ROWS: 0, // 0 = ไม่จำกัด แสดงทั้งหมด
-  ALLOWED_EXTENSIONS: [".xlsx", ".xls"],
-};
-
-function formatFileSize(bytes: number): string {
-  if (bytes === 0) return "0 Bytes";
-  const k = 1024;
-  const sizes = ["Bytes", "KB", "MB", "GB"];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return Math.round((bytes / Math.pow(k, i)) * 100) / 100 + " " + sizes[i];
-}
-
-function getFileExtension(fileName: string): string {
-  return fileName.substring(fileName.lastIndexOf(".")).toLowerCase();
-}
-
-function validateFile(file: File): { message: string } | null {
-  const extension = getFileExtension(file.name);
-
-  if (!DEFAULT_CONFIG.ALLOWED_EXTENSIONS.includes(extension)) {
-    return {
-      message: `กรุณาเลือกไฟล์ Excel เท่านั้น (${DEFAULT_CONFIG.ALLOWED_EXTENSIONS.join(", ")})`,
-    };
-  }
-
-  if (file.size > DEFAULT_CONFIG.MAX_FILE_SIZE) {
-    const fileSizeMB = (file.size / (1024 * 1024)).toFixed(2);
-    const maxSizeMB = (DEFAULT_CONFIG.MAX_FILE_SIZE / (1024 * 1024)).toFixed(2);
-    return {
-      message: `ขนาดไฟล์เกิน ${maxSizeMB}MB (ไฟล์ของคุณ: ${fileSizeMB}MB)`,
-    };
-  }
-
-  return null;
-}
-
-export async function parseExcelFile(
-  file: File,
-  options: ParseOptions = {}
-): Promise<ExcelPreviewData> {
-  const maxPreviewRows = options.maxPreviewRows ?? DEFAULT_CONFIG.MAX_PREVIEW_ROWS;
-  const sheetIndex = options.sheetIndex ?? 0;
-
-  // Validate file
-  const validationError = validateFile(file);
-  if (validationError) {
-    throw new Error(validationError.message);
-  }
-
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-
-    reader.onload = (e) => {
-      try {
-        const data = e.target?.result;
-        if (!data) {
-          reject(new Error("ไม่สามารถอ่านไฟล์ได้"));
-          return;
-        }
-
-        const workbook = XLSX.read(data, { type: "binary" });
-
-        if (workbook.SheetNames.length === 0) {
-          reject(new Error("ไฟล์ไม่มีข้อมูล"));
-          return;
-        }
-
-        const sheetName = workbook.SheetNames[sheetIndex];
-        const worksheet = workbook.Sheets[sheetName];
-
-        // ใช้ sheet_to_json กับ raw: true เพื่ออ่าน raw values ก่อน
-        const jsonData = XLSX.utils.sheet_to_json(worksheet, {
-          header: 1,
-          defval: "",
-          raw: true, // อ่าน raw values
-        }) as any[][];
-
-        // หลังจากได้ raw data แล้ว ต้องไปอ่านค่าจาก formula ที่ cells โดยตรง
-        // เพราะบาง formula อาจจะยังไม่ถูกคำนวณ
-        const range = XLSX.utils.decode_range(worksheet["!ref"] || "A1");
-
-        // อ่านค่าจาก cells ที่มี formula (column สุดท้าย)
-        for (let row = range.s.r; row <= range.e.r; row++) {
-          for (let col = range.s.c; col <= range.e.c; col++) {
-            const cellAddress = XLSX.utils.encode_cell({ r: row, c: col });
-            const cell = worksheet[cellAddress];
-
-            // ถ้ามี formula ให้ใช้ผลลัพธ์ที่คำนวณแล้ว
-            if (cell && cell.f && !cell.v) {
-              // ลองใช้ cell.w (formatted value) ถ้ามี
-              if (cell.w) {
-                // แปลง array index ให้ถูกต้อง (row + 1 เพราะมี header row)
-                const arrayRowIndex = row - range.s.r;
-                if (jsonData[arrayRowIndex] && jsonData[arrayRowIndex][col] !== undefined) {
-                  jsonData[arrayRowIndex][col] = cell.w;
-                }
-              }
-            }
-          }
-        }
-
-        if (jsonData.length === 0) {
-          reject(new Error("ไฟล์ไม่มีข้อมูล"));
-          return;
-        }
-
-        // Extract headers from first row (ภาษาไทย)
-        const headers = jsonData[0].map((h: any) => String(h ?? ""));
-
-        // Extract data rows (skip header row)
-        const dataRows = jsonData.slice(1).filter((row) => row.some((cell) => cell !== ""));
-
-        if (dataRows.length === 0) {
-          reject(new Error("ไฟล์ไม่มีข้อมูล"));
-          return;
-        }
-
-        // Convert to array of objects - ใช้ header จาก Excel เป็น field names โดยตรง
-        // ถ้า maxPreviewRows = 0 จะแสดงทั้งหมด มิฉะนั้นจะแสดงตามจำนวนที่กำหนด
-        const rowsToProcess = maxPreviewRows === 0 ? dataRows : dataRows.slice(0, maxPreviewRows);
-        const rows = rowsToProcess.map((row, rowIndex) => {
-          const obj: Record<string, any> = {
-            id: `row_${rowIndex}`,
-          };
-
-          // ใช้ header เป็น field names โดยตรง
-          headers.forEach((header, index) => {
-            const cellValue = row[index] ?? "";
-            // ใช้ค่าจาก Excel โดยตรง ไม่แปลงค่า
-            obj[header] = cellValue;
-          });
-
-          return obj;
-        });
-
-        resolve({
-          fileName: file.name,
-          fileSize: file.size,
-          sheetNames: workbook.SheetNames,
-          headers,
-          rows,
-          totalRows: dataRows.length,
-          previewRows: rows.length,
-        });
-      } catch (error) {
-        reject(new Error("ไม่สามารถอ่านไฟล์ Excel ได้ กรุณาตรวจสอบไฟล์อีกครั้ง"));
-      }
-    };
-
-    reader.onerror = () => {
-      reject(new Error("ไม่สามารถอ่านไฟล์ได้"));
-    };
-
-    reader.readAsBinaryString(file);
-  });
-}
-
-export { formatFileSize };
diff --git a/src/modules/04_registryPerson/utils/exportPosition.ts b/src/modules/04_registryPerson/utils/exportPosition.ts
deleted file mode 100644
index 144033429..000000000
--- a/src/modules/04_registryPerson/utils/exportPosition.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import ExcelJS from "exceljs";
-import { useEditPosDataStore } from "@/modules/04_registryPerson/stores/Edit";
-
-import type { DataPosition } from "@/modules/04_registryPerson/interface/response/Edit";
-
-const store = useEditPosDataStore();
-
-// ฟังก์ชันแปลงวันที่จาก ISO format เป็นรูปแบบ dd/mm/yyyy (เช่น 18/05/2564)
-function formatDateToDDMMYYYY(dateString: string | null | Date): string {
-  if (!dateString) return "";
-
-  const date = new Date(dateString);
-  if (isNaN(date.getTime())) return "";
-
-  const day = String(date.getDate()).padStart(2, "0");
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const year = date.getFullYear() + 543; // แปลงเป็นปีพุทธศักราช
-
-  return `${day}/${month}/${year}`;
-}
-
-export async function exportToExcelPosition(data: DataPosition[]) {
-  const workbook = new ExcelJS.Workbook();
-  const worksheet = workbook.addWorksheet("รายการประวัติตำแหน่งเงินเดือน");
-
-  // --- ส่วนที่ 1: สร้าง Master Data Sheet สำหรับอ้างอิง ID ---
-  // เราจะซ่อนแผ่นงานนี้ไว้ (hidden) เพื่อใช้ทำ Dropdown และ VLOOKUP
-  const masterSheet = workbook.addWorksheet("MasterData", { state: "hidden" });
-  const masterData = store.commandCodeData; // [{id: 1, name: "ย้าย"}, ...]
-
-  masterData.forEach((item, index) => {
-    masterSheet.getCell(`A${index + 1}`).value = item.name;
-    masterSheet.getCell(`B${index + 1}`).value = item.id;
-  });
-
-  // --- ส่วนที่ 2: กำหนด Columns ---
-  worksheet.columns = [
-    { header: "ลำดับ", key: "no", width: 8 },
-    { header: "วันที่คำสั่งมีผล", key: "commandDateAffect", width: 18 },
-    { header: "ตำแหน่งในสายงาน", key: "positionName", width: 25 },
-    { header: "ตำแหน่งประเภท", key: "positionType", width: 18 },
-    { header: "ระดับ", key: "positionLevel", width: 12 },
-    { header: "ระดับซี", key: "positionCee", width: 12 },
-    { header: "สายงาน", key: "positionLine", width: 20 },
-    { header: "ด้าน/สาขา", key: "positionPathSide", width: 15 },
-    { header: "ตำแหน่งทางการบริหาร", key: "positionExecutive", width: 20 },
-    { header: "ด้านทางการบริหาร", key: "positionExecutiveField", width: 20 },
-    { header: "เงินเดือน", key: "amount", width: 15 },
-    { header: "เงินค่าตอบแทนรายเดือน", key: "mouthSalaryAmount", width: 15 },
-    { header: "เงินประจำตำแหน่ง", key: "positionSalaryAmount", width: 15 },
-    { header: "เงินค่าตอบแทนพิเศษ", key: "amountSpecial", width: 15 },
-    { header: "หน่วยงาน", key: "organization", width: 30 },
-    { header: "ส่วนราชการระดับ 1", key: "orgChild1", width: 20 },
-    { header: "ส่วนราชการระดับ 2", key: "orgChild2", width: 20 },
-    { header: "ส่วนราชการระดับ 3", key: "orgChild3", width: 20 },
-    { header: "ส่วนราชการระดับ 4", key: "orgChild4", width: 20 },
-    { header: "ตัวย่อเลขที่ตำแหน่ง", key: "posNoAbb", width: 15 },
-    { header: "เลขที่ตำแหน่ง", key: "posNo", width: 15 },
-    { header: "หน่วยงานที่ออกคำสั่ง", key: "posNumCodeSit", width: 20 },
-    {
-      header: "ตัวย่อหน่วยงานที่ออกคำสั่ง",
-      key: "posNumCodeSitAbb",
-      width: 15,
-    },
-    { header: "เลขที่คำสั่ง", key: "commandNo", width: 15 },
-    { header: "ปีเลขที่คำสั่ง", key: "commandYear", width: 12 },
-    { header: "วันที่ลงนาม", key: "commandDateSign", width: 18 },
-    { header: "ประเภทคำสั่ง", key: "commandCodeName", width: 25 }, // AA
-    { header: "หมายเหตุ", key: "remark", width: 20 },
-    { header: "commandId", key: "commandId", width: 20 }, // AC (ลำดับที่ 29)
-    { header: "commandCode", key: "commandCode", width: 20 }, // AD (ลำดับที่ 30)
-  ];
-
-  // 3. Map ข้อมูล
-  const newData = data.map((e, index) => ({
-    no: index + 1,
-    commandDateAffect: e.commandDateAffect
-      ? formatDateToDDMMYYYY(e.commandDateAffect)
-      : "",
-    positionName: e.positionName,
-    positionType: e.positionType,
-    positionLevel: e.positionLevel,
-    positionCee: e.positionCee,
-    positionLine: e.positionLine || "",
-    positionPathSide: e.positionPathSide || "",
-    positionExecutive: e.positionExecutive,
-    positionExecutiveField: e.positionExecutiveField || "",
-    amount: e.amount || 0,
-    mouthSalaryAmount: e.mouthSalaryAmount || 0,
-    positionSalaryAmount: e.positionSalaryAmount || 0,
-    amountSpecial: e.amountSpecial || 0,
-    organization: e.orgRoot,
-    orgChild1: e.orgChild1,
-    orgChild2: e.orgChild2,
-    orgChild3: e.orgChild3,
-    orgChild4: e.orgChild4,
-    posNoAbb: e.posNoAbb,
-    posNo: e.posNo,
-    posNumCodeSit: e.posNumCodeSit,
-    posNumCodeSitAbb: e.posNumCodeSitAbb,
-    commandNo: e.commandNo,
-    commandYear: e.commandYear ? Number(e.commandYear) + 543 : "",
-    commandDateSign: e.commandDateSign
-      ? formatDateToDDMMYYYY(e.commandDateSign)
-      : "",
-    commandCodeName: store.convertCommandCodeName(e.commandCode),
-    remark: e.remark,
-    commandId: e.commandId || "",
-    commandCode: e.commandCode || "", // ใส่ค่าเริ่มต้นไว้
-  }));
-
-  worksheet.addRows(newData);
-
-  // 4. ตกแต่งสี, Dropdown และ สูตร VLOOKUP
-  newData.forEach((_, index) => {
-    const rowIndex = index + 2;
-
-    // --- ตั้งค่า Format สำหรับเซลล์วันที่ ---
-    // เซลล์ B (commandDateAffect) และ Z (commandDateSign)
-    const dateAffectCell = worksheet.getCell(`B${rowIndex}`);
-    const dateSignCell = worksheet.getCell(`Z${rowIndex}`);
-
-    [dateAffectCell, dateSignCell].forEach((cell) => {
-      cell.numFmt = "dd/mm/yyyy";
-    });
-
-    // --- ทำ Dropdown คอลัมน์ AA ---
-    // อ้างอิงรายการจาก MasterData Sheet จะทำให้ Excel ทำงานได้เสถียรกว่า (กรณีรายการเยอะ)
-    worksheet.getCell(`AA${rowIndex}`).dataValidation = {
-      type: "list",
-      allowBlank: true,
-      formulae: [`MasterData!$A$1:$A$${masterData.length}`],
-    };
-
-    // --- ผูกสูตรให้ commandCode (AD) เปลี่ยนตามการเลือกใน AA ---
-    // AA คือประเภทคำสั่ง, AD คือ commandCode
-    worksheet.getCell(`AD${rowIndex}`).value = {
-      formula: `=IFERROR(VLOOKUP(AA${rowIndex}, MasterData!$A$1:$B$${masterData.length}, 2, FALSE), "")`,
-    };
-  });
-
-  // 5. สไตล์ Header
-  worksheet.getRow(1).font = { bold: true };
-  worksheet.getRow(1).alignment = { vertical: "middle", horizontal: "center" };
-
-  // 6. เขียนไฟล์
-  const buffer = await workbook.xlsx.writeBuffer();
-  const blob = new Blob([buffer], {
-    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-  });
-  const url = window.URL.createObjectURL(blob);
-  const a = document.createElement("a");
-  a.href = url;
-  a.download = "รายการประวัติตำแหน่งเงินเดือน.xlsx";
-  a.click();
-  window.URL.revokeObjectURL(url);
-}
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 4fdec72a9..f5e951411 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -323,10 +323,10 @@ async function uploadFileURL(uploadUrl: string, file: any) {
  * ฟังก์ชันดึงข้อมูลรูปโปรไฟล์
  * @param id โปรไฟล์
  */
-function fetchProfile(id: string) {
-  http
+async function fetchProfile(id: string) {
+  await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, fileName.value))
-    .then((res) => {
+    .then(async (res) => {
       profilePicture.value = res.data.downloadUrl;
     })
     .catch(() => {
@@ -403,7 +403,7 @@ async function fetchDataPersonal() {
 
       fileName.value = res.data.result.avatarName;
       if (formDetail.value?.avatarName) {
-        fetchProfile(profileId.value);
+        await fetchProfile(profileId.value);
       } else {
         profilePicture.value = avatar;
       }
@@ -806,13 +806,9 @@ function handleBackNavigation() {
     router.go(-1);
   } else {
     if (empType.value === "") {
-      storeRegistry.isLeave
-        ? router.push("/registry-retire-officer")
-        : router.push("/registry-officer");
+      router.push("/registry-officer");
     } else if (empType.value === "-employee") {
-      storeRegistry.isLeave
-        ? router.push("/registry-retire-employee")
-        : router.push("/registry-employee");
+      router.push("/registry-employee");
     }
   }
 }
diff --git a/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue b/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
deleted file mode 100644
index 326a767c1..000000000
--- a/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<script setup lang="ts">
-import { ref, computed, watch } from "vue";
-import { useQuasar } from "quasar";
-import moment from "moment";
-
-import {
-  parseExcelFile,
-  formatFileSize,
-} from "@/modules/04_registryPerson/utils/excelParser";
-import { useCounterMixin } from "@/stores/mixin";
-
-const $q = useQuasar();
-const { dialogConfirm } = useCounterMixin();
-
-interface Props {
-  modal: boolean;
-  file: File | null;
-}
-
-interface Emits {
-  (e: "update:modal", value: boolean): void;
-  (e: "confirm", file: File): void;
-  (e: "cancel"): void;
-}
-
-const props = defineProps<Props>();
-const emit = defineEmits<Emits>();
-
-const isLoading = ref(false);
-const isUploading = ref(false);
-const previewData = ref<Record<string, any>[]>([]);
-const excelHeaders = ref<string[]>([]); // Headers จาก Excel
-
-const fileName = computed(() => props.file?.name ?? "");
-const fileSize = computed(() => props.file?.size ?? 0);
-const totalRows = computed(() => previewData.value.length);
-const previewRows = computed(() => previewData.value.length);
-
-const pagination = ref({
-  page: 1,
-  rowsPerPage: 50,
-});
-
-// ฟังก์ชันแปลงวันที่เป็นภาษาไทย (ไม่บวก 543 เพราะ Excel เป็น พ.ศ. อยู่แล้ว)
-function formatDateForDisplay(value: any): string {
-  if (!value) return "-";
-
-  // ถ้าเป็น string format dd/mm/yyyy (จาก Excel ที่เป็น พ.ศ.)
-  if (typeof value === "string") {
-    const parts = value.split("/");
-    if (parts.length === 3) {
-      const day = parts[0];
-      const monthNum = parseInt(parts[1], 10);
-      const year = parts[2];
-
-      // แปลงเลขเดือนเป็นชื่อเดือนภาษาไทย
-      const thaiMonths = [
-        "ม.ค.",
-        "ก.พ.",
-        "มี.ค.",
-        "เม.ย.",
-        "พ.ค.",
-        "มิ.ย.",
-        "ก.ค.",
-        "ส.ค.",
-        "ก.ย.",
-        "ต.ค.",
-        "พ.ย.",
-        "ธ.ค.",
-      ];
-      const thaiMonth = thaiMonths[monthNum - 1] || parts[1];
-
-      return `${day} ${thaiMonth} ${year}`;
-    }
-    return value;
-  }
-
-  // ถ้าเป็น Date object ให้แปลงโดยไม่บวก 543 (เพราะ Excel serial date แปลงเป็น ค.ศ. แล้วแต่เดิมเป็น พ.ศ.)
-  const dateMoment = moment(value);
-  const day = dateMoment.format("DD");
-  const month = dateMoment.format("MMM");
-  const year = +dateMoment.format("YYYY"); // ไม่บวก 543
-  return `${day} ${month} ${year}`;
-}
-
-// Headers ที่เป็นวันที่
-const DATE_HEADERS = ["วันที่คำสั่งมีผล", "วันที่ลงนาม"];
-const SALARY_HEADERS = [
-  "เงินเดือน",
-  "ค่าจ้าง",
-  "เงินค่าตอบแทนรายเดือน",
-  "เงินประจำตำแหน่ง",
-  "เงินค่าตอบแทนพิเศษ",
-];
-
-// สร้าง columns จาก Excel headers
-const tableColumns = computed(() => {
-  if (excelHeaders.value.length === 0) return [];
-  return excelHeaders.value.map((header, index) => {
-    const isDateColumn = DATE_HEADERS.includes(header);
-    const isSalaryColumn = SALARY_HEADERS.includes(header);
-
-    return {
-      name: `col_${index}`,
-      label: header,
-      field: header,
-      align: "left" as const,
-      sortable: false,
-      style: "white-space: nowrap;",
-      headerStyle: "font-size: 13px; font-weight: bold;",
-      format: (val: any) => {
-        // ถ้าค่าว่าง แสดง -
-        if (val == null || val === "") return "-";
-
-        // ถ้าเป็น column วันที่
-        if (isDateColumn) {
-          // ถ้าเป็น string วันที่ format dd/mm/yyyy (จาก Excel)
-          if (
-            typeof val === "string" &&
-            val.match(/^\d{1,2}\/\d{1,2}\/\d{4}$/)
-          ) {
-            return formatDateForDisplay(val);
-          }
-          // ถ้าเป็น number (Excel serial date) ให้แปลงเป็น Date object ก่อน
-          if (typeof val === "number") {
-            return formatDateForDisplay((val - 25569) * 86400 * 1000);
-          }
-        }
-
-        // ถ้าเป็น column เงินให้ format มี comma separator (ตรวจสอบชื่อ label)
-        if (isSalaryColumn) {
-          const numericValue = Number(val);
-          if (typeof numericValue === "number" && !isNaN(numericValue)) {
-            return numericValue.toLocaleString("en-US");
-          }
-        }
-
-        return val;
-      },
-    };
-  });
-});
-
-async function loadPreview() {
-  if (!props.file) return;
-
-  isLoading.value = true;
-  try {
-    const result = await parseExcelFile(props.file, {
-      maxPreviewRows: 0, // 0 = แสดงทั้งหมด
-      sheetIndex: 0, // ใช้ sheet แรกเสมอ
-    });
-    previewData.value = result.rows;
-    excelHeaders.value = result.headers; // เก็บ headers จาก Excel
-  } catch (error) {
-    console.error("Error parsing Excel file:", error);
-    previewData.value = [];
-    excelHeaders.value = [];
-  } finally {
-    isLoading.value = false;
-  }
-}
-
-function onConfirm() {
-  dialogConfirm($q, () => {
-    if (props.file) {
-      isUploading.value = true;
-      emit("confirm", props.file);
-    }
-  });
-}
-
-function onClose() {
-  emit("cancel");
-  emit("update:modal", false);
-}
-
-function onModalUpdate(value: boolean) {
-  emit("update:modal", value);
-}
-
-watch(
-  () => props.modal,
-  (newValue) => {
-    if (newValue && props.file) {
-      isUploading.value = false;
-      loadPreview();
-    }
-  }
-);
-</script>
-
-<template>
-  <q-dialog :model-value="modal" @update:model-value="onModalUpdate" persistent>
-    <q-card style="min-width: 80vw; max-width: 95vw">
-      <q-card-section class="row items-center q-pb-none">
-        <div class="text-h6">ตัวอย่างข้อมูลไฟล์ Excel</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup @click="onClose" />
-      </q-card-section>
-
-      <q-separator />
-
-      <!-- File Info Section -->
-      <q-card-section>
-        <div class="row q-col-gutter-md">
-          <div class="col-12">
-            <div class="text-subtitle2 text-grey-7">ข้อมูลไฟล์</div>
-          </div>
-          <div class="col-md-4 col-sm-6 col-12">
-            <div class="flex items-center">
-              <q-icon
-                name="insert_drive_file"
-                class="q-mr-sm"
-                color="primary"
-              />
-              <span class="text-body2">ชื่อไฟล์: {{ fileName }}</span>
-            </div>
-          </div>
-          <div class="col-md-4 col-sm-6 col-12">
-            <div class="flex items-center">
-              <q-icon name="folder" class="q-mr-sm" color="primary" />
-              <span class="text-body2"
-                >ขนาด: {{ formatFileSize(fileSize) }}</span
-              >
-            </div>
-          </div>
-          <div class="col-md-4 col-sm-12 col-12">
-            <div class="flex items-center">
-              <q-icon name="table_chart" class="q-mr-sm" color="primary" />
-              <span class="text-body2">จำนวนแถว: {{ totalRows }} แถว</span>
-            </div>
-          </div>
-        </div>
-      </q-card-section>
-
-      <q-separator />
-
-      <!-- Preview Table -->
-      <q-card-section style="max-height: 70vh" class="scroll">
-        <div class="text-subtitle2 q-mb-md">
-          รายการตำแหน่ง ({{ previewRows }} รายการ)
-        </div>
-        <d-table
-          :columns="tableColumns"
-          :rows="previewData"
-          :paging="true"
-          :rows-per-page-options="[20, 50, 100, 0]"
-          v-model:pagination="pagination"
-          :loading="isLoading"
-          row-key="id"
-          flat
-          bordered
-          dense
-        />
-      </q-card-section>
-
-      <!-- Actions -->
-      <q-card-actions align="right" class="q-pa-md">
-        <q-btn
-          type="submit"
-          color="public"
-          label="ยืนยันการอัปโหลด"
-          @click="onConfirm"
-          :loading="isUploading"
-        />
-      </q-card-actions>
-    </q-card>
-  </q-dialog>
-</template>
diff --git a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
index b6ef8c829..c30fec131 100644
--- a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
+++ b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
@@ -706,7 +706,6 @@ function classInput(val: boolean) {
             hide-bottom-space
             autocomplete="on"
             name="organization"
-            :label="`${'หน่วยงาน'}`"
           />
         </div>
 
diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index da180ac32..7d99fd725 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive } from "vue";
 import { useQuasar } from "quasar";
+import * as XLSX from "xlsx";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useEditPosDataStore } from "@/modules/04_registryPerson/stores/Edit";
-import { exportToExcelPosition } from "@/modules/04_registryPerson/utils/exportPosition";
 
 import type { QTableColumn } from "quasar";
 import type { FormDataSalary } from "@/modules/04_registryPerson/interface/index/Edit";
@@ -20,7 +20,6 @@ import type {
 
 import DialogForm from "@/modules/04_registryPerson/views/edit/components/DialogForm.vue";
 import DialogSort from "@/modules/04_registryPerson/views/edit/components/DialogSort.vue";
-import DialogExcelPreview from "@/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue";
 import CurruncyInput from "@/components/CurruncyInput.vue";
 
 const $q = useQuasar();
@@ -53,11 +52,6 @@ const amountRef = ref<any>(null);
 const amountSpecialRef = ref<any>(null);
 const currencyPopupRef = ref<any>(null);
 
-// Excel Preview
-const excelPreviewModal = ref<boolean>(false);
-const selectedExcelFile = ref<File | null>(null);
-const isParsingExcel = ref<boolean>(false);
-
 //Table
 const isLoad = ref<boolean>(true);
 const rowIndex = ref<number>(0);
@@ -436,7 +430,66 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
 
 /** ฟังก์ชันดาวน์โหลดไฟล Excel */
 function exportToExcel() {
-  exportToExcelPosition(rows.value);
+  const newData = rows.value.map((e: DataPosition) => {
+    return {
+      commandDateAffect: date2Thai(e.commandDateAffect),
+      positionName: e.positionName,
+      positionType: e.positionType,
+      positionLevel: e.positionLevel
+        ? e.positionLevel
+        : e.positionCee
+        ? e.positionCee
+        : "",
+      positionExecutive: e.positionExecutive,
+      amount: e.amount,
+      mouthSalaryAmount: e.mouthSalaryAmount,
+      positionSalaryAmount: e.positionSalaryAmount,
+      organization: findOrgName({
+        root: e.orgRoot,
+        child1: e.orgChild1,
+        child2: e.orgChild2,
+        child3: e.orgChild3,
+        child4: e.orgChild4,
+      }),
+      posNo:
+        e.posNoAbb && e.posNo
+          ? `${e.posNoAbb} ${e.posNo}`
+          : e.posNo
+          ? e.posNo
+          : "",
+      posNumCodeSit:
+        e.posNumCodeSitAbb && e.posNumCodeSit
+          ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
+          : e.posNumCodeSit
+          ? e.posNumCodeSit
+          : "",
+      commandNo:
+        e.commandNo && e.commandYear
+          ? `${e.commandNo}/${Number(e.commandYear) + 543}`
+          : "",
+      commandDateSign: date2Thai(e.commandDateSign),
+      commandCode: store.convertCommandCodeName(e.commandCode),
+      remark: e.remark,
+    };
+  });
+
+  const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
+  const worksheet = XLSX.utils.json_to_sheet(newData, {
+    header: visibleColumns.value,
+  });
+
+  //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
+  XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
+
+  // Create a new workbook and append the worksheet
+  const workbook = XLSX.utils.book_new();
+
+  XLSX.utils.book_append_sheet(
+    workbook,
+    worksheet,
+    `รายการประวัติตำแหน่งเงินเดือน`
+  );
+  XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
 }
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
@@ -794,106 +847,6 @@ async function validateAndSave(
   }
 }
 
-/**
- * ฟังก์ชันอัปโหลดไฟล์ Excel
- * เปิด preview modal ก่อนอัปโหลด
- */
-function handUploadFile() {
-  const input = document.createElement("input");
-  input.type = "file";
-  input.accept = ".xlsx,.xls";
-
-  input.onchange = async (e: Event) => {
-    const file = (e.target as HTMLInputElement).files?.[0];
-    if (!file) return;
-
-    // ตรวจสอบชนิดไฟล์โดยตรวจสอบนามสกุล
-    const validExtensions = [".xlsx", ".xls"];
-    const fileExtension = file.name
-      .substring(file.name.lastIndexOf("."))
-      .toLowerCase();
-
-    if (!validExtensions.includes(fileExtension)) {
-      messageError($q, {
-        response: {
-          data: {
-            title: "กรุณาเลือกไฟล์ Excel เท่านั้น (.xlsx, .xls)",
-          },
-        },
-      });
-      return;
-    }
-
-    // เก็บไฟล์และเปิด preview modal
-    selectedExcelFile.value = file;
-    excelPreviewModal.value = true;
-  };
-
-  input.click();
-}
-
-/**
- * ฟังก์ชันยืนยันการอัปโหลดไฟล์
- * ส่งไฟล์ไปยัง API เมื่อ user ยืนยันจาก preview modal
- */
-async function onConfirmUpload(file: File) {
-  try {
-    isParsingExcel.value = true;
-    showLoader();
-
-    const type = empType.value === "officer" ? "office" : "employee";
-    const formData = new FormData();
-    formData.append("file", file);
-
-    await http.post(config.API.uploadProfile(type, profileId.value), formData, {
-      headers: {
-        "Content-Type": "multipart/form-data",
-      },
-    });
-
-    success($q, "อัปโหลดไฟล์สำเร็จ");
-    await fetchData();
-    excelPreviewModal.value = false;
-  } catch (error) {
-    messageError($q, error);
-  } finally {
-    hideLoader();
-    isParsingExcel.value = false;
-  }
-}
-
-/**
- * ฟังก์ชันยกเลิกการอัปโหลด
- * ปิด preview modal และล้างค่า
- */
-function onCancelUpload() {
-  selectedExcelFile.value = null;
-  excelPreviewModal.value = false;
-}
-
-/** ฟังก์ชันจัดเรียงข้อมูลตามวันที่*/
-function handleSortByDate() {
-  dialogConfirm(
-    $q,
-    async () => {
-      try {
-        showLoader();
-        await http.put(config.API.sortOrderByDate, {
-          type: empType.value.toLocaleUpperCase(),
-          profileId: profileId.value,
-        });
-        await fetchData();
-      } catch (error) {
-        messageError($q, error);
-      } finally {
-        hideLoader();
-      }
-    },
-    "ยืนยันการจัดลำดับ",
-    "ต้องการยืนยันการจัดลำดับข้อมูลตามวันที่คำสั่งมีผลใช่หรือไม่?"
-  );
-}
-
 onMounted(async () => {
   await Promise.all([fetchData(), fetchType()]);
 });
@@ -929,39 +882,10 @@ onMounted(async () => {
           icon="mdi-sort"
           @click="modalSort = true"
         >
-          <q-tooltip>จัดลำดับข้อมูล</q-tooltip>
-        </q-btn>
-
-        <q-btn
-          v-if="
-            tabs === 'PENDING' && statusCheckEdit == 'PENDING' && isConfirmEdit
-          "
-          class="q-ml-sm"
-          round
-          flat
-          dense
-          color="indigo-5"
-          icon="mdi-calendar-export"
-          @click="handleSortByDate()"
+          <q-tooltip>จัดลำดับข้อมูล</q-tooltip></q-btn
         >
-          <q-tooltip>จัดลำดับตามวันที่คำสั่งมีผล</q-tooltip>
-        </q-btn>
         <q-space />
         <div>
-          <q-btn
-            v-if="
-              tabs === 'PENDING' &&
-              statusCheckEdit == 'PENDING' &&
-              isConfirmEdit
-            "
-            flat
-            round
-            color="blue"
-            icon="upload"
-            @click="handUploadFile()"
-          >
-            <q-tooltip>อัปโหลดไฟล์แก้ไข</q-tooltip>
-          </q-btn>
           <q-btn
             flat
             round
@@ -969,9 +893,7 @@ onMounted(async () => {
             icon="download"
             :disable="rows.length == 0"
             @click="exportToExcel()"
-          >
-            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
-          </q-btn>
+          />
         </div>
 
         <q-input
@@ -1802,13 +1724,6 @@ onMounted(async () => {
     :fetch-data="fetchData"
     :columns="columns"
   />
-
-  <DialogExcelPreview
-    v-model:modal="excelPreviewModal"
-    :file="selectedExcelFile"
-    @confirm="onConfirmUpload"
-    @cancel="onCancelUpload"
-  />
 </template>
 
 <style scoped></style>
diff --git a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
index 810983d6a..41c3854b9 100644
--- a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
@@ -54,7 +54,6 @@ const reason = ref<string>(""); //หมายเหตุ
 const status = ref<string>("");
 const fullName = ref<string>("");
 const mianData = ref<MainData>();
-const typeCommand = ref<string>(""); //ประเภทคำสั่ง
 
 /** fetch รายละเอียดการปรับระดับชั้นงานลูกจ้าง*/
 async function fecthappointmentByid() {
@@ -80,7 +79,6 @@ async function fecthappointmentByid() {
       salary.value = data.salary ?? 0;
       reason.value = data.reason;
       date.value = data.positionDate;
-      typeCommand.value = data.typeCommand;
     })
     .catch((e) => {
       messageError($q, e);
@@ -325,10 +323,7 @@ onMounted(async () => {
             </div>
 
             <div class="col-12"><q-separator /></div>
-            <div
-              class="col-xs-6 col-sm-6 row items-center"
-              v-if="typeCommand !== 'MOVE'"
-            >
+            <div class="col-xs-6 col-sm-6 row items-center">
               <div class="col-12">
                 <datepicker
                   :readonly="!edit"
diff --git a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
index 2d8ef8a7b..b5b55e00a 100644
--- a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
@@ -45,7 +45,6 @@ const date = ref<Date | null>(null); //ดำรงตำแหน่งใน
 const reason = ref<string>(""); //หมายเหตุ
 const status = ref<string>("");
 const fullName = ref<string>("");
-const typeCommand = ref<string>(""); //ประเภทคำสั่ง
 
 /** fetch รายละเอียดการแต่งตั้ง-เลื่อน-ย้าย*/
 async function fecthappointmentByid() {
@@ -62,7 +61,6 @@ async function fecthappointmentByid() {
       }`;
 
       status.value = data.status;
-      typeCommand.value = data.typeCommand;
       educationOld.value = data.educationOld ?? "-";
       organizationPositionOld.value = data.organizationPositionOld;
       positionTypeOld.value = data.positionTypeOld;
@@ -315,10 +313,7 @@ onMounted(() => {
             </div>
 
             <div class="col-12"><q-separator /></div>
-            <div
-              class="col-xs-6 col-sm-6 row items-center"
-              v-if="typeCommand !== 'MOVE'"
-            >
+            <div class="col-xs-6 col-sm-6 row items-center">
               <div class="col-12">
                 <datepicker
                   :readonly="!edit"
diff --git a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
index dd8d3ba5f..ce4a0284b 100644
--- a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
+++ b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
@@ -316,10 +316,9 @@ onMounted(() => {
                       :model-value="
                         dateEnd !== null ? date2Thai(dateEnd) : null
                       "
+                      :rules="edit ? [(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]:[]"
                       hide-bottom-space
                       :label="`${'ถึงวันที่'}`"
-                      clearable
-                      @clear="dateEnd = null"
                     >
                       <template v-slot:prepend>
                         <q-icon
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue b/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
index 63833fb13..3980a65a9 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
@@ -53,7 +53,6 @@ const saveData = async () => {
         changeBtn();
         onEdit.value = false;
         edit.value = false;
-        emit("update:statusEdit", false);
       })
       .catch((e: any) => {
         messageError($q, e);
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/top.vue b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
index fdf85e7af..599ed3562 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/top.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
@@ -1,7 +1,7 @@
 <!-- ส่วนหัวของ ข้อมูลส่วนตัว และ ที่อยู่ -->
 <script setup lang="ts">
 import { checkPermission } from "@/utils/permissions";
-import { computed } from "vue";
+import { ref } from "vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
@@ -62,9 +62,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(["update:edit"]);
-const isEdit = computed(() => {
-  return checkPermission(route)?.attrIsUpdate ? true : false;
-});
+const isEdit = ref<boolean>(
+  checkPermission(route)?.attrIsUpdate ? true : false
+);
 
 const updateEdit = (value: any) => {
   emit("update:edit", value);
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index a4e1f18b7..4c9b0a277 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -2,7 +2,7 @@
 import { ref, onMounted, watch } from "vue";
 
 /** importType*/
-import { type QTableProps } from "quasar";
+import type { QTableProps } from "quasar";
 import type {
   Positions,
   FormPosType,
@@ -22,14 +22,14 @@ const store = useSelectOrgStore();
 /** props*/
 const selected = defineModel("selectedPos", { required: true }); //ตำแหน่งที่เลือก
 const positionId = defineModel<string>("positionId", { required: true }); //id ตำแหน่งที่เลือก
-const selectId = defineModel<string>("selectId", { required: true }); // ตำแหน่งที่เลือก
-const date = defineModel<Date | null>("datePos", { required: true }); //วันยที่รายงานคัว
+const seletcId = defineModel<string>("seletcId", { required: true }); // ตำแหน่งที่เลือก
+const date = defineModel<Date>("datePos", { required: true }); //วันยที่รายงานคัว
 const positionData = defineModel<any[]>("position", { required: true }); //ข้อมูลรายการเลขที่ตำแหน่ง
 const isAll = defineModel<boolean>("isAll", { required: true }); //แสดงตำแหน่งทั้งหมด
 const isBlank = defineModel<boolean>("isBlank", { required: true }); //แสดงเฉพาะตำแหน่งว่าง
 const isPosition = defineModel<string>("isPosition", { required: true });
 // const isPositionOld = defineModel<boolean>("isPositionOld", { required: true }); //แสดงตำแหน่งที่ตรงกับประเภทและระดับเดิม
-const posType = defineModel<FormPosType | null>("posType", { required: true }); //ตำแหน่งประเภท
+const posType = defineModel<FormPosType>("posType", { required: true }); //ตำแหน่งประเภท
 const posLevel = defineModel<string>("posLevel", { required: true }); //ระดับตำแหน่ง
 const optionPosType = defineModel<FormPosType[]>("optionPosType", {
   required: true,
@@ -47,7 +47,6 @@ const props = defineProps({
   onPosType: Function,
   nodeId: String,
   nodeLevel: Number,
-  isLoadPosition: Boolean,
 });
 
 //Table
@@ -214,9 +213,9 @@ async function onClickSelectPos(id: string) {
   // หาตำแหน่ง
   if (position) {
     rowsPosition.value = position.positions;
-    if (selectId.value) {
+    if (seletcId.value) {
       selected.value = rowsPosition.value.filter(
-        (e) => e.id === selectId.value
+        (e) => e.id === seletcId.value
       );
     }
   }
@@ -249,20 +248,15 @@ watch(positionData, (newVal, oldVal) => {
   }
 });
 
-watch(
-  () => props.isLoadPosition,
-  (newVal) => {
-    if (newVal && positionId.value) {
-      onClickSelectPos(positionId.value);
-    }
-  }
-);
-
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  */
 onMounted(async () => {
-  if (!positionId.value) {
+  if (positionId.value) {
+    setTimeout(async () => {
+      await onClickSelectPos(positionId.value);
+    }, 1000);
+  } else {
     positionRows.value = positionData.value;
     positionRowsData.value = positionData.value;
   }
diff --git a/src/modules/05_placement/components/PersonalList/DialogDetail.vue b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
index 13aa09aef..56cc9b3c4 100644
--- a/src/modules/05_placement/components/PersonalList/DialogDetail.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
@@ -3,7 +3,6 @@ import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { calculateAge } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -39,20 +38,6 @@ const props = defineProps({
 
 const rows = ref<DataEducation[]>([]);
 const personalForm = ref<DataPerson>();
-const age = ref<string | null>(""); //อายุ
-
-// ข้อมูลแปลงจาก ID เป็นชื่อ
-const currentProvinceName = ref<string>("");
-const currentDistrictName = ref<string>("");
-const currentSubDistrictName = ref<string>("");
-const registProvinceName = ref<string>("");
-const registDistrictName = ref<string>("");
-const registSubDistrictName = ref<string>("");
-
-// Cache ข้อมูล
-const provincesCache = ref<any[]>([]);
-const districtsCache = ref<Map<string, any[]>>(new Map()); // key: provinceId, value: districts[]
-const subDistrictsCache = ref<Map<string, any[]>>(new Map()); // key: districtId, value: subDistricts[]
 
 /**หัวตาราง */
 const columns = ref<QTableProps["columns"]>([
@@ -102,20 +87,11 @@ const columns = ref<QTableProps["columns"]>([
  * ฟังก์ชันดึงข้อมูลรายละเอียด
  */
 async function fetchData() {
-  // Reset ข้อมูลเก่าก่อนโหลดข้อมูลใหม่
-  resetData();
-  
   showLoader();
   await http
     .get(config.API.getDatapersonal(props.personalId))
     .then((res) => {
       personalForm.value = res.data.result;
-      if (res.data.result.dateOfBirth) {
-        // กำหนดอายุ ส่งวันเกิดไปคำนวน
-        age.value = calculateAge(res.data.result.dateOfBirth);
-      } else {
-        age.value = null;
-      }
       personalForm.value?.education.map((e: Education) => {
         rows.value.push({
           university: e.institute,
@@ -131,159 +107,6 @@ async function fetchData() {
     .finally(() => {
       hideLoader();
     });
-
-  // แปลง ID เป็นชื่อ
-  await convertAddressIds();
-}
-
-/**
- * Reset ข้อมูลทุกครั้งที่เปิดคนใหม่
- */
-function resetData() {
-  // Reset ข้อมูลส่วนตัว
-  personalForm.value = undefined;
-  age.value = "";
-  rows.value = [];
-  
-  // Reset ข้อมูลที่อยู่
-  currentProvinceName.value = "";
-  currentDistrictName.value = "";
-  currentSubDistrictName.value = "";
-  registProvinceName.value = "";
-  registDistrictName.value = "";
-  registSubDistrictName.value = "";
-}
-
-/**
- * ฟังก์ชันแปลง ID เป็นชื่อจริงของที่อยู่ (แบบ optimize)
- */
-async function convertAddressIds() {
-  if (!personalForm.value) return;
-
-  try {
-    // โหลดข้อมูลจังหวัดครั้งเดียวถ้ายังไม่มี
-    await loadProvinces();
-
-    // แปลงข้อมูลที่อยู่ปัจจุบัน
-    if (personalForm.value.currentProvinceId && personalForm.value.currentProvinceId.trim() !== "") {
-      currentProvinceName.value = getProvinceNameFromCache(
-        personalForm.value.currentProvinceId
-      );
-
-      if (personalForm.value.currentDistrictId && personalForm.value.currentDistrictId.trim() !== "") {
-        currentDistrictName.value = await getDistrictNameOptimized(
-          personalForm.value.currentProvinceId,
-          personalForm.value.currentDistrictId
-        );
-
-        if (personalForm.value.currentSubDistrictId && personalForm.value.currentSubDistrictId.trim() !== "") {
-          currentSubDistrictName.value = await getSubDistrictNameOptimized(
-            personalForm.value.currentDistrictId,
-            personalForm.value.currentSubDistrictId
-          );
-        }
-      }
-    }
-
-    // แปลงข้อมูลที่อยู่ตามทะเบียน
-    if (personalForm.value.registProvinceId && personalForm.value.registProvinceId.trim() !== "") {
-      registProvinceName.value = getProvinceNameFromCache(
-        personalForm.value.registProvinceId
-      );
-
-      if (personalForm.value.registDistrictId && personalForm.value.registDistrictId.trim() !== "") {
-        registDistrictName.value = await getDistrictNameOptimized(
-          personalForm.value.registProvinceId,
-          personalForm.value.registDistrictId
-        );
-
-        if (personalForm.value.registSubDistrictId && personalForm.value.registSubDistrictId.trim() !== "") {
-          registSubDistrictName.value = await getSubDistrictNameOptimized(
-            personalForm.value.registDistrictId,
-            personalForm.value.registSubDistrictId
-          );
-        }
-      }
-    }
-  } catch (error) {
-    console.error("Error converting address IDs:", error);
-  }
-}
-
-/**
- * โหลดข้อมูลจังหวัดทั้งหมด (ครั้งเดียว)
- */
-async function loadProvinces() {
-  if (provincesCache.value.length === 0) {
-    try {
-      const res = await http.get(config.API.province);
-      provincesCache.value = res.data.result;
-    } catch (error) {
-      console.error("Error loading provinces:", error);
-    }
-  }
-}
-
-/**
- * ดึงชื่อจังหวัดจาก cache
- */
-function getProvinceNameFromCache(provinceId: string): string {
-  const province = provincesCache.value.find(
-    (p: any) => p.id.toString() === provinceId
-  );
-  return province ? province.name : "-";
-}
-
-/**
- * ดึงชื่ออำเภอแบบ optimize (เรียก API เฉพาะจังหวัดที่ต้องการ)
- * @param provinceId ID ของจังหวัด
- * @param districtId ID ของอำเภอ
- */
-async function getDistrictNameOptimized(
-  provinceId: string,
-  districtId: string
-): Promise<string> {
-  try {
-    // เช็ค cache ว่ามีข้อมูล districts ของ province นี้หรือไม่
-    if (!districtsCache.value.has(provinceId)) {
-      const res = await http.get(config.API.listDistrict(provinceId));
-      districtsCache.value.set(provinceId, res.data.result.districts);
-    }
-
-    const districts = districtsCache.value.get(provinceId) || [];
-    const district = districts.find((d: any) => d.id.toString() === districtId);
-    return district ? district.name : "-";
-  } catch (error) {
-    console.error("Error loading district:", error);
-    return "-";
-  }
-}
-
-/**
- * ดึงชื่อตำบลแบบ optimize (เรียก API เฉพาะอำเภอที่ต้องการ)
- * @param districtId ID ของอำเภอ
- * @param subDistrictId ID ของตำบล
- */
-async function getSubDistrictNameOptimized(
-  districtId: string,
-  subDistrictId: string
-): Promise<string> {
-  try {
-    // เช็ค cache ว่ามีข้อมูล subDistricts ของ district นี้หรือไม่
-    if (!subDistrictsCache.value.has(districtId)) {
-      const res = await http.get(config.API.listSubDistrict(districtId));
-      subDistrictsCache.value.set(districtId, res.data.result.subDistricts);
-    }
-
-    const subDistricts = subDistrictsCache.value.get(districtId) || [];
-    const subDistrict = subDistricts.find(
-      (sd: any) => sd.id.toString() === subDistrictId
-    );
-    return subDistrict ? subDistrict.name : "-";
-  } catch (error) {
-    console.error("Error loading subdistrict:", error);
-    return "-";
-  }
 }
 
 /**
@@ -308,7 +131,7 @@ function formBmaofficer(val: string) {
  */
 async function close() {
   props.close();
-  resetData(); // Reset ข้อมูลเมื่อปิด dialog
+  rows.value = [];
 }
 
 /**
@@ -347,58 +170,30 @@ watch(props, () => {
 
               <div class="row q-pa-xs">
                 <div class="col-3 header-sub-text">
-                  <div class="q-pb-sm">เลขประจำตัวประชาชน</div>
-                  <div class="q-pb-sm">วัน/เดือน/ปีเกิด</div>
-                  <div class="q-pb-sm">อายุ</div>
-                  <div class="q-pb-sm">สัญชาติ</div>
-                  <div>หมู่เลือด</div>
+                  <div class="q-pb-md">เลขประจำตัวประชาชน</div>
+                  <div>วัน/เดือน/ปีเกิด</div>
                 </div>
 
                 <div class="col-4 sub-text">
-                  <div class="q-pb-sm">
+                  <div class="q-pb-md">
                     {{ personalForm?.idCard }}
                   </div>
-                  <div class="q-pb-sm">
-                    {{ date2Thai(personalForm?.dateOfBirth) }}
-                  </div>
-                  <div class="q-pb-sm">
-                    {{ age ? age : "-" }}
-                  </div>
-                  <div class="q-pb-sm">
-                    {{
-                      personalForm?.nationality ? personalForm.nationality : "-"
-                    }}
-                  </div>
                   <div>
-                    {{
-                      personalForm?.bloodGroup ? personalForm.bloodGroup : "-"
-                    }}
+                    {{ date2Thai(personalForm?.dateOfBirth) }}
                   </div>
                 </div>
 
                 <div class="col-2 header-sub-text">
-                  <div class="q-pb-sm">ชื่อ-นามสกุล</div>
-                  <div class="q-pb-sm">เพศ</div>
-                  <div class="q-pb-sm">เชื้อชาติ</div>
-                  <div class="q-pb-sm">ศาสนา</div>
-                  <div>เบอร์โทรศัพท์</div>
+                  <div class="q-pb-md">ชื่อ-นามสกุล</div>
+                  <div>เพศ</div>
                 </div>
                 <div class="col-3 sub-text">
-                  <div class="q-pb-sm">
+                  <div class="q-pb-md">
                     {{ personalForm?.fullName }}
                   </div>
-                  <div class="q-pb-sm">
+                  <div>
                     {{ personalForm?.gender }}
                   </div>
-                  <div class="q-pb-sm">
-                    {{ personalForm?.race ? personalForm.race : "-" }}
-                  </div>
-                  <div class="q-pb-sm">
-                    {{ personalForm?.religion ? personalForm.religion : "-" }}
-                  </div>
-                  <div class="q-mt-sm">
-                    {{ personalForm?.telephone ? personalForm.telephone : "-" }}
-                  </div>
                 </div>
               </div>
             </q-card>
@@ -408,90 +203,9 @@ watch(props, () => {
             <q-card bordered class="card-panding">
               <div class="row items-center q-pa-xs header-text">ภูมิลำเนา</div>
               <div class="row q-pa-xs">
-                <!-- ที่อยู่ปัจจุบัน -->
-                <div class="col-6">
-                  <div class="q-pb-sm text-weight-medium text-primary">
-                    ที่อยู่ปัจจุบัน
-                  </div>
-                  <div class="row">
-                    <div class="col-4 header-sub-text">
-                      <div class="q-pb-sm">ที่อยู่</div>
-                      <div class="q-pb-sm">จังหวัด</div>
-                      <div class="q-pb-sm">เขต/อำเภอ</div>
-                      <div class="q-pb-sm">แขวง/ตำบล</div>
-                      <div>รหัสไปรษณีย์</div>
-                    </div>
-                    <div class="col-8 sub-text">
-                      <div class="q-pb-sm">
-                        {{
-                          personalForm?.currentAddress
-                            ? personalForm.currentAddress
-                            : "-"
-                        }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{ currentProvinceName ? currentProvinceName : "-" }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{ currentDistrictName ? currentDistrictName : "-" }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{
-                          currentSubDistrictName ? currentSubDistrictName : "-"
-                        }}
-                      </div>
-                      <div class="q-mt-sm">
-                        {{
-                          personalForm?.currentZipCode
-                            ? personalForm.currentZipCode
-                            : "-"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <!-- ที่อยู่ตามทะเบียนบ้าน -->
-                <div class="col-6">
-                  <div class="q-pb-sm text-weight-medium text-primary">
-                    ที่อยู่ตามทะเบียนบ้าน
-                  </div>
-                  <div class="row">
-                    <div class="col-4 header-sub-text">
-                      <div class="q-pb-sm">ที่อยู่</div>
-                      <div class="q-pb-sm">จังหวัด</div>
-                      <div class="q-pb-sm">เขต/อำเภอ</div>
-                      <div class="q-pb-sm">แขวง/ตำบล</div>
-                      <div>รหัสไปรษณีย์</div>
-                    </div>
-                    <div class="col-8 sub-text">
-                      <div class="q-pb-sm">
-                        {{
-                          personalForm?.registAddress
-                            ? personalForm.registAddress
-                            : "-"
-                        }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{ registProvinceName ? registProvinceName : "-" }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{ registDistrictName ? registDistrictName : "-" }}
-                      </div>
-                      <div class="q-pb-sm">
-                        {{
-                          registSubDistrictName ? registSubDistrictName : "-"
-                        }}
-                      </div>
-                      <div class="q-mt-sm">
-                        {{
-                          personalForm?.registZipCode
-                            ? personalForm.registZipCode
-                            : "-"
-                        }}
-                      </div>
-                    </div>
-                  </div>
+                <div class="col-3 header-sub-text">ที่อยู่</div>
+                <div class="col-9 sub-text">
+                  {{ personalForm?.registAddress }}
                 </div>
               </div>
             </q-card>
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index ad1028738..9d06a7da3 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, watch } from "vue";
+import { onMounted, ref, watch, reactive } from "vue";
 import { useQuasar } from "quasar";
 
 import { useRoute } from "vue-router";
@@ -11,7 +11,6 @@ import { useStructureTree } from "@/stores/structureTree";
 
 /** importType*/
 import type {
-  DataList,
   PositionMaim,
   PositionNo,
   Positions,
@@ -42,14 +41,17 @@ const {
 
 /**props*/
 const modal = defineModel<boolean>("modal", { required: true });
-
-interface Props {
-  dataRow?: DataList;
-  fetchTable?: () => Promise<void>;
-  fetchStatCard?: () => Promise<void>;
-}
-
-const props = defineProps<Props>();
+const props = defineProps({
+  dataRow: {
+    type: Object,
+    require: true,
+  },
+  fetchTable: {
+    type: Function,
+    require: true,
+  },
+  fetchStatCard: { type: Function, require: true },
+});
 
 /** Tree*/
 const nodeId = ref<string>("");
@@ -63,16 +65,15 @@ const expanded = ref<string[]>([]);
 const positionUse = ref<string[]>([]);
 const positionNo = ref<DataPositionNo[]>([]);
 const positionId = ref<string>("");
-const selectId = ref<string>("");
+const seletcId = ref<string>("");
 const posType = ref<FormPosType | null>(null);
 const posLevel = ref<string>("");
-const selectedPos = ref<Positions[]>([]);
-const datePos = ref<Date | null>(new Date());
-const posMasterMain = ref<PositionMaim[]>([]);
+const selectedPos = ref<any[]>([]);
+const datePos = ref<Date>(new Date());
+const posMasterMain = ref<any[]>([]);
 const orgRevisionId = ref<string>("");
 const optionPosType = ref<FormPosType[]>([]);
 const optionPosLevel = ref<FormPosLevel[]>([]);
-const isLoadPosition = ref<boolean>(false);
 
 /** function เรียกข้อมูลโครงสร้าง แบบปัจุบันและ แบบร่าง*/
 async function fetchStructure() {
@@ -90,14 +91,12 @@ async function fetchStructure() {
  */
 function updateSelected(data: TreeMain) {
   if (props?.dataRow?.nodeId === data.orgTreeId) {
-    positionId.value = props?.dataRow?.posmasterId ?? "";
-    selectId.value = props?.dataRow?.positionId ?? "";
-    datePos.value = props?.dataRow?.reportingDate
-      ? new Date(props.dataRow.reportingDate)
-      : new Date();
+    positionId.value = props?.dataRow?.posmasterId;
+    seletcId.value = props?.dataRow?.positionId;
+    datePos.value = props?.dataRow?.reportingDate;
   } else {
     positionId.value = "";
-    selectId.value = "";
+    seletcId.value = "";
     selectedPos.value = [];
     datePos.value = new Date();
   }
@@ -118,8 +117,6 @@ const isPosition = ref<string>("exam");
 // const isPositionOld = ref<boolean>(false);
 async function fetchDataTable(id: string, level: number = 0) {
   showLoader();
-  isLoadPosition.value = false;
-  positionNo.value = [];
   const body = {
     node: level,
     nodeId: id,
@@ -153,7 +150,7 @@ async function fetchDataTable(id: string, level: number = 0) {
         if (p.length !== 0) {
           const a = p.find((el: Positions) => el.positionIsSelected === true);
           const { id, ...rest } = a ? a : p[0];
-          const data: PositionMaim = { ...e, ...rest } as PositionMaim;
+          const data: any = { ...e, ...rest };
           dataMain.push(data);
         }
       });
@@ -165,22 +162,21 @@ async function fetchDataTable(id: string, level: number = 0) {
           (e) => e !== props.dataRow?.posmasterId
         );
 
-        positionNo.value = posMain.filter(
-          (e: DataPositionNo) => !newUse.includes(e.id)
-        );
+        positionNo.value = posMain.filter((e: any) => !newUse.includes(e.id));
       } else {
         positionNo.value = posMain.filter(
-          (e: DataPositionNo) => !positionUse.value.includes(e.id)
+          (e: any) => !positionUse.value.includes(e.id)
         );
       }
-
-      isLoadPosition.value = true;
     })
     .catch((err) => {
       messageError($q, err);
+      hideLoader();
     })
     .finally(() => {
-      hideLoader();
+      setTimeout(() => {
+        hideLoader();
+      }, 1000);
     });
 }
 
@@ -202,11 +198,9 @@ async function fetchPosFind(level: number, id: string) {
 
       expanded.value = data;
       nodeId.value = id;
-      positionId.value = props?.dataRow?.posmasterId ?? "";
-      selectId.value = props?.dataRow?.positionId ?? "";
-      datePos.value = props?.dataRow?.reportingDate
-        ? new Date(props.dataRow.reportingDate)
-        : new Date();
+      positionId.value = props?.dataRow?.posmasterId;
+      seletcId.value = props?.dataRow?.positionId;
+      datePos.value = props?.dataRow?.reportingDate;
 
       fetchDataTable(nodeId.value, level);
     })
@@ -218,14 +212,12 @@ async function fetchPosFind(level: number, id: string) {
 
 /** function บันทึกข้อมูลตำแหน่ง*/
 async function onClickSubmit() {
-  const dataPosMaster = posMasterMain.value?.find(
-    (e) => e.id === positionId.value
+  const dataPosMaster = await posMasterMain.value?.find(
+    (e: any) => e.id === positionId.value
   );
 
   if (selectedPos.value.length === 0) {
     dialogMessageNotify($q, "กรุณาเลือกตำแหน่ง");
-  } else if (!dataPosMaster) {
-    dialogMessageNotify($q, "ไม่พบข้อมูลตำแหน่ง");
   } else {
     dialogConfirm($q, async () => {
       showLoader();
@@ -243,7 +235,6 @@ async function onClickSubmit() {
         posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
         posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
         posExecutiveName: selectedPos.value[0].posExecutiveName,
-        posExecutiveId: selectedPos.value[0].posExecutiveId,
         reportingDate: convertDateToAPI(datePos.value),
         posmasterId: dataPosMaster.id,
         positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
@@ -281,9 +272,6 @@ function clearData() {
   posLevel.value = "";
   isPosition.value = "exam";
   filterTree.value = "";
-  datePos.value = new Date();
-  isLoadPosition.value = false;
-  positionNo.value = [];
 }
 
 /** callback function เมื่อมีการเปิด popup*/
@@ -292,11 +280,9 @@ watch(
   async () => {
     if (modal.value) {
       await fetchPositionUes();
+
       if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
-        await fetchPosFind(
-          props?.dataRow?.node ?? 0,
-          props?.dataRow?.nodeId ?? ""
-        );
+        await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId);
       } else {
         expanded.value = [];
       }
@@ -337,7 +323,8 @@ async function getOrgPosType() {
     })
     .catch((e) => {
       messageError($q, e);
-    });
+    })
+    .finally(() => {});
 }
 
 function onPosType() {
@@ -349,15 +336,28 @@ function onPosType() {
 }
 
 watch(
-  [isAll, isBlank, () => isPosition.value],
-  ([newAll, newBlank, newPos], [oldAll, oldBlank, oldPos]) => {
-    const shouldFetch = newAll !== oldAll || newBlank !== oldBlank;
-    const isSelectMode = newPos === "select" && oldPos !== "select";
-
-    if (shouldFetch || isSelectMode) {
+  () => isAll.value,
+  (value, oldVal) => {
+    if (value !== oldVal) {
       fetchDataTable(nodeId.value, nodeLevel.value);
     }
-    if (isSelectMode) {
+  }
+);
+
+watch(
+  () => isBlank.value,
+  (value, oldVal) => {
+    if (value !== oldVal) {
+      fetchDataTable(nodeId.value, nodeLevel.value);
+    }
+  }
+);
+
+watch(
+  () => isPosition.value === "select",
+  (value, oldVal) => {
+    if (value !== oldVal) {
+      fetchDataTable(nodeId.value, nodeLevel.value);
       getOrgPosType();
     }
   }
@@ -458,15 +458,15 @@ onMounted(() => {
                 :name="item"
               >
                 <CardPosition
-                  v-model:position="positionNo"
+                  v-model:position="positionNo as []"
                   v-model:selectedPos="selectedPos"
                   v-model:datePos="datePos"
                   v-model:positionId="positionId"
-                  v-model:selectId="selectId"
+                  v-model:seletcId="seletcId"
                   v-model:is-all="isAll"
                   v-model:is-blank="isBlank"
                   v-model:is-position="isPosition"
-                  v-model:pos-type="posType"
+                  v-model:pos-type="posType as FormPosType"
                   v-model:pos-level="posLevel"
                   v-model:option-pos-type="optionPosType"
                   v-model:option-pos-level="optionPosLevel"
@@ -474,8 +474,7 @@ onMounted(() => {
                   :on-pos-type="onPosType"
                   :node-id="nodeId"
                   :node-level="nodeLevel"
-                  :bma-officer="props.dataRow?.bmaOfficer ?? ''"
-                  :is-load-position="isLoadPosition"
+                  :bma-officer="props.dataRow?.bmaOfficer"
                 />
               </q-tab-panel>
             </q-tab-panels>
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 1e151ee01..584124bee 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, watch, reactive, computed, type PropType } from "vue";
+import { ref, onMounted, watch, reactive, computed } from "vue";
 import { useQuasar, QForm } from "quasar";
 
 import http from "@/plugins/http";
@@ -9,8 +9,6 @@ import { useRoute, useRouter } from "vue-router";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePlacementDataStore } from "@/modules/05_placement/store";
-import { useMenuDataStore } from "@/stores/menuList";
-import { validateFileSize } from "@/utils/function";
 import avatar from "@/assets/avatar_user.jpg";
 
 import type { PartialTableName } from "@/modules/05_placement/interface/request/placement";
@@ -29,7 +27,6 @@ import DialogPreviewCommand from "@/modules/18_command/components/DialogPreviewC
 
 const $q = useQuasar(); // show dialog
 const DataStore = usePlacementDataStore();
-const storeMenu = useMenuDataStore();
 const route = useRoute();
 const router = useRouter();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
@@ -48,7 +45,7 @@ const {
 /** รับค่ามาจากหน้าหลัก */
 const props = defineProps({
   statCard: {
-    type: Function as PropType<() => Promise<void>>,
+    type: Function,
     default: () => console.log("getStat"),
   },
 });
@@ -58,14 +55,7 @@ const command = ref<string>("");
 const commandId = ref<string>("");
 const commandCitizenId = ref<string>("");
 
-// เปลี่ยนจาก ref เป็น computed property
-const roleAdmin = computed(() => {
-  if (!storeMenu.permissions) return false;
-
-  const permission = checkPermission(route);
-  return DataStore.isOfficer || permission?.attrOwnership == "OWNER";
-});
-
+let roleAdmin = ref<boolean>(false);
 const edit = ref<boolean>(true);
 const modalPersonal = ref<boolean>(false);
 const modal = ref<boolean>(false); //modal ขอผ่อนผัน + สละสิทธิ์
@@ -94,6 +84,7 @@ const appointModal = ref<boolean>(false);
 const getNumFile = ref(0);
 const dataRes = ref<any>([]);
 const personal = ref<any>([]);
+const displayAdd = ref<boolean>(true);
 const containStatus = ref<boolean>(false);
 const modaladdlist = ref<boolean>(false);
 const selected = ref<any>([]);
@@ -101,13 +92,6 @@ const personal_selected = ref<any>([]);
 const filterlistAdd = ref<string>("");
 const paging = ref<boolean>(true);
 
-const displayAdd = computed(() => {
-  if (!storeMenu.permissions) return true;
-
-  const permission = checkPermission(route);
-  return roleAdmin.value || permission?.attrOwnership === "OWNER";
-});
-
 // เช็ตสถานะการเลือกคนไปยังหน่วยงาน
 const checkSelected = computed(() => {
   if (selected.value.length === 0) {
@@ -264,17 +248,16 @@ const columnsBase = ref<QTableProps["columns"]>([
   },
 ]);
 
-const columns = computed(() => {
-  const permission = checkPermission(route);
-  return roleAdmin.value || permission?.attrOwnership == "OWNER"
+const columns = computed(() =>
+  roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
     ? columnsBase.value
     : columnsBase.value?.filter(
         (col) =>
           col.name !== "no" &&
           col.name !== "draft" &&
           col.name !== "refCommandNo"
-      );
-});
+      )
+);
 
 /**
  * แปลงสถานะพนักงาน
@@ -423,9 +406,8 @@ async function getTable() {
           rowsAll.value.push(rowData);
         });
 
-      const permission = checkPermission(route);
       const rowData = await (roleAdmin.value ||
-      permission?.attrOwnership == "OWNER"
+      checkPermission(route)?.attrOwnership == "OWNER"
         ? rowsAll.value
         : rowsAll.value.filter((x: any) => x.isDraft === true));
 
@@ -572,9 +554,8 @@ function getClass(val: boolean) {
  * @param draft status
  */
 function selectData(pid: string, draft: string) {
-  const permission = checkPermission(route);
   if (
-    (roleAdmin.value || permission?.attrOwnership == "OWNER") &&
+    (roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") &&
     draft === "ส่งตัวแล้ว"
   ) {
     personalId.value = pid;
@@ -877,33 +858,34 @@ async function filterRowsMain(type: string, pos: string) {
   });
 }
 
-// Helper function รอให้ permissions load เสร็จ
-function waitForPermissions(): Promise<void> {
-  return new Promise((resolve) => {
-    const checkPermissions = () => {
-      if (storeMenu.permissions) {
-        resolve();
-      } else {
-        setTimeout(checkPermissions, 100); // เช็คทุก 100ms
-      }
-    };
-    checkPermissions();
-  });
-}
-
-// ปรับปรุง getWorkFlow function
 async function getWorkFlow() {
   showLoader();
-
-  // รอให้ permissions load เสร็จก่อน
-  await waitForPermissions();
-
   await http
     .get(config.API.workflowKeycloakSystem("SYS_PLACEMENT_PASS"))
     .then(async (res) => {
       const data = await res.data.result;
       DataStore.isOfficer = data.isOfficer;
       DataStore.isStaff = data.isStaff;
+      roleAdmin.value =
+        data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER";
+      if (
+        roleAdmin.value === false &&
+        checkPermission(route)?.attrOwnership !== "OWNER"
+      ) {
+        displayAdd.value = false;
+        // visibleColumns.value = [
+        //   "position",
+        //   "fullName",
+        //   "examNumber",
+        //   "idCard",
+        //   "positionNumber",
+        //   "organizationName",
+        //   "reportingDate",
+        //   "bmaOfficer",
+        //   "statusName",
+        //   "positionCandidate",
+        // ];
+      }
     })
     .catch((e) => {
       messageError($q, e);
@@ -968,28 +950,6 @@ function onUpdateStatus(id: string) {
   );
 }
 
-function onUpdateDraftStatus(id: string) {
-  dialogConfirm(
-    $q,
-    async () => {
-      showLoader();
-      try {
-        await http.post(config.API.placementUpdateDraftStatus, {
-          personalId: id,
-        });
-        await success($q, "บันทึกสำเร็จ");
-        await getTable();
-      } catch (error) {
-        messageError($q, error);
-      } finally {
-        hideLoader();
-      }
-    },
-    "ยืนยันการยกเลิกการส่งตัว",
-    "ต้องการยกเลิกการส่งตัวรายชื่อนี้ใช่หรือไม่ ?"
-  );
-}
-
 onMounted(async () => {
   await getWorkFlow();
   await getTable();
@@ -1052,31 +1012,6 @@ onMounted(async () => {
                     </q-item-section>
                     <q-item-section>รายละเอียด</q-item-section>
                   </q-item>
-                  <q-item
-                    v-if="
-                      checkPermission($route)?.attrIsUpdate &&
-                      props.row.isDraft &&
-                      props.row.statusId === 'PREPARE-CONTAIN' &&
-                      (DataStore.isOfficer ||
-                        checkPermission($route)?.attrOwnership == 'OWNER')
-                    "
-                    clickable
-                    v-close-popup
-                    @click="onUpdateDraftStatus(props.row.personalId)"
-                  >
-                    <q-item-section
-                      style="min-width: 0px"
-                      avatar
-                      class="q-py-sm"
-                    >
-                      <q-icon
-                        color="red"
-                        size="xs"
-                        name="mdi-account-arrow-left-outline"
-                      />
-                    </q-item-section>
-                    <q-item-section>ยกเลิกการส่งตัว</q-item-section>
-                  </q-item>
 
                   <q-item
                     v-if="
@@ -1545,10 +1480,7 @@ onMounted(async () => {
               :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
               outlined
               use-chips
-              :rules="[
-                (val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน',
-                (val) => validateFileSize(val),
-              ]"
+              :rules="[(val:string) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
               multiple
               @update:model-value="clickEditRow"
               class="q-py-sm"
diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index 2bdb14319..55777e2c7 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -20,7 +20,7 @@ const dataMapToSend = computed(() => {
   return selected.value.map((i: any) => ({
     id: i.id,
     profileId: i.profileId,
-    prefix: i.rank ? i.rank : i.prefix,
+    prefix: i.prefix,
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,
@@ -89,9 +89,7 @@ const columns2 = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format(val, row) {
-      return `${row.rank ? row.rank : row.prefix ?? ""}${row.firstName ?? ""} ${
-        row.lastName ?? ""
-      }`;
+      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
   {
@@ -112,11 +110,9 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.positionTypeOld && row.positionTypeOl !== "-"
+      return row.positionTypeOld
         ? `${row.positionTypeOld}${
-            row.positionLevelOld && row.positionLevelOld !== "-"
-              ? `(${row.positionLevelOld})`
-              : ""
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
           }`
         : "";
     },
diff --git a/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue b/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
index fa0551e99..e6d2da0ce 100644
--- a/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
+++ b/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
@@ -48,7 +48,6 @@ const informaData = ref<FormAddPerson>({
   employeeType: null,
   employeeClass: null,
   profileType: null,
-  rank: "",
 });
 
 // รายการข้อมูลทั้งหมด
@@ -61,7 +60,6 @@ const Ops = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
-  rankOps: [],
 });
 // ข้อมูลเมื่อเลือกแล้ว
 const OpsFilter = ref<InformationOps>({
@@ -73,7 +71,6 @@ const OpsFilter = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
-  rankOps: [],
 });
 
 // รูป profile
@@ -138,16 +135,6 @@ async function fetchPerson() {
       });
       Ops.value.religionOps = optionreligions;
       OpsFilter.value.religionOps = optionreligions;
-
-      let rank: DataOption[] = [];
-      data.rank.map((r: DataOptioninfo) => {
-        rank.push({
-          id: r.id.toString(),
-          name: r.name.toString(),
-        });
-      });
-      Ops.value.rankOps = rank;
-      OpsFilter.value.rankOps = rank;
     })
     .catch((e) => {
       messageError($q, e);
@@ -217,13 +204,7 @@ function filterSelector(val: string, update: Function, refData: string) {
         );
       });
       break;
-    case "rankOps":
-      update(() => {
-        Ops.value.rankOps = OpsFilter.value.rankOps.filter(
-          (v: DataOption) => v.name.toLowerCase().indexOf(newVal) > -1
-        );
-      });
-      break;
+
     default:
       break;
   }
@@ -246,7 +227,7 @@ function onSubmit() {
   if (fileData.value != null) formData.append("File", fileData.value); //แก้ไขรูป
   if (informaData.value.citizenId != undefined)
     formData.append("citizenId", informaData.value.citizenId);
-  if (informaData.value.prefix != undefined && informaData.value.prefix != "")
+  if (informaData.value.prefix != undefined)
     formData.append("prefix", informaData.value.prefix);
   if (informaData.value.firstName != undefined)
     formData.append("firstName", informaData.value.firstName);
@@ -275,8 +256,6 @@ function onSubmit() {
     formData.append("employeeType", informaData.value.employeeType);
   if (informaData.value.employeeClass != undefined)
     formData.append("employeeClass", informaData.value.employeeClass);
-  if (informaData.value.rank != undefined && informaData.value.rank != "")
-    formData.append("rank", informaData.value.rank);
 
   dialogConfirm($q, async () => {
     showLoader();
@@ -310,15 +289,6 @@ function updateBirthDate(v: Date) {
   age.value = calculateAge(v);
 }
 
-function prefixRankRule() {
-  return [
-    () =>
-      !!informaData.value.rank ||
-      !!informaData.value.prefix ||
-      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
-  ];
-}
-
 /**
  * ทำงานเมื่อมีการเรียกใช้ Components
  */
@@ -413,7 +383,7 @@ onMounted(async () => {
             </div>
             <q-card-section class="q-px-lg">
               <div class="row q-col-gutter-sm">
-                <div class="col-2">
+                <div class="col-3">
                   <q-input
                     bg-color="white"
                     outlined
@@ -434,14 +404,13 @@ onMounted(async () => {
                     mask="#############"
                   />
                 </div>
-                <div class="col-2">
+                <div class="col-3">
                   <q-select
                     bg-color="white"
                     v-model="informaData.prefix"
                     label="คำนำหน้าชื่อ"
                     outlined
                     dense
-                    clearable
                     lazy-rules
                     class="inputgreen"
                     :options="Ops.prefixOps"
@@ -449,8 +418,11 @@ onMounted(async () => {
                     option-value="name"
                     map-options
                     hide-bottom-space
-                    :rules="prefixRankRule()"
-                    reactive-rules
+                    :rules="[
+                      (val:string) => {
+                        return val.length > 0 || 'กรุณาเลือกคำนำหน้าชื่อ';
+                      },
+                    ]"
                     emit-value
                     use-input
                     hide-selected
@@ -460,32 +432,6 @@ onMounted(async () => {
                     )"
                   />
                 </div>
-                <div class="col-2">
-                  <q-select
-                    bg-color="white"
-                    v-model="informaData.rank"
-                    label="ยศ"
-                    outlined
-                    dense
-                    lazy-rules
-                    clearable
-                    class="inputgreen"
-                    :options="Ops.rankOps"
-                    option-label="name"
-                    option-value="name"
-                    map-options
-                    hide-bottom-space
-                    :rules="prefixRankRule()"
-                    reactive-rules
-                    emit-value
-                    use-input
-                    hide-selected
-                    fill-input
-                    @filter="(inputValue:string,
-                    doneFn: Function) => filterSelector(inputValue, doneFn, 'rankOps'
-                    )"
-                  />
-                </div>
                 <div class="col-3">
                   <q-input
                     bg-color="white"
diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue
index 950cfa42c..2b680ec90 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail.vue
@@ -113,7 +113,6 @@ const Ops = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
-  rankOps: [],
 });
 const OpsFilter = ref<InformationOps>({
   prefixOps: [],
@@ -130,7 +129,6 @@ const OpsFilter = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
-  rankOps: [],
 });
 
 /** ฟังก์ชันดึงข้อมูลรายการข้อมูลเกี่ยวกับบุคคล (dropdown list)*/
@@ -188,16 +186,6 @@ async function fetchPerson() {
       });
       Ops.value.religionOps = optionreligions;
       OpsFilter.value.religionOps = optionreligions;
-
-      let rank: DataOption[] = [];
-      data.rank.map((r: DataOptioninfo) => {
-        rank.push({
-          id: r.id.toString(),
-          name: r.name.toString(),
-        });
-      });
-      Ops.value.rankOps = rank;
-      OpsFilter.value.rankOps = rank;
     })
     .catch((e) => {
       messageError($q, e);
@@ -227,9 +215,9 @@ async function getData() {
       }
       rows.value = list;
       profileId.value = data.profileId;
-      title.value.fullname = `${data.rank ? data.rank : data.prefix ?? ""}${
-        data.firstName ?? ""
-      } ${data.lastName ?? ""}`;
+      title.value.fullname = `${data.prefix ?? ""}${data.firstName ?? ""} ${
+        data.lastName ?? ""
+      }`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
@@ -242,7 +230,6 @@ async function getData() {
           (data.prefix == "00000000-0000-0000-0000-000000000000"
             ? null
             : data.prefix) ?? "",
-        rank: data.rank ?? "",
         firstname: data.firstName ?? "",
         lastname: data.lastName ?? "",
         birthDate:
@@ -308,7 +295,6 @@ async function fetchData(data: any) {
       (data.prefix == "00000000-0000-0000-0000-000000000000"
         ? null
         : data.prefix) ?? "",
-    rank: data.rank ?? "",
     firstname: data.firstName ?? "",
     lastname: data.lastName ?? "",
     birthDate: data.dateOfBirth !== null ? new Date(data.dateOfBirth) : null,
@@ -450,14 +436,6 @@ function filterSelector(val: string, update: Function, refData: string) {
       });
       break;
 
-    case "rankOps":
-      update(() => {
-        Ops.value.rankOps = OpsFilter.value.rankOps.filter(
-          (v: DataOption) => v.name.toLowerCase().indexOf(newVal) > -1
-        );
-      });
-      break;
-
     default:
       break;
   }
@@ -492,7 +470,6 @@ function saveData() {
         positionNumberOld: posNo.value,
         amount: 0,
         amountOld: salary.value,
-        rank: informaData.value.rank,
       };
       showLoader();
       http
@@ -540,15 +517,6 @@ function updateBirthDate(v: Date) {
   informaData.value.age = calculateAge(v);
 }
 
-function prefixRankRule() {
-  return [
-    () =>
-      !!informaData.value.rank ||
-      !!informaData.value.prefixId ||
-      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
-  ];
-}
-
 /** ทำงานเมื่อมีการเรียกใช้ Components*/
 onMounted(async () => {
   await fetchPerson();
@@ -630,7 +598,7 @@ onMounted(async () => {
               <div class="col-xs-12">
                 <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
               </div>
-              <div class="col-xs-6 col-sm-2 col-md-2">
+              <div class="col-xs-6 col-sm-3 col-md-3">
                 <q-input
                   :class="getClass(edit)"
                   hide-bottom-space
@@ -646,7 +614,7 @@ onMounted(async () => {
                   mask="#############"
                 />
               </div>
-              <div class="col-xs-6 col-sm-2 col-md-2">
+              <div class="col-xs-6 col-sm-3 col-md-3">
                 <selector
                   :hide-dropdown-icon="!edit"
                   hide-bottom-space
@@ -666,42 +634,10 @@ onMounted(async () => {
                   option-value="name"
                   :label="`${'คำนำหน้าชื่อ'}`"
                   use-input
-                  clearable
                   input-debounce="0"
-                  :rules="prefixRankRule()"
-                  reactive-rules
                   @filter="(inputValue:string, doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps' ) "
                 />
               </div>
-
-              <div class="col-xs-6 col-sm-2 col-md-2">
-                <selector
-                  :hide-dropdown-icon="!edit"
-                  hide-bottom-space
-                  :class="getClass(edit)"
-                  :readonly="!edit"
-                  :borderless="!edit"
-                  :outlined="edit"
-                  dense
-                  lazy-rules
-                  v-model="informaData.rank"
-                  emit-value
-                  map-options
-                  hide-selected
-                  fill-input
-                  :rules="prefixRankRule()"
-                  option-label="name"
-                  :options="Ops.rankOps"
-                  option-value="name"
-                  :label="`${'ยศ'}`"
-                  reactive-rules
-                  use-input
-                  input-debounce="0"
-                  @filter="(inputValue:string, doneFn:Function) => filterSelector(inputValue, doneFn,'rankOps' ) "
-                  clearable
-                />
-              </div>
-
               <div class="col-xs-6 col-sm-3 col-md-3">
                 <q-input
                   :class="getClass(edit)"
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index c26536d90..26e35a5cd 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -201,7 +201,6 @@ watch(modal, (val) => {
                 hide-bottom-space
                 dense
                 label="คำค้น"
-                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/05_placement/interface/index/ProfileType.ts b/src/modules/05_placement/interface/index/ProfileType.ts
index c24f44ca2..9086ce40f 100644
--- a/src/modules/05_placement/interface/index/ProfileType.ts
+++ b/src/modules/05_placement/interface/index/ProfileType.ts
@@ -7,7 +7,6 @@ interface InformationOps {
   religionOps: DataOption[];
   employeeClassOps: DataOption[];
   employeeTypeOps: DataOption[];
-  rankOps: DataOption[];
 }
 
 //ข้อมูลส่วนตัว
@@ -64,7 +63,6 @@ interface FormAddPerson {
   employeeType: string | null;
   employeeClass: string | null;
   profileType: string | null;
-  rank?: string;
 }
 
 const defaultInformation: Information = {
@@ -85,7 +83,6 @@ const defaultInformation: Information = {
   employeeType: null,
   employeeClass: null,
   profileType: null,
-  rank: null,
 };
 
 export { defaultInformation };
diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts
index d40ed1f50..d28d1cbc5 100644
--- a/src/modules/05_placement/interface/request/Main.ts
+++ b/src/modules/05_placement/interface/request/Main.ts
@@ -152,7 +152,6 @@ interface FormDataAppoint {
   reportingDate: string;
   posmasterId: string;
   posExecutiveName?: string;
-  posExecutiveId?: string;
   typeCommand: string;
   positionExecutiveField?: string;
   positionArea?: string;
diff --git a/src/modules/05_placement/interface/response/SelectOrg.ts b/src/modules/05_placement/interface/response/SelectOrg.ts
index 5e264e51e..d5fa88ed5 100644
--- a/src/modules/05_placement/interface/response/SelectOrg.ts
+++ b/src/modules/05_placement/interface/response/SelectOrg.ts
@@ -1,24 +1,17 @@
 interface DataList {
   avatar: string;
   bmaOfficer: string;
-  bmaOfficerCheck?: string;
   deferment: boolean;
   draft: string;
   examNumber: number;
   fullName: string;
   idCard: string;
   name: string;
-  node: number | null;
-  nodeId: string | null;
   orgName: string | null;
   organizationName: string;
   organizationShortName: string | null;
   personalId: string;
-  posLevelCandidateId: string | null;
-  posmasterId: string | null;
-  posTypeCandidateId: string | null;
   positionCandidate: string;
-  positionId: string | null;
   positionNumber: string | null;
   positionPath: string | null;
   profilePhoto: string;
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 2dd18e96d..af28e52c2 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -10,25 +10,25 @@ import type {
 } from "@/modules/05_placement/interface/request/Main";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 
-interface profile {
-  main: { columns: String[] };
-  education: { columns: String[] };
-  certicate: { columns: String[] };
-  train: { columns: String[] };
-  insignia: { columns: String[] };
-  coined: { columns: String[] };
-  assessment: { columns: String[] };
-  salary: { columns: String[] };
-  discipline: { columns: String[] };
-  leave: { columns: String[] };
-  talent: { columns: String[] };
-  work: { columns: String[] };
-  record: { columns: String[] };
-  other: { columns: String[] };
-  document: { columns: String[] };
-}
-
 export const useProfileDataStore = defineStore("profilePlacenent", () => {
+  interface profile {
+    main: { columns: String[] };
+    education: { columns: String[] };
+    certicate: { columns: String[] };
+    train: { columns: String[] };
+    insignia: { columns: String[] };
+    coined: { columns: String[] };
+    assessment: { columns: String[] };
+    salary: { columns: String[] };
+    discipline: { columns: String[] };
+    leave: { columns: String[] };
+    talent: { columns: String[] };
+    work: { columns: String[] };
+    record: { columns: String[] };
+    other: { columns: String[] };
+    document: { columns: String[] };
+  }
+
   const birthDate = ref<Date>(new Date());
   const retireText = ref<string | null>(null);
   const changeRetireText = (val: string | null) => {
@@ -87,15 +87,15 @@ export const useProfileDataStore = defineStore("profilePlacenent", () => {
     changeRetireText,
   };
 });
-interface placement {
-  mappingPosition: { columns: String[] };
-}
 export const usePlacementDataStore = defineStore("placement", () => {
   const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
   const tabsMain = ref<string>("probation");
   const isOfficer = ref<boolean | null>(null);
   const isStaff = ref<boolean | null>(null);
   const { hideLoader } = mixin;
+  interface placement {
+    mappingPosition: { columns: String[] };
+  }
   const placementData = ref<placement>({
     mappingPosition: { columns: [] },
   });
@@ -218,10 +218,10 @@ export const usePlacementDataStore = defineStore("placement", () => {
     isStaff,
   };
 });
-interface placementOrder {
-  mappingPosition: { columns: String[] };
-}
 export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
+  interface placementOrder {
+    mappingPosition: { columns: String[] };
+  }
   const placementOrderData = ref<placementOrder>({
     mappingPosition: { columns: [] },
   });
@@ -369,8 +369,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
   ]);
   const statusOp = ref<DataOptions[]>(statusMainOp.value);
 
-  const statusDelete = ["REPORT", "WAITING", "DONE"];
-
   const statusText = (val: string) => {
     switch (val) {
       case "WAITTING":
@@ -440,6 +438,5 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
     statusOp,
     statusMainOp,
     filterOption,
-    statusDelete,
   };
 });
diff --git a/src/modules/05_placement/stores/storeSelect.ts b/src/modules/05_placement/stores/storeSelect.ts
index c07f26fcb..48020472d 100644
--- a/src/modules/05_placement/stores/storeSelect.ts
+++ b/src/modules/05_placement/stores/storeSelect.ts
@@ -14,10 +14,9 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
       isPosition: e.isPosition,
       posMasterNo:
         e.orgShortname +
-        (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
-        " " +
+        (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : " ") +
         e.posMasterNo +
-        (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
+        (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : " "),
       positionName: e.positionName,
       posTypeName: e.posTypeName,
       posLevelName: e.posLevelName,
diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue
index 181222caa..efd36dc90 100644
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from "vue";
 import { useQuasar } from "quasar";
 
-import { useRouter, useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 import {
   checkPermission,
   checkPermissionList,
@@ -20,19 +20,11 @@ import DialogOrders from "@/modules/05_placement/components/Transfer/DialogOrder
 
 const $q = useQuasar();
 const router = useRouter();
-const route = useRoute();
 const mixin = useCounterMixin();
 const store = useTransferDataStore();
 const { statusText, filterOption } = useTransferDataStore();
-const {
-  date2Thai,
-  messageError,
-  showLoader,
-  hideLoader,
-  onSearchDataTable,
-  dialogRemove,
-  success,
-} = mixin;
+const { date2Thai, messageError, showLoader, hideLoader, onSearchDataTable } =
+  mixin;
 
 const modal = ref<boolean>(false); //ส่งไปออกคำสั่ง
 const dataTransfer = ref<ResponseData[]>([]); //ช่อมูลรายการขอโอน
@@ -149,15 +141,6 @@ const visibleColumns = ref<string[]>([
   "createdAt",
 ]);
 
-const isPermissionDelete = computed(() => {
-  return (status: string) => {
-    return (
-      checkPermission(route)?.attrOwnership === "OWNER" &&
-      !store.statusDelete.includes(status)
-    );
-  };
-});
-
 /** ฟังก์ชันดึงข้อมูรายการขอโอน*/
 async function fetchData() {
   showLoader();
@@ -211,21 +194,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.transfer + `/admin/${id}`);
-      await fetchData();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  * จะเรียกใช้ fetchData เพื่อดึงข้อมูลรายการขอโอน
@@ -369,18 +337,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>รายละเอียด</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="isPermissionDelete(props.row.status)"
-                  flat
-                  round
-                  dense
-                  icon="mdi-delete"
-                  color="red"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div v-if="col.name === 'no'">
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 2541ce000..f34bf8a48 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -110,9 +110,7 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format(val, row) {
-      return ` ${row.rank ? row.rank : row.prefix ?? ""}${
-        row.firstName ?? ""
-      } ${row.lastName ?? ""}`;
+      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
   {
@@ -133,11 +131,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.positionTypeOld && row.positionTypeOld !== "-"
+      return row.positionTypeOld
         ? `${row.positionTypeOld}${
-            row.positionLevelOld && row.positionLevelOld !== "-"
-              ? `(${row.positionLevelOld})`
-              : ""
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
           }`
         : "";
     },
@@ -313,7 +309,7 @@ function openDelete(id: string) {
   dialogRemove($q, async () => {
     showLoader();
     await http
-      .delete(config.API.receiveData() + `/admin/${id}`)
+      .delete(config.API.receiveDataId(id))
       .then(async () => {
         await fecthlistRecevice();
         await success($q, "ลบข้อมูลสำเร็จ");
@@ -382,7 +378,6 @@ async function onSave(data: FormDataAppoint) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
-    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();
@@ -606,10 +601,8 @@ onMounted(async () => {
 
                         <q-item
                           v-if="
-                            checkPermission($route)?.attrOwnership ===
-                              'OWNER' &&
+                            checkPermission($route)?.attrIsDelete &&
                             props.row.status !== 'REPORT' &&
-                            props.row.status !== 'WAITING' &&
                             props.row.status !== 'DONE'
                           "
                           clickable
diff --git a/src/modules/05_placement/views/04_helpGovernmentMain.vue b/src/modules/05_placement/views/04_helpGovernmentMain.vue
index 6c167b6a7..f25af0cfc 100644
--- a/src/modules/05_placement/views/04_helpGovernmentMain.vue
+++ b/src/modules/05_placement/views/04_helpGovernmentMain.vue
@@ -236,7 +236,8 @@ function openModalOrder() {
         item.status == "APPROVE") &&
       item.organizationPositionOld &&
       item.organization &&
-      item.dateStart
+      item.dateStart &&
+      item.dateEnd
   );
   rows2.value = row;
   rows2Data.value = row;
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index e04778221..9abaa643d 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -381,7 +381,7 @@ async function fecthlistappointment() {
           e.positionTypeOld &&
           e.positionLevelOld &&
           e.positionNumberOld &&
-          (e.typeCommand === "MOVE" || e.positionDate)
+          e.positionDate
       );
       rows2.value = listData;
       rows2Data.value = listData;
@@ -457,7 +457,6 @@ async function onSave(data: FormDataAppoint) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
-    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue
index 3a1da2bea..af63c652a 100644
--- a/src/modules/05_placement/views/07_appointEmployeeMain.vue
+++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue
@@ -252,7 +252,7 @@ async function fecthlistappointment() {
           e.positionTypeOld &&
           e.positionLevelOld &&
           e.positionNumberOld &&
-          (e.positionDate || e.typeCommand === "MOVE")
+          e.positionDate
       );
       rows2.value = listData;
       rows2Data.value = listData;
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue
index bfa730364..19ba41342 100644
--- a/src/modules/05_placement/views/08_otherMain.vue
+++ b/src/modules/05_placement/views/08_otherMain.vue
@@ -286,7 +286,6 @@ async function onSaveSelectOrg(data: any) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
-    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();
diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 08d05ff47..2f773e5e1 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -370,32 +370,18 @@ async function uploadFile(event: any, date: any) {
  */
 async function downloadAttachment(type: string, id: string) {
   showLoader();
-  try {
-    const response = await http.get(
-      config.API.retirementReport + `/${type}/${id}`,
-      {
-        headers: {
-          accept:
-            type === "pdf"
-              ? "application/pdf"
-              : "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-          "content-Type": "application/json",
-        },
-        responseType: "blob",
-      }
-    );
-    const blob = response.data;
-    const url = URL.createObjectURL(blob);
-    const link = document.createElement("a");
-    link.href = url;
-    link.download = `รายชื่อผู้เกษียณอายุราชการ.${type}`;
-    link.click();
-    URL.revokeObjectURL(url);
-  } catch (e) {
-    messageError($q, e);
-  } finally {
-    hideLoader();
-  }
+  await http
+    .get(config.API.reportRetireList(type, id))
+    .then(async (res) => {
+      const data = res.data.result;
+      await genReport(data, `รายชื่อผู้เกษียณอายุราชการ`, type);
+    })
+    .catch(async (e) => {
+      messageError($q, JSON.parse(await e.response.data.text()));
+    })
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 // ยืนยันการแก้ไขข้อมูล
diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 4d4dac874..9413a3488 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -771,7 +771,6 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
-          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate
diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index d40a2b1ec..b0061bcc4 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -36,7 +36,7 @@ const {
   dialogConfirm,
 } = useCounterMixin();
 
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailreject");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailReject");
 
 /** ตัวแปร */
 const roleUser = ref<string>("");
@@ -439,7 +439,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push('/retirement/resign')"
       />
-      รายละเอียดการยกเลิกลาออก 
+      รายละเอียดการยกเลิกลาออก
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}
diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue
index c4a1001b8..b5769dc33 100644
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@@ -33,8 +33,7 @@ const {
   showLoader,
   hideLoader,
   onSearchDataTable,
-  dialogRemove,
-  success,
+  findOrgName,
 } = mixin;
 
 /** Table */
@@ -258,21 +257,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.listResign() + `/admin/${id}`);
-      await fecthlist();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**Hook */
 onMounted(async () => {
   status.value = stroeResign.formQurey.status;
@@ -324,11 +308,7 @@ onMounted(async () => {
             color="primary"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>{{
-              `ส่งไปออกคำสั่ง${
-                stroeResign.mainTabs == "2" ? "ยกเลิกการ" : ""
-              }ลาออก`
-            }}</q-tooltip>
+            <q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
           </q-btn>
         </div>
         <q-space />
@@ -413,26 +393,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="
-                    checkPermission($route)?.attrOwnership === 'OWNER' &&
-                    props.row.status !== 'REPORT' &&
-                    props.row.status !== 'WAITING' &&
-                    props.row.status !== 'DONE' &&
-                    props.row.status !== 'CANCELING' &&
-                    props.row.status !== 'CANCEL' &&
-                    stroeResign.mainTabs === '1'
-                  "
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="delete"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index fddf3cf66..802f75753 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -801,7 +801,6 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
-          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index ff5313b80..4221aaaee 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const store = useRetirementDataStore();
 const { fetchDataCheckIsoffice } = useRoleWorkflowDataStore();
 const { convertStatusText } = store;
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailrejectEMP");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailRejectEMP");
 const mixin = useCounterMixin();
 const {
   messageError,
diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue
index 7eeee2f80..89a181576 100644
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@@ -27,15 +27,8 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const {
-  messageError,
-  date2Thai,
-  showLoader,
-  hideLoader,
-  onSearchDataTable,
-  dialogRemove,
-  success,
-} = mixin;
+const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
+  mixin;
 
 /** Table */
 const rows = ref<ResponseItems[]>([]);
@@ -136,7 +129,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "status",
     format(val, row) {
-      return stroeResign.mainTabsEMP === "1"
+      return stroeResign.mainTabs === "1"
         ? statusText(row.status)
         : statusText(row.status, "อนุญาต");
     },
@@ -259,21 +252,6 @@ function onSearch() {
   );
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.listResignEMP() + `/admin/${id}`);
-      await fecthlist();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**Hook */
 onMounted(async () => {
   statusEMP.value = stroeResign.formQureyEMP.status;
@@ -413,26 +391,6 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
-
-                <q-btn
-                  v-if="
-                    checkPermission($route)?.attrOwnership === 'OWNER' &&
-                    props.row.status !== 'REPORT' &&
-                    props.row.status !== 'WAITING' &&
-                    props.row.status !== 'DONE' &&
-                    props.row.status !== 'CANCELING' &&
-                    props.row.status !== 'CANCEL' &&
-                    stroeResign.mainTabsEMP === '1'
-                  "
-                  flat
-                  dense
-                  round
-                  color="red"
-                  icon="delete"
-                  @click.prevent="handleDelete(props.row.id)"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div
diff --git a/src/modules/06_retirement/components/DialogAddCommander.vue b/src/modules/06_retirement/components/DialogAddCommander.vue
index e4d3c697a..506e5b5ea 100644
--- a/src/modules/06_retirement/components/DialogAddCommander.vue
+++ b/src/modules/06_retirement/components/DialogAddCommander.vue
@@ -4,6 +4,7 @@ import { useQuasar, type QTableProps } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { getColumnLabel } from "@/utils/function";
 import { useCounterMixin } from "@/stores/mixin";
 
 import DialogHeader from "@/components/DialogHeader.vue";
@@ -228,7 +229,6 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
-                  @keydown.enter.prevent="onSearchData"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
@@ -308,7 +308,9 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{ col.label }}</span>
+                      <span class="text-weight-medium">{{
+                        getColumnLabel(col, isAct)
+                      }}</span>
                     </q-th>
                   </q-tr>
                 </template>
diff --git a/src/modules/06_retirement/views/09_retirementOld.vue b/src/modules/06_retirement/views/09_retirementOld.vue
index 64c05c218..0520a3c35 100644
--- a/src/modules/06_retirement/views/09_retirementOld.vue
+++ b/src/modules/06_retirement/views/09_retirementOld.vue
@@ -151,7 +151,7 @@ async function fetchDataRetirement() {
       firstNameTH: filter.value.firstNameTH.trim(),
       lastNameTH: filter.value.lastNameTH.trim(),
     });
-    const data: RetirementOld = response.data.result;
+    const data: RetirementOld = response.data.data;
     pagination.value.rowsNumber = data.totalRecords;
     rows.value = data.dataRecords;
   } catch (error) {
diff --git a/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue b/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
index 2cf7b60c3..3330aea56 100644
--- a/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
+++ b/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
@@ -35,7 +35,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => (v ? v + 543 : "-"),
+    format: (v) => v + 543,
   },
   {
     name: "receiveDate",
diff --git a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 7b093166b..9202066c0 100644
--- a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -267,13 +267,7 @@ watch(
                 <div class="q-pa-md q-gutter-md">
                   <div class="row">
                     <div class="col text-grey-8">เวลาเข้างาน</div>
-                    <div class="col">
-                      {{
-                        formData.checkInDate
-                          ? `${formData.checkInDate} ${formData.checkInTime} น.`
-                          : "-"
-                      }}
-                    </div>
+                    <div class="col">{{ formData.checkInTime }}</div>
                   </div>
                   <div class="row">
                     <div class="col text-grey-8">สถานที่ทำงาน</div>
@@ -343,23 +337,17 @@ watch(
                 <div class="q-pa-md q-gutter-md">
                   <div class="row">
                     <div class="col text-grey-8">เวลาออกงาน</div>
-                    <div class="col">
-                      {{
-                        formData.checkOutDate
-                          ? `${formData.checkOutDate} ${formData.checkOutTime} น.`
-                          : "-"
-                      }}
-                    </div>
+                    <div class="col">{{ formData.checkOutTime }}</div>
                   </div>
                   <div class="row">
                     <div class="col text-grey-8">สถานที่ทำงาน</div>
                     <div class="col" v-if="formData.isLocationCheckOut">
-                      {{ formData.checkOutLat ? "ในสถานที่" : "-" }}
+                      ในสถานที่
                     </div>
                     <div class="col" v-else>
                       {{
-                        formData.checkOutLocationName
-                          ? `นอกสถานที่ (${formData.checkOutLocationName})`
+                        formData.checkInLocationName
+                          ? `นอกสถานที่ (${formData.checkInLocationName})`
                           : ""
                       }}
                     </div>
diff --git a/src/modules/09_leave/components/02_WorkList/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
index 9c140b4e2..c33afe3c8 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -74,12 +74,6 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      if (row.checkInDate && val) {
-        return `${row.checkInDate} ${val} น.`;
-      }
-      return "-";
-    },
   },
   {
     name: "checkInLocation",
@@ -107,12 +101,6 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      if (row.checkOutDate && val) {
-        return `${row.checkOutDate} ${val} น.`;
-      }
-      return "-";
-    },
   },
   {
     name: "checkOutLocation",
@@ -172,19 +160,19 @@ async function fetchListTimeRecord() {
           id: e.id,
           fullName: e.fullName,
           profileType: e.profileType,
-          checkInDate: date2Thai(e.checkInDate),
+          checkInDate: e.checkInDate ? date2Thai(e.checkInDate) : "-",
           checkInTime: e.checkInTime,
           checkInLocation: e.checkInLocation,
-          checkInLat: e.checkInLat,
-          checkInLon: e.checkInLon,
+          checkInLat: e.checkInLat ? e.checkInLat : "",
+          checkInLon: e.checkInLon ? e.checkInLon : "",
           checkInStatus: e.checkInStatus
             ? workStore.convertSatatus(e.checkInStatus)
             : "-",
-          checkOutDate: date2Thai(e.checkOutDate),
-          checkOutLocation: e.checkOutLocation,
-          checkOutTime: e.checkOutTime,
-          checkOutLat: e.checkOutLat,
-          checkOutLon: e.checkOutLon,
+          checkOutDate: e.checkOutDate ? date2Thai(e.checkOutDate) : "-",
+          checkOutLocation: e.checkOutLocation ? e.checkOutLocation : "-",
+          checkOutTime: e.checkOutTime ? e.checkOutTime : "-",
+          checkOutLat: e.checkOutLat ? e.checkOutLat : "",
+          checkOutLon: e.checkOutLat ? e.checkOutLon : "",
           checkOutStatus: e.checkOutStatus
             ? workStore.convertSatatus(e.checkOutStatus)
             : "-",
diff --git a/src/modules/09_leave/components/02_WorkList/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue
index e385be482..6c6af46b8 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -70,12 +70,6 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      if (row.checkInDate && val) {
-        return `${row.checkInDate} ${val} น.`;
-      }
-      return "-";
-    },
   },
   {
     name: "checkInLocation",
@@ -94,12 +88,6 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      if (row.checkOutDate && val) {
-        return `${row.checkOutDate} ${val} น.`;
-      }
-      return "-";
-    },
   },
   {
     name: "checkOutLocation",
@@ -145,15 +133,15 @@ async function fetchListLogRecord() {
           profileType: e.profileType,
           fullName: e.fullName,
           checkInDate: e.checkInDate && date2Thai(e.checkInDate),
-          checkInTime: e.checkInTime,
-          checkInLocation: e.checkInLocation,
-          checkInLat: e.checkInLat,
-          checkInLon: e.checkInLon,
+          checkInTime: e.checkInTime ? e.checkInTime : "-",
+          checkInLocation: e.checkInLocation ? e.checkInLocation : "-",
+          checkInLat: e.checkInLat ? e.checkInLat : "",
+          checkInLon: e.checkInLon ? e.checkInLon : "",
           checkOutDate: e.checkOutDate && date2Thai(e.checkOutDate),
-          checkOutLocation: e.checkOutLocation,
-          checkOutTime: e.checkOutTime,
-          checkOutLat: e.checkOutLat,
-          checkOutLon: e.checkOutLon,
+          checkOutLocation: e.checkOutLocation ? e.checkOutLocation : "-",
+          checkOutTime: e.checkOutTime ? e.checkOutTime : "-",
+          checkOutLat: e.checkOutLat ? e.checkOutLat : "",
+          checkOutLon: e.checkOutLon ? e.checkOutLon : "",
         }));
       } else {
         rows.value = [];
diff --git a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
deleted file mode 100644
index 9533ea64e..000000000
--- a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
+++ /dev/null
@@ -1,491 +0,0 @@
-<script setup lang="ts">
-import { onMounted, reactive, ref } 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 { FormDataProcess } from "@/modules/09_leave/interface/request/work";
-import type { DataProcess } from "@/modules/09_leave/interface/response/work";
-
-import HeaderDialog from "@/components/DialogHeader.vue";
-
-const $q = useQuasar();
-const {
-  dialogConfirm,
-  showLoader,
-  hideLoader,
-  messageError,
-  success,
-  date2Thai,
-  onSearchDataTable,
-  convertDateToAPI,
-  dialogRemove,
-} = useCounterMixin();
-
-/** ข้อมูลตาราง*/
-const keyword = ref<string>("");
-const rowsMain = ref<DataProcess[]>([]);
-const rows = ref<DataProcess[]>([]);
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "no",
-    align: "left",
-    label: "ลำดับ",
-    sortable: false,
-    field: "no",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "startDate",
-    align: "left",
-    label: "วันเริ่มต้น",
-    sortable: true,
-    field: "startDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return val ? date2Thai(val) : "-";
-    },
-  },
-  {
-    name: "endDate",
-    align: "left",
-    label: "วันสิ้นสุด",
-    sortable: true,
-    field: "endDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return val ? date2Thai(val) : "-";
-    },
-  },
-  {
-    name: "processingDate",
-    align: "left",
-    label: "วันที่ประมวลผล",
-    sortable: true,
-    field: "processingDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return val ? date2Thai(val, false, true) : "-";
-    },
-  },
-  {
-    name: "completedDate",
-    align: "left",
-    label: "วันที่เสร็จสิ้น",
-    sortable: true,
-    field: "completedDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return val ? date2Thai(val, false, true) : "-";
-    },
-  },
-  {
-    name: "status",
-    align: "left",
-    label: "สถานะ",
-    sortable: true,
-    field: "status",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return convertStatus(val);
-    },
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: true,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format(val, row) {
-      return val ? date2Thai(val, false, true) : "-";
-    },
-  },
-  {
-    name: "createdFullName",
-    align: "left",
-    label: "ผู้สร้าง",
-    sortable: true,
-    field: "createdFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-const visibleColumns = ref<string[]>([
-  "no",
-  "startDate",
-  "endDate",
-  "processingDate",
-  "completedDate",
-  "status",
-  "createdAt",
-  "createdFullName",
-]);
-
-const modal = ref<boolean>(false); // dialog
-const isEdit = ref<boolean>(false); // แก้ไขหรือเพิ่ม
-const editId = ref<string>(""); // id ที่จะแก้ไข
-const formData = reactive<FormDataProcess>({
-  startDate: null,
-  endDate: null,
-});
-
-/** ฟังก์ชันดึงข้อมูลจาก API */
-async function fetchData() {
-  try {
-    showLoader();
-    // เรียก API เพื่อดึงข้อมูล
-    const res = await http.get(`${config.API.leaveTask}`);
-    rowsMain.value = res.data.result;
-    serchDataTable();
-  } catch (error) {
-    messageError($q, error);
-  } finally {
-    hideLoader();
-  }
-}
-
-/** ฟังก์ชันค้นหาข้อมูลในตาราง */
-function serchDataTable() {
-  rows.value = onSearchDataTable(
-    keyword.value,
-    rowsMain.value,
-    columns.value ? columns.value : []
-  );
-}
-
-/** ฟังก์ชันเปิด dialog เพื่อเพิ่มข้อมูล */
-function handleOpenDialog() {
-  modal.value = true;
-  isEdit.value = false;
-}
-
-/** ฟังก์ชันปิด dialog และรีเซ็ตข้อมูล */
-function handleCloseDialog() {
-  modal.value = false;
-  formData.startDate = null;
-  formData.endDate = null;
-  editId.value = "";
-}
-
-/** ฟังก์ชันส่งข้อมูล */
-function onSubmit() {
-  dialogConfirm($q, async () => {
-    showLoader();
-
-    // สร้าง payload สำหรับส่งข้อมูลไปยัง API
-    const payload = {
-      startDate: convertDateToAPI(formData.startDate),
-      endDate: convertDateToAPI(formData.endDate),
-    };
-
-    //กำหนด URL และ method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
-    const url = isEdit.value
-      ? `${config.API.leaveTask}/${editId.value}`
-      : config.API.leaveTask;
-
-    // กำหนด method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
-    const method = isEdit.value ? "put" : "post";
-
-    try {
-      await http[method](url, payload);
-      success($q, "บันทึกข้อมูลสำเร็จ");
-      fetchData();
-      handleCloseDialog();
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
-/** ฟังก์ชันตรวจสอบและอัปเดตวันที่สิ้นสุดให้เป็น null หากวันที่เริ่มต้นมากกว่าวันที่สิ้นสุด*/
-function updateDate() {
-  if (
-    formData.startDate &&
-    formData.endDate &&
-    new Date(formData.startDate) > new Date(formData.endDate)
-  ) {
-    formData.endDate = null;
-  }
-}
-
-/**
- * ฟังก์ชันแก้ไขข้อมูล
- * @param data ข้อมูลที่ต้องการแก้ไข
- */
-function handleEdit(data: DataProcess) {
-  isEdit.value = true;
-  editId.value = data.id;
-  formData.startDate = data.startDate;
-  formData.endDate = data.endDate;
-  modal.value = true;
-}
-
-/**
- * ฟังก์ชันลบข้อมูล
- * @param id ที่ต้องการลบ
- */
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    showLoader();
-    try {
-      await http.delete(`${config.API.leaveTask}/${id}`);
-      success($q, "ลบข้อมูลสำเร็จ");
-      fetchData();
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
-/**
- * ฟังก์ชันแปลงสถานะเป็นข้อความ
- * @param val
- */
-function convertStatus(val: string) {
-  switch (val) {
-    case "PENDING":
-      return "รอดำเนินการ";
-    case "COMPLETED":
-      return "ดำเนินการเสร็จสิ้น";
-    default:
-      break;
-  }
-}
-
-onMounted(() => {
-  fetchData();
-});
-</script>
-
-<template>
-  <div class="row items-center q-gutter-x-sm q-pb-sm">
-    <q-btn
-      round
-      dense
-      flat
-      color="primary"
-      icon="add"
-      @click="handleOpenDialog"
-    >
-      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-    </q-btn>
-
-    <q-space />
-
-    <q-input
-      dense
-      outlined
-      v-model="keyword"
-      label="ค้นหา"
-      @keydown.enter.prevent="serchDataTable"
-    >
-      <template v-slot:append>
-        <q-icon name="search" />
-      </template>
-    </q-input>
-    <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"
-      style="min-width: 140px"
-    />
-  </div>
-  <d-table
-    :columns="columns"
-    :rows="rows"
-    row-key="id"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th auto-width />
-        <q-th
-          v-for="col in props.cols"
-          :key="col.name"
-          :props="props"
-          style="color: #000000; font-weight: 500"
-        >
-          <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">
-        <q-td auto-width>
-          <q-btn
-            v-if="props.row.status === 'PENDING'"
-            dense
-            flat
-            round
-            color="edit"
-            icon="edit"
-            @click.stop.prevent="handleEdit(props.row)"
-          >
-            <q-tooltip>แก้ไข</q-tooltip>
-          </q-btn>
-
-          <q-btn
-            v-if="props.row.status === 'PENDING'"
-            dense
-            flat
-            round
-            color="red"
-            icon="delete"
-            @click.stop.prevent="handleDelete(props.row.id)"
-          >
-            <q-tooltip>ลบ</q-tooltip>
-          </q-btn>
-        </q-td>
-        <q-td v-for="col in props.cols" :key="col.name" :props="props">
-          <div v-if="col.name == 'no'">
-            {{ props.rowIndex + 1 }}
-          </div>
-          <div v-else>
-            {{ col.value ? col.value : "-" }}
-          </div>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
-
-  <q-dialog v-model="modal" persistent>
-    <q-card style="width: 320px">
-      <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <HeaderDialog
-          :tittle="'ประมวลผลการขาดราชการ/มาสาย'"
-          :close="handleCloseDialog"
-        />
-
-        <q-separator />
-        <q-card-section>
-          <div class="row q-col-gutter-md">
-            <div class="col-12">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="formData.startDate"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-                @update:model-value="updateDate"
-              >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    ref="dateRef"
-                    outlined
-                    dense
-                    hide-bottom-space
-                    :model-value="
-                      formData.startDate != null
-                        ? date2Thai(formData.startDate)
-                        : null
-                    "
-                    label="วันที่เริ่มต้น"
-                    :rules="[
-                      (val:string) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`,
-                    ]"
-                  >
-                    <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-12">
-              <datepicker
-                menu-class-name="modalfix"
-                v-model="formData.endDate"
-                :locale="'th'"
-                autoApply
-                borderless
-                :enableTimePicker="false"
-                week-start="0"
-                :min-date="formData.startDate"
-              >
-                <template #year="{ year }">
-                  {{ year + 543 }}
-                </template>
-                <template #year-overlay-value="{ value }">
-                  {{ parseInt(value + 543) }}
-                </template>
-                <template #trigger>
-                  <q-input
-                    ref="dateRef"
-                    outlined
-                    dense
-                    hide-bottom-space
-                    :model-value="
-                      formData.endDate != null
-                        ? date2Thai(formData.endDate)
-                        : null
-                    "
-                    label="วันที่สิ้นสุด"
-                    :rules="[
-                      (val:string) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
-                    ]"
-                  >
-                    <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>
-        </q-card-section>
-
-        <q-separator />
-        <q-card-actions align="right">
-          <q-btn color="secondary" label="บันทึก" type="submit" />
-        </q-card-actions>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/09_leave/components/02_WorkList/TableList.vue b/src/modules/09_leave/components/02_WorkList/TableList.vue
index f3f6305f6..9fd478cea 100644
--- a/src/modules/09_leave/components/02_WorkList/TableList.vue
+++ b/src/modules/09_leave/components/02_WorkList/TableList.vue
@@ -123,7 +123,7 @@ onMounted(() => {
             {{ props.rowIndex + 1 }}
           </div>
           <div v-else-if="col.name == 'checkInLocation'">
-            <q-item style="padding: 0" v-if="props.row.checkInLocation">
+            <q-item style="padding: 0">
               <q-item-section>
                 <q-item-label> {{ props.row.checkInLocation }}</q-item-label>
                 <q-item-label caption lines="2">{{
@@ -131,10 +131,9 @@ onMounted(() => {
                 }}</q-item-label>
               </q-item-section>
             </q-item>
-            <div v-else>-</div>
           </div>
           <div v-else-if="col.name == 'checkOutLocation'">
-            <q-item style="padding: 0" v-if="props.row.checkOutLocation">
+            <q-item style="padding: 0">
               <q-item-section>
                 <q-item-label> {{ props.row.checkOutLocation }}</q-item-label>
                 <q-item-label caption lines="2">{{
@@ -142,7 +141,6 @@ onMounted(() => {
                 }}</q-item-label>
               </q-item-section>
             </q-item>
-            <div v-else>-</div>
           </div>
           <div v-else-if="col.name == 'profileType'">
             {{
@@ -152,7 +150,7 @@ onMounted(() => {
             }}
           </div>
           <div v-else>
-            {{ col.value ? col.value : "-" }}
+            {{ col.value }}
           </div>
         </q-td>
       </q-tr>
diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index 954827e64..0448729fb 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -27,11 +27,7 @@ const {
   convertDateToAPI,
 } = mixin;
 
-const emit = defineEmits(["update:change-page", "update:selected"]);
-
-const isMultiple = defineModel<boolean>("isMultiple", {
-  default: false,
-});
+const emit = defineEmits(["update:change-page"]);
 
 /**Props */
 const props = defineProps({
@@ -44,10 +40,6 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  selectedMultiple: {
-    type: Array,
-    default: () => [],
-  },
 });
 
 /**FormData */
@@ -126,43 +118,18 @@ function onSubmit() {
 async function changeRound() {
   const formattedDateForAPI = await convertDateToAPI(formData.effectiveDate);
 
-  const urlAPI =
+  const url =
     props.type == "emp" ? config.API.leaveRoundEMP() : config.API.leaveRound();
   showLoader();
-
-  const urlFull = isMultiple.value ? urlAPI + `/multiple ` : urlAPI;
-  let payload: any;
-  if (isMultiple.value && props.selectedMultiple.length > 0) {
-    payload = props.selectedMultiple.map((item: any) => ({
-      profileId: item.profileId,
-      roundId: formData.round,
-      effectiveDate: formattedDateForAPI,
-      remark: formData.reson,
-      firstName: item.firstName,
-      lastName: item.lastName,
-      prefix: item.prefix,
-      rootDnaId: item.rootDnaId,
-      child1DnaId: item.child1DnaId,
-      child2DnaId: item.child2DnaId,
-      child3DnaId: item.child3DnaId,
-      child4DnaId: item.child4DnaId,
-    }));
-  } else {
-    payload = {
+  await http
+    .post(url, {
       profileId: props.personId,
       roundId: formData.round,
       effectiveDate: formattedDateForAPI,
       remark: formData.reson,
-    };
-  }
-  await http
-    .post(urlFull, payload)
+    })
     .then(() => {
       success($q, "บันทึกข้อมูลเปลี่ยนรอบเวลา");
-      if (isMultiple.value) {
-        emit("update:selected");
-        isMultiple.value = false;
-      }
       props.closeDialog?.();
     })
     .catch((err) => {
@@ -275,10 +242,10 @@ watch(
                 ? "เปลี่ยนรอบการปฏิบัติงาน"
                 : "ประวัติการเปลี่ยนรอบการปฏิบัติงาน"
             }}
-            <span class="text-teal-6" v-if="!isMultiple">
-              {{ props.DataRow ? props.DataRow.fullName : "" }}
-            </span>
-          </q-toolbar-title>
+            <span class="text-teal-6">{{
+              props.DataRow ? props.DataRow.fullName : ""
+            }}</span></q-toolbar-title
+          >
           <q-btn
             icon="close"
             unelevated
@@ -292,7 +259,7 @@ watch(
           <q-separator />
           <q-card-section style="max-height: 50vh" class="scroll q-pa-none">
             <div class="q-pa-md">
-              <div class="row" v-if="!isMultiple">
+              <div class="row">
                 <q-icon
                   name="mdi-label-variant"
                   class="cursor-pointer self-center"
@@ -300,12 +267,12 @@ watch(
                   size="md"
                 >
                 </q-icon>
-                <span class="self-center text-bold text-blue text-subtitle1">
-                  รอบปัจจุบัน
-                </span>
-                <span class="self-center text-subtitle1 q-ml-sm">
-                  {{ props.DataRow ? `${props.DataRow.currentRound} น.` : "" }}
-                </span>
+                <span class="self-center text-bold text-blue text-subtitle1"
+                  >รอบปัจจุบัน</span
+                >
+                <span class="self-center text-subtitle1 q-ml-sm">{{
+                  props.DataRow ? `${props.DataRow.currentRound} น.` : ""
+                }}</span>
               </div>
               <div class="row q-mt-sm q-col-gutter-sm">
                 <div class="col-6">
diff --git a/src/modules/09_leave/components/05_Leave/Calendar.vue b/src/modules/09_leave/components/05_Leave/Calendar.vue
index eff336884..14665b235 100644
--- a/src/modules/09_leave/components/05_Leave/Calendar.vue
+++ b/src/modules/09_leave/components/05_Leave/Calendar.vue
@@ -228,12 +228,8 @@ onMounted(async () => {
 <template>
   <div class="q-mt-sm">
     <div class="row q-gutter-sm">
-      <div class="col-3 scrollable-list">
-        <q-list
-          bordered
-          class="rounded-borders"
-          style="max-height: 80vh; overflow-y: auto"
-        >
+      <div class="col-3">
+        <q-list bordered class="rounded-borders">
           <q-item
             v-for="(item, i) in filterLists"
             :key="i"
diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index d8192d5ce..1ba2c0a2b 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -82,7 +82,6 @@ const formData = reactive<FormData>({
   status: "", //สถานะการของลา
   leaveLimit: 0, //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
   leaveSummary: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
-  leaveWaitingSummary: 0, //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: 0, //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
   leaveWrote: "", //เขียนที่
   leaveAddress: "", //สถานที่ติดต่อขณะลา
@@ -150,41 +149,21 @@ const rows = ref<RowsType>();
 // เช็คสิทธิ์การอนุมัติ
 const idCheck = computed(() => {
   if (typeAdd.value == "COMMANDER") {
-    return rows.value?.commanders.map((items: SeqTypeRow) => items.keyId);
+    return rows.value?.commanders.map((items: SeqTypeRow) => items.profileId);
   } else if (typeAdd.value == "APPROVER") {
-    return rows.value?.approvers.map((items: SeqTypeRow) => items.keyId);
+    return rows.value?.approvers.map((items: SeqTypeRow) => items.profileId);
   }
 });
 
 // เช็คสิทธิ์การเลือกผู้มีอำนาจ
 const commanderList = computed(() => {
-  if (typeAdd.value === "COMMANDER") {
-    return rows.value?.approvers.map((items: SeqTypeRow) => ({
-      profileId: items.profileId,
-      isAct: items.isAct,
-    }));
-  } else if (typeAdd.value === "APPROVER") {
-    return rows.value?.commanders.map((items: SeqTypeRow) => ({
-      profileId: items.profileId,
-      isAct: items.isAct,
-    }));
+  if (typeAdd.value == "COMMANDER") {
+    return rows.value?.approvers.map((items: SeqTypeRow) => items.profileId);
+  } else if (typeAdd.value == "APPROVER") {
+    return rows.value?.commanders.map((items: SeqTypeRow) => items.profileId);
   }
-  return [];
 });
 
-//
-const isAct = computed(() => {
-  if (typeAdd.value === "COMMANDER") {
-    return rows.value?.commanders && rows.value.commanders.length > 0
-      ? rows.value.commanders[0].isAct
-      : false;
-  } else if (typeAdd.value === "APPROVER") {
-    return rows.value?.approvers && rows.value.approvers.length > 0
-      ? rows.value.approvers[0].isAct
-      : false;
-  }
-  return false;
-});
 // เช็คว่าผู้ใช้มีสิทธิ์อนุมัติหรือไม่
 const approveCheck = computed(() => {
   const commanders = rows.value?.commanders;
@@ -412,9 +391,6 @@ async function fetchDetailLeave(paramsId: string) {
       formData.leaveRange = data.leaveRange;
       formData.commanderPosition = data.commanderPosition;
       formData.leaveRangeEnd = data.leaveRangeEnd;
-      formData.leaveWaitingSummary = data.leaveWaitingSummary
-        ? data.leaveWaitingSummary
-        : "0";
       keycloakUserId.value = data.keycloakUserId;
       rows.value = {
         commanders: data.commanders,
@@ -692,10 +668,10 @@ onMounted(async () => {
         fetchOptionType(),
         fetchKeycloakPositionData(),
         fetchDetailLeave(paramsId),
+        checkOfficer(),
       ]);
 
       await checkLeaveType(formData.leaveTypeId, formData);
-      await checkOfficer();
     } finally {
       hideLoader();
     }
@@ -797,50 +773,40 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="col-xs-12 col-sm-7 row">
-                  <div class="row col-12 q-col-gutter-md">
+                  <div class="row col-12 q-gutter-md">
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-md-3 col-xs-6"
+                      class="col-3"
                     >
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-blue-10">
                           {{ formData.leaveLimit }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>ได้รับ</span>
+                          <span class="gt-xs">ได้รับ</span>
                         </div>
                       </q-card>
                     </div>
-                    <div class="col-md-3 col-xs-6">
+                    <div class="col-3">
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-light-blue-6">
                           {{ formData.leaveSummary }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>ใช้ไป</span>
+                          <span class="gt-xs">ใช้ไป</span>
                         </div>
                       </q-card>
                     </div>
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-md-3 col-xs-6"
+                      class="col-3"
                     >
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-indigo-7">
                           {{ formData.leaveRemain }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>คงเหลือ</span>
-                        </div>
-                      </q-card>
-                    </div>
-                    <div class="col-md-3 col-xs-6">
-                      <q-card bordered class="items-center row col-12 q-pa-md">
-                        <div class="text-h6 text-weight-bold text-light-blue-6">
-                          {{ formData.leaveWaitingSummary }}
-                        </div>
-                        <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>อยู่ระหว่างการพิจารณา</span>
+                          <span class="gt-xs">คงเหลือ</span>
                         </div>
                       </q-card>
                     </div>
@@ -1292,6 +1258,5 @@ onMounted(async () => {
     :id-check="idCheck"
     :keycloak-user-id="keycloakUserId"
     :commanders-list="commanderList"
-    :commanders-is-act="isAct"
   />
 </template>
diff --git a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
index 6653eed35..6b0e4e44b 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
@@ -151,7 +151,6 @@ const formData = reactive<FormData>({
   leaveSubTypeName: "",
   commanderPosition: "",
   leaveRangeEnd: "",
-  leaveWaitingSummary: 0, //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
 });
 
 const isLoadData = ref<boolean>(false);
@@ -218,9 +217,6 @@ async function fetchDetailLeave(paramsId: string) {
       formData.leaveLimit = data.leaveLimit;
       formData.leaveSummary = data.leaveSummary;
       formData.leaveRemain = data.leaveRemain;
-      formData.leaveWaitingSummary = data.leaveWaitingSummary
-        ? data.leaveWaitingSummary
-        : 0;
       formData.leaveWrote = data.leaveWrote;
       formData.leaveAddress = data.leaveAddress;
       formData.leaveNumber = data.leaveNumber;
@@ -630,50 +626,40 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="col-xs-12 col-sm-7 row">
-                  <div class="row col-12 q-col-gutter-md">
+                  <div class="row col-12 q-gutter-md">
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-md-3 col-xs-6"
+                      class="col-3"
                     >
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-blue-10">
                           {{ formData.leaveLimit }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>ได้รับ</span>
+                          <span class="gt-xs">ได้รับ</span>
                         </div>
                       </q-card>
                     </div>
-                    <div class="col-md-3 col-xs-6">
+                    <div class="col-3">
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-light-blue-6">
                           {{ formData.leaveSummary }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>ใช้ไป</span>
+                          <span class="gt-xs">ใช้ไป</span>
                         </div>
                       </q-card>
                     </div>
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-md-3 col-xs-6"
+                      class="col-3"
                     >
                       <q-card bordered class="items-center row col-12 q-pa-md">
                         <div class="text-h6 text-weight-bold text-indigo-7">
                           {{ formData.leaveRemain }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>คงเหลือ</span>
-                        </div>
-                      </q-card>
-                    </div>
-                    <div class="col-md-3 col-xs-6">
-                      <q-card bordered class="items-center row col-12 q-pa-md">
-                        <div class="text-h6 text-weight-bold text-light-blue-6">
-                          {{ formData.leaveWaitingSummary }}
-                        </div>
-                        <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span>อยู่ระหว่างการพิจารณา</span>
+                          <span class="gt-xs">คงเหลือ</span>
                         </div>
                       </q-card>
                     </div>
diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
index e7697ce5b..c3eac2353 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -4,6 +4,7 @@ import { useQuasar, type QTableProps } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { getColumnLabel } from "@/utils/function";
 import { useCounterMixin } from "@/stores/mixin";
 
 import DialogHeader from "@/components/DialogHeader.vue";
@@ -29,7 +30,6 @@ const props = defineProps({
   fetchDetailLeave: Function,
   idCheck: Array,
   commandersList: Array,
-  commandersIsAct: Boolean,
 });
 
 const pageId = ref<string>(route.params.id as string);
@@ -117,7 +117,7 @@ async function getData() {
       total.value = data.total;
       rows.value = data.data;
       selected.value = data.data.filter((items: any) => {
-        return props.idCheck?.some((i: any) => i === items.key);
+        return props.idCheck?.some((i: any) => i === items.id);
       });
     })
     .catch((err) => {
@@ -153,14 +153,10 @@ function onSubmit() {
       ]
         .filter(Boolean)
         .join(" "),
-      isAct: isAct.value,
-      keyId: items.key,
     }));
 
     const hasCommander = selected.value.some((e) =>
-      props.commandersList?.some(
-        (i: any) => i.profileId === e.id && i.isAct === isAct.value
-      )
+      props.commandersList?.some((i: any) => i === e.id)
     );
 
     if (hasCommander) {
@@ -209,7 +205,6 @@ watch(
   () => modal.value,
   () => {
     if (modal.value) {
-      isAct.value = props.commandersIsAct ?? false;
       getSearch();
     }
   }
@@ -238,7 +233,6 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
-                  @keydown.enter.prevent="onSearchData()"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
@@ -318,7 +312,9 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{ col.label }}</span>
+                      <span class="text-weight-medium">{{
+                        getColumnLabel(col, isAct)
+                      }}</span>
                     </q-th>
                   </q-tr>
                 </template>
diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index 74b2de08c..65a8a2c3c 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -1,59 +1,17 @@
 <script setup lang="ts">
-import { ref, onMounted, computed } from "vue";
-import { useQuasar } from "quasar";
+import { ref, onMounted, watch } from "vue";
 import type { QTableProps } from "quasar";
-import { useRouter, useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 
 import { checkPermission } from "@/utils/permissions";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
-import { useCounterMixin } from "@/stores/mixin";
-import http from "@/plugins/http";
-import config from "@/app.config";
 
-const $q = useQuasar();
 const leaveStore = useLeavelistDataStore();
-const route = useRoute();
 const router = useRouter();
-const { showLoader, hideLoader, messageError, dialogRemove, success } =
-  useCounterMixin();
 
 const total = defineModel<number>("total", { required: true });
 const totalList = defineModel<number>("totalList", { required: true });
 const pagination = defineModel<any>("pagination", { required: true });
-const props = defineProps({
-  getList: Function,
-  rows: {
-    type: Object,
-    require: true,
-  },
-  page: {
-    type: Number,
-    require: true,
-  },
-  rowsPerPage: {
-    type: Number,
-    require: true,
-  },
-  maxPage: {
-    type: Number,
-    require: true,
-  },
-  totalList: {
-    type: Number,
-    require: true,
-  },
-  dataToobar: Object,
-});
-
-const isPermissionDelete = computed(() => {
-  return (status: string) => {
-    return (
-      checkPermission(route)?.attrOwnership === "OWNER" &&
-      !leaveStore.statusDelete.includes(status) &&
-      leaveStore.tabMenu === "1"
-    );
-  };
-});
 
 /** ข้อมูลหัวตาราง รายการลา */
 const columnsLeave = ref<QTableProps["columns"]>([
@@ -254,6 +212,31 @@ const visibleReject = ref<string[]>([
   "status",
 ]);
 
+const props = defineProps({
+  getList: Function,
+  rows: {
+    type: Object,
+    require: true,
+  },
+  page: {
+    type: Number,
+    require: true,
+  },
+  rowsPerPage: {
+    type: Number,
+    require: true,
+  },
+  maxPage: {
+    type: Number,
+    require: true,
+  },
+  totalList: {
+    type: Number,
+    require: true,
+  },
+  dataToobar: Object,
+});
+
 /** ไปหน้ารายละเอียด */
 function redirectToDetail(id: string) {
   const routePrefix = leaveStore.tabMenu === "1" ? "/leave" : "/leave-reject";
@@ -265,37 +248,6 @@ function updatePagination(newPagination: any) {
   pagination.value.rowsPerPage = newPagination.rowsPerPage;
 }
 
-/**
- * ฟังก์ชันสำหรับดึงชื่อ CSS Class ตามสถานะ
- * @param statusText สถานะของรายการ
- */
-function getStatusColor(statusText: string) {
-  const statusMap: Record<string, string> = {
-    APPROVE: "text-green-6",
-    REJECT: "text-red",
-    NEW: "text-blue",
-    PENDING: "text-warning",
-    // DELETE  DELETING
-  };
-
-  return statusMap[statusText.toUpperCase()] ?? "";
-}
-
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    try {
-      showLoader();
-      await http.delete(config.API.leaveList() + `/${id}`);
-      await props.getList?.();
-      success($q, "ลบข้อมูลสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /** Hook*/
 onMounted(() => {
   if (leaveStore.tabMenu === "1") {
@@ -345,23 +297,23 @@ onMounted(() => {
           >
             <q-tooltip>รายละเอียด</q-tooltip>
           </q-btn>
-          <q-btn
-            v-if="isPermissionDelete(props.row.statusText)"
-            flat
-            round
-            dense
-            icon="mdi-delete"
-            color="red"
-            @click.prevent="handleDelete(props.row.id)"
-          >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
           :key="col.name"
           :props="props"
-          :class="getStatusColor(props.row.statusText)"
+          :class="
+            props.row.statusText == 'REJECT'
+              ? 'text-red'
+              : props.row.statusText == 'NEW'
+              ? 'text-blue'
+              : props.row.statusText == 'PENDING'
+              ? 'text-warning'
+              : props.row.statusText == 'DELETE' ||
+                props.row.statusText == 'DELETING'
+              ? 'text-orange'
+              : ''
+          "
         >
           <div v-if="col.name == 'no'">
             {{
diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index d30d19755..19d468cec 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -10,7 +10,6 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveHistoryDataStore } from "@/modules/09_leave/stores/LeaveHistoryStore";
 import { calculateFiscalYear } from "@/utils/function";
 import { usePagination } from "@/composables/usePagination";
-import { checkPermission } from "@/utils/permissions";
 
 import type { QTableColumn } from "quasar";
 import type { DataOption } from "@/modules/09_leave/interface/index/Main";
@@ -105,18 +104,10 @@ async function onSubmit() {
       leaveTypeId: formData.leaveTypeId,
       leaveYear: formData.leaveYear,
       leaveDays: formData.leaveDays ? Number(formData.leaveDays) : 0,
-      leaveDaysUsed:
-        checkPermission(route)?.attrOwnership === "OWNER"
-          ? formData.leaveDaysUsed
-            ? Number(formData.leaveDaysUsed)
-            : 0
-          : undefined,
-      leaveCount:
-        checkPermission(route)?.attrOwnership === "OWNER"
-          ? formData.leaveCount
-            ? Number(formData.leaveCount)
-            : 0
-          : undefined,
+      leaveDaysUsed: formData.leaveDaysUsed
+        ? Number(formData.leaveDaysUsed)
+        : 0,
+      leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
       beginningLeaveDays: formData.beginningLeaveDays
         ? Number(formData.beginningLeaveDays)
         : 0,
@@ -274,6 +265,7 @@ watch(modal, async (val) => {
       await Promise.all([
         filterLeaveTypeData(),
         isStatusEdit.value && defineDataLeaveBeginning(rowData.value),
+        console.log(rowData.value),
       ]);
     } finally {
       hideLoader();
@@ -322,7 +314,6 @@ watch(modal, async (val) => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
-                    @keydown.enter.prevent="onSearchData(true)"
                   >
                     <template v-slot:after>
                       <q-btn
@@ -396,7 +387,7 @@ watch(modal, async (val) => {
             <q-separator vertical />
 
             <!-- input -->
-            <div class="col overflow-auto q-pa-md">
+            <div class="col overflow-hidden q-pa-md">
               <div class="row q-col-gutter-sm">
                 <div class="col-12">
                   <datepicker
@@ -407,7 +398,6 @@ watch(modal, async (val) => {
                     year-picker
                     :enableTimePicker="false"
                     :max-date="`${calculateFiscalYear(new Date())}, 12, 31`"
-                    :class="classInput(true)"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -464,7 +454,7 @@ watch(modal, async (val) => {
                     </template>
                   </q-select>
                 </div>
-                <div v-show="leaveTypeCode === 'LV-005'" class="col-12">
+                <div class="col-12">
                   <q-input
                     :class="classInput(leaveTypeCode == 'LV-005')"
                     :readonly="leaveTypeCode !== 'LV-005'"
@@ -472,8 +462,31 @@ watch(modal, async (val) => {
                     dense
                     outlined
                     label="จำนวนสิทธิ์การลา"
-                    hint="* สำหรับลาพักผ่อนเท่านั้น คือสิทธิ์ลาประจำปี + สิทธิ์สะสม"
-                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
+                    hide-bottom-space
+                  />
+                </div>
+                <div class="col-12">
+                  <q-input
+                    :class="classInput(true)"
+                    v-model="formData.leaveDaysUsed"
+                    dense
+                    outlined
+                    label="ที่ใช้ไป (วัน)"
+                    hide-bottom-space
+                    mask="#"
+                    reverse-fill-mask
+                  />
+                </div>
+                <div class="col-12">
+                  <q-input
+                    :class="classInput(true)"
+                    v-model="formData.leaveCount"
+                    dense
+                    outlined
+                    label="ที่ใช้ไป (ครั้ง)"
+                    hide-bottom-space
+                    mask="#"
+                    reverse-fill-mask
                   />
                 </div>
 
@@ -483,9 +496,10 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveDays"
                     dense
                     outlined
-                    label="จำนวนวันลาก่อนใช้งานระบบ"
-                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    hint="* จำนวนวันรวมการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
+                    label="ยกมา (วัน)"
+                    hide-bottom-space
+                    mask="#"
+                    reverse-fill-mask
                   />
                 </div>
 
@@ -495,38 +509,10 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveCount"
                     dense
                     outlined
-                    label="จำนวนครั้งที่ลาก่อนใช้งานระบบ"
-                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
-                    hint="* จำนวนครั้งของการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
-                  />
-                </div>
-
-                <div
-                  v-if="checkPermission(route)?.attrOwnership === 'OWNER'"
-                  class="col-12"
-                >
-                  <q-input
-                    :class="classInput(true)"
-                    v-model="formData.leaveDaysUsed"
-                    dense
-                    outlined
-                    label="ที่ใช้ไปทั้งหมด (วัน)"
+                    label="ยกมา (ครั้ง)"
                     hide-bottom-space
-                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                  />
-                </div>
-                <div
-                  v-if="checkPermission(route)?.attrOwnership === 'OWNER'"
-                  class="col-12"
-                >
-                  <q-input
-                    :class="classInput(true)"
-                    v-model="formData.leaveCount"
-                    dense
-                    outlined
-                    label="ที่ใช้ไปทั้งหมด (ครั้ง)"
-                    hide-bottom-space
-                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                    mask="#"
+                    reverse-fill-mask
                   />
                 </div>
               </div>
diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index bdc339a04..ed8c9347a 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -4,8 +4,6 @@ interface DataPost {
   lastName: string;
   page: number;
   pageSize: number;
-  selectedNodeId?: string | null;
-  selectedNode?: string;
 }
 
 interface DataOption {
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
index 27426c709..95b81143e 100644
--- a/src/modules/09_leave/interface/request/leave.ts
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -41,7 +41,6 @@ interface FormData {
   status: string; //สถานะการของลา
   leaveLimit: number; //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
   leaveSummary: number; //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
-  leaveWaitingSummary: number; //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: number; //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
   // leaveStartDate: Date | null; //*วัน เดือน ปีเริ่มต้นลา
   // leaveEndDate: Date | null; //*วัน เดือน ปีสิ้นสุดลา
diff --git a/src/modules/09_leave/interface/request/work.ts b/src/modules/09_leave/interface/request/work.ts
index c448c9fc9..e69de29bb 100644
--- a/src/modules/09_leave/interface/request/work.ts
+++ b/src/modules/09_leave/interface/request/work.ts
@@ -1,6 +0,0 @@
-interface FormDataProcess {
-  startDate: Date | null;
-  endDate: Date | null;
-}
-
-export type { FormDataProcess };
diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts
index 81dd4b42d..8ad8f42f4 100644
--- a/src/modules/09_leave/interface/response/leave.ts
+++ b/src/modules/09_leave/interface/response/leave.ts
@@ -50,8 +50,6 @@ interface SeqTypeRow {
   keycloakId: string;
   approveStatus: string;
   comment: string;
-  keyId?: string;
-  isAct?: boolean;
 }
 interface DataDateMonthObject {
   month: number;
diff --git a/src/modules/09_leave/interface/response/work.ts b/src/modules/09_leave/interface/response/work.ts
index af055b794..41df27b5f 100644
--- a/src/modules/09_leave/interface/response/work.ts
+++ b/src/modules/09_leave/interface/response/work.ts
@@ -85,24 +85,4 @@ interface FormDetail {
   checkInLocationName: string;
   checkOutLocationName: string;
 }
-
-interface DataProcess {
-  id: string;
-  createdFullName: string;
-  createdAt: Date | null;
-  status: string;
-  startDate: Date | null;
-  endDate: Date | null;
-  processingDate: Date | null;
-  completedDate: Date | null;
-  errorMessage: string | null;
-}
-
-export type {
-  TableRows,
-  DataResLog,
-  DataResTime,
-  TableRowsTime,
-  FormDetail,
-  DataProcess,
-};
+export type { TableRows, DataResLog, DataResTime, TableRowsTime, FormDetail };
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 8914ebd4f..eda800a4f 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -125,7 +125,7 @@ export const useChangeRoundDataStore = defineStore(
 
     async function fetchDataForCardId(dataDetail: any, type?: string) {
       if (dataDetail) {
-        // showLoader();
+        showLoader();
         const url =
           type && type == "emp"
             ? config.API.leaveSearchEMP()
@@ -138,8 +138,6 @@ export const useChangeRoundDataStore = defineStore(
             page: dataDetail.page, //หน้า
             pageSize: dataDetail.pageSize || 10, //จำนวนแถวต่อหน้า
             keyword: dataDetail.keyword || "", //keyword ค้นหา
-            selectedNodeId: dataDetail.selectedNodeId, //id ต้นไม้ที่เลือก
-            selectedNode: dataDetail.selectedNode, //ระดับต้นไม้ที่เลือก
           })
           .then((res) => {
             const apiData = res.data.result.data;
@@ -150,7 +148,6 @@ export const useChangeRoundDataStore = defineStore(
             if (apiData.length > 0) {
               checkCilck.value = false;
               rows.value = apiData.map((e: any) => ({
-                ...e,
                 profileId: e.profileId,
                 cardId: e.citizenId,
                 fullName: e.fullName,
@@ -170,7 +167,7 @@ export const useChangeRoundDataStore = defineStore(
             console.log(e);
           })
           .finally(() => {
-            // hideLoader();
+            hideLoader();
           });
       }
     }
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 280ae58cb..6c0665db3 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -44,8 +44,6 @@ export const useLeavelistDataStore = defineStore("leave", () => {
 
   const leaveType = ref<LeaveType[]>([]);
 
-  const statusDelete = ["APPROVE", "DELETING", "DELETE"];
-
   /**
    * ฟังก์ชั่น fetchListLeave
    * @param data รับข้อมูลจาก Page
@@ -266,6 +264,5 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     leaveTypeOption,
     leaveTypeList,
     fetchKeycloakPosition,
-    statusDelete,
   };
 });
diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 83024a8ef..4196c93b6 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -11,14 +11,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     { id: "NOT_COMPLETE", name: "ปฏิบัติงานไม่ครบตามกำหนดเวลา" },
   ]);
 
-  const optionStatusMain = ref<DataOption[]>([
-    { id: "ALL", name: "ทั้งหมด" },
-    { id: "PENDING", name: "รอดำเนินการ" },
-    { id: "APPROVE", name: "อนุมัติ" },
-    { id: "REJECT", name: "ไม่อนุมัติ" },
-  ]);
-
-  // convertStatus
+  // convertSatatus
   function convertStatus(val: string) {
     const value = val ? val.toUpperCase() : null;
     switch (value) {
@@ -36,6 +29,5 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   return {
     optionStatus,
     convertStatus,
-    optionStatusMain,
   };
 });
diff --git a/src/modules/09_leave/views/02_WorkingMain.vue b/src/modules/09_leave/views/02_WorkingMain.vue
index fed615baf..99387a4bb 100644
--- a/src/modules/09_leave/views/02_WorkingMain.vue
+++ b/src/modules/09_leave/views/02_WorkingMain.vue
@@ -1,26 +1,15 @@
 <script setup lang="ts">
-import { computed, ref, toRefs } from "vue";
+import { ref, toRefs } from "vue";
 
 import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
-import { checkPermission } from "@/utils/permissions";
-import { useRoute } from "vue-router";
 
 /** import Components */
 import Tab1 from "@/modules/09_leave/components/02_WorkList/Tab1.vue";
 import Tab2 from "@/modules/09_leave/components/02_WorkList/Tab2.vue";
-import Tab3 from "@/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue";
 
 const stores = useWorklistDataStore();
-const route = useRoute();
-const { tabs } = toRefs(stores);
 
-const isPermissionTab3 = computed(() => {
-  return (
-    checkPermission(route)?.attrOwnership === "OWNER" ||
-    (checkPermission(route)?.attrOwnership === "STAFF" &&
-      checkPermission(route)?.attrIsUpdate)
-  );
-});
+const { tabs } = toRefs(stores);
 </script>
 
 <template>
@@ -41,12 +30,6 @@ const isPermissionTab3 = computed(() => {
     >
       <q-tab name="1" label="รายการลงเวลาที่ประมวลผลแล้ว" />
       <q-tab name="2" label="รายการลงเวลา" />
-      <q-tab
-        v-if="isPermissionTab3"
-        name="3"
-        label="ประมวลผลการขาดราชการ/มาสาย"
-      />
-      <!-- เพิ่มแท็บใหม่ -->
     </q-tabs>
 
     <q-separator />
@@ -59,9 +42,6 @@ const isPermissionTab3 = computed(() => {
         <q-tab-panel name="2">
           <Tab2 />
         </q-tab-panel>
-        <q-tab-panel name="3">
-          <Tab3 />
-        </q-tab-panel>
       </q-tab-panels>
     </div>
   </q-card>
diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index 92f50c679..fdb7433d5 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, reactive, onMounted, nextTick } from "vue";
+import { ref, watch, reactive, onMounted } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -7,20 +7,22 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useChangeRoundDataStore } from "@/modules/09_leave/stores/ChangeRoundStore";
 import { checkPermission } from "@/utils/permissions";
-import { useStructureTree } from "@/stores/structureTree";
-import { useRoute } from "vue-router";
 
 import type { DataPost } from "@/modules/09_leave/interface/request/changeRound";
 
 import Dialogform from "@/modules/09_leave/components/03_ChangeRound/DialogForm.vue";
 
 /** useStore */
-const route = useRoute();
 const mixin = useCounterMixin();
-
-const { showLoader, hideLoader, success, messageError, dialogConfirm } = mixin;
+const {
+  showLoader,
+  hideLoader,
+  success,
+  messageError,
+  dialogMessageNotify,
+  dialogConfirm,
+} = mixin;
 const dataStore = useChangeRoundDataStore();
-const { fetchStructureTree } = useStructureTree();
 
 /** use */
 const $q = useQuasar();
@@ -35,42 +37,9 @@ const formData = reactive<DataPost>({
   firstName: "",
   lastName: "",
   page: 1,
-  pageSize: 100,
-  selectedNodeId: null,
-  selectedNode: "",
+  pageSize: 10,
 });
 
-const pagination = ref({
-  page: 1,
-  rowsPerPage: 0,
-});
-
-/** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
-const nodeTree = ref<any[]>([]);
-const expanded = ref<string[]>([]);
-const orgTreeId = ref<string | null>(null);
-const filter = ref<string>("");
-const selected = ref<any[]>([]);
-const isMultiple = ref<boolean>(false);
-
-/** client-side data & batch loading **/
-const allRows = ref<any[]>([]);
-const isLoadingAll = ref<boolean>(false);
-const loadAllProgress = ref<number>(0);
-const totalToLoad = ref<number | null>(null);
-const BATCH_SIZE = 250;
-
-function waitForUi() {
-  return new Promise((resolve) => {
-    setTimeout(resolve, 0);
-  });
-}
-
-/** function fetch ข้อมูลของ Tree*/
-async function fetchDataTree() {
-  nodeTree.value = await fetchStructureTree(route.meta.Key as string, true);
-}
-
 /**
  * Function openPopup
  * @param check action edit,history
@@ -118,7 +87,6 @@ async function OpenmodalFix(detail: any) {
 function closeDialog() {
   modal.value = false;
   modalFix.value = false;
-  isMultiple.value = false;
 }
 
 function save() {
@@ -142,416 +110,214 @@ function save() {
   });
 }
 
-/** Function โหลดข้อมูลทั้งหมดแบบ batch แล้วให้ QTable ทำ pagination เอง */
-async function fetchAllData() {
-  isLoadingAll.value = true;
-  allRows.value = [];
-  loadAllProgress.value = 0;
-  totalToLoad.value = null;
-  selected.value = [];
-
-  // ให้ UI แสดงสถานะกำลังโหลดทันที ก่อนรอผล API แรก
-  await nextTick();
-  await waitForUi();
-
-  try {
-    await dataStore.fetchDataForCardId({
-      ...formData,
-      page: 1,
-      pageSize: BATCH_SIZE,
-    });
-    allRows.value = dataStore.rows.slice();
-
-    const total = dataStore.totalListMain;
-    totalToLoad.value = total;
-    const totalPages = Math.ceil(total / BATCH_SIZE);
-    loadAllProgress.value =
-      totalPages <= 1 ? 100 : Math.round(100 / totalPages);
-    await nextTick();
-
-    for (let page = 2; page <= totalPages; page++) {
-      await dataStore.fetchDataForCardId({
-        ...formData,
-        page,
-        pageSize: BATCH_SIZE,
-      });
-      allRows.value.push(...dataStore.rows);
-      loadAllProgress.value = Math.round((page / totalPages) * 100);
-      await nextTick();
-      await waitForUi();
-    }
-  } finally {
-    isLoadingAll.value = false;
-    totalToLoad.value = null;
-  }
+/**
+ * function updatePagination
+ * @param newPagination ข้อมูล Pagination ใหม่
+ */
+function updatePagination(newPagination: any) {
+  formData.pageSize = newPagination.rowsPerPage;
 }
 
 /** Function ค้นหาข้อมูล */
 async function searchData() {
-  await fetchAllData();
-}
-
-function submitSearchByEnter() {
-  if (isLoadingAll.value) return;
-  if (!checkPermission(route)?.attrIsGet) return;
-  formData.page = 1;
-  searchData();
-}
-
-/** Function เลือกทั้งหมด */
-function selectAllRows() {
-  selected.value = [...allRows.value];
-}
-
-function onSelectedOrgTree(data: any) {
-  if (isLoadingAll.value) return;
-  selected.value = [];
-  allRows.value = [];
-  orgTreeId.value = data.orgTreeId;
-  formData.selectedNodeId = data.orgTreeDnaId;
-  formData.selectedNode = data.orgLevel;
-  formData.page = 1;
-}
-
-function handleSelectMultiple() {
-  modal.value = true;
-  isMultiple.value = true;
-  editCheck.value = "edit";
-}
-
-function resetSelected() {
-  selected.value = [];
+  if (formData.cardId || formData.firstName || formData.lastName) {
+    await dataStore.fetchDataForCardId(formData);
+  } else {
+    dialogMessageNotify($q, "กรุณากรอกข้อมูลอย่างน้อย 1 ช่อง");
+  }
 }
 
 watch(
   () => formData.pageSize,
   () => {
-    // pageSize ถูกควบคุมโดย QTable (client-side) ไม่ต้อง fetch API ใหม่
+    formData.page = 1;
+    searchData();
   }
 );
 
 onMounted(() => {
-  fetchDataTree();
   dataStore.rows = [];
-  allRows.value = [];
 });
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     เปลี่ยนแปลงรอบการปฏิบัติงานของข้าราชการ
   </div>
-
-  <q-card>
-    <q-card-section :horizontal="$q.screen.gt.xs">
-      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
-        <div>
-          <q-input dense outlined v-model="filter" label="ค้นหา">
-            <template v-slot:append>
-              <q-icon name="search" />
-            </template>
-          </q-input>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="row col-12 q-mb-sm">
+      <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
+        <div class="text-dark col-12 text-weight-bold text-subtitle1">
+          ค้นหารายชื่อ
         </div>
-        <div class="bg-white tree-container q-pa-xs">
-          <q-tree
-            class="q-pa-sm q-gutter-sm"
+        <div class="row justify-between q-gutter-y-sm">
+          <q-input
+            :readonly="!checkPermission($route)?.attrIsGet"
+            v-model="formData.cardId"
+            outlined
+            label="เลขประจำตัวประชาชน"
+            class="col-6 col-md-4 bg-white inputgreen"
             dense
-            :nodes="nodeTree"
-            node-key="orgTreeId"
-            label-key="labelName"
-            :filter="filter.trim()"
-            no-results-label="ไม่พบข้อมูลที่ค้นหา"
-            no-nodes-label="ไม่มีข้อมูล"
-            v-model:expanded="expanded"
+            hide-bottom-space
+            maxlength="13"
+          />
+          <q-input
+            :readonly="!checkPermission($route)?.attrIsGet"
+            v-model="formData.firstName"
+            outlined
+            label="ชื่อ"
+            class="col-5 col-md-3 bg-white inputgreen"
+            dense
+            hide-bottom-space
+          />
+          <q-input
+            :readonly="!checkPermission($route)?.attrIsGet"
+            v-model="formData.lastName"
+            outlined
+            label="นามสกุล"
+            class="col-6 col-md-3 bg-white inputgreen"
+            dense
+            hide-bottom-space
+          />
+          <q-btn
+            v-if="checkPermission($route)?.attrIsGet"
+            @click="(formData.page = 1), searchData()"
+            for="#search"
+            dense
+            unelevated
+            color="primary"
+            class="q-px-sm col-5 col-md-1"
+            style="max-height: 40px"
+            >ค้นหา</q-btn
           >
-            <template v-slot:default-header="prop">
-              <q-item
-                clickable
-                :active="orgTreeId == prop.node.orgTreeId"
-                @click.stop="onSelectedOrgTree(prop.node)"
-                active-class="my-list-link text-primary text-weight-medium"
-                class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list"
-              >
-                <div>
-                  <div class="text-weight-medium">
-                    {{ prop.node.orgTreeName }}
-                  </div>
-                  <div class="text-weight-light text-grey-8">
-                    {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
-                    {{
-                      prop.node.orgTreeShortName == null
-                        ? null
-                        : prop.node.orgTreeShortName
-                    }}
-                  </div>
-                </div>
-              </q-item>
-            </template>
-          </q-tree>
         </div>
-      </q-card-section>
-      <q-separator :vertical="$q.screen.gt.xs" />
-      <q-card-section
-        class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm scroll"
-        style="height: 80vh"
+      </q-card>
+    </div>
+    <div v-if="dataStore.rows.length === 0 && dataStore.checkCilck === true">
+      <q-card
+        flat
+        bordered
+        class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
+        >ไม่พบข้อมูล</q-card
       >
-        <div class="row col-xs-12 col-sm-9">
-          <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
-            <div class="text-dark col-12 text-weight-bold text-subtitle1">
-              ค้นหารายชื่อ
-            </div>
-            <div class="row justify-between q-gutter-y-sm">
-              <q-input
-                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
-                v-model="formData.cardId"
-                outlined
-                label="เลขประจำตัวประชาชน"
-                class="col-6 col-md-4 bg-white inputgreen"
-                dense
-                hide-bottom-space
-                maxlength="13"
-                @keyup.enter="submitSearchByEnter"
-              />
-              <q-input
-                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
-                v-model="formData.firstName"
-                outlined
-                label="ชื่อ"
-                class="col-5 col-md-3 bg-white inputgreen"
-                dense
-                hide-bottom-space
-                @keyup.enter="submitSearchByEnter"
-              />
-              <q-input
-                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
-                v-model="formData.lastName"
-                outlined
-                label="นามสกุล"
-                class="col-6 col-md-3 bg-white inputgreen"
-                dense
-                hide-bottom-space
-                @keyup.enter="submitSearchByEnter"
-              />
-              <q-btn
-                v-if="checkPermission($route)?.attrIsGet"
-                @click="(formData.page = 1), searchData()"
-                :disable="isLoadingAll"
-                for="#search"
-                dense
-                unelevated
-                color="primary"
-                class="q-px-sm col-5 col-md-1"
-                style="max-height: 40px"
-                >ค้นหา</q-btn
-              >
-            </div>
-          </q-card>
-        </div>
-        <div
-          v-if="
-            allRows.length === 0 &&
-            dataStore.checkCilck === true &&
-            !isLoadingAll
-          "
-        >
-          <q-card
-            flat
-            bordered
-            class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
-            >ไม่พบข้อมูล</q-card
-          >
-        </div>
-        <div v-if="allRows.length !== 0 || isLoadingAll" class="col-12">
-          <q-banner
-            v-if="isLoadingAll"
-            rounded
-            class="bg-blue-1 text-primary q-mb-sm"
-          >
-            <div class="row items-center q-gutter-sm">
-              <q-spinner color="primary" size="22px" />
-              <div v-if="totalToLoad === null || totalToLoad <= 500">
-                กำลังค้นหาข้อมูล กรุณารอสักครู่
-              </div>
-              <div v-else>
-                กำลังโหลดข้อมูลจำนวนมาก กรุณารอสักครู่
-                <div class="text-caption text-grey-7">
-                  ระบบกำลังดึงข้อมูลทั้งหมด
-                  {{ totalToLoad.toLocaleString() }} รายการ
-                </div>
-              </div>
-            </div>
-          </q-banner>
-          <q-linear-progress
-            v-if="isLoadingAll && totalToLoad === null"
-            indeterminate
-            color="primary"
-            class="q-mb-xs"
-          />
-          <q-linear-progress
-            v-if="isLoadingAll && totalToLoad !== null"
-            :value="loadAllProgress / 100"
-            color="primary"
-            class="q-mb-xs"
-          />
-          <div
-            v-if="isLoadingAll && totalToLoad !== null"
-            class="text-caption text-grey-6 q-mb-xs"
-          >
-            กำลังโหลด... {{ allRows.length.toLocaleString() }} /
-            {{ totalToLoad.toLocaleString() }} รายการ
-          </div>
-          <div class="row justify-between items-center q-mb-sm">
-            <div class="row q-gutter-sm">
-              <!-- <q-btn
-                color="secondary"
-                dense
-                icon="mdi-checkbox-multiple-marked-outline"
-                label="เลือกทั้งหมด"
-                :disable="isLoadingAll || allRows.length === 0"
-                @click="selectAllRows()"
-              /> -->
-              <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
-                :disable="selected.length === 0 || isLoadingAll"
-                :color="selected.length === 0 ? 'grey' : 'info'"
-                dense
-                icon="mdi-shuffle-variant"
-                :label="`เปลี่ยนรอบการลงเวลา${
-                  selected.length > 0 ? ` (${selected.length})` : ''
-                }`"
-                @click="handleSelectMultiple()"
-              />
-            </div>
-          </div>
-
-          <d-table
-            ref="table"
-            :columns="dataStore.columns"
-            :rows="allRows"
-            row-key="profileId"
-            flat
-            bordered
-            dense
-            virtual-scroll
-            table-style="max-height: 58vh"
-            class="custom-header-table"
-            :visible-columns="dataStore.visibleColumns"
-            hide-pagination
-            v-model:pagination="pagination"
-            selection="multiple"
-            v-model:selected="selected"
-          >
-            <template v-slot:header="props">
-              <q-tr :props="props">
-                <q-th auto-width>
-                  <q-checkbox
-                    keep-color
-                    color="primary"
-                    dense
-                    :disable="isLoadingAll"
-                    v-model="props.selected"
-                  />
-                </q-th>
-                <q-th auto-width />
-                <q-th
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  style="color: #000000; font-weight: 500"
+    </div>
+    <div v-if="dataStore.rows.length !== 0" class="col-12 q-mt-xl">
+      <d-table
+        ref="table"
+        :columns="dataStore.columns"
+        :rows="dataStore.rows"
+        row-key="interrogated"
+        flat
+        bordered
+        dense
+        class="custom-header-table"
+        :visible-columns="dataStore.visibleColumns"
+        :rows-per-page-options="[10, 25, 50, 100]"
+        @update:pagination="updatePagination"
+      >
+        <!-- :paging="true" -->
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th auto-width />
+            <q-th
+              v-for="col in props.cols"
+              :key="col.name"
+              :props="props"
+              style="color: #000000; font-weight: 500"
+            >
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props">
+            <q-td>
+              <div>
+                <q-btn
+                  flat
+                  icon="mdi-dots-horizontal-circle-outline"
+                  color="secondary"
+                  for="#cancel"
+                  dense
+                  round
                 >
-                  <span class="text-weight-medium">{{ col.label }}</span>
-                </q-th>
-              </q-tr>
-            </template>
-            <template v-slot:body="props">
-              <q-tr :props="props">
-                <q-td class="text-center">
-                  <q-checkbox
-                    keep-color
-                    color="primary"
-                    dense
-                    :disable="isLoadingAll"
-                    v-model="props.selected"
-                  />
-                </q-td>
-                <q-td>
-                  <div>
-                    <q-btn
-                      flat
-                      icon="mdi-dots-horizontal-circle-outline"
-                      color="secondary"
-                      for="#cancel"
-                      dense
-                      round
-                    >
-                      <q-menu>
-                        <q-list>
-                          <q-item
-                            v-if="checkPermission($route)?.attrIsUpdate"
-                            clickable
-                            v-close-popup
-                            @click="Openmodal('edit', props.row)"
-                          >
-                            <q-item-section style="min-width: 0px" avatar>
-                              <q-icon
-                                color="primary"
-                                name="mdi-shuffle-variant"
-                                size="xs"
-                              />
-                            </q-item-section>
+                  <q-menu>
+                    <q-list>
+                      <q-item
+                        v-if="checkPermission($route)?.attrIsUpdate"
+                        clickable
+                        v-close-popup
+                        @click="Openmodal('edit', props.row)"
+                      >
+                        <q-item-section style="min-width: 0px" avatar>
+                          <q-icon
+                            color="primary"
+                            name="mdi-shuffle-variant"
+                            size="xs"
+                          />
+                        </q-item-section>
 
-                            <q-item-section>
-                              <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
-                            </q-item-section>
-                          </q-item>
-                          <q-item
-                            v-if="checkPermission($route)?.attrIsUpdate"
-                            clickable
-                            v-close-popup
-                            @click="OpenmodalFix(props.row)"
-                          >
-                            <q-item-section style="min-width: 0px" avatar>
-                              <q-icon color="edit" name="edit" size="xs" />
-                            </q-item-section>
+                        <q-item-section>
+                          <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
+                        </q-item-section>
+                      </q-item>
+                      <q-item
+                        v-if="checkPermission($route)?.attrIsUpdate"
+                        clickable
+                        v-close-popup
+                        @click="OpenmodalFix(props.row)"
+                      >
+                        <q-item-section style="min-width: 0px" avatar>
+                          <q-icon color="edit" name="edit" size="xs" />
+                        </q-item-section>
 
-                            <q-item-section>
-                              <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
-                            </q-item-section>
-                          </q-item>
-                          <q-item
-                            clickable
-                            v-close-popup
-                            @click="Openmodal('history', props.row)"
-                          >
-                            <q-item-section style="min-width: 0px" avatar>
-                              <q-icon
-                                color="deep-purple"
-                                name="mdi-history"
-                                size="xs"
-                              />
-                            </q-item-section>
-                            <q-item-section>
-                              <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
-                            </q-item-section>
-                          </q-item>
-                        </q-list>
-                      </q-menu>
-                    </q-btn>
-                  </div>
-                </q-td>
-                <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 class="text-caption text-grey-7 q-mt-sm">
-            ทั้งหมด {{ allRows.length }} รายการ
-          </div>
-        </div>
-      </q-card-section>
-    </q-card-section>
+                        <q-item-section>
+                          <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
+                        </q-item-section>
+                      </q-item>
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click="Openmodal('history', props.row)"
+                      >
+                        <q-item-section style="min-width: 0px" avatar>
+                          <q-icon
+                            color="deep-purple"
+                            name="mdi-history"
+                            size="xs"
+                          />
+                        </q-item-section>
+                        <q-item-section>
+                          <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
+                        </q-item-section>
+                      </q-item>
+                    </q-list>
+                  </q-menu>
+                </q-btn>
+              </div>
+            </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div>
+                {{ col.value ?? "-" }}
+              </div>
+            </q-td>
+          </q-tr>
+        </template>
+        <template v-slot:pagination="scope">
+          ทั้งหมด {{ dataStore.totalListMain }} รายการ
+          <q-pagination
+            v-model="formData.page"
+            active-color="primary"
+            color="dark"
+            :max="Number(dataStore.maxPageMain)"
+            size="sm"
+            boundary-links
+            direction-links
+            :max-pages="5"
+            @update:model-value="dataStore.fetchDataForCardId(formData)"
+          ></q-pagination>
+        </template>
+      </d-table>
+    </div>
   </q-card>
 
   <!-- popup เปลี่ยนรอบการปฏิบัติงาน ,ประวัติการเปลี่ยนรอบการปฏิบัติงาน  -->
@@ -562,9 +328,6 @@ onMounted(() => {
     :DataRow="DataRow"
     :personId="DataRow == null ? '' : DataRow.profileId"
     @update:change-page="dataStore.changePage"
-    v-model:isMultiple="isMultiple"
-    :selectedMultiple="selected"
-    @update:selected="resetSelected"
   />
 
   <!-- แก้ไขปฏิทินวันทำงาน -->
@@ -621,19 +384,4 @@ onMounted(() => {
 .q-table tbody td:before.no-background {
   background: none;
 }
-
-.tree-container {
-  overflow: auto;
-  height: 75vh;
-  border: 1px solid #e6e6e7;
-  border-radius: 10px;
-}
-
-.my-list-link {
-  color: rgb(118, 168, 222);
-  border-radius: 5px;
-  background: #a3d3fb48 !important;
-  font-weight: 600;
-  border: 1px solid rgba(175, 185, 196, 0.217);
-}
 </style>
diff --git a/src/modules/09_leave/views/04_SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
index 1ea9ec44b..10b9dc8df 100644
--- a/src/modules/09_leave/views/04_SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -10,10 +10,8 @@ import { useSpecialTimeStore } from "@/modules/09_leave/stores/SpecialTimeStore"
 import { checkPermission } from "@/utils/permissions";
 import { usePagination } from "@/composables/usePagination";
 
-import type {
-  DataSpecialTime,
-  DataOption,
-} from "@/modules/09_leave/interface/index/Main";
+import type { DataDateMonthObject } from "@/modules/09_leave/interface/request/specialTime";
+import type { DataSpecialTime } from "@/modules/09_leave/interface/index/Main";
 
 import DialogReason from "@/components/Dialogs/PopupReason.vue";
 import DialogApprove from "@/modules/09_leave/components/04_SpecialTime/DialogApprove.vue";
@@ -23,17 +21,23 @@ const mixin = useCounterMixin();
 const store = useSpecialTimeStore();
 const {
   hideLoader,
+  monthYear2Thai,
   messageError,
   showLoader,
   success,
   date2Thai,
   dialogConfirm,
-  dateToISO,
 } = mixin;
 const { pagination, params, onRequest } = usePagination("", fetchData);
 
 const emit = defineEmits(["update:change-page"]);
 
+const toDay = ref<Date>(new Date());
+const monthToday = toDay.value.getMonth();
+const yearToday = toDay.value.getFullYear();
+
+const month = ref<number>(monthToday + 1);
+const year = ref<number>(yearToday);
 const description = ref<string>("");
 
 /**ตัวแปรที่ใช้ */
@@ -47,12 +51,16 @@ const name = ref<string>("");
 const id = ref<string>("");
 const dateDialog = ref<string>("");
 const dateFixDialog = ref<string>("");
+const dateYear = ref<number>(new Date().getFullYear());
+
+/** Function Date */
+const dateMonth = ref<DataDateMonthObject>({
+  month: new Date().getMonth(),
+  year: new Date().getFullYear(),
+});
 
 // ค้นหาในตาราง
 const filterKeyword = ref<string>("");
-const filterStatus = ref<string>("PENDING");
-const filterDate = ref<[Date, Date] | null>([new Date(), new Date()]); //วันที่ประกาศ
-const optionStatus = ref<DataOption[]>(store.optionStatusMain);
 const rows = ref<DataSpecialTime[]>([]);
 const visibleColumns = ref<String[]>([
   "no",
@@ -136,10 +144,9 @@ async function fetchData() {
     .get(config.API.specialTime(), {
       params: {
         ...params.value,
+        year: year.value,
+        month: month.value,
         keyword: filterKeyword.value.trim(),
-        status: filterStatus.value != "ALL" ? filterStatus.value : null,
-        startDate: filterDate.value ? dateToISO(filterDate.value[0]) : null,
-        endDate: filterDate.value ? dateToISO(filterDate.value[1]) : null,
       },
     })
     .then(async (res) => {
@@ -239,43 +246,40 @@ async function clickSave(reason: string) {
   });
 }
 
+/**
+ * ดึงข้อมูลตามปี
+ * @param e ปี
+ */
+async function updateMonth(e: DataDateMonthObject) {
+  if (e != null) {
+    dateYear.value = e.year;
+    dateYear.value = year.value;
+    month.value = dateMonth.value.month + 1;
+    year.value = dateMonth.value.year;
+    onSearchData();
+  }
+}
+
+//แปลงเดือนเป็นไทย
+function monthYearThai(val: DataDateMonthObject) {
+  if (val == null) return "";
+  else return monthYear2Thai(val.month, val.year);
+}
+
 /** ฟังก์ชั่นค้นหาข้อมูล */
 function onSearchData() {
   pagination.value.page = 1;
   fetchData();
 }
 
-/**
- * ฟังก์ชั่นค้นหาข้อมูลของ Option Filter
- * @param val คำที่ค้นหา
- * @param update Function
- * @param typeOp ประเภทของ Select
- */
-function filterOption(val: string, update: Function) {
-  update(() => {
-    const needle = val.toLowerCase();
-    optionStatus.value = store.optionStatusMain.filter(
-      (v: DataOption) => v.name.toLowerCase().indexOf(needle) > -1
-    );
-  });
-}
-
-/**
- * แปลงช่วงวันที่ถ้า2ค่าเป็นวันเดียวกันจะโชววันเดียวแต่ถ้าไม่เท่ากันจะแสดงเป็นช่วง
- * @param val ช่วงวันที่
- */
-function dateThaiRange(val: [Date, Date]) {
-  if (val === null) {
-    return "";
-  } else if (date2Thai(val[0], true) === date2Thai(val[1], true)) {
-    return `${date2Thai(val[0], true)}`;
-  } else {
-    return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`;
-  }
-}
-
 /**Hook */
 onMounted(async () => {
+  //อัพเดทเป็นวันปัจจุบันเมื่อเข้าหน้านี้
+  const toDay = ref<Date>(new Date());
+  const monthToday = toDay.value.getMonth();
+  const yearToday = toDay.value.getFullYear();
+  month.value = monthToday + 1;
+  year.value = yearToday;
   await fetchData();
 });
 </script>
@@ -287,31 +291,25 @@ onMounted(async () => {
 
   <q-card flat bordered class="col-12 q-pa-md">
     <div class="row col-12 q-col-gutter-sm q-mb-sm">
-      <div class="col-xs-12 col-sm-6 col-md-3">
+      <div class="col-xs-12 col-sm-3 col-md-2">
         <datepicker
-          v-model="filterDate"
+          v-model="dateMonth"
           :locale="'th'"
           autoApply
-          borderless
-          range
+          month-picker
           :enableTimePicker="false"
-          week-start="0"
-          @update:modelValue="onSearchData()"
+          @update:modelValue="updateMonth"
         >
-          <template #year="{ year }">
-            {{ year + 543 }}
-          </template>
-          <template #year-overlay-value="{ value }">
-            {{ parseInt(value + 543) }}
-          </template>
+          <template #year="{ year }">{{ year + 543 }}</template>
+          <template #year-overlay-value="{ value }">{{
+            parseInt(value + 543)
+          }}</template>
           <template #trigger>
             <q-input
-              outlined
+              :model-value="monthYearThai(dateMonth)"
               dense
-              class="full-width datepicker"
-              :model-value="
-                filterDate != null ? dateThaiRange(filterDate) : null
-              "
+              outlined
+              hide-bottom-space
             >
               <template v-slot:prepend>
                 <q-icon
@@ -325,37 +323,9 @@ onMounted(async () => {
           </template>
         </datepicker>
       </div>
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-select
-          hide-bottom-space
-          dense
-          lazy-rules
-          outlined
-          onlind
-          hide-selected
-          v-model="filterStatus"
-          label="สถานะ"
-          emit-value
-          map-options
-          :options="optionStatus"
-          option-value="id"
-          use-input
-          fill-input
-          option-label="name"
-          @update:modelValue="onSearchData()"
-          @filter="(inputValue:string, doneFn:Function) =>
-                    filterOption(inputValue, doneFn,)"
-        >
-          <template v-slot:no-option>
-            <q-item>
-              <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
-            </q-item>
-          </template>
-        </q-select>
-      </div>
 
-      <q-space v-if="!$q.screen.xs && !$q.screen.sm" />
-      <div class="col-xs-12 col-sm-6 col-md-2">
+      <q-space />
+      <div class="col-xs-12 col-sm-3 col-md-2">
         <q-input
           standout
           dense
@@ -370,7 +340,7 @@ onMounted(async () => {
         </q-input>
       </div>
 
-      <div class="col-xs-12 col-sm-6 col-md-2">
+      <div class="col-xs-12 col-sm-3 col-md-2">
         <q-select
           v-model="visibleColumns"
           multiple
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index 797abf014..b367b6490 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -269,7 +269,6 @@ async function fetchLeaveday(
  * @param data  ข้อมูลบัญชีวันลา
  */
 async function fetchDocumentTemplate(data: any) {
-  if (typeReport.value === 4) return;
   await axios
     .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
@@ -353,7 +352,7 @@ function clearData() {
   };
 }
 
-async function onSearch() {
+function onSearch() {
   isReport.value = false;
   isLoadPDF.value = true;
   pdfSrc.value = undefined;
@@ -468,19 +467,6 @@ const reportName = () => {
   return reportNameVal + employeeClassName;
 };
 
-async function handleDownload() {
-  updateLeaveday();
-  await fetchLeaveday(
-    employeeClass.value,
-    typeReport.value == 3 || typeReport.value == 4
-      ? leaveType.value
-      : yearType.value,
-    dateStart.value,
-    dateEnd.value
-  );
-  await genReportXLSX(detailReport.value, `${reportName()}`);
-}
-
 onMounted(() => {
   fetchDataTree();
 });
@@ -526,11 +512,7 @@ onMounted(() => {
                 round
                 color="primary"
                 icon="download"
-                v-if="
-                  checkPermission($route)?.attrIsGet &&
-                  typeReport !== 3 &&
-                  typeReport !== 4
-                "
+                v-if="checkPermission($route)?.attrIsGet && typeReport !== 3"
               >
                 <q-menu>
                   <q-list style="min-width: 150px">
@@ -565,11 +547,8 @@ onMounted(() => {
                 round
                 color="primary"
                 icon="download"
-                v-if="
-                  checkPermission($route)?.attrIsGet &&
-                  (typeReport == 3 || typeReport == 4)
-                "
-                @click="typeReport == 3 ? getReport() : handleDownload()"
+                v-if="checkPermission($route)?.attrIsGet && typeReport == 3"
+                @click="getReport()"
               >
               </q-btn>
             </div>
@@ -978,7 +957,7 @@ onMounted(() => {
                 <q-separator />
                 <q-card-actions align="right">
                   <q-btn
-                    v-if="typeReport !== 3 && typeReport !== 4"
+                    v-if="typeReport !== 3"
                     dense
                     class="q-px-md"
                     label="ค้นหา"
@@ -997,7 +976,7 @@ onMounted(() => {
             </div>
             <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
               <q-splitter
-                v-if="typeReport !== 3 && typeReport !== 4"
+                v-if="typeReport !== 3"
                 disable
                 v-model="splitterModel"
                 horizontal
diff --git a/src/modules/09_leave/views/07_LeaveHistoryMain.vue b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
index 190c80628..8fdfcc774 100644
--- a/src/modules/09_leave/views/07_LeaveHistoryMain.vue
+++ b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
@@ -83,7 +83,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "leaveDaysUsed",
     align: "left",
-    label: "ที่ใช้ไปทั้งหมด (วัน)",
+    label: "ที่ใช้ไป (วัน)",
     sortable: true,
     field: "leaveDaysUsed",
     headerStyle: "font-size: 14px",
@@ -92,7 +92,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "leaveCount",
     align: "left",
-    label: "ที่ใช้ไปทั้งหมด (ครั้ง)",
+    label: "ที่ใช้ไป (ครั้ง)",
     sortable: true,
     field: "leaveCount",
     headerStyle: "font-size: 14px",
@@ -101,7 +101,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "beginningLeaveDays",
     align: "left",
-    label: "จำนวนวันลาก่อนใช้งานระบบ",
+    label: "ยกมา (วัน)",
     sortable: true,
     field: "beginningLeaveDays",
     headerStyle: "font-size: 14px",
@@ -110,7 +110,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "beginningLeaveCount",
     align: "left",
-    label: "จำนวนครั้งที่ลาก่อนใช้งานระบบ",
+    label: "ยกมา (ครั้ง)",
     sortable: true,
     field: "beginningLeaveCount",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue b/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
index 0605fe50d..16f858475 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
@@ -2,7 +2,6 @@
 import { ref } from "vue";
 import { useRoute } from "vue-router";
 import { useQuasar } from "quasar";
-import type { QTableColumn } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -23,12 +22,21 @@ const checkRoutePermisson = ref<boolean>(
   route.name == "disciplineInvestigatefactsDetail"
 );
 
-const props = defineProps<{
-  rows?: any[];
-  columns?: QTableColumn[];
-  visibleColumns?: string[];
-  fetchData?: () => void;
-}>();
+const props = defineProps({
+  rows: {
+    type: Array,
+    default: [],
+  },
+  columns: {
+    type: Array,
+    default: [],
+  },
+  visibleColumns: {
+    type: Array,
+    default: [],
+  },
+  fetchData: Function,
+});
 
 const remark = ref<string>("");
 const selected = ref<any[]>([]);
@@ -92,7 +100,7 @@ function onSubmit() {
                 <q-card-section class="q-pa-xs">
                   <q-table
                     :columns="props.columns"
-                    :rows="props.rows ?? []"
+                    :rows="rows"
                     row-key="personId"
                     flat
                     bordered
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
index 9b30c5ae0..14b87568a 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@@ -10,7 +10,7 @@ import { useInvestigateFactStore } from "@/modules/11_discipline/store/Investiga
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
-import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 3d3c7c3d7..2eb919bb2 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
-import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 
 import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index b59b44744..60d0d8066 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -15,7 +15,7 @@ import type {
   FormData,
   Director,
   PersonsArray,
-} from "@/modules/11_discipline/interface/request/disciplinary";
+} from "@/modules/11_discipline/interface/request/Disciplinary";
 import type {
   DataOption,
   FileLists,
diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
index 5608acb62..18a6c494a 100644
--- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
@@ -260,7 +260,7 @@ watch(
               keep-color
               color="primary"
               dense
-              :disable="commandType === ''"
+              :disable="commandType"
               v-model="scope.selected"
             />
           </template>
@@ -271,7 +271,7 @@ watch(
                   keep-color
                   color="primary"
                   dense
-                  :disable="commandType === ''"
+                  :disable="commandType"
                   v-model="props.selected"
                 />
               </q-td>
diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index 64b2f70d2..fb8e9ab73 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -9,13 +9,13 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
-import type { DataListRow } from "@/modules/11_discipline/interface/request/result";
+import type { DataListRow } from "@/modules/11_discipline/interface/request/Result";
 import type {
   FormData as FormDataComplaint,
   ArrayPerson,
   ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
-import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
+import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
 
 import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue
index 83180daca..78027708d 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue
@@ -98,7 +98,7 @@ watch(props, () => {
                       v-ripple
                       :active="listCheck === index"
                       active-class="my-menu-link"
-                      @click="clickList(Number(index), item.director)"
+                      @click="clickList(index, item.director)"
                     >
                       <q-item-section>{{ item.title }}</q-item-section>
                     </q-item>
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 940687fe7..c5cf71505 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -294,7 +294,6 @@ watch(
                   hide-bottom-space
                   dense
                   label="คำค้น"
-                  @keydown.enter.prevent="searchInput()"
                 >
                   <template v-slot:after>
                     <q-btn
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index dc438eccc..5cc54f572 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -9,7 +9,7 @@ import config from "@/app.config";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type { Director } from "@/modules/11_discipline/interface/request/disciplinary";
+import type { Director } from "@/modules/11_discipline/interface/request/Disciplinary";
 import type { Directors } from "@/modules/12_evaluatePersonal/interface/response/Main";
 
 /** importComponents*/
@@ -20,14 +20,7 @@ import DialogDuty from "@/modules/12_evaluatePersonal/components/Detail/viewTab2
 const $q = useQuasar();
 const route = useRoute();
 const mixin = useCounterMixin();
-const {
-  showLoader,
-  hideLoader,
-  messageError,
-  dialogConfirm,
-  success,
-  dialogRemove,
-} = mixin;
+const { showLoader, hideLoader, messageError, dialogConfirm, success } = mixin;
 
 const props = defineProps({
   data: {
@@ -208,21 +201,6 @@ function onEditDuty(data: Director) {
   modalDuty.value = true;
 }
 
-function handleDelete(id: string) {
-  dialogRemove($q, async () => {
-    showLoader();
-    try {
-      await http.delete(config.API.evaluationMain() + `/del-director/${id}`);
-      await props.fetchData();
-      await success($q, "ลบสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 /**
  * ทำงานเมื่อ props.data มีการเปลี่ยนแปลง
  */
@@ -290,30 +268,17 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
-            <q-td auto-width>
+            <q-td>
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
                 flat
                 round
-                dense
+                denes
                 icon="edit"
                 color="edit"
                 @click.stop.prevent="onEditDuty(props.row)"
               >
                 <q-tooltip>แก้ไขหน้าที่</q-tooltip>
               </q-btn>
-
-              <q-btn
-                v-if="checkPermission($route)?.attrIsDelete"
-                flat
-                round
-                dense
-                icon="delete"
-                color="red"
-                @click="handleDelete(props.row.id)"
-              >
-                <q-tooltip>ลบ</q-tooltip>
-              </q-btn>
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
index cf4611de5..28e26a3f8 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
@@ -27,7 +27,6 @@ const {
   dialogConfirm,
   date2Thai,
   success,
-  dialogRemove,
 } = mixin;
 
 /** props*/
@@ -209,23 +208,6 @@ async function getList() {
     });
 }
 
-function handleDelete(meetingId: string) {
-  dialogRemove($q, async () => {
-    showLoader();
-    try {
-      await http.delete(
-        config.API.evaluationMain() + `/del-meeting/${id.value}/${meetingId}`
-      );
-      await props.fetchData();
-      await success($q, "ลบสำเร็จ");
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
-    }
-  });
-}
-
 watch(
   () => props.data,
   () => {
@@ -283,7 +265,6 @@ watch(
       >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th auto-width />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -291,19 +272,6 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
-            <q-td auto-width>
-              <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
-                flat
-                round
-                dense
-                icon="delete"
-                color="red"
-                @click="handleDelete(props.row.id)"
-              >
-                <q-tooltip>ลบ</q-tooltip>
-              </q-btn>
-            </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}
diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index 3228dfe3a..884f8d470 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -280,7 +280,6 @@ onMounted(async () => {
                   hide-bottom-space
                   dense
                   label="คำค้น"
-                  @keydown.enter.prevent="(pagination.page = 1), searchInput()"
                 >
                   <template v-slot:after>
                     <q-btn
diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
index ddf8804e5..5da8f0b3d 100644
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@@ -222,7 +222,6 @@ const itemsCard = ref([
  * @param id กลุ่ม
  */
 async function fetchDataQuota(id: string) {
-  if (!id) return;
   await http
     .get(config.API.salaryListPeriodQuota(id))
     .then((res) => {
@@ -255,7 +254,6 @@ async function fetchDataQuota(id: string) {
  * @param id กลุ่ม
  */
 async function fetchDataPeriod(id: string, force: boolean = false) {
-  if (!id) return;
   force && showLoader();
   let formData = {
     ...params.value,
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
index cc50f45cb..e4f00a7cc 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
@@ -215,7 +215,6 @@ const itemsCard = ref([
  * @param id กลุ่ม
  */
 async function fetchDataQuota(id: string) {
-  if (!id) return;
   await http
     .get(config.API.salaryListPeriodQuotaEmp(id))
     .then((res) => {
@@ -247,7 +246,6 @@ async function fetchDataQuota(id: string) {
  * @param id กลุ่ม
  */
 async function fetchDataPeriod(id: string, force: boolean = false) {
-  if (!id) return;
   force && showLoader();
   let formData = {
     ...params.value,
diff --git a/src/modules/13_salary/components/DialogInfoMain.vue b/src/modules/13_salary/components/DialogInfoMain.vue
index c5bfc6762..3da947277 100644
--- a/src/modules/13_salary/components/DialogInfoMain.vue
+++ b/src/modules/13_salary/components/DialogInfoMain.vue
@@ -52,7 +52,7 @@ function fetchInformation() {
       citizenId.value = data.citizenId;
 
       if (data.avatarName) {
-        fetchProfile(data.id as string, data.avatarName);
+        await fetchProfile(data.id as string, data.avatarName);
       } else {
         avatar.value = avatarMain;
       }
@@ -70,14 +70,11 @@ function fetchInformation() {
  * @param id profileId
  * @param avatarName ชื้อไฟล์
  */
-function fetchProfile(id: string, avatarName: string) {
+async function fetchProfile(id: string, avatarName: string) {
   http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
-    .then((res) => {
+    .then(async (res) => {
       avatar.value = res.data.downloadUrl;
-    })
-    .catch(() => {
-      avatar.value = avatarMain;
     });
 }
 
diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index d3f38a61f..6e9a4c4fc 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -308,7 +308,6 @@ async function fetchSalalyPeriod(
         if (!data.group1id) {
           hideLoader();
         }
-        isLoad.value = data.group1id ? true : false;
       })
       .catch((err) => {
         messageError($q, err);
diff --git a/src/modules/14_KPI/views/01_kpiRound.vue b/src/modules/14_KPI/views/01_kpiRound.vue
index 46502850b..f6db8904d 100644
--- a/src/modules/14_KPI/views/01_kpiRound.vue
+++ b/src/modules/14_KPI/views/01_kpiRound.vue
@@ -44,7 +44,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val) => (val ? val + 543 : "-"),
+    format: (val) => val + 543,
   },
   {
     name: "durationKPI",
diff --git a/src/modules/14_KPI/views/detail.vue b/src/modules/14_KPI/views/detail.vue
index 81d3df41a..aede8c187 100644
--- a/src/modules/14_KPI/views/detail.vue
+++ b/src/modules/14_KPI/views/detail.vue
@@ -8,7 +8,6 @@ import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
-import avatar from "@/assets/avatar_user.jpg";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
@@ -66,7 +65,7 @@ async function fetchEvaluation() {
       await store.checkCompetency();
       await store.checkCompetencyDefaultCompetencyLevel();
 
-      fetchProfile(data.profileId);
+      await fetchProfile(data.profileId);
 
       plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
       rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
@@ -82,8 +81,8 @@ async function fetchEvaluation() {
   // });
 }
 
-function fetchProfile(id: string) {
-  http
+async function fetchProfile(id: string) {
+  await http
     .get(
       config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `profile-${id}`)
     )
@@ -91,7 +90,6 @@ function fetchProfile(id: string) {
       store.dataEvaluation.avartar = res.data.downloadUrl;
     })
     .catch(() => {
-      store.dataEvaluation.avartar = avatar;
       // profilePicture.value = avatar;
     });
 }
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 978d5358c..f723dd697 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -876,6 +876,43 @@ onMounted(() => {
     </div>
   </q-form>
 
+  <q-card flat bordered>
+    <q-card-section class="q-gutter-y-sm">
+      <q-toolbar style="padding: 0">
+        <div class="row q-gutter-sm"></div>
+
+        <q-space />
+      </q-toolbar>
+      <q-toolbar
+        class="q-pa-sm bg-grey-2"
+        style="padding: 0; border-radius: 5px"
+        v-if="typeReport"
+      >
+        <div
+          class="row q-gutter-sm"
+          v-if="
+            typeReport === 'KPI1' ||
+            typeReport === 'KPI2' ||
+            typeReport === 'KPI3' ||
+            typeReport === 'KPI7' ||
+            typeReport === 'KPI8' ||
+            typeReport === 'KPI9'
+          "
+        ></div>
+
+        <div
+          class="q-pa-sm"
+          v-if="
+            typeReport === 'KPI4' ||
+            typeReport === 'KPI5' ||
+            typeReport === 'KPI6' ||
+            typeReport === 'KPI8'
+          "
+        ></div>
+      </q-toolbar>
+    </q-card-section>
+  </q-card>
+
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 1000px; max-width: 100vw">
       <DialogHeader :tittle="'เลือกราชชื่อ'" :close="onCloseModal" />
@@ -905,7 +942,6 @@ onMounted(() => {
               hide-bottom-space
               dense
               label="คำค้น"
-              @keydown.enter.prevent="(formFilter.page = 1), fetchListPerson()"
             >
               <template v-slot:after>
                 <q-btn
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 241666999..87e7f696e 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -67,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => (v ? v + 543 : "-"),
+    format: (v) => v + 543,
   },
   {
     name: "citizenId",
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index a9806406c..76a8079ea 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -44,7 +44,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => (v ? v + 543 : "-"),
+    format: (v) => v + 543,
   },
   {
     name: "citizenId",
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 397fd2b99..7db45984f 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px ; width:10%",
-    format: (val) => (val ? val + 543 : "-"),
+    format: (val) => val + 543,
   },
   {
     name: "projectName",
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 12e494ddc..48d94b36c 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -32,7 +32,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val) {
-      return val ? val + 543 : "-";
+      return val + 543;
     },
   },
   {
diff --git a/src/modules/16_positionEmployee/components/DialogMovePos.vue b/src/modules/16_positionEmployee/components/DialogMovePos.vue
index 96539fc61..97fd67813 100644
--- a/src/modules/16_positionEmployee/components/DialogMovePos.vue
+++ b/src/modules/16_positionEmployee/components/DialogMovePos.vue
@@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
 let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
 const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
-const columns = defineModel<QTableProps["columns"]>("columns", { required: true });
+const columns = defineModel<QTableProps[]>("columns", {});
 const rows = defineModel<PosMaster2[]>("rows", { required: true });
 const props = defineProps({
   fetchDataTree: {
diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue
index 8943c2423..f56a0ab4e 100644
--- a/src/modules/16_positionEmployee/components/TableMain.vue
+++ b/src/modules/16_positionEmployee/components/TableMain.vue
@@ -777,7 +777,7 @@ watch(
   <DialogMovePos
     v-model:modal="modalDialogMMove"
     v-model:nodeTree="nodeTree"
-    v-model:columns="columns"
+    v-model:columns="columns as QTableProps[]"
     v-model:rows="posMaster"
     v-model:totalPage="totalPage"
     v-model:reqMaster="reqMaster"
diff --git a/src/modules/18_command/components/Main/TableMain.vue b/src/modules/18_command/components/Main/TableMain.vue
index 307bfcff1..22970fc17 100644
--- a/src/modules/18_command/components/Main/TableMain.vue
+++ b/src/modules/18_command/components/Main/TableMain.vue
@@ -248,7 +248,7 @@ onMounted(() => {
                   </q-item-section>
                 </q-item>
 
-                <!-- มอบหมายคำสั่ง -->
+                <!-- หมอบหมายคำสั่ง -->
                 <q-item
                   clickable
                   v-close-popup
@@ -262,7 +262,7 @@ onMounted(() => {
                         size="xs"
                         name="mdi-account-check"
                       />
-                      <div class="q-pl-md">มอบหมายคำสั่ง</div>
+                      <div class="q-pl-md">หมอบหมายคำสั่ง</div>
                     </div>
                   </q-item-section>
                 </q-item>
diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 2a3f3b60f..cb3b532b8 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -25,7 +25,6 @@ const {
   dialogConfirm,
   convertDateToAPI,
   dialogRemove,
-  dialogMessageNotify,
 } = useCounterMixin();
 
 /**
@@ -61,6 +60,7 @@ let formData = reactive<FormDataDetail>({
 });
 const commandVolume = ref<string>(""); //เล่มที่
 const commandChapter = ref<string>(""); //ตอนที่
+const isIdofficer = ref<boolean>(false); //เช็ค สกจ.
 
 const rows = ref<Array<DataOperators>>([]);
 const columns = ref<QTableProps["columns"]>([
@@ -113,22 +113,23 @@ const visibleColumns = ref<Array<string>>([
 
 const modalAddOperator = ref<boolean>(false); // แสดงเพิ่มรายชื่อลงนามในแนบท้ายคำสั่ง
 
-
+/** ฟังก์ชันเช็ค สกจ.*/
+async function fetchCheckIdofficer() {
+  await http
+    .get(config.API.checkIdofficer)
+    .then((res) => {
+      isIdofficer.value = res.data.result;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
 
 /**
  * ฟังก์ชันบันทึกข้อมูลรายละเอียดคำสั่ง
  * และกำหนด isChangeData เป็น false
  */
 async function onSubmit() {
-  //ถ้าเป็น สกจ. ต้องเลือกประเภทคำสั่งด้วย
-  if (
-    store.isIdofficer &&
-    formData.isBangkok !== "BANGKOK" &&
-    formData.isBangkok !== "OFFICE"
-  ) {
-    dialogMessageNotify($q, "กรุณาเลือกคำสั่ง");
-    return;
-  }
   dialogConfirm($q, async () => {
     showLoader();
     await http
@@ -155,7 +156,7 @@ async function onSubmit() {
   });
 }
 
-/** ฟังก์ชันดึงข้อมูลรายชื่อเจ้าหน้าที่ดำเนินการ */
+/** ฟังกชันดึงข้อมูลรายชื่อเจ้าหน้าที่ดำเนินการ */
 async function fetchDataOperatorList() {
   try {
     const res = await http.get(
@@ -214,6 +215,7 @@ function onDeleteData(id: string) {
 onMounted(async () => {
   try {
     showLoader();
+    await fetchCheckIdofficer();
     await fetchDataOperatorList();
     formData.commandNo = props.formCommandList.commandNo;
     formData.commandYear = props.formCommandList.commandYear;
@@ -223,7 +225,7 @@ onMounted(async () => {
     formData.issue = props.formCommandList.issue;
     formData.commandAffectDate = props.formCommandList.commandAffectDate;
     formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
-    formData.isBangkok = !store.isIdofficer
+    formData.isBangkok = !isIdofficer.value
       ? null
       : props.formCommandList.isBangkok;
     commandCode.value = props.formCommandList.commandCode;
@@ -488,7 +490,7 @@ onMounted(async () => {
 
               <div
                 class="col-12 q-gutter-sm"
-                v-if="store.isIdofficer && commandCode !== 'C-PM-47'"
+                v-if="isIdofficer && commandCode !== 'C-PM-47'"
               >
                 <q-radio
                   :disable="store.readonly"
diff --git a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
index 35293eb89..3084779b3 100644
--- a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
+++ b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
@@ -4,6 +4,7 @@ import { useQuasar, type QTableProps } from "quasar";
 import { usePagination } from "@/composables/usePagination";
 
 import { useCounterMixin } from "@/stores/mixin";
+import { getColumnLabel } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -273,7 +274,9 @@ watch(modal, (newVal) => {
                     :key="col.name"
                     :props="props"
                   >
-                    <span class="text-weight-medium">{{ col.label }}</span>
+                    <span class="text-weight-medium">{{
+                      getColumnLabel(col, isAct)
+                    }}</span>
                   </q-th>
                 </q-tr>
               </template>
diff --git a/src/modules/18_command/components/Step/View0_Digital.vue b/src/modules/18_command/components/Step/View0_Digital.vue
index 1601a21b6..8cc2469f8 100644
--- a/src/modules/18_command/components/Step/View0_Digital.vue
+++ b/src/modules/18_command/components/Step/View0_Digital.vue
@@ -719,7 +719,6 @@ onMounted(async () => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
-                @keydown.enter.prevent="onSearchData"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index ffaa97790..57a7d3ef6 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -191,6 +191,7 @@ async function uploadFileDoc(
  * @param group ประเภพไฟล์ "คำสั่ง","แนบท้าย"
  */
 async function fetchDoc(group: string) {
+  showLoader();
   let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
   if (group === "order") {
     await fetchDocOrder(type);
@@ -291,10 +292,7 @@ function onConfirmOrder() {
   if (
     store?.dataCommand?.commandNo !== "" &&
     store?.dataCommand?.commandAffectDate !== null &&
-    store?.dataCommand?.commandExcecuteDate !== null &&
-    (!store.isIdofficer ||
-      store?.dataCommand?.isBangkok === "BANGKOK" ||
-      store?.dataCommand?.isBangkok === "OFFICE")
+    store?.dataCommand?.commandExcecuteDate !== null
   ) {
     dialogConfirm(
       $q,
@@ -318,10 +316,10 @@ function onConfirmOrder() {
       "คุณต้องการยืนยันการส่งออกคำสั่งใช่หรือไม่?"
     );
   } else {
-    const messageWarning = !store.isIdofficer
-      ? "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม และวันที่คำสั่งมีผลให้ครบ"
-      : "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม วันที่คำสั่งมีผล และเลือกคำสั่งให้ครบ";
-    dialogMessageNotify($q, messageWarning);
+    dialogMessageNotify(
+      $q,
+      "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม และวันที่คำสั่งมีผลให้ครบ"
+    );
   }
 }
 
diff --git a/src/modules/18_command/store/DetailStore.ts b/src/modules/18_command/store/DetailStore.ts
index 7a744d451..ffdfc035a 100644
--- a/src/modules/18_command/store/DetailStore.ts
+++ b/src/modules/18_command/store/DetailStore.ts
@@ -7,8 +7,7 @@ export const useCommandDetail = defineStore("commandDetailStore", () => {
   const readonly = ref<boolean>(false);
   const dataCommand = ref<FormDataDetail>();
   const status = ref<string>("");
-  const isSalary = ref<boolean>(false);
-  const isIdofficer = ref<boolean>(false);
+  const isSalary = ref<boolean>(false)
   function checkStep(val: string) {
     status.value = val;
     switch (val) {
@@ -40,7 +39,6 @@ export const useCommandDetail = defineStore("commandDetailStore", () => {
     readonly,
     status,
     dataCommand,
-    isSalary,
-    isIdofficer,
+    isSalary
   };
 });
diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue
index e9020037e..37ab3326f 100644
--- a/src/modules/18_command/views/detail.vue
+++ b/src/modules/18_command/views/detail.vue
@@ -92,24 +92,11 @@ async function fetchDataCommandList() {
     });
 }
 
-/** ฟังก์ชันเช็ค สกจ.*/
-async function fetchCheckIdofficer() {
-  await http
-    .get(config.API.checkIdofficer)
-    .then((res) => {
-      store.isIdofficer = res.data.result;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    });
-}
-
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  * กำหนดค่า `store.readonly` เมื่อ  route.name เป็น "commandViewDetailPage" จะอ่านข้อมูลได้อย่างเดียว
  */
 onMounted(async () => {
-  await fetchCheckIdofficer();
   await fetchDataCommandList();
   store.readonly =
     route.name === "commandViewDetailPage" ||
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index 585e60005..9fc3ec703 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -454,6 +454,7 @@ onMounted(async () => {
                         table-class="text-grey-9"
                         row-key="id"
                         dense
+                        hide-bottom
                         bordered
                         separator="vertical"
                         class="custom-header-table-expand"
diff --git a/src/modules/21_report/components/01_org/MainReport.vue b/src/modules/21_report/components/01_org/MainReport.vue
index 5afa2e63d..19119313d 100644
--- a/src/modules/21_report/components/01_org/MainReport.vue
+++ b/src/modules/21_report/components/01_org/MainReport.vue
@@ -111,16 +111,17 @@ async function fetchSummary() {
  * ฟังก์ชัน DownloadReport
  * @param list รายงานที่ต้องการดาวน์โหลด
  */
-async function getReport(valReport: string) {
+async function getReport(list: string) {
+  const listFind = baseDocument.value.find(
+    (item: DataDocument) => item.val == list
+  )?.val;
+  const newReport = listFind === "report2" ? "report2-history" : listFind;
   pdfSrc.value = undefined;
   page.value = 1;
   isLoadPDF.value = true;
-  if (valReport) {
+  if (newReport) {
     await http
-      .post(config.API.orgReport(valReport), {
-        node: 0,
-        nodeId: organizationId.value,
-      })
+      .get(config.API.orgReport(newReport) + `/${organizationId.value}`)
       .then(async (res) => {
         const data = res.data.result;
         detailReport.value = data;
@@ -413,8 +414,10 @@ onMounted(async () => {
                           color="primary"
                           icon="download"
                         >
-                          <q-tooltip> ดาวน์โหลดรายงาน </q-tooltip>
-
+                        <q-tooltip>
+                          ดาวน์โหลดรายงาน
+                        </q-tooltip>
+                        
                           <q-menu>
                             <q-list style="min-width: 150px">
                               <q-item
diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue
index 786f4dd3a..dafbfd3be 100644
--- a/src/modules/21_report/views/05_reportSalary.vue
+++ b/src/modules/21_report/views/05_reportSalary.vue
@@ -807,6 +807,28 @@ onMounted(() => {
       </div>
     </div>
   </q-form>
+
+  <div class="q-pa-sm q-gutter-sm">
+    <q-card flat bordered class="col-12">
+      <div class="row q-col-gutter-sm q-pa-sm">
+        <div class="row col-12">
+          <q-card bordered class="col-12 filter-card q-pa-sm">
+            <div class="row col-12 q-col-gutter-sm items-center">
+              <div class="row col-md-8 col-sx-12 q-col-gutter-sm">
+                <div class="col-md-3 col-xs-6"></div>
+                <div class="col-md-3 col-xs-6"></div>
+
+                <div class="col-md-3 col-xs-6"></div>
+              </div>
+              <div class="row q-col-gutter-sm col-md-12">
+                <div class="col-md-4 col-xs-12"></div>
+              </div>
+            </div>
+          </q-card>
+        </div>
+      </div>
+    </q-card>
+  </div>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/modules/22_issues/store.ts b/src/modules/22_issues/store.ts
index 0ab403a7e..f7d19d0a6 100644
--- a/src/modules/22_issues/store.ts
+++ b/src/modules/22_issues/store.ts
@@ -13,10 +13,8 @@ export const useIssueStore = defineStore("issue", () => {
   const statusOptions = ref<Options[]>([
     { label: "ทั้งหมด", value: "" },
     { label: "ใหม่", value: "NEW" },
-    { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
+    { label: "กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
-    { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
-    { label: "แจ้งกลับแล้ว", value: "REPLIED" },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 
@@ -31,10 +29,6 @@ export const useIssueStore = defineStore("issue", () => {
         return "แก้ไขแล้ว";
       case "CLOSED":
         return "ปิดแล้ว";
-      case "HELPDESK_IN_PROGRESS":
-        return "Helpdesk กำลังดำเนินการ";
-      case "REPLIED":
-        return "แจ้งกลับแล้ว";
       default:
         return "-";
     }
diff --git a/src/modules/22_issues/views/Main.vue b/src/modules/22_issues/views/Main.vue
index 72d6b6c5d..7e7d27c32 100644
--- a/src/modules/22_issues/views/Main.vue
+++ b/src/modules/22_issues/views/Main.vue
@@ -22,7 +22,6 @@ const { convertStatus, convertSystem } = store;
 const { systemOptions, statusOptions } = storeToRefs(store);
 
 const visibleColumns = ref<string[]>([
-  "codeIssue",
   "title",
   "description",
   "system",
@@ -35,43 +34,6 @@ const visibleColumns = ref<string[]>([
   "status",
 ]);
 const columns = ref<QTableProps["columns"]>([
-  {
-    name: "codeIssue",
-    align: "left",
-    label: "รหัส",
-    sortable: false,
-    field: "codeIssue",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: false,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format: (val: string) => date2Thai(new Date(val), false, true),
-  },
-  {
-    name: "org",
-    align: "left",
-    label: "หน่วยงาน",
-    sortable: false,
-    field: "org",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "createdFullName",
-    align: "left",
-    label: "ชื่อผู้สร้าง",
-    sortable: false,
-    field: "createdFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "title",
     align: "left",
@@ -110,6 +72,15 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 
+  {
+    name: "org",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: false,
+    field: "org",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "email",
     align: "left",
@@ -129,6 +100,25 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: false,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val: string) => date2Thai(new Date(val), false, true),
+  },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ชื่อผู้สร้าง",
+    sortable: false,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "status",
     align: "left",
diff --git a/src/modules/23_persons/components/TablePersons.vue b/src/modules/23_persons/components/TablePersons.vue
deleted file mode 100644
index f3e5b9467..000000000
--- a/src/modules/23_persons/components/TablePersons.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
-import { useQuasar } from "quasar";
-
-import http from "@/plugins/http";
-import config from "@/app.config";
-import { useCounterMixin } from "@/stores/mixin";
-import { usePersonsStore } from "@/modules/23_persons/stores/PersonsStore";
-import { usePagination } from "@/composables/usePagination";
-
-import type { QTableProps } from "quasar";
-import type {
-  DataOptions,
-  PosTypes,
-  PosLevels,
-  Person,
-} from "@/modules/23_persons/interface/Main";
-
-const $q = useQuasar();
-const { showLoader, hideLoader, messageError } = useCounterMixin();
-const { pagination, params, onRequest } = usePagination("", fetchData);
-const store = usePersonsStore();
-
-const props = defineProps<{ type: "current" | "draft" }>();
-
-const options = reactive({
-  posType: [] as DataOptions[],
-  posLevel: [] as DataOptions[],
-});
-
-const filters = reactive({
-  keyword: "",
-  position: "",
-  posTypeId: "",
-  posLevelId: "",
-});
-
-const rows = ref<Person[]>([]);
-const visibleColumns = ref<string[]>([
-  "citizenId",
-  "fullName",
-  "position",
-  "posType",
-  "posLevel",
-]);
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "citizenId",
-    align: "left",
-    label: "เลขบัตรประชาชน",
-    sortable: false,
-    field: "citizenId",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "fullName",
-    align: "left",
-    label: "ชื่อ-นามสกุล",
-    sortable: false,
-    field: "fullName",
-    format(val, row) {
-      return `${row.prefix || ""}${row.firstName || ""} ${
-        row.lastName || ""
-      }`.trim();
-    },
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: false,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posType",
-    align: "left",
-    label: "ประเภทตำแหน่ง",
-    sortable: false,
-    field: "posType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posLevel",
-    align: "left",
-    label: "ระดับตำแหน่ง",
-    sortable: false,
-    field: "posLevel",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-/** ฟังก์ชันดึงข้อมูลรายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง */
-async function fetchData() {
-  try {
-    showLoader();
-    const payload = {
-      ...params.value,
-      posTypeId: filters.posTypeId,
-      posLevelId: filters.posLevelId,
-      position: filters.position.trim(),
-      keyword: filters.keyword.trim(),
-    };
-    const endpoint =
-      props.type === "current"
-        ? config.API.orgSearchCurrentProfile
-        : config.API.orgSearchProfile;
-
-    const res = await http.post(endpoint, payload);
-    const result = res.data.result;
-
-    pagination.value.rowsNumber = result?.total || 0;
-    rows.value = result?.data || [];
-  } catch (error) {
-    messageError($q, error);
-  } finally {
-    hideLoader();
-  }
-}
-
-/** ฟังก์ชันดึงข้อมูลประเภทตำแหน่ง */
-async function getPosType() {
-  try {
-    options.posType = await store.fetchPosType();
-  } catch (error) {
-    messageError($q, error);
-  }
-}
-
-/**
- * ฟังก์ชันอัปเดตตัวเลือกระดับตำแหน่งเมื่อเลือกประเภทตำแหน่ง
- * @param val ID เภทตำแหน่ง
- */
-function updateSelectType(val: string) {
-  const listLevel: PosTypes | undefined = store.optionsData.dataType.find(
-    (e: PosTypes) => e.id === val
-  );
-
-  store.optionsData.posLevel =
-    listLevel?.posLevels?.map((e: PosLevels) => ({
-      id: e.id,
-      name: e.posLevelName,
-    })) || [];
-
-  options.posLevel = store.optionsData.posLevel;
-
-  filters.posLevelId = "";
-  searchData();
-}
-
-/** ฟังก์ชันค้นหาข้อมูล*/
-function searchData() {
-  pagination.value.page = 1;
-  fetchData();
-}
-
-/**
- * ฟังก์ชันเปิดหน้าทะเบียนขรก. ในแท็บใหม่
- * @param personId ID ของขรก.
- */
-function handleRedirect(personId: string) {
-  window.open(`/registry-officer/${personId}`, "_blank");
-}
-
-onMounted(() => {
-  fetchData();
-  getPosType();
-});
-</script>
-
-<template>
-  <div class="col-12">
-    <!-- Filter Section -->
-    <div class="row col-12 q-col-gutter-sm q-mb-sm">
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-input
-          v-model="filters.position"
-          dense
-          outlined
-          label="ตำแหน่งในสายงาน"
-          @keydown.enter.prevent="searchData"
-        />
-      </div>
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-select
-          label="ตำแหน่งประเภท"
-          v-model="filters.posTypeId"
-          :options="options.posType"
-          emit-value
-          dense
-          map-options
-          outlined
-          option-label="name"
-          option-value="id"
-          clearable
-          @clear="filters.posTypeId = ''"
-          @update:model-value="updateSelectType"
-        />
-      </div>
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-select
-          label="ระดับตำแหน่ง"
-          v-model="filters.posLevelId"
-          :disable="!filters.posTypeId"
-          :options="options.posLevel"
-          emit-value
-          dense
-          map-options
-          outlined
-          option-label="name"
-          option-value="id"
-          clearable
-          @clear="filters.posLevelId = ''"
-          @update:model-value="searchData"
-        />
-      </div>
-
-      <q-space />
-
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-input
-          v-model="filters.keyword"
-          dense
-          outlined
-          label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
-          @keydown.enter.prevent="searchData"
-        >
-          <template v-slot:append>
-            <q-icon name="search" class="cursor-pointer" @click="searchData" />
-          </template>
-        </q-input>
-      </div>
-      <div class="col-xs-12 col-sm-6 col-md-2">
-        <q-select
-          for="visibleColumns"
-          v-model="visibleColumns"
-          multiple
-          outlined
-          dense
-          options-dense
-          :display-value="$q.lang.table.columns"
-          emit-value
-          map-options
-          :options="columns"
-          option-value="name"
-        />
-      </div>
-    </div>
-
-    <!-- Table Section -->
-    <div class="col-12">
-      <p-table
-        ref="table"
-        :columns="columns"
-        :rows="rows"
-        row-key="id"
-        flat
-        bordered
-        dense
-        class="custom-header-table"
-        :visible-columns="visibleColumns"
-        :rows-per-page-options="[1, 10, 25, 50, 100]"
-        v-model:pagination="pagination"
-        @request="onRequest"
-      >
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th auto-width></q-th>
-            <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">
-            <q-td auto-width>
-              <q-btn
-                flat
-                dense
-                round
-                color="info"
-                icon="mdi-eye"
-                @click.prevent="handleRedirect(props.row.id)"
-              >
-                <q-tooltip>ดูรายละเอียด</q-tooltip>
-              </q-btn>
-            </q-td>
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div>
-                {{ col.value ? col.value : "-" }}
-              </div>
-            </q-td>
-          </q-tr>
-        </template>
-      </p-table>
-    </div>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/src/modules/23_persons/interface/Main.ts b/src/modules/23_persons/interface/Main.ts
deleted file mode 100644
index b92ae3cd2..000000000
--- a/src/modules/23_persons/interface/Main.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-interface DataOptions {
-  id: string;
-  name: string;
-}
-
-interface PosTypes {
-  createdAt: Date;
-  id: string;
-  lastUpdateFullName: string;
-  lastUpdatedAt: Date;
-  posTypeName: string;
-  posTypeRank: number;
-  posLevels: PosLevels[];
-}
-
-interface PosLevels {
-  createdAt: Date;
-  id: string;
-  lastUpdateFullName: string;
-  lastUpdatedAt: Date;
-  posLevelAuthority: string;
-  posLevelName: string;
-  posLevelRank: number;
-}
-
-interface Person {
-  citizenId: string;
-  firstName: string;
-  id: string;
-  lastName: string;
-  posLevel: string;
-  posType: string;
-  position: string;
-  prefix: string;
-  rank: string;
-}
-
-export type { DataOptions, PosTypes, PosLevels, Person };
diff --git a/src/modules/23_persons/router.ts b/src/modules/23_persons/router.ts
deleted file mode 100644
index 0ad543b53..000000000
--- a/src/modules/23_persons/router.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-const Main = () => import("@/modules/23_persons/views/Main.vue");
-
-export default [
-  {
-    path: "/persons",
-    name: "personsMain",
-    component: Main,
-    meta: {
-      Auth: true,
-      Key: "PERSONS",
-      Role: "PERSONS",
-    },
-  },
-];
diff --git a/src/modules/23_persons/stores/PersonsStore.ts b/src/modules/23_persons/stores/PersonsStore.ts
deleted file mode 100644
index e19b5e29f..000000000
--- a/src/modules/23_persons/stores/PersonsStore.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { defineStore } from "pinia";
-import { reactive } from "vue";
-
-import http from "@/plugins/http";
-import config from "@/app.config";
-
-import type {
-  DataOptions,
-  PosTypes,
-} from "@/modules/23_persons/interface/Main";
-
-export const usePersonsStore = defineStore("personsStore", () => {
-  const routeCheck = {
-    registry: {
-      meta: { Auth: true, Key: "SYS_REGISTRY_OFFICER", Role: "OWNER" },
-    },
-    org: {
-      meta: { Auth: true, Key: "SYS_ORG", Role: "OWNER" },
-    },
-  };
-
-  const optionsData = reactive({
-    posType: [] as DataOptions[],
-    posLevel: [] as DataOptions[],
-    dataType: [] as PosTypes[],
-  });
-
-  /** ฟังก์ชันดึงข้อมูลประเภทตำแหน่ง */
-  async function fetchPosType() {
-    if (optionsData.posType.length > 0) {
-      return optionsData.posType;
-    }
-
-    const res = await http.get(config.API.orgPosType);
-    optionsData.dataType = res.data.result;
-    optionsData.posType = res.data.result.map((e: PosTypes) => ({
-      id: e.id,
-      name: e.posTypeName,
-    }));
-
-    return optionsData.posType;
-  }
-
-  return { routeCheck, optionsData, fetchPosType };
-});
diff --git a/src/modules/23_persons/views/Main.vue b/src/modules/23_persons/views/Main.vue
deleted file mode 100644
index ce5c336d8..000000000
--- a/src/modules/23_persons/views/Main.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<script setup lang="ts">
-import { watch, computed, ref } from "vue";
-
-import { useRouter } from "vue-router";
-import { usePersonsStore } from "@/modules/23_persons/stores/PersonsStore";
-import { checkPermission } from "@/utils/permissions";
-
-import TablePersons from "@/modules/23_persons/components/TablePersons.vue";
-
-const router = useRouter();
-const { routeCheck } = usePersonsStore();
-
-/// คำนวณสิทธิ์การเข้าถึงหน้ารายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง
-const hasPermission = computed(() => {
-  const registryPermission = checkPermission(routeCheck.registry);
-  const orgPermission = checkPermission(routeCheck.org);
-
-  if (registryPermission === null || orgPermission === null) {
-    return null;
-  }
-
-  return (
-    registryPermission?.attrOwnership === "OWNER" &&
-    orgPermission?.attrOwnership === "OWNER"
-  );
-});
-
-const tabs = ref("1");
-
-watch(
-  () => hasPermission.value,
-  (allowed) => {
-    if (!allowed) {
-      router.push("/404");
-    }
-  }
-);
-</script>
-
-<template>
-  <div class="row items-center">
-    <div class="toptitle text-dark row items-center q-py-xs">
-      รายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง
-    </div>
-  </div>
-
-  <q-card bordered flat>
-    <q-tabs
-      v-model="tabs"
-      dense
-      align="left"
-      inline-label
-      class="rounded-borders"
-      indicator-color="primary"
-      active-bg-color="teal-1"
-      active-class="text-primary"
-    >
-      <q-tab name="1" label="ปัจจุบัน" />
-      <q-tab name="2" label="แบบร่าง" />
-    </q-tabs>
-
-    <q-separator />
-    <div class="q-pa-sm">
-      <q-tab-panels v-model="tabs" animated>
-        <q-tab-panel name="1">
-          <TablePersons v-if="hasPermission" type="current" />
-        </q-tab-panel>
-
-        <q-tab-panel name="2">
-          <TablePersons v-if="hasPermission" type="draft" />
-        </q-tab-panel>
-      </q-tab-panels>
-    </div>
-  </q-card>
-</template>
-
-<style scoped></style>
diff --git a/src/router/index.ts b/src/router/index.ts
index 565174cf3..f570ed6ce 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -29,7 +29,6 @@ import ModulePositionCondition from "@/modules/19_condition/router";
 import ModulePositionTemp from "@/modules/20_positionTemp/router";
 import ModuleReport from "@/modules/21_report/router";
 import ModuleIssues from "@/modules/22_issues/router";
-import ModulePersons from "@/modules/23_persons/router";
 
 // TODO: ใช้หรือไม่?
 import { authenticated, logout } from "@/plugins/auth";
@@ -82,7 +81,6 @@ const router = createRouter({
         ...ModulePositionTemp,
         ...ModuleReport,
         ...ModuleIssues,
-        ...ModulePersons,
       ],
     },
     /**
diff --git a/src/stores/socket.ts b/src/stores/socket.ts
index b7951a9df..0d5ea4c64 100644
--- a/src/stores/socket.ts
+++ b/src/stores/socket.ts
@@ -3,7 +3,6 @@ import { getToken } from "@/plugins/auth";
 import { defineStore } from "pinia";
 import { Notify } from "quasar";
 import { io, Socket } from "socket.io-client";
-import { ref } from "vue";
 interface sockeBackup {
   message: string;
   success?: boolean;
@@ -11,7 +10,6 @@ interface sockeBackup {
 
 export const useSocketStore = defineStore("socket", () => {
   let socket: Socket;
-  const notificationCounter = ref(0);
 
   async function init() {
     socket = io(new URL(config.API.socket).origin, {
@@ -45,12 +43,6 @@ export const useSocketStore = defineStore("socket", () => {
         notifyStatusOrg("current", body.message, body.success);
       }
     });
-
-    socket.on("socket-notification", (payload) => {
-      let body: sockeBackup = JSON.parse(payload);
-      notifyStatusWithProgress(body.message, body.success);
-      notificationCounter.value++;
-    });
   }
 
   function notifyStatus(message: string, success?: boolean) {
@@ -70,27 +62,6 @@ export const useSocketStore = defineStore("socket", () => {
     });
   }
 
-  function notifyStatusWithProgress(message: string, success?: boolean) {
-    Notify.create({
-      group: false,
-      type: success === undefined || success ? "positive" : "negative",
-      message: `${message}`,
-      position: "top",
-      timeout: success === undefined || success ? 3000 : 0,
-      actions:
-        success === undefined || success
-          ? []
-          : [
-              {
-                icon: "close",
-                color: "white",
-                round: true,
-              },
-            ],
-      progress: true,
-    });
-  }
-
   function fnStyleNotiOrg() {
     if (document.getElementById("notify-link-style")) return;
     const style = document.createElement("style");
@@ -113,12 +84,10 @@ export const useSocketStore = defineStore("socket", () => {
   `;
     document.head.appendChild(style);
   }
-
   (window as any).resetOrgPage = (type: string) => {
     localStorage.setItem("org_type", type);
     window.location.reload();
   };
-
   function notifyStatusOrg(type: string, message: string, success?: boolean) {
     fnStyleNotiOrg();
     Notify.create({
@@ -142,5 +111,5 @@ export const useSocketStore = defineStore("socket", () => {
 
   init();
 
-  return { notificationCounter };
+  return {};
 });
diff --git a/src/stores/uploadProgress.ts b/src/stores/uploadProgress.ts
deleted file mode 100644
index 94fcc7536..000000000
--- a/src/stores/uploadProgress.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { defineStore } from 'pinia';
-import { ref } from 'vue';
-
-interface PendingUpload {
-	jobId: string;
-	type: 'candidate' | 'score' | 'result' | 'period';
-	periodId: string;
-}
-
-export const useUploadProgressStore = defineStore('uploadProgress', () => {
-	const pendingUploads = ref<PendingUpload[]>([]);
-
-	function addUpload(jobId: string, periodId: string, uploadType: 'candidate' | 'score' | 'result' | 'period') {
-		pendingUploads.value.push({
-			jobId,
-			type: uploadType,
-			periodId
-		});
-	}
-
-	function removeUpload(jobId: string) {
-		const index = pendingUploads.value.findIndex(u => u.jobId === jobId);
-		if (index !== -1) {
-			pendingUploads.value.splice(index, 1);
-		}
-	}
-
-	function removeByPeriodAndType(periodId: string, uploadType: string) {
-		const index = pendingUploads.value.findIndex(
-			u => u.periodId === periodId && u.type === uploadType
-		);
-		if (index !== -1) {
-			pendingUploads.value.splice(index, 1);
-		}
-	}
-
-	function isUploading(periodId: string, uploadType: string): boolean {
-		return pendingUploads.value.some(
-			u => u.periodId === periodId && u.type === uploadType
-		);
-	}
-
-	return { pendingUploads, addUpload, removeUpload, removeByPeriodAndType, isUploading };
-}, {
-	persist: true
-});
diff --git a/src/utils/function.ts b/src/utils/function.ts
index e3f5e836f..43d08e0b8 100644
--- a/src/utils/function.ts
+++ b/src/utils/function.ts
@@ -73,24 +73,3 @@ export function getColumnLabel(col: any, isAct: boolean) {
   }
   return col.label;
 }
-
-/**
- * ตรวจสอบขนาดไฟล์
- * @param val ไฟล์หรืออาร์เรย์ของไฟล์ที่ต้องการตรวจสอบ
- * @param maxSizeMB ขนาดจำกัดในหน่วย MB (ค่าเริ่มต้นคือ 10MB)
- * @returns true หากไฟล์ทั้งหมดมีขนาดไม่เกินที่กำหนด, หรือข้อความแจ้งเตือนหากมีไฟล์ที่เกินขนาด
- */
-export function validateFileSize(
-  val: File | File[],
-  maxSizeMB: number = 10
-): string | true {
-  if (!val) return true;
-
-  const filesArray = Array.isArray(val) ? val : [val];
-  const limit = maxSizeMB * 1024 * 1024;
-
-  const isAllValid = filesArray.every((file: File) => file.size <= limit);
-  if (isAllValid) return true;
-
-  return `ขนาดไฟล์ไม่เกิน ${maxSizeMB}MB`;
-}
diff --git a/src/views/Error404NotFound.vue b/src/views/Error404NotFound.vue
index b1e69ea96..e521ddd28 100644
--- a/src/views/Error404NotFound.vue
+++ b/src/views/Error404NotFound.vue
@@ -22,12 +22,6 @@ export default defineComponent({
         label="กลับไปหน้าหลัก"
         no-caps
       />
-
-      <div class="q-mt-xl text-subtitle1">
-        <q-icon name="mdi-alert-circle-outline" size="20px" class="q-mr-sm" />
-        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
-        <span class="text-weight-bold q-ml-xs">088-264-9800</span>
-      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/ErrorPermission.vue b/src/views/ErrorPermission.vue
index 49429875f..ec5e14aad 100644
--- a/src/views/ErrorPermission.vue
+++ b/src/views/ErrorPermission.vue
@@ -18,12 +18,6 @@
         label="กลับหน้าหลัก"
         no-caps
       />
-
-      <div class="q-mt-xl text-subtitle1 text-grey-8">
-        <q-icon name="mdi-alert-circle-outline" size="20px" class="q-mr-sm" />
-        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
-        <span class="text-weight-bold text-dark q-ml-xs">088-264-9800</span>
-      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 33e733b0b..369ddee6d 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -28,7 +28,6 @@ import { tabList, tabListPlacement } from "../interface/request/main/main";
 
 import LoginLinkage from "@/components/LoginLinkage.vue";
 import DialogDebug from "@/components/Dialogs/DialogDebug.vue";
-import FooterContact from "@/components/FooterContact.vue";
 
 // landing page config url
 const configParam = {
@@ -532,29 +531,25 @@ async function fetchKeycloakPosition() {
   await http
     .get(config.API.keycloakPosition())
     .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       usePositionKeycloakStore().setPositionKeycloak(data);
       if (data.avatarName) {
-        getImg(data.profileId, data.avatarName);
+        await getImg(data.profileId, data.avatarName);
       } else {
         profileImg.value = avatar;
       }
     })
     .catch((err) => {
       messageError($q, err);
-      profileImg.value = avatar;
     });
 }
 
 const profileImg = ref<string>("");
-function getImg(id: string, pathName: string) {
-  http
+async function getImg(id: string, pathName: string) {
+  await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
     .then((res) => {
       profileImg.value = res.data.downloadUrl;
-    })
-    .catch((err) => {
-      profileImg.value = avatar;
     });
 }
 
@@ -1287,10 +1282,6 @@ function onViewDetailNoti(url: string) {
         <router-view :key="$route.fullPath" />
       </q-page>
     </q-page-container>
-    <q-footer class="bg-grey-1 text-dark q-pa-md" bordered>
-      <FooterContact />
-    </q-footer>
-
     <full-loader :visibility="loader" />
     <LoginLinkage v-model:modal="modalLoginLinkage" />
     <DialogDebug v-model:modal="modalDebug" />