diff --git a/package.json b/package.json
index 088a0ead7..6e2ddd2c2 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
     "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",
diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index b30ec3ec1..bcb7e54d9 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -192,8 +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}`,
 
   workflowCommanderOperate: `${workflow}/commander/operate`,
   workflowCommanderSign: `${workflow}/commander/sign`,
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/components/CardProfile.vue b/src/components/CardProfile.vue
index 72fe7aad0..d6b9fe4cf 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -43,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 =
diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 89b5f803a..42bd3965b 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -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..e84ef99da 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -354,11 +354,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 +363,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 +378,12 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
+                    :rules="[
+                      () =>
+                        !!formData.email ||
+                        !!formData.phone ||
+                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                    ]"
                   />
                 </div>
               </div>
diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index e3c5e4634..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,42 +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, //ชื่อตำแหน่ง
-      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();
-  });
 }
 
 function onSearch() {
@@ -536,7 +534,6 @@ onMounted(async () => {
   await fetchTree();
 });
 </script>
-
 <template>
   <q-dialog v-model="modal" persistent full-width>
     <q-card class="no-scroll">
@@ -568,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"
@@ -834,7 +831,7 @@ onMounted(async () => {
                             </q-toolbar>
                             <d-table
                               ref="table"
-                              :columns="columnsPosition"
+                              :columns="columnsPostition"
                               :rows="rowsPosition"
                               row-key="id"
                               flat
@@ -932,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/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/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/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 2631acf53..e02f71ad4 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(() => {
@@ -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/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/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/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/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/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 f470254c6..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,67 +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 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,
-  // });
+  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" });
+  //แทรกหัวคอลัมน์ภาษาไทย (ใช้ 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();
+  // 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");
+  XLSX.utils.book_append_sheet(
+    workbook,
+    worksheet,
+    `รายการประวัติตำแหน่งเงินเดือน`
+  );
+  XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
 }
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
@@ -854,83 +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;
-}
-
 onMounted(async () => {
   await Promise.all([fetchData(), fetchType()]);
 });
@@ -970,20 +886,6 @@ onMounted(async () => {
         >
         <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
@@ -991,9 +893,7 @@ onMounted(async () => {
             icon="download"
             :disable="rows.length == 0"
             @click="exportToExcel()"
-          >
-            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
-          </q-btn>
+          />
         </div>
 
         <q-input
@@ -1824,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/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/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index e54741069..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,20 +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);
     });
 }
 
@@ -200,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);
     })
@@ -216,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();
@@ -278,9 +272,6 @@ function clearData() {
   posLevel.value = "";
   isPosition.value = "exam";
   filterTree.value = "";
-  datePos.value = new Date();
-  isLoadPosition.value = false;
-  positionNo.value = [];
 }
 
 /** callback function เมื่อมีการเปิด popup*/
@@ -289,8 +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 = [];
       }
@@ -331,7 +323,8 @@ async function getOrgPosType() {
     })
     .catch((e) => {
       messageError($q, e);
-    });
+    })
+    .finally(() => {});
 }
 
 function onPosType() {
@@ -343,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();
     }
   }
@@ -452,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"
@@ -468,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 1d43085e9..bdf4ae494 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -10,7 +10,6 @@ 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";
@@ -1057,8 +1056,7 @@ onMounted(async () => {
                       checkPermission($route)?.attrIsUpdate &&
                       props.row.isDraft &&
                       props.row.statusId === 'PREPARE-CONTAIN' &&
-                      (DataStore.isOfficer ||
-                        checkPermission($route)?.attrOwnership == 'OWNER')
+                      DataStore.isOfficer
                     "
                     clickable
                     v-close-popup
@@ -1545,10 +1543,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 3d7315c78..55777e2c7 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -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/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/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 7cfd48a32..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})` : ""
           }`
         : "";
     },
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 051985d84..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;
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/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/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/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/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/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/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index d30d19755..b33009b20 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,
@@ -322,7 +313,6 @@ watch(modal, async (val) => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
-                    @keydown.enter.prevent="onSearchData(true)"
                   >
                     <template v-slot:after>
                       <q-btn
@@ -396,7 +386,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 +397,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 +453,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,10 +461,33 @@ watch(modal, async (val) => {
                     dense
                     outlined
                     label="จำนวนสิทธิ์การลา"
-                    hint="* สำหรับลาพักผ่อนเท่านั้น คือสิทธิ์ลาประจำปี + สิทธิ์สะสม"
+                    hide-bottom-space
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
+                <div class="col-12">
+                  <q-input
+                    :class="classInput(true)"
+                    v-model="formData.leaveDaysUsed"
+                    dense
+                    outlined
+                    label="ที่ใช้ไป (วัน)"
+                    hide-bottom-space
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
+                  />
+                </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>
 
                 <div class="col-12">
                   <q-input
@@ -483,9 +495,9 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveDays"
                     dense
                     outlined
-                    label="จำนวนวันลาก่อนใช้งานระบบ"
+                    label="ยกมา (วัน)"
+                    hide-bottom-space
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    hint="* จำนวนวันรวมการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
                   />
                 </div>
 
@@ -495,38 +507,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..7dfc20841 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -4,8 +4,8 @@ interface DataPost {
   lastName: string;
   page: number;
   pageSize: number;
-  selectedNodeId?: string | null;
-  selectedNode?: string;
+  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/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/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/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index 92f50c679..5bbb76fc5 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -410,7 +410,6 @@ onMounted(() => {
                 @click="selectAllRows()"
               /> -->
               <q-btn
-                v-if="checkPermission($route)?.attrIsUpdate"
                 :disable="selected.length === 0 || isLoadingAll"
                 :color="selected.length === 0 ? 'grey' : 'info'"
                 dense
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/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/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/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 978d5358c..23d14d89b 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -905,7 +905,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/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 2a3f3b60f..ff3f564a6 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -61,6 +61,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,7 +114,17 @@ 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);
+    });
+}
 
 /**
  * ฟังก์ชันบันทึกข้อมูลรายละเอียดคำสั่ง
@@ -122,7 +133,7 @@ const modalAddOperator = ref<boolean>(false); // แสดงเพิ่มร
 async function onSubmit() {
   //ถ้าเป็น สกจ. ต้องเลือกประเภทคำสั่งด้วย
   if (
-    store.isIdofficer &&
+    isIdofficer.value &&
     formData.isBangkok !== "BANGKOK" &&
     formData.isBangkok !== "OFFICE"
   ) {
@@ -214,6 +225,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 +235,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 +500,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/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/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`;
-}