From 6ef832d84b197e97d4b58a66151b3fc7d4796f9b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 13 Mar 2026 14:01:33 +0700
Subject: [PATCH 001/125] fix(command): disable button delete

---
 .../18_command/components/Step/1_Detail.vue        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index ddab5c0ef..cb3b532b8 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, computed } from "vue";
 import { useQuasar, type QTableProps } from "quasar";
 import { useRoute } from "vue-router";
 
@@ -37,6 +37,12 @@ const props = defineProps({
   formCommandList: { type: Object, required: true },
 });
 
+const isCanDelete = computed(
+  () => (role: string) =>
+    rows.value.filter((row) => row.roleName === "เจ้าหน้าที่ดำเนินการ")
+      .length === 1 && role === "เจ้าหน้าที่ดำเนินการ"
+); //เช็คสามารถลบรายชื่อผู้ลงนามในแนบท้ายคำสั่ง ได้หรือไม่
+
 const commandId = ref<string>(route.params.id.toString()); //ID คำสั่ง
 const commandCode = ref<string>(""); //รหัสคำสั่ง
 const createdUserId = ref<string>(""); //ID ผู้สร้างคำสั่ง
@@ -597,14 +603,12 @@ onMounted(async () => {
                       <q-btn
                         icon="mdi-delete"
                         :color="
-                          props.row.roleName === 'เจ้าหน้าที่ดำเนินการ'
-                            ? 'grey'
-                            : 'red'
+                          isCanDelete(props.row.roleName) ? 'grey' : 'red'
                         "
                         flat
                         dense
                         round
-                        :disable="props.row.roleName === 'เจ้าหน้าที่ดำเนินการ'"
+                        :disable="isCanDelete(props.row.roleName)"
                         @click.prevent.stop="onDeleteData(props.row.id)"
                       >
                         <q-tooltip>ลบข้อมูล</q-tooltip>

From c7a784adc5968851fa2da0550b9de2dee62d29ec Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 13 Mar 2026 16:18:48 +0700
Subject: [PATCH 002/125] =?UTF-8?q?fix=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/18_command/components/Main/TableMain.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/18_command/components/Main/TableMain.vue b/src/modules/18_command/components/Main/TableMain.vue
index 22970fc17..307bfcff1 100644
--- a/src/modules/18_command/components/Main/TableMain.vue
+++ b/src/modules/18_command/components/Main/TableMain.vue
@@ -248,7 +248,7 @@ onMounted(() => {
                   </q-item-section>
                 </q-item>
 
-                <!-- หมอบหมายคำสั่ง -->
+                <!-- มอบหมายคำสั่ง -->
                 <q-item
                   clickable
                   v-close-popup
@@ -262,7 +262,7 @@ onMounted(() => {
                         size="xs"
                         name="mdi-account-check"
                       />
-                      <div class="q-pl-md">หมอบหมายคำสั่ง</div>
+                      <div class="q-pl-md">มอบหมายคำสั่ง</div>
                     </div>
                   </q-item-section>
                 </q-item>

From 52cfa6e0af5a99f1b533a2431d3c330b1be1874b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 16 Mar 2026 10:14:03 +0700
Subject: [PATCH 003/125] fix(registry): add reactive-rules rule prefix rank

---
 .../detail/PersonalInformation/01_Profile.vue        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 8f54e02cd..7730029f7 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -406,6 +406,12 @@ function calculateMinDate() {
   return today;
 }
 
+function prefixRankRule() {
+  return [
+    () => !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
+  ];
+}
+
 /** ดูการเปลี่ยนแปลงของวันเกิดเมื่อมีการเปลี่ยนแปลงจะคำนวนอายูใหม่*/
 watch(
   () => formData.birthDate,
@@ -599,7 +605,8 @@ onMounted(() => {
                 class="inputgreen"
                 :options="store.Ops.prefixOps"
                 :label="dataLabel.prefix"
-                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
+                :rules="prefixRankRule()"
+                reactive-rules
                 @filter="(inputValue: string,
               doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
               )"
@@ -620,7 +627,8 @@ onMounted(() => {
                 input-debounce="0"
                 option-label="name"
                 option-value="name"
-                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
+                :rules="prefixRankRule()"
+                reactive-rules
                 v-model="formData.rank"
                 class="inputgreen"
                 :options="store.Ops.rankOps"

From 1d99705b651cec37be47e12ded423c465d9dafbd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Mar 2026 10:01:34 +0700
Subject: [PATCH 004/125] fix(registry-officer): add field leaveSubTypeName 
 and coupleDayLevelCountry  form leave

---
 .../detail/GovernmentInformation/03_Leave.vue | 59 ++++++++++++++++++-
 .../interface/index/leave.ts                  |  3 +
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
index 726ed821a..721542aba 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue
@@ -202,6 +202,17 @@ const pagination = ref({
 const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
 const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
 
+/** รายการประเภทการลาของ ลาไปศึกษา ฝึกอบรม ปฎิบัติการวิจัย หรือดูงาน*/
+const leaveSubTypeName = ref<string>("");
+const optionSubTypeName = ref<string[]>([
+  "ศึกษาต่อ",
+  "ฝึกอบรม",
+  "ปฎิบัติการวิจัย",
+  "ดูงาน",
+]);
+
+const coupleDayLevelCountry = ref<string>("");
+
 /** function fetch ข้อมูลรายการลา*/
 async function getData() {
   showLoader();
@@ -213,6 +224,7 @@ async function getData() {
         ...item,
         id: item.id,
         typeLeave: item.leaveType.name,
+        codeLeave: item.leaveType.code,
         code: item.leaveType.refCommandDate,
         dateStartLeave: item.dateLeaveStart,
         dateEndLeave: item.dateLeaveEnd,
@@ -292,8 +304,10 @@ function openDialogEdit(props: DetailData) {
   typeLeave.value = {
     id: props.typeLeaveId,
     name: props.typeLeave,
-    code: props.code,
+    code: props.codeLeave,
   };
+  leaveSubTypeName.value = props.leaveSubTypeName;
+  coupleDayLevelCountry.value = props.coupleDayLevelCountry;
   statLeave.value = props.status;
   reason.value = props.reason;
   dateRange.value = [
@@ -316,6 +330,10 @@ function onSubmit() {
 
     const body = {
       leaveTypeId: typeLeave.value?.id,
+      leaveSubTypeName:
+        typeLeave.value?.code === "LV-008" ? leaveSubTypeName.value : undefined,
+      coupleDayLevelCountry:
+        typeLeave.value?.code === "LV-010" ? coupleDayLevelCountry.value : undefined,
       dateLeaveStart: dateToISO(dateRange.value[0]),
       dateLeaveEnd: dateToISO(dateRange.value[1]),
       leaveDays: numLeave.value,
@@ -451,6 +469,8 @@ function closeDialog() {
   dateRange.value = [new Date(), new Date()];
   numLeave.value = 1;
   numUsedLeave.value = 0;
+  leaveSubTypeName.value = "";
+  coupleDayLevelCountry.value = "";
 }
 
 function statusLeave(val: string) {
@@ -741,6 +761,43 @@ onMounted(() => {
                       ) "
               />
             </div>
+
+            <div
+              class="col-xs-6 col-sm-6 col-md-6"
+              v-if="
+                typeLeave?.code === 'LV-008' || typeLeave?.code === 'LV-010'
+              "
+            >
+              <q-select
+                v-if="typeLeave?.code === 'LV-008'"
+                ref="typeLeaveRef"
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                :label="`${'ประเภท'}`"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกประเภท'}`]"
+                v-model="leaveSubTypeName"
+                :options="optionSubTypeName"
+                option-value="id"
+                option-label="name"
+                emit-value
+                map-options
+                hide-bottom-space
+              />
+              <q-input
+                v-if="typeLeave?.code === 'LV-010'"
+                ref="numLeaveRef"
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                v-model="coupleDayLevelCountry"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกประเทศที่ลาติดตามคู่สมรส'}`]"
+                hide-bottom-space
+                :label="`${'ประเทศที่ลาติดตามคู่สมรส'}`"
+              />
+            </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 :readonly="!typeLeave"
diff --git a/src/modules/04_registryPerson/interface/index/leave.ts b/src/modules/04_registryPerson/interface/index/leave.ts
index 8de49f6f5..fb9e48922 100644
--- a/src/modules/04_registryPerson/interface/index/leave.ts
+++ b/src/modules/04_registryPerson/interface/index/leave.ts
@@ -8,6 +8,9 @@ interface DetailData {
   reason: string;
   typeLeaveId: string;
   code: string;
+  codeLeave:string
+  leaveSubTypeName:string
+  coupleDayLevelCountry:string
 }
 
 interface FormFilter {

From f899f05527fd1d28ed3c6aefb235455288a87050 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Mar 2026 13:08:17 +0700
Subject: [PATCH 005/125] feat:Change Round Multiple

---
 .../components/03_ChangeRound/DialogForm.vue  |  57 +-
 .../09_leave/interface/request/changeRound.ts |   2 +
 .../09_leave/stores/ChangeRoundStore.ts       |   2 +
 .../09_leave/views/03_ChangeRoundMain.vue     | 486 +++++++++++-------
 4 files changed, 358 insertions(+), 189 deletions(-)

diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index 0448729fb..59a5c8be2 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -27,7 +27,11 @@ const {
   convertDateToAPI,
 } = mixin;
 
-const emit = defineEmits(["update:change-page"]);
+const emit = defineEmits(["update:change-page", "update:selected"]);
+
+const isMultiple = defineModel<boolean>("isMultiple", {
+  default: false,
+});
 
 /**Props */
 const props = defineProps({
@@ -40,6 +44,10 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  selectedMultiple: {
+    type: Array,
+    default: () => [],
+  },
 });
 
 /**FormData */
@@ -118,18 +126,35 @@ function onSubmit() {
 async function changeRound() {
   const formattedDateForAPI = await convertDateToAPI(formData.effectiveDate);
 
-  const url =
+  const urlAPI =
     props.type == "emp" ? config.API.leaveRoundEMP() : config.API.leaveRound();
   showLoader();
-  await http
-    .post(url, {
+
+  const urlFull = isMultiple.value ? urlAPI + `/multiple ` : urlAPI;
+  let payload: any;
+  if (isMultiple.value && props.selectedMultiple.length > 0) {
+    payload = props.selectedMultiple.map((item: any) => ({
+      profileId: item.profileId,
+      roundId: formData.round,
+      effectiveDate: formattedDateForAPI,
+      remark: formData.reson,
+    }));
+  } else {
+    payload = {
       profileId: props.personId,
       roundId: formData.round,
       effectiveDate: formattedDateForAPI,
       remark: formData.reson,
-    })
+    };
+  }
+  await http
+    .post(urlFull, payload)
     .then(() => {
       success($q, "บันทึกข้อมูลเปลี่ยนรอบเวลา");
+      if (isMultiple.value) {
+        emit("update:selected");
+        isMultiple.value = false;
+      }
       props.closeDialog?.();
     })
     .catch((err) => {
@@ -242,10 +267,10 @@ watch(
                 ? "เปลี่ยนรอบการปฏิบัติงาน"
                 : "ประวัติการเปลี่ยนรอบการปฏิบัติงาน"
             }}
-            <span class="text-teal-6">{{
-              props.DataRow ? props.DataRow.fullName : ""
-            }}</span></q-toolbar-title
-          >
+            <span class="text-teal-6" v-if="!isMultiple">
+              {{ props.DataRow ? props.DataRow.fullName : "" }}
+            </span>
+          </q-toolbar-title>
           <q-btn
             icon="close"
             unelevated
@@ -259,7 +284,7 @@ watch(
           <q-separator />
           <q-card-section style="max-height: 50vh" class="scroll q-pa-none">
             <div class="q-pa-md">
-              <div class="row">
+              <div class="row" v-if="!isMultiple">
                 <q-icon
                   name="mdi-label-variant"
                   class="cursor-pointer self-center"
@@ -267,12 +292,12 @@ watch(
                   size="md"
                 >
                 </q-icon>
-                <span class="self-center text-bold text-blue text-subtitle1"
-                  >รอบปัจจุบัน</span
-                >
-                <span class="self-center text-subtitle1 q-ml-sm">{{
-                  props.DataRow ? `${props.DataRow.currentRound} น.` : ""
-                }}</span>
+                <span class="self-center text-bold text-blue text-subtitle1">
+                  รอบปัจจุบัน
+                </span>
+                <span class="self-center text-subtitle1 q-ml-sm">
+                  {{ props.DataRow ? `${props.DataRow.currentRound} น.` : "" }}
+                </span>
               </div>
               <div class="row q-mt-sm q-col-gutter-sm">
                 <div class="col-6">
diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index ed8c9347a..b00d7ffba 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -4,6 +4,8 @@ interface DataPost {
   lastName: string;
   page: number;
   pageSize: number;
+  selectedNodeId: string | null;
+  selectNode: string;
 }
 
 interface DataOption {
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index eda800a4f..0b883fb4b 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -138,6 +138,8 @@ export const useChangeRoundDataStore = defineStore(
             page: dataDetail.page, //หน้า
             pageSize: dataDetail.pageSize || 10, //จำนวนแถวต่อหน้า
             keyword: dataDetail.keyword || "", //keyword ค้นหา
+            selectedNodeId: dataDetail.selectedNodeId, //id ต้นไม้ที่เลือก
+            selectNode: dataDetail.selectNode, //ระดับต้นไม้ที่เลือก
           })
           .then((res) => {
             const apiData = res.data.result.data;
diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index fdb7433d5..a123f3f0b 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -7,13 +7,17 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useChangeRoundDataStore } from "@/modules/09_leave/stores/ChangeRoundStore";
 import { checkPermission } from "@/utils/permissions";
+import { useStructureTree } from "@/stores/structureTree";
+import { useRoute } from "vue-router";
 
 import type { DataPost } from "@/modules/09_leave/interface/request/changeRound";
 
 import Dialogform from "@/modules/09_leave/components/03_ChangeRound/DialogForm.vue";
 
 /** useStore */
+const route = useRoute();
 const mixin = useCounterMixin();
+
 const {
   showLoader,
   hideLoader,
@@ -23,6 +27,7 @@ const {
   dialogConfirm,
 } = mixin;
 const dataStore = useChangeRoundDataStore();
+const { fetchStructureTree } = useStructureTree();
 
 /** use */
 const $q = useQuasar();
@@ -38,8 +43,23 @@ const formData = reactive<DataPost>({
   lastName: "",
   page: 1,
   pageSize: 10,
+  selectedNodeId: null,
+  selectNode: "",
 });
 
+/** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
+const nodeTree = ref<any[]>([]);
+const expanded = ref<string[]>([]);
+const orgTreeId = ref<string | null>(null);
+const filter = ref<string>("");
+const selected = ref<any[]>([]);
+const isMultiple = ref<boolean>(false);
+
+/** function fetch ข้อมูลของ Tree*/
+async function fetchDataTree() {
+  nodeTree.value = await fetchStructureTree(route.meta.Key as string, true);
+}
+
 /**
  * Function openPopup
  * @param check action edit,history
@@ -87,6 +107,7 @@ async function OpenmodalFix(detail: any) {
 function closeDialog() {
   modal.value = false;
   modalFix.value = false;
+  isMultiple.value = false;
 }
 
 function save() {
@@ -120,11 +141,26 @@ function updatePagination(newPagination: any) {
 
 /** Function ค้นหาข้อมูล */
 async function searchData() {
-  if (formData.cardId || formData.firstName || formData.lastName) {
-    await dataStore.fetchDataForCardId(formData);
-  } else {
-    dialogMessageNotify($q, "กรุณากรอกข้อมูลอย่างน้อย 1 ช่อง");
-  }
+  await dataStore.fetchDataForCardId(formData);
+}
+
+function onSelectedOrgTree(data: any) {
+  selected.value = [];
+  orgTreeId.value = data.orgTreeId;
+  formData.selectedNodeId = data.orgTreeId;
+  formData.selectNode = data.orgLevel;
+  formData.page = 1;
+  searchData();
+}
+
+function handleSelectMultiple() {
+  modal.value = true;
+  isMultiple.value = true;
+  editCheck.value = "edit";
+}
+
+function resetSelected() {
+  selected.value = [];
 }
 
 watch(
@@ -136,6 +172,7 @@ watch(
 );
 
 onMounted(() => {
+  fetchDataTree();
   dataStore.rows = [];
 });
 </script>
@@ -143,181 +180,266 @@ onMounted(() => {
   <div class="toptitle text-dark col-12 row items-center">
     เปลี่ยนแปลงรอบการปฏิบัติงานของข้าราชการ
   </div>
-  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-    <div class="row col-12 q-mb-sm">
-      <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
-        <div class="text-dark col-12 text-weight-bold text-subtitle1">
-          ค้นหารายชื่อ
+
+  <q-card>
+    <q-card-section :horizontal="$q.screen.gt.xs">
+      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
+        <div>
+          <q-input dense outlined v-model="filter" label="ค้นหา">
+            <template v-slot:append>
+              <q-icon name="search" />
+            </template>
+          </q-input>
         </div>
-        <div class="row justify-between q-gutter-y-sm">
-          <q-input
-            :readonly="!checkPermission($route)?.attrIsGet"
-            v-model="formData.cardId"
-            outlined
-            label="เลขประจำตัวประชาชน"
-            class="col-6 col-md-4 bg-white inputgreen"
+        <div class="bg-white tree-container q-pa-xs">
+          <q-tree
+            class="q-pa-sm q-gutter-sm"
             dense
-            hide-bottom-space
-            maxlength="13"
-          />
-          <q-input
-            :readonly="!checkPermission($route)?.attrIsGet"
-            v-model="formData.firstName"
-            outlined
-            label="ชื่อ"
-            class="col-5 col-md-3 bg-white inputgreen"
-            dense
-            hide-bottom-space
-          />
-          <q-input
-            :readonly="!checkPermission($route)?.attrIsGet"
-            v-model="formData.lastName"
-            outlined
-            label="นามสกุล"
-            class="col-6 col-md-3 bg-white inputgreen"
-            dense
-            hide-bottom-space
-          />
-          <q-btn
-            v-if="checkPermission($route)?.attrIsGet"
-            @click="(formData.page = 1), searchData()"
-            for="#search"
-            dense
-            unelevated
-            color="primary"
-            class="q-px-sm col-5 col-md-1"
-            style="max-height: 40px"
-            >ค้นหา</q-btn
+            :nodes="nodeTree"
+            node-key="orgTreeId"
+            label-key="labelName"
+            :filter="filter.trim()"
+            no-results-label="ไม่พบข้อมูลที่ค้นหา"
+            no-nodes-label="ไม่มีข้อมูล"
+            v-model:expanded="expanded"
+          >
+            <template v-slot:default-header="prop">
+              <q-item
+                clickable
+                :active="orgTreeId == prop.node.orgTreeId"
+                @click.stop="onSelectedOrgTree(prop.node)"
+                active-class="my-list-link text-primary text-weight-medium"
+                class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list"
+              >
+                <div>
+                  <div class="text-weight-medium">
+                    {{ prop.node.orgTreeName }}
+                  </div>
+                  <div class="text-weight-light text-grey-8">
+                    {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
+                    {{
+                      prop.node.orgTreeShortName == null
+                        ? null
+                        : prop.node.orgTreeShortName
+                    }}
+                  </div>
+                </div>
+              </q-item>
+            </template>
+          </q-tree>
+        </div>
+      </q-card-section>
+      <q-separator :vertical="$q.screen.gt.xs" />
+      <q-card-section
+        class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm scroll"
+        style="height: 80vh"
+        v-if="orgTreeId"
+      >
+        <div class="row col-xs-12 col-sm-9">
+          <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
+            <div class="text-dark col-12 text-weight-bold text-subtitle1">
+              ค้นหารายชื่อ
+            </div>
+            <div class="row justify-between q-gutter-y-sm">
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet"
+                v-model="formData.cardId"
+                outlined
+                label="เลขประจำตัวประชาชน"
+                class="col-6 col-md-4 bg-white inputgreen"
+                dense
+                hide-bottom-space
+                maxlength="13"
+              />
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet"
+                v-model="formData.firstName"
+                outlined
+                label="ชื่อ"
+                class="col-5 col-md-3 bg-white inputgreen"
+                dense
+                hide-bottom-space
+              />
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet"
+                v-model="formData.lastName"
+                outlined
+                label="นามสกุล"
+                class="col-6 col-md-3 bg-white inputgreen"
+                dense
+                hide-bottom-space
+              />
+              <q-btn
+                v-if="checkPermission($route)?.attrIsGet"
+                @click="(formData.page = 1), searchData()"
+                for="#search"
+                dense
+                unelevated
+                color="primary"
+                class="q-px-sm col-5 col-md-1"
+                style="max-height: 40px"
+                >ค้นหา</q-btn
+              >
+            </div>
+          </q-card>
+        </div>
+        <div
+          v-if="dataStore.rows.length === 0 && dataStore.checkCilck === true"
+        >
+          <q-card
+            flat
+            bordered
+            class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
+            >ไม่พบข้อมูล</q-card
           >
         </div>
-      </q-card>
-    </div>
-    <div v-if="dataStore.rows.length === 0 && dataStore.checkCilck === true">
-      <q-card
-        flat
-        bordered
-        class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
-        >ไม่พบข้อมูล</q-card
-      >
-    </div>
-    <div v-if="dataStore.rows.length !== 0" class="col-12 q-mt-xl">
-      <d-table
-        ref="table"
-        :columns="dataStore.columns"
-        :rows="dataStore.rows"
-        row-key="interrogated"
-        flat
-        bordered
-        dense
-        class="custom-header-table"
-        :visible-columns="dataStore.visibleColumns"
-        :rows-per-page-options="[10, 25, 50, 100]"
-        @update:pagination="updatePagination"
-      >
-        <!-- :paging="true" -->
-        <template v-slot:header="props">
-          <q-tr :props="props">
-            <q-th auto-width />
-            <q-th
-              v-for="col in props.cols"
-              :key="col.name"
-              :props="props"
-              style="color: #000000; font-weight: 500"
-            >
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
-          </q-tr>
-        </template>
-        <template v-slot:body="props">
-          <q-tr :props="props">
-            <q-td>
-              <div>
-                <q-btn
-                  flat
-                  icon="mdi-dots-horizontal-circle-outline"
-                  color="secondary"
-                  for="#cancel"
-                  dense
-                  round
+        <div v-if="dataStore.rows.length !== 0" class="col-12">
+          <div class="row justify-between items-center q-mb-sm">
+            <q-btn
+              v-show="selected.length > 0"
+              color="info"
+              dense
+              icon="mdi-shuffle-variant"
+              label="เปลี่ยนรอบการลงเวลา"
+              @click="handleSelectMultiple()"
+            />
+          </div>
+          <d-table
+            ref="table"
+            :columns="dataStore.columns"
+            :rows="dataStore.rows"
+            row-key="profileId"
+            flat
+            bordered
+            dense
+            class="custom-header-table"
+            :visible-columns="dataStore.visibleColumns"
+            :rows-per-page-options="[10, 25, 50, 100]"
+            @update:pagination="updatePagination"
+            selection="multiple"
+            v-model:selected="selected"
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width>
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    v-model="props.selected"
+                  />
+                </q-th>
+                <q-th auto-width />
+                <q-th
+                  v-for="col in props.cols"
+                  :key="col.name"
+                  :props="props"
+                  style="color: #000000; font-weight: 500"
                 >
-                  <q-menu>
-                    <q-list>
-                      <q-item
-                        v-if="checkPermission($route)?.attrIsUpdate"
-                        clickable
-                        v-close-popup
-                        @click="Openmodal('edit', props.row)"
-                      >
-                        <q-item-section style="min-width: 0px" avatar>
-                          <q-icon
-                            color="primary"
-                            name="mdi-shuffle-variant"
-                            size="xs"
-                          />
-                        </q-item-section>
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr :props="props">
+                <q-td class="text-center">
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    v-model="props.selected"
+                  />
+                </q-td>
+                <q-td>
+                  <div>
+                    <q-btn
+                      flat
+                      icon="mdi-dots-horizontal-circle-outline"
+                      color="secondary"
+                      for="#cancel"
+                      dense
+                      round
+                    >
+                      <q-menu>
+                        <q-list>
+                          <q-item
+                            v-if="checkPermission($route)?.attrIsUpdate"
+                            clickable
+                            v-close-popup
+                            @click="Openmodal('edit', props.row)"
+                          >
+                            <q-item-section style="min-width: 0px" avatar>
+                              <q-icon
+                                color="primary"
+                                name="mdi-shuffle-variant"
+                                size="xs"
+                              />
+                            </q-item-section>
 
-                        <q-item-section>
-                          <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                      <q-item
-                        v-if="checkPermission($route)?.attrIsUpdate"
-                        clickable
-                        v-close-popup
-                        @click="OpenmodalFix(props.row)"
-                      >
-                        <q-item-section style="min-width: 0px" avatar>
-                          <q-icon color="edit" name="edit" size="xs" />
-                        </q-item-section>
+                            <q-item-section>
+                              <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
+                            </q-item-section>
+                          </q-item>
+                          <q-item
+                            v-if="checkPermission($route)?.attrIsUpdate"
+                            clickable
+                            v-close-popup
+                            @click="OpenmodalFix(props.row)"
+                          >
+                            <q-item-section style="min-width: 0px" avatar>
+                              <q-icon color="edit" name="edit" size="xs" />
+                            </q-item-section>
 
-                        <q-item-section>
-                          <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                      <q-item
-                        clickable
-                        v-close-popup
-                        @click="Openmodal('history', props.row)"
-                      >
-                        <q-item-section style="min-width: 0px" avatar>
-                          <q-icon
-                            color="deep-purple"
-                            name="mdi-history"
-                            size="xs"
-                          />
-                        </q-item-section>
-                        <q-item-section>
-                          <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
-                        </q-item-section>
-                      </q-item>
-                    </q-list>
-                  </q-menu>
-                </q-btn>
-              </div>
-            </q-td>
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div>
-                {{ col.value ?? "-" }}
-              </div>
-            </q-td>
-          </q-tr>
-        </template>
-        <template v-slot:pagination="scope">
-          ทั้งหมด {{ dataStore.totalListMain }} รายการ
-          <q-pagination
-            v-model="formData.page"
-            active-color="primary"
-            color="dark"
-            :max="Number(dataStore.maxPageMain)"
-            size="sm"
-            boundary-links
-            direction-links
-            :max-pages="5"
-            @update:model-value="dataStore.fetchDataForCardId(formData)"
-          ></q-pagination>
-        </template>
-      </d-table>
-    </div>
+                            <q-item-section>
+                              <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
+                            </q-item-section>
+                          </q-item>
+                          <q-item
+                            clickable
+                            v-close-popup
+                            @click="Openmodal('history', props.row)"
+                          >
+                            <q-item-section style="min-width: 0px" avatar>
+                              <q-icon
+                                color="deep-purple"
+                                name="mdi-history"
+                                size="xs"
+                              />
+                            </q-item-section>
+                            <q-item-section>
+                              <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
+                            </q-item-section>
+                          </q-item>
+                        </q-list>
+                      </q-menu>
+                    </q-btn>
+                  </div>
+                </q-td>
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                  <div>
+                    {{ col.value ?? "-" }}
+                  </div>
+                </q-td>
+              </q-tr>
+            </template>
+            <template v-slot:pagination="scope">
+              ทั้งหมด {{ dataStore.totalListMain }} รายการ
+              <q-pagination
+                v-model="formData.page"
+                active-color="primary"
+                color="dark"
+                :max="Number(dataStore.maxPageMain)"
+                size="sm"
+                boundary-links
+                direction-links
+                :max-pages="5"
+                @update:model-value="dataStore.fetchDataForCardId(formData)"
+              ></q-pagination>
+            </template>
+          </d-table>
+        </div>
+      </q-card-section>
+    </q-card-section>
   </q-card>
 
   <!-- popup เปลี่ยนรอบการปฏิบัติงาน ,ประวัติการเปลี่ยนรอบการปฏิบัติงาน  -->
@@ -328,6 +450,9 @@ onMounted(() => {
     :DataRow="DataRow"
     :personId="DataRow == null ? '' : DataRow.profileId"
     @update:change-page="dataStore.changePage"
+    v-model:isMultiple="isMultiple"
+    :selectedMultiple="selected"
+    @update:selected="resetSelected"
   />
 
   <!-- แก้ไขปฏิทินวันทำงาน -->
@@ -384,4 +509,19 @@ onMounted(() => {
 .q-table tbody td:before.no-background {
   background: none;
 }
+
+.tree-container {
+  overflow: auto;
+  height: 75vh;
+  border: 1px solid #e6e6e7;
+  border-radius: 10px;
+}
+
+.my-list-link {
+  color: rgb(118, 168, 222);
+  border-radius: 5px;
+  background: #a3d3fb48 !important;
+  font-weight: 600;
+  border: 1px solid rgba(175, 185, 196, 0.217);
+}
 </style>

From ecc10e16c9030cbe54d478f64beb9dee1eb50830 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Mar 2026 16:50:26 +0700
Subject: [PATCH 006/125] feat:absentlate

---
 src/api/registry/api.registry.ts              |   6 +
 .../GovernmentInformation/08_AbsentLate.vue   | 424 ++++++++++++++++++
 .../08_DialogAbsentLate.vue                   | 242 ++++++++++
 .../detail/GovernmentInformation/Main.vue     |   5 +
 .../interface/response/Government.ts          |  19 +-
 .../04_registryPerson/stores/AbsentLate.ts    |  19 +
 6 files changed, 714 insertions(+), 1 deletion(-)
 create mode 100644 src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue
 create mode 100644 src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
 create mode 100644 src/modules/04_registryPerson/stores/AbsentLate.ts

diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 0cbfc086e..f3378e539 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -272,4 +272,10 @@ export default {
   profileAssistanceReturn: `${env.API_URI}/placement/repatriation`,
   profileAssistanceUpdateDelete: (type: string) =>
     `${registryNew}${type}/assistance/update-delete/`,
+
+   profileAbsentLate: (type: string) => `${registryNew}${type}/absent-late`,
+   profileAbsentLateUpdateDelete: (type: string) => `${registryNew}${type}/absent-late/update-delete`,
+   profileAbsentLateHistory: (id: string, type: string) =>
+     `${registryNew}${type}/absent-late/history/${id}`,
+
 };
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue
new file mode 100644
index 000000000..1ae40bde9
--- /dev/null
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue
@@ -0,0 +1,424 @@
+<script setup lang="ts">
+import { ref, onMounted, reactive } from "vue";
+import { useQuasar } from "quasar";
+
+import { useRoute } from "vue-router";
+import { checkPermission } from "@/utils/permissions";
+import { useCounterMixin } from "@/stores/mixin";
+import { useAbsentLateStore } from "@/modules/04_registryPerson/stores/AbsentLate";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type { QTableColumn } from "quasar";
+import type { ResAbsentLateData} from "@/modules/04_registryPerson/interface/response/Government";
+
+import DialogAbsentLate from "@/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/DialogHistory.vue";
+
+const route = useRoute();
+const absentLateStore = useAbsentLateStore();
+const $q = useQuasar();
+const {
+  date2Thai,
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  pathRegistryEmp,
+  onSearchDataTable,
+  convertDateToAPI,
+  dialogRemove,
+} = useCounterMixin();
+
+const profileId = ref<string>(
+  route.params.id ? route.params.id.toString() : ""
+);
+const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
+
+const isLeave = defineModel<boolean>("isLeave", {
+  required: true,
+});
+
+const baseColumns = ref<QTableColumn[]>([
+  {
+    name: "status",
+    align: "left",
+    label: "มาสาย/ ขาดราชการ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      const status = absentLateStore.statusOps.find(
+        (option) => option.id === val
+      );
+      return status ? status.name : val;
+    },
+  },
+  {
+    name: "stampDate",
+    align: "left",
+    label: "วันที่ลงเวลา",
+    sortable: true,
+    field: "stampDate",
+    format: (v) => date2Thai(v),
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "stampType",
+    align: "left",
+    label: "ประเภทการลงเวลา",
+    sortable: true,
+    field: "stampType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val) {
+      const type = absentLateStore.stampTypeOps.find(
+        (option) => option.id === val
+      );
+      return type ? type.name : val;
+    },
+  },
+  {
+    name: "stampAmount",
+    align: "left",
+    label: "จำนวน",
+    sortable: true,
+    field: "stampAmount",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "remark",
+    align: "left",
+    label: "หมายเหตุ",
+    sortable: true,
+    field: "remark",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const baseVisibleColumns = ref<string[]>([
+  "status",
+  "stampDate",
+  "stampType",
+  "stampAmount",
+  "remark",
+]);
+
+/** Table*/
+const rows = ref<ResAbsentLateData[]>([]);
+const rowsMain = ref<ResAbsentLateData[]>([]);
+const mode = ref<string>("table"); //การแสดงผล Table card
+const filterKeyword = ref<string>(""); //คำค้นหา
+const columns = ref<QTableColumn[]>(
+  baseColumns.value.filter((e: QTableColumn) => e.name !== "lastUpdateFullName")
+);
+const visibleColumns = ref<string[]>(
+  baseVisibleColumns.value.filter((e: string) => e !== "lastUpdateFullName")
+);
+const pagination = ref({
+  sortBy: "lastUpdatedAt",
+});
+
+const columnsHistory = ref<QTableColumn[]>(baseColumns.value);
+const visibleColumnsHistory = ref<string[]>(baseVisibleColumns.value);
+
+/** Dialog*/
+const isStatusEdit = ref<boolean>(false);
+const modal = ref<boolean>(false);
+const modalHistory = ref<boolean>(false);
+const rowId = ref<string>("");
+const dataAbsentLate = ref<ResAbsentLateData | null>(null);
+
+async function fetchData() {
+  showLoader();
+  try {
+    const res = await http.get(
+      config.API.profileAbsentLate(empType.value) + `/${profileId.value}`
+    );
+    const data = res.data.result;
+    rowsMain.value = data;
+    serchDataTable();
+  } catch (err) {
+    messageError($q, err);
+  } finally {
+    hideLoader();
+  }
+}
+
+/** function fetch ข้อมูลประวัติการแก้ไขข้อมูล*/
+async function fetchDataHistory() {
+  showLoader();
+  try {
+    const res = await http.get(
+      config.API.profileAbsentLateHistory(rowId.value, empType.value)
+    );
+    return res.data.result;
+  } catch (err) {
+    messageError($q, err);
+  } finally {
+    hideLoader();
+  }
+}
+
+function openEditDialog(data: any) {
+  modal.value = true;
+  isStatusEdit.value = true;
+  rowId.value = data.id;
+  dataAbsentLate.value = data;
+}
+
+function showHistoryDialog(id: string) {
+  modalHistory.value = true;
+  rowId.value = id;
+}
+
+/** ฟังก์ค้นหาข้อมูลขาดราชการ/มาสาย*/
+function serchDataTable() {
+  rows.value = onSearchDataTable(
+    filterKeyword.value,
+    rowsMain.value,
+    columns.value ? columns.value : []
+  );
+}
+
+function onDelete(rowId: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.patch(
+        config.API.profileAbsentLateUpdateDelete(empType.value) + `/${rowId}`
+      );
+      await fetchData();
+      await success($q, "ลบข้อมูลสำเร็จ");
+    } catch (err) {
+      messageError($q, err);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+onMounted(() => {
+  fetchData();
+});
+</script>
+
+<template>
+  <div class="row items-center q-gutter-x-sm q-pb-sm">
+    <q-btn
+      v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
+      dense
+      color="primary"
+      icon="add"
+      flat
+      round
+      @click.stop.prevent="(modal = true), (isStatusEdit = false)"
+    >
+      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+    </q-btn>
+
+    <q-space />
+    <q-input
+      standout
+      dense
+      v-model="filterKeyword"
+      ref="filterRef"
+      outlined
+      placeholder="ค้นหา"
+      @keydown.enter.prevent="serchDataTable"
+    >
+      <template v-slot:append>
+        <q-icon name="search" />
+      </template>
+    </q-input>
+    <q-select
+      v-model="visibleColumns"
+      multiple
+      outlined
+      dense
+      options-dense
+      :display-value="$q.lang.table.columns"
+      emit-value
+      map-options
+      :options="columns"
+      option-value="name"
+      style="min-width: 140px"
+    />
+    <q-btn-toggle
+      v-model="mode"
+      dense
+      class="no-shadow toggle-borderd"
+      toggle-color="grey-4"
+      :options="[
+        { value: 'table', slot: 'table' },
+        { value: 'card', slot: 'card' },
+      ]"
+    >
+      <template v-slot:table>
+        <q-icon
+          name="format_list_bulleted"
+          size="24px"
+          :style="{
+            color: mode === 'table' ? '#787B7C' : '#C9D3DB',
+          }"
+        />
+      </template>
+
+      <template v-slot:card>
+        <q-icon
+          name="mdi-view-grid-outline"
+          size="24px"
+          :style="{
+            color: mode === 'card' ? '#787B7C' : '#C9D3DB',
+          }"
+        />
+      </template>
+    </q-btn-toggle>
+  </div>
+
+  <d-table
+    :grid="mode === 'card'"
+    ref="table"
+    row-key="id"
+    flat
+    bordered
+    dense
+    :columns="columns"
+    :rows="rows"
+    :visible-columns="visibleColumns"
+    v-model:pagination="pagination"
+  >
+    >
+    <template v-slot:header="props">
+      <q-tr :props="props">
+        <q-th auto-width></q-th>
+        <q-th v-for="col in props.cols" :key="col.name" :props="props">
+          <span class="text-weight-medium">{{ col.label }}</span>
+        </q-th>
+      </q-tr>
+    </template>
+    <template v-slot:body="props" v-if="mode === 'table'">
+      <q-tr :props="props">
+        <q-td auto-width>
+          <q-btn
+            flat
+            dense
+            round
+            color="deep-purple"
+            icon="mdi-history"
+            @click.stop.prevent="showHistoryDialog(props.row.id)"
+          >
+            <q-tooltip>ประวัติแก้ไขขาดราชการ/มาสาย</q-tooltip>
+          </q-btn>
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsUpdate"
+            flat
+            dense
+            round
+            color="edit"
+            icon="edit"
+            @click.stop.prevent="openEditDialog(props.row)"
+          >
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+          </q-btn>
+
+          <q-btn
+            v-if="!isLeave && checkPermission($route)?.attrIsDelete"
+            flat
+            dense
+            round
+            color="red"
+            icon="delete"
+            @click.stop.prevent="onDelete(props.row.id)"
+          >
+            <q-tooltip>ลบข้อมูล</q-tooltip>
+          </q-btn>
+        </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          <div>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+      </q-tr>
+    </template>
+    <template v-slot:item="props" v-else>
+      <div class="q-pa-xs col-xs-12 col-sm-4 col-md-3">
+        <q-card flat bordered>
+          <q-card-actions align="right" class="bg-grey-3">
+            <q-btn
+              color="deep-purple"
+              icon="mdi-history"
+              flat
+              round
+              @click.stop.prevent="showHistoryDialog(props.row.id)"
+            >
+              <q-tooltip>ประวัติแก้ไขขาดราชการ/มาสาย</q-tooltip>
+            </q-btn>
+
+            <q-btn
+              v-if="isLeave === false && checkPermission($route)?.attrIsUpdate"
+              :color="props.row.commandId ? 'grey-5' : 'edit'"
+              :disable="props.row.commandId !== null"
+              icon="edit"
+              flat
+              round
+              @click.stop.prevent="openEditDialog(props.row)"
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+
+            <q-btn
+              v-if="isLeave === false && checkPermission($route)?.attrIsDelete"
+              color="red"
+              icon="delete"
+              flat
+              round
+              @click.stop.prevent="onDelete(props.row.id)"
+            >
+              <q-tooltip>ลบข้อมูล</q-tooltip>
+            </q-btn>
+          </q-card-actions>
+          <q-separator />
+
+          <q-list>
+            <div
+              :class="`row q-pa-sm`"
+              :style="`background-color: ${index % 2 !== 0 ? '#FAFAFA' : ''}`"
+              v-for="(col, index) in props.cols"
+              :key="col.name"
+            >
+              <div class="col text-grey-6">
+                <div>{{ col.label }}</div>
+              </div>
+              <div class="col">
+                <div>{{ col.value ? col.value : "-" }}</div>
+              </div>
+            </div>
+          </q-list>
+        </q-card>
+      </div>
+    </template>
+  </d-table>
+
+  <DialogAbsentLate
+    v-model:modal="modal"
+    v-model:isStatusEdit="isStatusEdit"
+    :fetchData="fetchData"
+    :rowId="rowId"
+    :dataAbsentLate="dataAbsentLate"
+  />
+
+  <DialogHistory
+    v-model:modal="modalHistory"
+    :title="`ประวัติแก้ไขขาดราชการ/มาสาย`"
+    :columns="columnsHistory"
+    :visible-columns="visibleColumnsHistory"
+    :fetch-data="fetchDataHistory"
+  />
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
new file mode 100644
index 000000000..3bc7b9c3e
--- /dev/null
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
@@ -0,0 +1,242 @@
+<script setup lang="ts">
+import { reactive, ref, computed, watch } from "vue";
+import { useQuasar } from "quasar";
+
+import { useRoute } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+import { useAbsentLateStore } from "@/modules/04_registryPerson/stores/AbsentLate";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+/** import components*/
+import DialogHeader from "@/components/DialogHeader.vue";
+
+//use
+const $q = useQuasar();
+const route = useRoute();
+const absentLateStore = useAbsentLateStore();
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  date2Thai,
+  convertDateToAPI,
+  dialogConfirm,
+  pathRegistryEmp,
+} = useCounterMixin();
+
+//props
+const modal = defineModel<boolean>("modal", { required: true });
+const isStatusEdit = defineModel<boolean>("isStatusEdit", { required: true });
+const rowId = defineModel<string>("rowId", { required: true });
+
+const props = defineProps<{
+  fetchData: () => Promise<void>;
+  dataAbsentLate: any;
+}>();
+
+const profileId = ref<string>(route.params.id?.toString() ?? ""); //ProfileId
+const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
+
+const form = reactive({
+  status: "",
+  stampDate: new Date(),
+  stampType: "FULL_DAY",
+  stampAmount: "1.0",
+  remark: "",
+});
+
+const tittle = computed(() => {
+  return isStatusEdit.value
+    ? "แก้ไขข้อมูลขาดราชการ/มาสาย"
+    : "เพิ่มข้อมูลขาดราชการ/มาสาย";
+});
+
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    try {
+      showLoader();
+      const playload = {
+        ...form,
+        stampDate: convertDateToAPI(form.stampDate),
+        profileId: isStatusEdit.value ? undefined : profileId.value,
+      };
+      const method = isStatusEdit.value ? "patch" : "post";
+      const url = isStatusEdit.value
+        ? config.API.profileAbsentLate(empType.value) + `/${rowId.value}`
+        : config.API.profileAbsentLate(empType.value);
+      await http[method](url, playload);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      props.fetchData();
+      closeDialog();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/** function ปิด popup*/
+function closeDialog() {
+  modal.value = false;
+}
+
+watch(
+  () => modal.value,
+  (newVal) => {
+    if (newVal) {
+      form.status = isStatusEdit.value ? props.dataAbsentLate.status : "";
+      form.stampDate = isStatusEdit.value
+        ? new Date(props.dataAbsentLate.stampDate)
+        : new Date();
+      form.stampType = isStatusEdit.value
+        ? props.dataAbsentLate.stampType
+        : "FULL_DAY";
+      form.stampAmount = isStatusEdit.value
+        ? props.dataAbsentLate.stampAmount
+        : "1.0";
+      form.remark = isStatusEdit.value ? props.dataAbsentLate.remark : "";
+    }
+  }
+);
+</script>
+
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card style="min-width: 50vw">
+      <q-form greedy @submit.prevent="onSubmit">
+        <DialogHeader :tittle="tittle" :close="closeDialog" />
+        <q-separator />
+
+        <q-card-section class="q-pa-md">
+          <div class="col-12 row q-col-gutter-sm">
+            <div class="col-md-7 col-sm-12">
+              <q-select
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                v-model="form.status"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
+                hide-bottom-space
+                :label="`${'สถานะ'}`"
+                map-options
+                emit-value
+                option-label="name"
+                option-value="id"
+                :options="absentLateStore.statusOps"
+                use-input
+                hide-selected
+                fill-input
+                input-debounce="0"
+              />
+            </div>
+
+            <div class="col-md-5 col-sm-12">
+              <datepicker
+                class="inputgreen"
+                menu-class-name="modalfix"
+                v-model="form.stampDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    outlined
+                    dense
+                    hide-bottom-space
+                    class="full-width"
+                    :model-value="
+                      form.stampDate != null ? date2Thai(form.stampDate) : null
+                    "
+                    :label="`${'วันที่ลงเวลา'}`"
+                    :rules="[
+                              (val: string) =>
+                                !!val || `${'กรุณาเลือกวันที่ลงเวลา'}`,
+                            ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-md-6 col-xs-12">
+              <q-select
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                v-model="form.stampType"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกประเภทการลงเวลา'}`]"
+                hide-bottom-space
+                :label="`${'ประเภทการลงเวลา'}`"
+                map-options
+                emit-value
+                option-label="name"
+                :options="absentLateStore.stampTypeOps"
+                option-value="id"
+                use-input
+                hide-selected
+                fill-input
+                input-debounce="0"
+              />
+            </div>
+
+            <div class="col-md-6 col-xs-12">
+              <q-input
+                class="inputgreen"
+                dense
+                outlined
+                v-model="form.stampAmount"
+                label="จำนวน"
+                hide-bottom-space
+                :rules="[(val:string) => !!val || `${'กรุณากรอกจำนวน'}`]"
+                mask="#.#"
+              />
+            </div>
+
+            <div class="col-12">
+              <q-input
+                class="inputgreen"
+                dense
+                outlined
+                v-model="form.remark"
+                label="เหตุผล"
+                hide-bottom-space
+                type="textarea"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกเหตุผล'}`]"
+              />
+            </div>
+          </div>
+        </q-card-section>
+        <q-separator />
+
+        <q-card-actions align="right">
+          <q-btn type="submit" :label="`บันทึก`" color="public">
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
index da7af1456..3f30cf12e 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue
@@ -14,6 +14,7 @@ import PerformSpecialWork from "@/modules/04_registryPerson/components/detail/Go
 import ActingPos from "@/modules/04_registryPerson/components/detail/GovernmentInformation/05_ActingPos.vue"; //รักษาการในตำแหน่ง
 import HelpGovernmentDetail from "@/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue"; //ช่วยราชการ
 import Postion from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue";
+import AbsentLate from "@/modules/04_registryPerson/components/detail/GovernmentInformation/08_AbsentLate.vue";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@@ -47,6 +48,7 @@ const storeRegistry = useRegistryNewDataStore();
     <q-tab v-if="empType != '-employee'" name="6" label="ช่วยราชการ" />
     <q-tab name="2" label="วินัย" />
     <q-tab name="3" label="การลา" />
+    <q-tab name="8" label="ขาดราชการ/มาสาย" />
     <q-tab name="4" label="ปฏิบัติราชการพิเศษ" />
   </q-tabs>
   <q-separator />
@@ -76,6 +78,9 @@ const storeRegistry = useRegistryNewDataStore();
         :citizen-id="storeRegistry.citizenId"
       />
     </q-tab-panel>
+    <q-tab-panel name="8">
+      <AbsentLate :is-leave="storeRegistry.isLeave" />
+    </q-tab-panel>
     <q-tab-panel name="7">
       <Postion
         :is-leave="storeRegistry.isLeave"
diff --git a/src/modules/04_registryPerson/interface/response/Government.ts b/src/modules/04_registryPerson/interface/response/Government.ts
index bcdf39e50..5fbad6012 100644
--- a/src/modules/04_registryPerson/interface/response/Government.ts
+++ b/src/modules/04_registryPerson/interface/response/Government.ts
@@ -44,4 +44,21 @@ interface ResFileData {
   pathname: string;
 }
 
-export type { ResActingPosData, ResAssistanceData, ResFileData };
+interface ResAbsentLateData {
+  createdAt: string;
+  createdFullName: string;
+  createdUserId: string;
+  id: string;
+  isDeleted: boolean;
+  lastUpdateFullName: string;
+  lastUpdateUserId: string;
+  lastUpdatedAt: string;
+  profileId: string;
+  remark: string;
+  stampAmount: string;
+  stampDate: string;
+  stampType: string;
+  status: string;
+}
+
+export type { ResActingPosData, ResAssistanceData, ResFileData, ResAbsentLateData };
diff --git a/src/modules/04_registryPerson/stores/AbsentLate.ts b/src/modules/04_registryPerson/stores/AbsentLate.ts
new file mode 100644
index 000000000..1247fa0f8
--- /dev/null
+++ b/src/modules/04_registryPerson/stores/AbsentLate.ts
@@ -0,0 +1,19 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
+
+export const useAbsentLateStore = defineStore("absentLate", () => {
+  const statusOps = ref<DataOption[]>([
+    { name: "ขาดราชการ", id: "ABSENT" },
+    { name: "มาสาย", id: "LATE" },
+  ]);
+
+  const stampTypeOps = ref<DataOption[]>([
+    { name: "เต็มวัน", id: "FULL_DAY" },
+    { name: "ครึ่งเช้า", id: "MORNING" },
+    { name: "ครึ่งบ่าย ", id: "AFTERNOON" },
+  ]);
+
+  return { statusOps, stampTypeOps };
+});

From b70d9948c0b879caec576b321952239953b3d60a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Mar 2026 17:30:10 +0700
Subject: [PATCH 007/125] fix : orgTreeDnaId

---
 src/modules/09_leave/interface/request/changeRound.ts | 2 +-
 src/modules/09_leave/stores/ChangeRoundStore.ts       | 2 +-
 src/modules/09_leave/views/03_ChangeRoundMain.vue     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index b00d7ffba..7dfc20841 100644
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@@ -5,7 +5,7 @@ interface DataPost {
   page: number;
   pageSize: number;
   selectedNodeId: string | null;
-  selectNode: string;
+  selectedNode: string;
 }
 
 interface DataOption {
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 0b883fb4b..b1370e358 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -139,7 +139,7 @@ export const useChangeRoundDataStore = defineStore(
             pageSize: dataDetail.pageSize || 10, //จำนวนแถวต่อหน้า
             keyword: dataDetail.keyword || "", //keyword ค้นหา
             selectedNodeId: dataDetail.selectedNodeId, //id ต้นไม้ที่เลือก
-            selectNode: dataDetail.selectNode, //ระดับต้นไม้ที่เลือก
+            selectedNode: dataDetail.selectedNode, //ระดับต้นไม้ที่เลือก
           })
           .then((res) => {
             const apiData = res.data.result.data;
diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index a123f3f0b..415615ef9 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -44,7 +44,7 @@ const formData = reactive<DataPost>({
   page: 1,
   pageSize: 10,
   selectedNodeId: null,
-  selectNode: "",
+  selectedNode: "",
 });
 
 /** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
@@ -147,8 +147,8 @@ async function searchData() {
 function onSelectedOrgTree(data: any) {
   selected.value = [];
   orgTreeId.value = data.orgTreeId;
-  formData.selectedNodeId = data.orgTreeId;
-  formData.selectNode = data.orgLevel;
+  formData.selectedNodeId = data.orgTreeDnaId;
+  formData.selectedNode = data.orgLevel;
   formData.page = 1;
   searchData();
 }

From 6f495cca9d59503f8e35b41145816d3b9ba4e07c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 24 Mar 2026 17:35:55 +0700
Subject: [PATCH 008/125] fix:add filter rowsPerPage = 3000

---
 src/modules/09_leave/views/03_ChangeRoundMain.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index 415615ef9..eaf03bcc3 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -136,7 +136,8 @@ function save() {
  * @param newPagination ข้อมูล Pagination ใหม่
  */
 function updatePagination(newPagination: any) {
-  formData.pageSize = newPagination.rowsPerPage;
+  formData.pageSize =
+    newPagination.rowsPerPage === 0 ? 3000 : newPagination.rowsPerPage;
 }
 
 /** Function ค้นหาข้อมูล */
@@ -314,7 +315,7 @@ onMounted(() => {
             dense
             class="custom-header-table"
             :visible-columns="dataStore.visibleColumns"
-            :rows-per-page-options="[10, 25, 50, 100]"
+            :rows-per-page-options="[0, 10, 25, 50, 100]"
             @update:pagination="updatePagination"
             selection="multiple"
             v-model:selected="selected"

From 0a5f64c17ca4f228fa7f785f9b663e5e8f51f42e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 09:18:51 +0700
Subject: [PATCH 009/125] fix: payload profileEmployeeId

---
 .../GovernmentInformation/08_DialogAbsentLate.vue   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
index 3bc7b9c3e..0697b5ad9 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
@@ -57,16 +57,23 @@ function onSubmit() {
   dialogConfirm($q, async () => {
     try {
       showLoader();
-      const playload = {
+      const payload = {
         ...form,
         stampDate: convertDateToAPI(form.stampDate),
-        profileId: isStatusEdit.value ? undefined : profileId.value,
+        profileId:
+          !isStatusEdit.value && empType.value === ""
+            ? profileId.value
+            : undefined,
+        profileEmployeeId:
+          !isStatusEdit.value && empType.value !== ""
+            ? profileId.value
+            : undefined,
       };
       const method = isStatusEdit.value ? "patch" : "post";
       const url = isStatusEdit.value
         ? config.API.profileAbsentLate(empType.value) + `/${rowId.value}`
         : config.API.profileAbsentLate(empType.value);
-      await http[method](url, playload);
+      await http[method](url, payload);
       success($q, "บันทึกข้อมูลสำเร็จ");
       props.fetchData();
       closeDialog();

From c6ea0527c7bcec362e10e8d779b931a88ea21f78 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 09:23:19 +0700
Subject: [PATCH 010/125] fix

---
 src/modules/09_leave/views/03_ChangeRoundMain.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index eaf03bcc3..86f0f1195 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -297,8 +297,8 @@ onMounted(() => {
         <div v-if="dataStore.rows.length !== 0" class="col-12">
           <div class="row justify-between items-center q-mb-sm">
             <q-btn
-              v-show="selected.length > 0"
-              color="info"
+              :disable="selected.length === 0"
+              :color="selected.length === 0 ? 'grey' : 'info'"
               dense
               icon="mdi-shuffle-variant"
               label="เปลี่ยนรอบการลงเวลา"
@@ -315,7 +315,7 @@ onMounted(() => {
             dense
             class="custom-header-table"
             :visible-columns="dataStore.visibleColumns"
-            :rows-per-page-options="[0, 10, 25, 50, 100]"
+            :rows-per-page-options="[10, 25, 50, 100]"
             @update:pagination="updatePagination"
             selection="multiple"
             v-model:selected="selected"

From 8359d1fbcabb014be80b5efa50221be39e8f6269 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 09:32:02 +0700
Subject: [PATCH 011/125] fix: rowsPerPage 100

---
 src/modules/09_leave/views/03_ChangeRoundMain.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index 86f0f1195..fe7943b22 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -23,7 +23,6 @@ const {
   hideLoader,
   success,
   messageError,
-  dialogMessageNotify,
   dialogConfirm,
 } = mixin;
 const dataStore = useChangeRoundDataStore();
@@ -42,11 +41,16 @@ const formData = reactive<DataPost>({
   firstName: "",
   lastName: "",
   page: 1,
-  pageSize: 10,
+  pageSize: 100,
   selectedNodeId: null,
   selectedNode: "",
 });
 
+const pagination = ref({
+  page: 1,
+  rowsPerPage: formData.pageSize,
+});
+
 /** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
 const nodeTree = ref<any[]>([]);
 const expanded = ref<string[]>([]);
@@ -305,6 +309,7 @@ onMounted(() => {
               @click="handleSelectMultiple()"
             />
           </div>
+
           <d-table
             ref="table"
             :columns="dataStore.columns"
@@ -317,6 +322,7 @@ onMounted(() => {
             :visible-columns="dataStore.visibleColumns"
             :rows-per-page-options="[10, 25, 50, 100]"
             @update:pagination="updatePagination"
+            v-model:pagination="pagination"
             selection="multiple"
             v-model:selected="selected"
           >

From e9c545a18d9010b8ad85a8cf5ab9aa171b802e66 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 10:20:48 +0700
Subject: [PATCH 012/125] feat: add contact banner

---
 src/components/Dialogs/DialogDebug.vue | 9 ++++++++-
 src/views/Error404NotFound.vue         | 6 ++++++
 src/views/ErrorPermission.vue          | 6 ++++++
 src/views/MainLayout.vue               | 8 ++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/components/Dialogs/DialogDebug.vue b/src/components/Dialogs/DialogDebug.vue
index 94c5c349f..cd5b3a78d 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -391,7 +391,14 @@ function onClose() {
         </q-card-section>
 
         <q-separator />
-        <q-card-actions align="right">
+        <q-card-actions class="q-px-md items-center">
+          <div class="text-caption text-grey-8 q-ml-xs q-pa-sm">
+            *พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
+            <span class="text-weight-bold text-grey-8 q-ml-xs"
+              >088-264-9800</span
+            >
+          </div>
+          <q-space />
           <q-btn
             type="submit"
             for="#submitForm"
diff --git a/src/views/Error404NotFound.vue b/src/views/Error404NotFound.vue
index e521ddd28..b1e69ea96 100644
--- a/src/views/Error404NotFound.vue
+++ b/src/views/Error404NotFound.vue
@@ -22,6 +22,12 @@ export default defineComponent({
         label="กลับไปหน้าหลัก"
         no-caps
       />
+
+      <div class="q-mt-xl text-subtitle1">
+        <q-icon name="mdi-alert-circle-outline" size="20px" class="q-mr-sm" />
+        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
+        <span class="text-weight-bold q-ml-xs">088-264-9800</span>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/ErrorPermission.vue b/src/views/ErrorPermission.vue
index ec5e14aad..49429875f 100644
--- a/src/views/ErrorPermission.vue
+++ b/src/views/ErrorPermission.vue
@@ -18,6 +18,12 @@
         label="กลับหน้าหลัก"
         no-caps
       />
+
+      <div class="q-mt-xl text-subtitle1 text-grey-8">
+        <q-icon name="mdi-alert-circle-outline" size="20px" class="q-mr-sm" />
+        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
+        <span class="text-weight-bold text-dark q-ml-xs">088-264-9800</span>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 369ddee6d..36b6d7ff7 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -1282,6 +1282,14 @@ function onViewDetailNoti(url: string) {
         <router-view :key="$route.fullPath" />
       </q-page>
     </q-page-container>
+    <q-footer class="bg-grey-2 text-grey-7 q-py-sm" bordered>
+      <div class="row justify-center items-center text-caption" style="font-size: 13px;">
+        <q-icon name="mdi-alert-circle-outline" size="18px" class="q-mr-sm" />
+        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
+        <span class="text-weight-bold text-grey-9 q-ml-xs">088-264-9800</span>
+      </div>
+    </q-footer>
+
     <full-loader :visibility="loader" />
     <LoginLinkage v-model:modal="modalLoginLinkage" />
     <DialogDebug v-model:modal="modalDebug" />

From 5f48063ae79424b67e82d7c5f7fdb2c195f8c566 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 25 Mar 2026 10:27:45 +0700
Subject: [PATCH 013/125] fix layout and select input

---
 .../08_DialogAbsentLate.vue                   | 64 +++++++++++--------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
index 0697b5ad9..4d0311de3 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue
@@ -90,6 +90,17 @@ function closeDialog() {
   modal.value = false;
 }
 
+watch(
+  () => form.stampType,
+  (stampType) => {
+    if (stampType === "FULL_DAY") {
+      form.stampAmount = "1.0";
+    } else if (stampType === "MORNING" || stampType === "AFTERNOON") {
+      form.stampAmount = "0.5";
+    }
+  }
+);
+
 watch(
   () => modal.value,
   (newVal) => {
@@ -119,29 +130,31 @@ watch(
 
         <q-card-section class="q-pa-md">
           <div class="col-12 row q-col-gutter-sm">
-            <div class="col-md-7 col-sm-12">
-              <q-select
-                class="full-width inputgreen cursor-pointer"
-                outlined
-                dense
-                lazy-rules
-                v-model="form.status"
-                :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
-                hide-bottom-space
-                :label="`${'สถานะ'}`"
-                map-options
-                emit-value
-                option-label="name"
-                option-value="id"
-                :options="absentLateStore.statusOps"
-                use-input
-                hide-selected
-                fill-input
-                input-debounce="0"
-              />
+            <div class="col-12 row">
+              <div class="col-md-4 col-sm-12">
+                <q-select
+                  class="full-width inputgreen cursor-pointer"
+                  outlined
+                  dense
+                  lazy-rules
+                  v-model="form.status"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
+                  hide-bottom-space
+                  :label="`${'สถานะ'}`"
+                  map-options
+                  emit-value
+                  option-label="name"
+                  option-value="id"
+                  :options="absentLateStore.statusOps"
+                  use-input
+                  hide-selected
+                  fill-input
+                  input-debounce="0"
+                />
+              </div>
             </div>
 
-            <div class="col-md-5 col-sm-12">
+            <div class="col-md-4 col-sm-12">
               <datepicker
                 class="inputgreen"
                 menu-class-name="modalfix"
@@ -185,7 +198,7 @@ watch(
                 </template>
               </datepicker>
             </div>
-            <div class="col-md-6 col-xs-12">
+            <div class="col-md-4 col-xs-12">
               <q-select
                 class="full-width inputgreen cursor-pointer"
                 outlined
@@ -207,7 +220,7 @@ watch(
               />
             </div>
 
-            <div class="col-md-6 col-xs-12">
+            <div class="col-md-4 col-xs-12">
               <q-input
                 class="inputgreen"
                 dense
@@ -215,7 +228,9 @@ watch(
                 v-model="form.stampAmount"
                 label="จำนวน"
                 hide-bottom-space
-                :rules="[(val:string) => !!val || `${'กรุณากรอกจำนวน'}`]"
+                readonly
+                :rules="[(val:string) => !!val ||
+              `${'กรุณากรอกจำนวน'}`]"
                 mask="#.#"
               />
             </div>
@@ -229,7 +244,6 @@ watch(
                 label="เหตุผล"
                 hide-bottom-space
                 type="textarea"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเหตุผล'}`]"
               />
             </div>
           </div>

From 140553666dc8d6da16310e16a0cc44d69cef429f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 11:05:28 +0700
Subject: [PATCH 014/125] fix

---
 src/components/Dialogs/DialogDebug.vue | 10 ++++------
 src/components/FooterContact.vue       | 13 +++++++++++++
 src/views/MainLayout.vue               |  9 +++------
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 src/components/FooterContact.vue

diff --git a/src/components/Dialogs/DialogDebug.vue b/src/components/Dialogs/DialogDebug.vue
index cd5b3a78d..e84ef99da 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -11,6 +11,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import DialogHeader from "@/components/DialogHeader.vue";
+import FooterContact from "@/components/FooterContact.vue";
 
 const $q = useQuasar();
 const store = usePositionKeycloakStore();
@@ -391,12 +392,9 @@ function onClose() {
         </q-card-section>
 
         <q-separator />
-        <q-card-actions class="q-px-md items-center">
-          <div class="text-caption text-grey-8 q-ml-xs q-pa-sm">
-            *พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
-            <span class="text-weight-bold text-grey-8 q-ml-xs"
-              >088-264-9800</span
-            >
+        <q-card-actions class="q-px-sm items-center">
+          <div class="row items-center q-pa-sm">
+            <FooterContact />
           </div>
           <q-space />
           <q-btn
diff --git a/src/components/FooterContact.vue b/src/components/FooterContact.vue
new file mode 100644
index 000000000..fe2123415
--- /dev/null
+++ b/src/components/FooterContact.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="row items-center justify-center q-gutter-sm">
+    <q-icon name="support_agent" color="primary" size="sm" />
+    <span class="text-body2">
+      พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
+      <span class="text-weight-medium text-primary">088-264-9800</span>
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped></style>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 36b6d7ff7..3812a311d 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -28,6 +28,7 @@ import { tabList, tabListPlacement } from "../interface/request/main/main";
 
 import LoginLinkage from "@/components/LoginLinkage.vue";
 import DialogDebug from "@/components/Dialogs/DialogDebug.vue";
+import FooterContact from "@/components/FooterContact.vue";
 
 // landing page config url
 const configParam = {
@@ -1282,12 +1283,8 @@ function onViewDetailNoti(url: string) {
         <router-view :key="$route.fullPath" />
       </q-page>
     </q-page-container>
-    <q-footer class="bg-grey-2 text-grey-7 q-py-sm" bordered>
-      <div class="row justify-center items-center text-caption" style="font-size: 13px;">
-        <q-icon name="mdi-alert-circle-outline" size="18px" class="q-mr-sm" />
-        พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ 
-        <span class="text-weight-bold text-grey-9 q-ml-xs">088-264-9800</span>
-      </div>
+    <q-footer class="bg-grey-1 text-dark q-pa-md" bordered>
+      <FooterContact />
     </q-footer>
 
     <full-loader :visibility="loader" />

From 2b0d3340ee4c838ff288d3b6d3d5ae56b87a4a92 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 11:54:34 +0700
Subject: [PATCH 015/125] fix:tel

---
 src/components/FooterContact.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/FooterContact.vue b/src/components/FooterContact.vue
index fe2123415..3aa672f3c 100644
--- a/src/components/FooterContact.vue
+++ b/src/components/FooterContact.vue
@@ -3,7 +3,8 @@
     <q-icon name="support_agent" color="primary" size="sm" />
     <span class="text-body2">
       พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
-      <span class="text-weight-medium text-primary">088-264-9800</span>
+      <span class="text-weight-medium text-primary"><a href="tel:0882649800">088-264-9800</a>
+ </span>
     </span>
   </div>
 </template>

From 59c188a3a99ba5bce70631bc40b9fc136d541a89 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 11:59:14 +0700
Subject: [PATCH 016/125] fix:tel

---
 src/components/FooterContact.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/FooterContact.vue b/src/components/FooterContact.vue
index 3aa672f3c..d8d7236c5 100644
--- a/src/components/FooterContact.vue
+++ b/src/components/FooterContact.vue
@@ -3,8 +3,9 @@
     <q-icon name="support_agent" color="primary" size="sm" />
     <span class="text-body2">
       พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
-      <span class="text-weight-medium text-primary"><a href="tel:0882649800">088-264-9800</a>
- </span>
+      <span class="text-weight-medium text-primary"
+        ><a href="tel:0882649800">088-264-9800</a>
+      </span>
     </span>
   </div>
 </template>

From c066ee577a8ecc706b7dbf2da90c074d9c572efd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 12:10:53 +0700
Subject: [PATCH 017/125] fix: style

---
 src/components/FooterContact.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/FooterContact.vue b/src/components/FooterContact.vue
index d8d7236c5..45082f566 100644
--- a/src/components/FooterContact.vue
+++ b/src/components/FooterContact.vue
@@ -4,7 +4,9 @@
     <span class="text-body2">
       พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
       <span class="text-weight-medium text-primary"
-        ><a href="tel:0882649800">088-264-9800</a>
+        ><a href="tel:0882649800" style="text-decoration: none; color: inherit"
+          >088-264-9800</a
+        >
       </span>
     </span>
   </div>

From 263e122b60cafe089e7c3783a7b6ea28be396569 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 15:05:49 +0700
Subject: [PATCH 018/125] fix: payload multiple

---
 .../09_leave/components/03_ChangeRound/DialogForm.vue     | 8 ++++++++
 src/modules/09_leave/stores/ChangeRoundStore.ts           | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
index 59a5c8be2..954827e64 100644
--- a/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
+++ b/src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
@@ -138,6 +138,14 @@ async function changeRound() {
       roundId: formData.round,
       effectiveDate: formattedDateForAPI,
       remark: formData.reson,
+      firstName: item.firstName,
+      lastName: item.lastName,
+      prefix: item.prefix,
+      rootDnaId: item.rootDnaId,
+      child1DnaId: item.child1DnaId,
+      child2DnaId: item.child2DnaId,
+      child3DnaId: item.child3DnaId,
+      child4DnaId: item.child4DnaId,
     }));
   } else {
     payload = {
diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index b1370e358..4d34b5872 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -150,6 +150,7 @@ export const useChangeRoundDataStore = defineStore(
             if (apiData.length > 0) {
               checkCilck.value = false;
               rows.value = apiData.map((e: any) => ({
+                ...e,
                 profileId: e.profileId,
                 cardId: e.citizenId,
                 fullName: e.fullName,

From 5830d2411867149b8fb0958cb504facd56246444 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 16:55:15 +0700
Subject: [PATCH 019/125] refactor(ui): apply +543 year formatting to columns

---
 src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue    | 2 +-
 .../components/detail/Achievement/03_Insignia.vue               | 2 +-
 src/modules/07_insignia/components/2_Manage/InfoInsignia.vue    | 2 +-
 src/modules/14_KPI/views/01_kpiRound.vue                        | 2 +-
 src/modules/15_development/views/EmployeeHistory.vue            | 2 +-
 src/modules/15_development/views/History.vue                    | 2 +-
 src/modules/15_development/views/MainPage.vue                   | 2 +-
 src/modules/15_development/views/Scholarship.vue                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index 15ecf3039..d23684dea 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -112,7 +112,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.year + 543}`;
+      return `${row.year ? row.year + 543 : "-"}`;
     },
     sort: (a: number, b: number) => b - a,
   },
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index 5da6c11e0..4c5be3b21 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -92,7 +92,7 @@ const baseColumns = ref<QTableColumn[]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => v + 543,
+    format: (v) => (v ? v + 543 : "-"),
     sort: (a: string, b: string) =>
       a
         .toString()
diff --git a/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue b/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
index 3330aea56..2cf7b60c3 100644
--- a/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
+++ b/src/modules/07_insignia/components/2_Manage/InfoInsignia.vue
@@ -35,7 +35,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => v + 543,
+    format: (v) => (v ? v + 543 : "-"),
   },
   {
     name: "receiveDate",
diff --git a/src/modules/14_KPI/views/01_kpiRound.vue b/src/modules/14_KPI/views/01_kpiRound.vue
index f6db8904d..46502850b 100644
--- a/src/modules/14_KPI/views/01_kpiRound.vue
+++ b/src/modules/14_KPI/views/01_kpiRound.vue
@@ -44,7 +44,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val) => val + 543,
+    format: (val) => (val ? val + 543 : "-"),
   },
   {
     name: "durationKPI",
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 87e7f696e..241666999 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -67,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => v + 543,
+    format: (v) => (v ? v + 543 : "-"),
   },
   {
     name: "citizenId",
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 76a8079ea..a9806406c 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -44,7 +44,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => v + 543,
+    format: (v) => (v ? v + 543 : "-"),
   },
   {
     name: "citizenId",
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 7db45984f..397fd2b99 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -75,7 +75,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "year",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px ; width:10%",
-    format: (val) => val + 543,
+    format: (val) => (val ? val + 543 : "-"),
   },
   {
     name: "projectName",
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 48d94b36c..12e494ddc 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -32,7 +32,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val) {
-      return val + 543;
+      return val ? val + 543 : "-";
     },
   },
   {

From beef941dfda6a02a826cfc85080b90a4cad6439b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Mar 2026 17:08:34 +0700
Subject: [PATCH 020/125] fix: insigniaForm.year

---
 .../components/detail/Achievement/03_Insignia.vue         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
index 4c5be3b21..e08b1a073 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@@ -920,9 +920,11 @@ onMounted(async () => {
                 :locale="'th'"
                 :enableTimePicker="false"
               >
-                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year="{ year }">{{
+                  year ? year + 543 : "-"
+                }}</template>
                 <template #year-overlay-value="{ value }">{{
-                  parseInt(value + 543)
+                  value ? parseInt(value + 543) : "-"
                 }}</template>
                 <template #trigger>
                   <q-input
@@ -930,7 +932,7 @@ onMounted(async () => {
                     outlined
                     hide-bottom-space
                     class="inputgreen"
-                    :model-value="insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
+                    :model-value="insigniaForm.year != null && insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
                     :rules="[
                     (val:string) =>
                       !!val ||

From bebf684069148bbb956fe78409c310252b75a42e Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 25 Mar 2026 17:48:24 +0700
Subject: [PATCH 021/125] update selected and load data

---
 .../09_leave/stores/ChangeRoundStore.ts       |   4 +-
 .../09_leave/views/03_ChangeRoundMain.vue     | 206 +++++++++++++-----
 2 files changed, 157 insertions(+), 53 deletions(-)

diff --git a/src/modules/09_leave/stores/ChangeRoundStore.ts b/src/modules/09_leave/stores/ChangeRoundStore.ts
index 4d34b5872..8914ebd4f 100644
--- a/src/modules/09_leave/stores/ChangeRoundStore.ts
+++ b/src/modules/09_leave/stores/ChangeRoundStore.ts
@@ -125,7 +125,7 @@ export const useChangeRoundDataStore = defineStore(
 
     async function fetchDataForCardId(dataDetail: any, type?: string) {
       if (dataDetail) {
-        showLoader();
+        // showLoader();
         const url =
           type && type == "emp"
             ? config.API.leaveSearchEMP()
@@ -170,7 +170,7 @@ export const useChangeRoundDataStore = defineStore(
             console.log(e);
           })
           .finally(() => {
-            hideLoader();
+            // hideLoader();
           });
       }
     }
diff --git a/src/modules/09_leave/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index fe7943b22..5bbb76fc5 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, reactive, onMounted } from "vue";
+import { ref, watch, reactive, onMounted, nextTick } from "vue";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
@@ -18,13 +18,7 @@ import Dialogform from "@/modules/09_leave/components/03_ChangeRound/DialogForm.
 const route = useRoute();
 const mixin = useCounterMixin();
 
-const {
-  showLoader,
-  hideLoader,
-  success,
-  messageError,
-  dialogConfirm,
-} = mixin;
+const { showLoader, hideLoader, success, messageError, dialogConfirm } = mixin;
 const dataStore = useChangeRoundDataStore();
 const { fetchStructureTree } = useStructureTree();
 
@@ -48,7 +42,7 @@ const formData = reactive<DataPost>({
 
 const pagination = ref({
   page: 1,
-  rowsPerPage: formData.pageSize,
+  rowsPerPage: 0,
 });
 
 /** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
@@ -59,6 +53,19 @@ const filter = ref<string>("");
 const selected = ref<any[]>([]);
 const isMultiple = ref<boolean>(false);
 
+/** client-side data & batch loading **/
+const allRows = ref<any[]>([]);
+const isLoadingAll = ref<boolean>(false);
+const loadAllProgress = ref<number>(0);
+const totalToLoad = ref<number | null>(null);
+const BATCH_SIZE = 250;
+
+function waitForUi() {
+  return new Promise((resolve) => {
+    setTimeout(resolve, 0);
+  });
+}
+
 /** function fetch ข้อมูลของ Tree*/
 async function fetchDataTree() {
   nodeTree.value = await fetchStructureTree(route.meta.Key as string, true);
@@ -135,27 +142,75 @@ function save() {
   });
 }
 
-/**
- * function updatePagination
- * @param newPagination ข้อมูล Pagination ใหม่
- */
-function updatePagination(newPagination: any) {
-  formData.pageSize =
-    newPagination.rowsPerPage === 0 ? 3000 : newPagination.rowsPerPage;
+/** Function โหลดข้อมูลทั้งหมดแบบ batch แล้วให้ QTable ทำ pagination เอง */
+async function fetchAllData() {
+  isLoadingAll.value = true;
+  allRows.value = [];
+  loadAllProgress.value = 0;
+  totalToLoad.value = null;
+  selected.value = [];
+
+  // ให้ UI แสดงสถานะกำลังโหลดทันที ก่อนรอผล API แรก
+  await nextTick();
+  await waitForUi();
+
+  try {
+    await dataStore.fetchDataForCardId({
+      ...formData,
+      page: 1,
+      pageSize: BATCH_SIZE,
+    });
+    allRows.value = dataStore.rows.slice();
+
+    const total = dataStore.totalListMain;
+    totalToLoad.value = total;
+    const totalPages = Math.ceil(total / BATCH_SIZE);
+    loadAllProgress.value =
+      totalPages <= 1 ? 100 : Math.round(100 / totalPages);
+    await nextTick();
+
+    for (let page = 2; page <= totalPages; page++) {
+      await dataStore.fetchDataForCardId({
+        ...formData,
+        page,
+        pageSize: BATCH_SIZE,
+      });
+      allRows.value.push(...dataStore.rows);
+      loadAllProgress.value = Math.round((page / totalPages) * 100);
+      await nextTick();
+      await waitForUi();
+    }
+  } finally {
+    isLoadingAll.value = false;
+    totalToLoad.value = null;
+  }
 }
 
 /** Function ค้นหาข้อมูล */
 async function searchData() {
-  await dataStore.fetchDataForCardId(formData);
+  await fetchAllData();
+}
+
+function submitSearchByEnter() {
+  if (isLoadingAll.value) return;
+  if (!checkPermission(route)?.attrIsGet) return;
+  formData.page = 1;
+  searchData();
+}
+
+/** Function เลือกทั้งหมด */
+function selectAllRows() {
+  selected.value = [...allRows.value];
 }
 
 function onSelectedOrgTree(data: any) {
+  if (isLoadingAll.value) return;
   selected.value = [];
+  allRows.value = [];
   orgTreeId.value = data.orgTreeId;
   formData.selectedNodeId = data.orgTreeDnaId;
   formData.selectedNode = data.orgLevel;
   formData.page = 1;
-  searchData();
 }
 
 function handleSelectMultiple() {
@@ -171,14 +226,14 @@ function resetSelected() {
 watch(
   () => formData.pageSize,
   () => {
-    formData.page = 1;
-    searchData();
+    // pageSize ถูกควบคุมโดย QTable (client-side) ไม่ต้อง fetch API ใหม่
   }
 );
 
 onMounted(() => {
   fetchDataTree();
   dataStore.rows = [];
+  allRows.value = [];
 });
 </script>
 <template>
@@ -238,7 +293,6 @@ onMounted(() => {
       <q-card-section
         class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm scroll"
         style="height: 80vh"
-        v-if="orgTreeId"
       >
         <div class="row col-xs-12 col-sm-9">
           <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
@@ -247,7 +301,7 @@ onMounted(() => {
             </div>
             <div class="row justify-between q-gutter-y-sm">
               <q-input
-                :readonly="!checkPermission($route)?.attrIsGet"
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
                 v-model="formData.cardId"
                 outlined
                 label="เลขประจำตัวประชาชน"
@@ -255,28 +309,32 @@ onMounted(() => {
                 dense
                 hide-bottom-space
                 maxlength="13"
+                @keyup.enter="submitSearchByEnter"
               />
               <q-input
-                :readonly="!checkPermission($route)?.attrIsGet"
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
                 v-model="formData.firstName"
                 outlined
                 label="ชื่อ"
                 class="col-5 col-md-3 bg-white inputgreen"
                 dense
                 hide-bottom-space
+                @keyup.enter="submitSearchByEnter"
               />
               <q-input
-                :readonly="!checkPermission($route)?.attrIsGet"
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
                 v-model="formData.lastName"
                 outlined
                 label="นามสกุล"
                 class="col-6 col-md-3 bg-white inputgreen"
                 dense
                 hide-bottom-space
+                @keyup.enter="submitSearchByEnter"
               />
               <q-btn
                 v-if="checkPermission($route)?.attrIsGet"
                 @click="(formData.page = 1), searchData()"
+                :disable="isLoadingAll"
                 for="#search"
                 dense
                 unelevated
@@ -289,7 +347,11 @@ onMounted(() => {
           </q-card>
         </div>
         <div
-          v-if="dataStore.rows.length === 0 && dataStore.checkCilck === true"
+          v-if="
+            allRows.length === 0 &&
+            dataStore.checkCilck === true &&
+            !isLoadingAll
+          "
         >
           <q-card
             flat
@@ -298,30 +360,81 @@ onMounted(() => {
             >ไม่พบข้อมูล</q-card
           >
         </div>
-        <div v-if="dataStore.rows.length !== 0" class="col-12">
+        <div v-if="allRows.length !== 0 || isLoadingAll" class="col-12">
+          <q-banner
+            v-if="isLoadingAll"
+            rounded
+            class="bg-blue-1 text-primary q-mb-sm"
+          >
+            <div class="row items-center q-gutter-sm">
+              <q-spinner color="primary" size="22px" />
+              <div v-if="totalToLoad === null || totalToLoad <= 500">
+                กำลังค้นหาข้อมูล กรุณารอสักครู่
+              </div>
+              <div v-else>
+                กำลังโหลดข้อมูลจำนวนมาก กรุณารอสักครู่
+                <div class="text-caption text-grey-7">
+                  ระบบกำลังดึงข้อมูลทั้งหมด
+                  {{ totalToLoad.toLocaleString() }} รายการ
+                </div>
+              </div>
+            </div>
+          </q-banner>
+          <q-linear-progress
+            v-if="isLoadingAll && totalToLoad === null"
+            indeterminate
+            color="primary"
+            class="q-mb-xs"
+          />
+          <q-linear-progress
+            v-if="isLoadingAll && totalToLoad !== null"
+            :value="loadAllProgress / 100"
+            color="primary"
+            class="q-mb-xs"
+          />
+          <div
+            v-if="isLoadingAll && totalToLoad !== null"
+            class="text-caption text-grey-6 q-mb-xs"
+          >
+            กำลังโหลด... {{ allRows.length.toLocaleString() }} /
+            {{ totalToLoad.toLocaleString() }} รายการ
+          </div>
           <div class="row justify-between items-center q-mb-sm">
-            <q-btn
-              :disable="selected.length === 0"
-              :color="selected.length === 0 ? 'grey' : 'info'"
-              dense
-              icon="mdi-shuffle-variant"
-              label="เปลี่ยนรอบการลงเวลา"
-              @click="handleSelectMultiple()"
-            />
+            <div class="row q-gutter-sm">
+              <!-- <q-btn
+                color="secondary"
+                dense
+                icon="mdi-checkbox-multiple-marked-outline"
+                label="เลือกทั้งหมด"
+                :disable="isLoadingAll || allRows.length === 0"
+                @click="selectAllRows()"
+              /> -->
+              <q-btn
+                :disable="selected.length === 0 || isLoadingAll"
+                :color="selected.length === 0 ? 'grey' : 'info'"
+                dense
+                icon="mdi-shuffle-variant"
+                :label="`เปลี่ยนรอบการลงเวลา${
+                  selected.length > 0 ? ` (${selected.length})` : ''
+                }`"
+                @click="handleSelectMultiple()"
+              />
+            </div>
           </div>
 
           <d-table
             ref="table"
             :columns="dataStore.columns"
-            :rows="dataStore.rows"
+            :rows="allRows"
             row-key="profileId"
             flat
             bordered
             dense
+            virtual-scroll
+            table-style="max-height: 58vh"
             class="custom-header-table"
             :visible-columns="dataStore.visibleColumns"
-            :rows-per-page-options="[10, 25, 50, 100]"
-            @update:pagination="updatePagination"
+            hide-pagination
             v-model:pagination="pagination"
             selection="multiple"
             v-model:selected="selected"
@@ -333,6 +446,7 @@ onMounted(() => {
                     keep-color
                     color="primary"
                     dense
+                    :disable="isLoadingAll"
                     v-model="props.selected"
                   />
                 </q-th>
@@ -354,6 +468,7 @@ onMounted(() => {
                     keep-color
                     color="primary"
                     dense
+                    :disable="isLoadingAll"
                     v-model="props.selected"
                   />
                 </q-td>
@@ -429,21 +544,10 @@ onMounted(() => {
                 </q-td>
               </q-tr>
             </template>
-            <template v-slot:pagination="scope">
-              ทั้งหมด {{ dataStore.totalListMain }} รายการ
-              <q-pagination
-                v-model="formData.page"
-                active-color="primary"
-                color="dark"
-                :max="Number(dataStore.maxPageMain)"
-                size="sm"
-                boundary-links
-                direction-links
-                :max-pages="5"
-                @update:model-value="dataStore.fetchDataForCardId(formData)"
-              ></q-pagination>
-            </template>
           </d-table>
+          <div class="text-caption text-grey-7 q-mt-sm">
+            ทั้งหมด {{ allRows.length }} รายการ
+          </div>
         </div>
       </q-card-section>
     </q-card-section>

From ec5f1139224590a13091c65e352329a0cbcc83d2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 26 Mar 2026 09:49:02 +0700
Subject: [PATCH 022/125] fix(registry): handle router.push based on isLeave
 status

---
 src/modules/04_registryPerson/views/detailView.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index f5e951411..33ca37200 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -806,9 +806,13 @@ function handleBackNavigation() {
     router.go(-1);
   } else {
     if (empType.value === "") {
-      router.push("/registry-officer");
+      storeRegistry.isLeave
+        ? router.push("/registry-retire-officer")
+        : router.push("/registry-officer");
     } else if (empType.value === "-employee") {
-      router.push("/registry-employee");
+      storeRegistry.isLeave
+        ? router.push("/registry-retire-employee")
+        : router.push("/registry-employee");
     }
   }
 }

From 3c15bb3b0b159587ec35a03112fe93c366c6ad88 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 26 Mar 2026 09:59:29 +0700
Subject: [PATCH 023/125] fix(salary): add null check for id before processing

---
 src/modules/13_salary/components/04_salaryLists/TabMain.vue     | 2 ++
 .../13_salary/components/05_salaryListsEmployee/TabMain.vue     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
index 5da8f0b3d..ddf8804e5 100644
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@@ -222,6 +222,7 @@ const itemsCard = ref([
  * @param id กลุ่ม
  */
 async function fetchDataQuota(id: string) {
+  if (!id) return;
   await http
     .get(config.API.salaryListPeriodQuota(id))
     .then((res) => {
@@ -254,6 +255,7 @@ async function fetchDataQuota(id: string) {
  * @param id กลุ่ม
  */
 async function fetchDataPeriod(id: string, force: boolean = false) {
+  if (!id) return;
   force && showLoader();
   let formData = {
     ...params.value,
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
index e4f00a7cc..cc50f45cb 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
@@ -215,6 +215,7 @@ const itemsCard = ref([
  * @param id กลุ่ม
  */
 async function fetchDataQuota(id: string) {
+  if (!id) return;
   await http
     .get(config.API.salaryListPeriodQuotaEmp(id))
     .then((res) => {
@@ -246,6 +247,7 @@ async function fetchDataQuota(id: string) {
  * @param id กลุ่ม
  */
 async function fetchDataPeriod(id: string, force: boolean = false) {
+  if (!id) return;
   force && showLoader();
   let formData = {
     ...params.value,

From dd5b2e0676fe08323db7c9a2e5f8b8b4b8059201 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 26 Mar 2026 10:16:46 +0700
Subject: [PATCH 024/125] fix(discipline): clear selected employees on class
 change

---
 src/components/Dialogs/AddPersonal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 6003ace6f..42bd3965b 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -305,7 +305,7 @@ watch(
               outlined
               option-label="name"
               option-value="id"
-              @update:model-value="rows = []"
+              @update:model-value="(rows = []), (selected = [])"
             />
           </div>
         </div>

From db4df70a8373dfbe5facc6926081b277eaebfe2c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 26 Mar 2026 11:11:59 +0700
Subject: [PATCH 025/125] fix(salary): filter data to show only records with
 groupid

---
 src/modules/13_salary/views/04_salaryLists.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index 6e9a4c4fc..d3f38a61f 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -308,6 +308,7 @@ async function fetchSalalyPeriod(
         if (!data.group1id) {
           hideLoader();
         }
+        isLoad.value = data.group1id ? true : false;
       })
       .catch((err) => {
         messageError($q, err);

From 24c307e076a9478273dc741133faf98e5aef6ef1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 27 Mar 2026 10:44:41 +0700
Subject: [PATCH 026/125] refactor(ui report): remove unused code and clean up

---
 .../views/01_compete/CompeteReport.vue        | 10 -----
 src/modules/14_KPI/views/report.vue           | 37 -------------------
 .../21_report/views/05_reportSalary.vue       | 22 -----------
 3 files changed, 69 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
index d75dded2d..de4c59ddc 100644
--- a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
+++ b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
@@ -403,16 +403,6 @@ function clearFilter() {
       </div>
     </div>
   </q-form>
-
-  <div class="q-pa-sm q-gutter-sm">
-    <q-card flat bordered class="col-12">
-      <div class="row q-col-gutter-sm q-pa-sm">
-        <div class="row col-12 q-col-gutter-sm">
-          <q-space />
-        </div>
-      </div>
-    </q-card>
-  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index f723dd697..23d14d89b 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -876,43 +876,6 @@ onMounted(() => {
     </div>
   </q-form>
 
-  <q-card flat bordered>
-    <q-card-section class="q-gutter-y-sm">
-      <q-toolbar style="padding: 0">
-        <div class="row q-gutter-sm"></div>
-
-        <q-space />
-      </q-toolbar>
-      <q-toolbar
-        class="q-pa-sm bg-grey-2"
-        style="padding: 0; border-radius: 5px"
-        v-if="typeReport"
-      >
-        <div
-          class="row q-gutter-sm"
-          v-if="
-            typeReport === 'KPI1' ||
-            typeReport === 'KPI2' ||
-            typeReport === 'KPI3' ||
-            typeReport === 'KPI7' ||
-            typeReport === 'KPI8' ||
-            typeReport === 'KPI9'
-          "
-        ></div>
-
-        <div
-          class="q-pa-sm"
-          v-if="
-            typeReport === 'KPI4' ||
-            typeReport === 'KPI5' ||
-            typeReport === 'KPI6' ||
-            typeReport === 'KPI8'
-          "
-        ></div>
-      </q-toolbar>
-    </q-card-section>
-  </q-card>
-
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 1000px; max-width: 100vw">
       <DialogHeader :tittle="'เลือกราชชื่อ'" :close="onCloseModal" />
diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue
index dafbfd3be..786f4dd3a 100644
--- a/src/modules/21_report/views/05_reportSalary.vue
+++ b/src/modules/21_report/views/05_reportSalary.vue
@@ -807,28 +807,6 @@ onMounted(() => {
       </div>
     </div>
   </q-form>
-
-  <div class="q-pa-sm q-gutter-sm">
-    <q-card flat bordered class="col-12">
-      <div class="row q-col-gutter-sm q-pa-sm">
-        <div class="row col-12">
-          <q-card bordered class="col-12 filter-card q-pa-sm">
-            <div class="row col-12 q-col-gutter-sm items-center">
-              <div class="row col-md-8 col-sx-12 q-col-gutter-sm">
-                <div class="col-md-3 col-xs-6"></div>
-                <div class="col-md-3 col-xs-6"></div>
-
-                <div class="col-md-3 col-xs-6"></div>
-              </div>
-              <div class="row q-col-gutter-sm col-md-12">
-                <div class="col-md-4 col-xs-12"></div>
-              </div>
-            </div>
-          </q-card>
-        </div>
-      </div>
-    </q-card>
-  </div>
 </template>
 
 <style lang="scss" scoped>

From b1ae19afa7168c1762536ae6f9a6c678e683f87d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 27 Mar 2026 16:07:14 +0700
Subject: [PATCH 027/125] fix(placement): condition edit

---
 .../PersonalDetail/Information/Qualification.vue          | 1 +
 .../components/PersonalDetail/Information/top.vue         | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue b/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
index 3980a65a9..63833fb13 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue
@@ -53,6 +53,7 @@ const saveData = async () => {
         changeBtn();
         onEdit.value = false;
         edit.value = false;
+        emit("update:statusEdit", false);
       })
       .catch((e: any) => {
         messageError($q, e);
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/top.vue b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
index 599ed3562..fdf85e7af 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/top.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/top.vue
@@ -1,7 +1,7 @@
 <!-- ส่วนหัวของ ข้อมูลส่วนตัว และ ที่อยู่ -->
 <script setup lang="ts">
 import { checkPermission } from "@/utils/permissions";
-import { ref } from "vue";
+import { computed } from "vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
@@ -62,9 +62,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(["update:edit"]);
-const isEdit = ref<boolean>(
-  checkPermission(route)?.attrIsUpdate ? true : false
-);
+const isEdit = computed(() => {
+  return checkPermission(route)?.attrIsUpdate ? true : false;
+});
 
 const updateEdit = (value: any) => {
   emit("update:edit", value);

From abce475de0d3db41540c5a52109fef38df45abf6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 27 Mar 2026 16:25:56 +0700
Subject: [PATCH 028/125] fix(retirement): checkRoutePermisson

---
 src/modules/06_retirement/components/02_resign/ResignByid.vue | 1 +
 .../06_retirement/components/02_resign/ResignReject.vue       | 4 ++--
 .../06_retirement/components/03_resignEmp/ResignByid.vue      | 1 +
 .../06_retirement/components/03_resignEmp/ResignReject.vue    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 9413a3488..4d4dac874 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -771,6 +771,7 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
+          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate
diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index b0061bcc4..acfcbe296 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -36,7 +36,7 @@ const {
   dialogConfirm,
 } = useCounterMixin();
 
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailReject");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailreject");
 
 /** ตัวแปร */
 const roleUser = ref<string>("");
@@ -439,7 +439,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push('/retirement/resign')"
       />
-      รายละเอียดการยกเลิกลาออก
+      รายละเอียดการยกเลิกลาออก {{ route.name }}
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index 802f75753..fddf3cf66 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -801,6 +801,7 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
+          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index 4221aaaee..ff5313b80 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -29,7 +29,7 @@ const router = useRouter();
 const store = useRetirementDataStore();
 const { fetchDataCheckIsoffice } = useRoleWorkflowDataStore();
 const { convertStatusText } = store;
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailRejectEMP");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailrejectEMP");
 const mixin = useCounterMixin();
 const {
   messageError,

From 70d2c59f65320b6587ba85f7f989da215d929567 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Sat, 28 Mar 2026 11:27:13 +0700
Subject: [PATCH 029/125] fix: display

---
 src/modules/06_retirement/components/02_resign/ResignReject.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index acfcbe296..d40a2b1ec 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -439,7 +439,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push('/retirement/resign')"
       />
-      รายละเอียดการยกเลิกลาออก {{ route.name }}
+      รายละเอียดการยกเลิกลาออก 
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}

From e9bcebee6d9d849ca7b01382e3163e49053a2433 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 30 Mar 2026 10:40:57 +0700
Subject: [PATCH 030/125] fix(exam): add qualify period validation for
 announcement type

---
 src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 6b54c2ac7..e02f71ad4 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -400,7 +400,7 @@ async function checkSave() {
 
     // เช็ค validation form ตำแหน่ง
     const isPositionFormValid = await myFormPosition.value?.validate();
-    if (!isPositionFormValid) return;
+    if (!isPositionFormValid && announcementExam.value) return;
 
     // เช็คการเพิ่มตำแหน่ง
     if (announcementExam.value && rowsPosition.value.length === 0) {
@@ -889,7 +889,7 @@ function fetchPosition(level: number) {
  * @param val ค่าประเภทตำแหน่ง 0 = ประเภททั่วไป ,1 = ประเภทวิชาการ
  * @param index ตำแหน่งของข้อมูล
  */
-function onUpdateHighDegree(val: string, index: string) {
+function onUpdateHighDegree(val: string, index: number) {
   rowsPosition.value[index].position = null;
   rowsPosition.value[index].level =
     val === "0" ? optionPosLevel1.value[0] : optionPosLevel2.value[0];

From 514de15f094a4b3382ae2514b7998e9a18f1a6f3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Apr 2026 11:09:33 +0700
Subject: [PATCH 031/125] feat(leave): add Processed Late tab to work-list

---
 src/api/09_leave/api.leave.ts                 |   2 +
 .../02_WorkList/Tab3_Processed_Late.vue       | 491 ++++++++++++++++++
 .../09_leave/interface/request/work.ts        |   6 +
 .../09_leave/interface/response/work.ts       |  22 +-
 src/modules/09_leave/views/02_WorkingMain.vue |  24 +-
 5 files changed, 542 insertions(+), 3 deletions(-)
 create mode 100644 src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue

diff --git a/src/api/09_leave/api.leave.ts b/src/api/09_leave/api.leave.ts
index 865db4ea6..d0229b204 100644
--- a/src/api/09_leave/api.leave.ts
+++ b/src/api/09_leave/api.leave.ts
@@ -61,4 +61,6 @@ export default {
 
   leaveReportAPI: (type: string) =>
     `${leave}/report/download/time-records/${type}`,
+
+  leaveTask: `${leave}/admin/leave-task/process`,
 };
diff --git a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
new file mode 100644
index 000000000..5a6b50854
--- /dev/null
+++ b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
@@ -0,0 +1,491 @@
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
+import { useQuasar } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+
+import type { QTableProps } from "quasar";
+import type { FormDataProcess } from "@/modules/09_leave/interface/request/work";
+import type { DataProcess } from "@/modules/09_leave/interface/response/work";
+
+import HeaderDialog from "@/components/DialogHeader.vue";
+
+const $q = useQuasar();
+const {
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  date2Thai,
+  onSearchDataTable,
+  convertDateToAPI,
+  dialogRemove,
+} = useCounterMixin();
+
+/** ข้อมูลตาราง*/
+const keyword = ref<string>("");
+const rowsMain = ref<DataProcess[]>([]);
+const rows = ref<DataProcess[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "startDate",
+    align: "left",
+    label: "วันเริ่มต้น",
+    sortable: true,
+    field: "startDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val) : "-";
+    },
+  },
+  {
+    name: "endDate",
+    align: "left",
+    label: "วันสิ้นสุด",
+    sortable: true,
+    field: "endDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val) : "-";
+    },
+  },
+  {
+    name: "processingDate",
+    align: "left",
+    label: "วันที่ประมวลผล",
+    sortable: true,
+    field: "processingDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val, false, true) : "-";
+    },
+  },
+  {
+    name: "completeDate",
+    align: "left",
+    label: "วันที่เสร็จสิ้น",
+    sortable: true,
+    field: "completeDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val, false, true) : "-";
+    },
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return convertStatus(val);
+    },
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val, false, true) : "-";
+    },
+  },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ผู้สร้าง",
+    sortable: true,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "startDate",
+  "endDate",
+  "processingDate",
+  "completeDate",
+  "status",
+  "createdAt",
+  "createdFullName",
+]);
+
+const modal = ref<boolean>(false); // dialog
+const isEdit = ref<boolean>(false); // แก้ไขหรือเพิ่ม
+const editId = ref<string>(""); // id ที่จะแก้ไข
+const formData = reactive<FormDataProcess>({
+  startDate: null,
+  endDate: null,
+});
+
+/** ฟังก์ชันดึงข้อมูลจาก API */
+async function fetchData() {
+  try {
+    showLoader();
+    // เรียก API เพื่อดึงข้อมูล
+    const res = await http.get(`${config.API.leaveTask}`);
+    rowsMain.value = res.data.result;
+    serchDataTable();
+  } catch (error) {
+    messageError($q, error);
+  } finally {
+    hideLoader();
+  }
+}
+
+/** ฟังก์ชันค้นหาข้อมูลในตาราง */
+function serchDataTable() {
+  rows.value = onSearchDataTable(
+    keyword.value,
+    rowsMain.value,
+    columns.value ? columns.value : []
+  );
+}
+
+/** ฟังก์ชันเปิด dialog เพื่อเพิ่มข้อมูล */
+function handleOpenDialog() {
+  modal.value = true;
+  isEdit.value = false;
+}
+
+/** ฟังก์ชันปิด dialog และรีเซ็ตข้อมูล */
+function handleCloseDialog() {
+  modal.value = false;
+  formData.startDate = null;
+  formData.endDate = null;
+  editId.value = "";
+}
+
+/** ฟังก์ชันส่งข้อมูล */
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    showLoader();
+
+    // สร้าง payload สำหรับส่งข้อมูลไปยัง API
+    const payload = {
+      startDate: convertDateToAPI(formData.startDate),
+      endDate: convertDateToAPI(formData.endDate),
+    };
+
+    //กำหนด URL และ method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
+    const url = isEdit.value
+      ? `${config.API.leaveTask}/${editId.value}`
+      : config.API.leaveTask;
+
+    // กำหนด method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
+    const method = isEdit.value ? "put" : "post";
+
+    try {
+      await http[method](url, payload);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      fetchData();
+      handleCloseDialog();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/** ฟังก์ชันตรวจสอบและอัปเดตวันที่สิ้นสุดให้เป็น null หากวันที่เริ่มต้นมากกว่าวันที่สิ้นสุด*/
+function updateDate() {
+  if (
+    formData.startDate &&
+    formData.endDate &&
+    new Date(formData.startDate) > new Date(formData.endDate)
+  ) {
+    formData.endDate = null;
+  }
+}
+
+/**
+ * ฟังก์ชันแก้ไขข้อมูล
+ * @param data ข้อมูลที่ต้องการแก้ไข
+ */
+function handleEdit(data: DataProcess) {
+  isEdit.value = true;
+  editId.value = data.id;
+  formData.startDate = data.startDate;
+  formData.endDate = data.endDate;
+  modal.value = true;
+}
+
+/**
+ * ฟังก์ชันลบข้อมูล
+ * @param id ที่ต้องการลบ
+ */
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.delete(`${config.API.leaveTask}/${id}`);
+      success($q, "ลบข้อมูลสำเร็จ");
+      fetchData();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/**
+ * ฟังก์ชันแปลงสถานะเป็นข้อความ
+ * @param val
+ */
+function convertStatus(val: string) {
+  switch (val) {
+    case "PENDING":
+      return "รอดำเนินการ";
+    case "COMPLETED":
+      return "ดำเนินการเสร็จสิ้น";
+    default:
+      break;
+  }
+}
+
+onMounted(() => {
+  fetchData();
+});
+</script>
+
+<template>
+  <div class="row items-center q-gutter-x-sm q-pb-sm">
+    <q-btn
+      round
+      dense
+      flat
+      color="primary"
+      icon="add"
+      @click="handleOpenDialog"
+    >
+      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+    </q-btn>
+
+    <q-space />
+
+    <q-input
+      dense
+      outlined
+      v-model="keyword"
+      label="ค้นหา"
+      @keydown.enter.prevent="serchDataTable"
+    >
+      <template v-slot:append>
+        <q-icon name="search" />
+      </template>
+    </q-input>
+    <q-select
+      v-model="visibleColumns"
+      multiple
+      outlined
+      dense
+      options-dense
+      :display-value="$q.lang.table.columns"
+      emit-value
+      map-options
+      :options="columns"
+      option-value="name"
+      style="min-width: 140px"
+    />
+  </div>
+  <d-table
+    :columns="columns"
+    :rows="rows"
+    row-key="id"
+    flat
+    bordered
+    :paging="true"
+    dense
+    class="custom-header-table"
+    :visible-columns="visibleColumns"
+  >
+    <template v-slot:header="props">
+      <q-tr :props="props">
+        <q-th auto-width />
+        <q-th
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+          style="color: #000000; font-weight: 500"
+        >
+          <span class="text-weight-medium">{{ col.label }}</span>
+        </q-th>
+      </q-tr>
+    </template>
+    <template v-slot:body="props">
+      <q-tr :props="props" class="cursor-pointer">
+        <q-td auto-width>
+          <q-btn
+            v-if="props.row.status === 'PENDING'"
+            dense
+            flat
+            round
+            color="edit"
+            icon="edit"
+            @click.stop.prevent="handleEdit(props.row)"
+          >
+            <q-tooltip>แก้ไข</q-tooltip>
+          </q-btn>
+
+          <q-btn
+            v-if="props.row.status === 'PENDING'"
+            dense
+            flat
+            round
+            color="red"
+            icon="delete"
+            @click.stop.prevent="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบ</q-tooltip>
+          </q-btn>
+        </q-td>
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
+          <div v-if="col.name == 'no'">
+            {{ props.rowIndex + 1 }}
+          </div>
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+      </q-tr>
+    </template>
+  </d-table>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 320px">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <HeaderDialog
+          :tittle="'ประมวลผลการขาดราชการ/มาสาย'"
+          :close="handleCloseDialog"
+        />
+
+        <q-separator />
+        <q-card-section class="q-pt-none">
+          <div class="row q-col-gutter-md">
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="formData.startDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+                @update:model-value="updateDate"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    ref="dateRef"
+                    outlined
+                    dense
+                    hide-bottom-space
+                    :model-value="
+                      formData.startDate != null
+                        ? date2Thai(formData.startDate)
+                        : null
+                    "
+                    label="วันที่เริ่มต้น"
+                    :rules="[
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`,
+                    ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="formData.endDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+                :min-date="formData.startDate"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    ref="dateRef"
+                    outlined
+                    dense
+                    hide-bottom-space
+                    :model-value="
+                      formData.endDate != null
+                        ? date2Thai(formData.endDate)
+                        : null
+                    "
+                    label="วันที่สิ้นสุด"
+                    :rules="[
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
+                    ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
+        </q-card-section>
+
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn color="secondary" label="บันทึก" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/09_leave/interface/request/work.ts b/src/modules/09_leave/interface/request/work.ts
index e69de29bb..c448c9fc9 100644
--- a/src/modules/09_leave/interface/request/work.ts
+++ b/src/modules/09_leave/interface/request/work.ts
@@ -0,0 +1,6 @@
+interface FormDataProcess {
+  startDate: Date | null;
+  endDate: Date | null;
+}
+
+export type { FormDataProcess };
diff --git a/src/modules/09_leave/interface/response/work.ts b/src/modules/09_leave/interface/response/work.ts
index 41df27b5f..af055b794 100644
--- a/src/modules/09_leave/interface/response/work.ts
+++ b/src/modules/09_leave/interface/response/work.ts
@@ -85,4 +85,24 @@ interface FormDetail {
   checkInLocationName: string;
   checkOutLocationName: string;
 }
-export type { TableRows, DataResLog, DataResTime, TableRowsTime, FormDetail };
+
+interface DataProcess {
+  id: string;
+  createdFullName: string;
+  createdAt: Date | null;
+  status: string;
+  startDate: Date | null;
+  endDate: Date | null;
+  processingDate: Date | null;
+  completedDate: Date | null;
+  errorMessage: string | null;
+}
+
+export type {
+  TableRows,
+  DataResLog,
+  DataResTime,
+  TableRowsTime,
+  FormDetail,
+  DataProcess,
+};
diff --git a/src/modules/09_leave/views/02_WorkingMain.vue b/src/modules/09_leave/views/02_WorkingMain.vue
index 99387a4bb..fed615baf 100644
--- a/src/modules/09_leave/views/02_WorkingMain.vue
+++ b/src/modules/09_leave/views/02_WorkingMain.vue
@@ -1,15 +1,26 @@
 <script setup lang="ts">
-import { ref, toRefs } from "vue";
+import { computed, ref, toRefs } from "vue";
 
 import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
+import { checkPermission } from "@/utils/permissions";
+import { useRoute } from "vue-router";
 
 /** import Components */
 import Tab1 from "@/modules/09_leave/components/02_WorkList/Tab1.vue";
 import Tab2 from "@/modules/09_leave/components/02_WorkList/Tab2.vue";
+import Tab3 from "@/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue";
 
 const stores = useWorklistDataStore();
-
+const route = useRoute();
 const { tabs } = toRefs(stores);
+
+const isPermissionTab3 = computed(() => {
+  return (
+    checkPermission(route)?.attrOwnership === "OWNER" ||
+    (checkPermission(route)?.attrOwnership === "STAFF" &&
+      checkPermission(route)?.attrIsUpdate)
+  );
+});
 </script>
 
 <template>
@@ -30,6 +41,12 @@ const { tabs } = toRefs(stores);
     >
       <q-tab name="1" label="รายการลงเวลาที่ประมวลผลแล้ว" />
       <q-tab name="2" label="รายการลงเวลา" />
+      <q-tab
+        v-if="isPermissionTab3"
+        name="3"
+        label="ประมวลผลการขาดราชการ/มาสาย"
+      />
+      <!-- เพิ่มแท็บใหม่ -->
     </q-tabs>
 
     <q-separator />
@@ -42,6 +59,9 @@ const { tabs } = toRefs(stores);
         <q-tab-panel name="2">
           <Tab2 />
         </q-tab-panel>
+        <q-tab-panel name="3">
+          <Tab3 />
+        </q-tab-panel>
       </q-tab-panels>
     </div>
   </q-card>

From a6018507c9db58f29529da1e07cb34eafa5bf001 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Apr 2026 11:33:33 +0700
Subject: [PATCH 032/125] fix(checkin-report): resolve preview display issue
 for typeReport 4

---
 src/modules/09_leave/views/06_ReportMain.vue | 33 ++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index b367b6490..797abf014 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -269,6 +269,7 @@ async function fetchLeaveday(
  * @param data  ข้อมูลบัญชีวันลา
  */
 async function fetchDocumentTemplate(data: any) {
+  if (typeReport.value === 4) return;
   await axios
     .post(`${config.API.reportTemplate}/xlsx`, data, {
       headers: {
@@ -352,7 +353,7 @@ function clearData() {
   };
 }
 
-function onSearch() {
+async function onSearch() {
   isReport.value = false;
   isLoadPDF.value = true;
   pdfSrc.value = undefined;
@@ -467,6 +468,19 @@ const reportName = () => {
   return reportNameVal + employeeClassName;
 };
 
+async function handleDownload() {
+  updateLeaveday();
+  await fetchLeaveday(
+    employeeClass.value,
+    typeReport.value == 3 || typeReport.value == 4
+      ? leaveType.value
+      : yearType.value,
+    dateStart.value,
+    dateEnd.value
+  );
+  await genReportXLSX(detailReport.value, `${reportName()}`);
+}
+
 onMounted(() => {
   fetchDataTree();
 });
@@ -512,7 +526,11 @@ onMounted(() => {
                 round
                 color="primary"
                 icon="download"
-                v-if="checkPermission($route)?.attrIsGet && typeReport !== 3"
+                v-if="
+                  checkPermission($route)?.attrIsGet &&
+                  typeReport !== 3 &&
+                  typeReport !== 4
+                "
               >
                 <q-menu>
                   <q-list style="min-width: 150px">
@@ -547,8 +565,11 @@ onMounted(() => {
                 round
                 color="primary"
                 icon="download"
-                v-if="checkPermission($route)?.attrIsGet && typeReport == 3"
-                @click="getReport()"
+                v-if="
+                  checkPermission($route)?.attrIsGet &&
+                  (typeReport == 3 || typeReport == 4)
+                "
+                @click="typeReport == 3 ? getReport() : handleDownload()"
               >
               </q-btn>
             </div>
@@ -957,7 +978,7 @@ onMounted(() => {
                 <q-separator />
                 <q-card-actions align="right">
                   <q-btn
-                    v-if="typeReport !== 3"
+                    v-if="typeReport !== 3 && typeReport !== 4"
                     dense
                     class="q-px-md"
                     label="ค้นหา"
@@ -976,7 +997,7 @@ onMounted(() => {
             </div>
             <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12 col-xs-12 flex">
               <q-splitter
-                v-if="typeReport !== 3"
+                v-if="typeReport !== 3 && typeReport !== 4"
                 disable
                 v-model="splitterModel"
                 horizontal

From 546942f8fb3461c80d0586a5d2210e0908090e34 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Apr 2026 13:40:50 +0700
Subject: [PATCH 033/125] feat(): add handleDelete director meeting

---
 .../Detail/viewTab2/CardDirector.vue          | 43 +++++++++++++++++--
 .../components/Detail/viewTab2/CardMeet.vue   | 30 +++++++++++++
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index 5cc54f572..6a0c10c5b 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -9,7 +9,7 @@ import config from "@/app.config";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type { Director } from "@/modules/11_discipline/interface/request/Disciplinary";
+import type { Director } from "@/modules/11_discipline/interface/request/disciplinary";
 import type { Directors } from "@/modules/12_evaluatePersonal/interface/response/Main";
 
 /** importComponents*/
@@ -20,7 +20,14 @@ import DialogDuty from "@/modules/12_evaluatePersonal/components/Detail/viewTab2
 const $q = useQuasar();
 const route = useRoute();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, dialogConfirm, success } = mixin;
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  dialogConfirm,
+  success,
+  dialogRemove,
+} = mixin;
 
 const props = defineProps({
   data: {
@@ -201,6 +208,21 @@ function onEditDuty(data: Director) {
   modalDuty.value = true;
 }
 
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.delete(config.API.evaluateDirectorMain() + `/admin/${id}`);
+      await props.fetchData();
+      await success($q, "ลบสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 /**
  * ทำงานเมื่อ props.data มีการเปลี่ยนแปลง
  */
@@ -268,17 +290,30 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
-            <q-td>
+            <q-td auto-width>
               <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
                 flat
                 round
-                denes
+                dense
                 icon="edit"
                 color="edit"
                 @click.stop.prevent="onEditDuty(props.row)"
               >
                 <q-tooltip>แก้ไขหน้าที่</q-tooltip>
               </q-btn>
+
+              <q-btn
+                v-if="checkPermission($route)?.attrIsDelete"
+                flat
+                round
+                dense
+                icon="delete"
+                color="red"
+                @click="handleDelete(props.row.id)"
+              >
+                <q-tooltip>ลบ</q-tooltip>
+              </q-btn>
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
index 28e26a3f8..ecd47e139 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
@@ -27,6 +27,7 @@ const {
   dialogConfirm,
   date2Thai,
   success,
+  dialogRemove,
 } = mixin;
 
 /** props*/
@@ -208,6 +209,21 @@ async function getList() {
     });
 }
 
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.delete(config.API.meeting() + `/admin/${id}`);
+      await props.fetchData();
+      await success($q, "ลบสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 watch(
   () => props.data,
   () => {
@@ -265,6 +281,7 @@ watch(
       >
         <template v-slot:header="props">
           <q-tr :props="props">
+            <q-th auto-width />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -272,6 +289,19 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
+            <q-th auto-width>
+              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
+                flat
+                round
+                dense
+                icon="delete"
+                color="red"
+                @click="handleDelete(props.row.id)"
+              >
+                <q-tooltip>ลบ</q-tooltip>
+              </q-btn>
+            </q-th>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}

From 17c05d60d72cc56f36575bda13e84f3fcdbdb31a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Apr 2026 16:17:14 +0700
Subject: [PATCH 034/125] fix(ui): class q-pt-none

---
 .../09_leave/components/02_WorkList/Tab3_Processed_Late.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
index 5a6b50854..827bf5687 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
@@ -384,7 +384,7 @@ onMounted(() => {
         />
 
         <q-separator />
-        <q-card-section class="q-pt-none">
+        <q-card-section>
           <div class="row q-col-gutter-md">
             <div class="col-12">
               <datepicker

From 503d1116343e314c89e1bcb6327e95bc3e820bbf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Apr 2026 16:59:59 +0700
Subject: [PATCH 035/125] fix: fetch permission.attrOwnership

---
 .../components/PersonalList/Table.vue         | 77 ++++++++++++-------
 1 file changed, 50 insertions(+), 27 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 584124bee..5f2d3f260 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -9,6 +9,7 @@ import { useRoute, useRouter } from "vue-router";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePlacementDataStore } from "@/modules/05_placement/store";
+import { useMenuDataStore } from "@/stores/menuList";
 import avatar from "@/assets/avatar_user.jpg";
 
 import type { PartialTableName } from "@/modules/05_placement/interface/request/placement";
@@ -27,6 +28,7 @@ import DialogPreviewCommand from "@/modules/18_command/components/DialogPreviewC
 
 const $q = useQuasar(); // show dialog
 const DataStore = usePlacementDataStore();
+const storeMenu = useMenuDataStore();
 const route = useRoute();
 const router = useRouter();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
@@ -55,7 +57,14 @@ const command = ref<string>("");
 const commandId = ref<string>("");
 const commandCitizenId = ref<string>("");
 
-let roleAdmin = ref<boolean>(false);
+// เปลี่ยนจาก ref เป็น computed property
+const roleAdmin = computed(() => {
+  if (!storeMenu.permissions) return false;
+
+  const permission = checkPermission(route);
+  return DataStore.isOfficer || permission?.attrOwnership == "OWNER";
+});
+
 const edit = ref<boolean>(true);
 const modalPersonal = ref<boolean>(false);
 const modal = ref<boolean>(false); //modal ขอผ่อนผัน + สละสิทธิ์
@@ -92,6 +101,18 @@ const personal_selected = ref<any>([]);
 const filterlistAdd = ref<string>("");
 const paging = ref<boolean>(true);
 
+// เพิ่ม watcher สำหรับ roleAdmin
+watch(
+  roleAdmin,
+  (newValue) => {
+    const permission = checkPermission(route);
+    if (!newValue && permission?.attrOwnership !== "OWNER") {
+      displayAdd.value = false;
+    }
+  },
+  { immediate: true }
+);
+
 // เช็ตสถานะการเลือกคนไปยังหน่วยงาน
 const checkSelected = computed(() => {
   if (selected.value.length === 0) {
@@ -248,16 +269,17 @@ const columnsBase = ref<QTableProps["columns"]>([
   },
 ]);
 
-const columns = computed(() =>
-  roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
+const columns = computed(() => {
+  const permission = checkPermission(route);
+  return roleAdmin.value || permission?.attrOwnership == "OWNER"
     ? columnsBase.value
     : columnsBase.value?.filter(
         (col) =>
           col.name !== "no" &&
           col.name !== "draft" &&
           col.name !== "refCommandNo"
-      )
-);
+      );
+});
 
 /**
  * แปลงสถานะพนักงาน
@@ -406,8 +428,9 @@ async function getTable() {
           rowsAll.value.push(rowData);
         });
 
+      const permission = checkPermission(route);
       const rowData = await (roleAdmin.value ||
-      checkPermission(route)?.attrOwnership == "OWNER"
+      permission?.attrOwnership == "OWNER"
         ? rowsAll.value
         : rowsAll.value.filter((x: any) => x.isDraft === true));
 
@@ -554,8 +577,9 @@ function getClass(val: boolean) {
  * @param draft status
  */
 function selectData(pid: string, draft: string) {
+  const permission = checkPermission(route);
   if (
-    (roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") &&
+    (roleAdmin.value || permission?.attrOwnership == "OWNER") &&
     draft === "ส่งตัวแล้ว"
   ) {
     personalId.value = pid;
@@ -858,34 +882,33 @@ async function filterRowsMain(type: string, pos: string) {
   });
 }
 
+// Helper function รอให้ permissions load เสร็จ
+function waitForPermissions(): Promise<void> {
+  return new Promise((resolve) => {
+    const checkPermissions = () => {
+      if (storeMenu.permissions) {
+        resolve();
+      } else {
+        setTimeout(checkPermissions, 100); // เช็คทุก 100ms
+      }
+    };
+    checkPermissions();
+  });
+}
+
+// ปรับปรุง getWorkFlow function
 async function getWorkFlow() {
   showLoader();
+
+  // รอให้ permissions load เสร็จก่อน
+  await waitForPermissions();
+
   await http
     .get(config.API.workflowKeycloakSystem("SYS_PLACEMENT_PASS"))
     .then(async (res) => {
       const data = await res.data.result;
       DataStore.isOfficer = data.isOfficer;
       DataStore.isStaff = data.isStaff;
-      roleAdmin.value =
-        data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER";
-      if (
-        roleAdmin.value === false &&
-        checkPermission(route)?.attrOwnership !== "OWNER"
-      ) {
-        displayAdd.value = false;
-        // visibleColumns.value = [
-        //   "position",
-        //   "fullName",
-        //   "examNumber",
-        //   "idCard",
-        //   "positionNumber",
-        //   "organizationName",
-        //   "reportingDate",
-        //   "bmaOfficer",
-        //   "statusName",
-        //   "positionCandidate",
-        // ];
-      }
     })
     .catch((e) => {
       messageError($q, e);

From f4038130993b8ade852daa77f8785028e8d6429c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 2 Apr 2026 09:22:30 +0700
Subject: [PATCH 036/125] fix(leave): diaplay columns completedDate

---
 .../09_leave/components/02_WorkList/Tab3_Processed_Late.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
index 827bf5687..9533ea64e 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue
@@ -76,11 +76,11 @@ const columns = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "completeDate",
+    name: "completedDate",
     align: "left",
     label: "วันที่เสร็จสิ้น",
     sortable: true,
-    field: "completeDate",
+    field: "completedDate",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
@@ -126,7 +126,7 @@ const visibleColumns = ref<string[]>([
   "startDate",
   "endDate",
   "processingDate",
-  "completeDate",
+  "completedDate",
   "status",
   "createdAt",
   "createdFullName",

From 26977319ed8ea8b40f8f0e2c990671850cd64c5e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 2 Apr 2026 15:49:48 +0700
Subject: [PATCH 037/125] fix: mask leaveDaysUsed add beginningLeaveDays

---
 .../09_leave/components/07_LeaveHistory/DialogForm.vue    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index 19d468cec..b33009b20 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -265,7 +265,6 @@ watch(modal, async (val) => {
       await Promise.all([
         filterLeaveTypeData(),
         isStatusEdit.value && defineDataLeaveBeginning(rowData.value),
-        console.log(rowData.value),
       ]);
     } finally {
       hideLoader();
@@ -463,6 +462,7 @@ watch(modal, async (val) => {
                     outlined
                     label="จำนวนสิทธิ์การลา"
                     hide-bottom-space
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
                 <div class="col-12">
@@ -473,8 +473,7 @@ watch(modal, async (val) => {
                     outlined
                     label="ที่ใช้ไป (วัน)"
                     hide-bottom-space
-                    mask="#"
-                    reverse-fill-mask
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
                 <div class="col-12">
@@ -498,8 +497,7 @@ watch(modal, async (val) => {
                     outlined
                     label="ยกมา (วัน)"
                     hide-bottom-space
-                    mask="#"
-                    reverse-fill-mask
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
 

From f5e1c0eca6ca67f6a132f5c41bb55cda30320a16 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 3 Apr 2026 10:08:12 +0700
Subject: [PATCH 038/125] refactor: convert displayAdd to a computed property

---
 .../components/PersonalList/Table.vue          | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 5f2d3f260..a88cb44a3 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -93,7 +93,6 @@ const appointModal = ref<boolean>(false);
 const getNumFile = ref(0);
 const dataRes = ref<any>([]);
 const personal = ref<any>([]);
-const displayAdd = ref<boolean>(true);
 const containStatus = ref<boolean>(false);
 const modaladdlist = ref<boolean>(false);
 const selected = ref<any>([]);
@@ -101,17 +100,12 @@ const personal_selected = ref<any>([]);
 const filterlistAdd = ref<string>("");
 const paging = ref<boolean>(true);
 
-// เพิ่ม watcher สำหรับ roleAdmin
-watch(
-  roleAdmin,
-  (newValue) => {
-    const permission = checkPermission(route);
-    if (!newValue && permission?.attrOwnership !== "OWNER") {
-      displayAdd.value = false;
-    }
-  },
-  { immediate: true }
-);
+const displayAdd = computed(() => {
+  if (!storeMenu.permissions) return true;
+
+  const permission = checkPermission(route);
+  return roleAdmin.value || permission?.attrOwnership === "OWNER";
+});
 
 // เช็ตสถานะการเลือกคนไปยังหน่วยงาน
 const checkSelected = computed(() => {

From 006c2bc0ba96656a85e980ef6506beb1ce095d4f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 3 Apr 2026 17:32:32 +0700
Subject: [PATCH 039/125] feat(evaluate): implement delete endpoints for
 meeting and director

---
 .../components/Detail/viewTab2/CardDirector.vue               | 2 +-
 .../components/Detail/viewTab2/CardMeet.vue                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
index 6a0c10c5b..dc438eccc 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue
@@ -212,7 +212,7 @@ function handleDelete(id: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.delete(config.API.evaluateDirectorMain() + `/admin/${id}`);
+      await http.delete(config.API.evaluationMain() + `/del-director/${id}`);
       await props.fetchData();
       await success($q, "ลบสำเร็จ");
     } catch (error) {
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
index ecd47e139..7a6973420 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
@@ -209,11 +209,11 @@ async function getList() {
     });
 }
 
-function handleDelete(id: string) {
+function handleDelete(meetingId: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.delete(config.API.meeting() + `/admin/${id}`);
+      await http.delete(config.API.evaluationMain() + `/del-meeting/${id.value}/${meetingId}`);
       await props.fetchData();
       await success($q, "ลบสำเร็จ");
     } catch (error) {

From 7da397a1fe8fbf263b7c7afdca84bc7b644cd5ed Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 8 Apr 2026 10:54:08 +0700
Subject: [PATCH 040/125] fix(command): handle dialog notification for Bangkok
 officers

---
 src/modules/18_command/components/Step/1_Detail.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index cb3b532b8..ff3f564a6 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -25,6 +25,7 @@ const {
   dialogConfirm,
   convertDateToAPI,
   dialogRemove,
+  dialogMessageNotify,
 } = useCounterMixin();
 
 /**
@@ -130,6 +131,15 @@ async function fetchCheckIdofficer() {
  * และกำหนด isChangeData เป็น false
  */
 async function onSubmit() {
+  //ถ้าเป็น สกจ. ต้องเลือกประเภทคำสั่งด้วย
+  if (
+    isIdofficer.value &&
+    formData.isBangkok !== "BANGKOK" &&
+    formData.isBangkok !== "OFFICE"
+  ) {
+    dialogMessageNotify($q, "กรุณาเลือกคำสั่ง");
+    return;
+  }
   dialogConfirm($q, async () => {
     showLoader();
     await http
@@ -156,7 +166,7 @@ async function onSubmit() {
   });
 }
 
-/** ฟังกชันดึงข้อมูลรายชื่อเจ้าหน้าที่ดำเนินการ */
+/** ฟังก์ชันดึงข้อมูลรายชื่อเจ้าหน้าที่ดำเนินการ */
 async function fetchDataOperatorList() {
   try {
     const res = await http.get(

From 1de7a11721078c98a3e5c179de12536a89ddb034 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Apr 2026 09:09:01 +0700
Subject: [PATCH 041/125] refactor(evaluate):  convert table headers to data
 cells

---
 .../components/Detail/viewTab2/CardMeet.vue               | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
index 7a6973420..cf4611de5 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue
@@ -213,7 +213,9 @@ function handleDelete(meetingId: string) {
   dialogRemove($q, async () => {
     showLoader();
     try {
-      await http.delete(config.API.evaluationMain() + `/del-meeting/${id.value}/${meetingId}`);
+      await http.delete(
+        config.API.evaluationMain() + `/del-meeting/${id.value}/${meetingId}`
+      );
       await props.fetchData();
       await success($q, "ลบสำเร็จ");
     } catch (error) {
@@ -289,7 +291,7 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
-            <q-th auto-width>
+            <q-td auto-width>
               <q-btn
                 v-if="checkPermission($route)?.attrIsUpdate"
                 flat
@@ -301,7 +303,7 @@ watch(
               >
                 <q-tooltip>ลบ</q-tooltip>
               </q-btn>
-            </q-th>
+            </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}

From 3f5a4783c1aecaefe590877e390cd1e67110b2cd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Apr 2026 10:05:42 +0700
Subject: [PATCH 042/125] refactor(reportOrg): change getReport API method from
 GET to POST

---
 .../components/01_org/MainReport.vue          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/modules/21_report/components/01_org/MainReport.vue b/src/modules/21_report/components/01_org/MainReport.vue
index 19119313d..5afa2e63d 100644
--- a/src/modules/21_report/components/01_org/MainReport.vue
+++ b/src/modules/21_report/components/01_org/MainReport.vue
@@ -111,17 +111,16 @@ async function fetchSummary() {
  * ฟังก์ชัน DownloadReport
  * @param list รายงานที่ต้องการดาวน์โหลด
  */
-async function getReport(list: string) {
-  const listFind = baseDocument.value.find(
-    (item: DataDocument) => item.val == list
-  )?.val;
-  const newReport = listFind === "report2" ? "report2-history" : listFind;
+async function getReport(valReport: string) {
   pdfSrc.value = undefined;
   page.value = 1;
   isLoadPDF.value = true;
-  if (newReport) {
+  if (valReport) {
     await http
-      .get(config.API.orgReport(newReport) + `/${organizationId.value}`)
+      .post(config.API.orgReport(valReport), {
+        node: 0,
+        nodeId: organizationId.value,
+      })
       .then(async (res) => {
         const data = res.data.result;
         detailReport.value = data;
@@ -414,10 +413,8 @@ onMounted(async () => {
                           color="primary"
                           icon="download"
                         >
-                        <q-tooltip>
-                          ดาวน์โหลดรายงาน
-                        </q-tooltip>
-                        
+                          <q-tooltip> ดาวน์โหลดรายงาน </q-tooltip>
+
                           <q-menu>
                             <q-list style="min-width: 150px">
                               <q-item

From 376fba605929a610202a92906ce627d9aba5018b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Apr 2026 12:09:33 +0700
Subject: [PATCH 043/125] feat(personal-detail): add display section for
 personal info

---
 .../components/PersonalList/DialogDetail.vue  | 283 +++++++++++++++++-
 1 file changed, 272 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/DialogDetail.vue b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
index 56cc9b3c4..fca5acdfb 100644
--- a/src/modules/05_placement/components/PersonalList/DialogDetail.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
@@ -3,6 +3,7 @@ import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateAge } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -38,6 +39,20 @@ const props = defineProps({
 
 const rows = ref<DataEducation[]>([]);
 const personalForm = ref<DataPerson>();
+const age = ref<string | null>(""); //อายุ
+
+// ข้อมูลแปลงจาก ID เป็นชื่อ
+const currentProvinceName = ref<string>("");
+const currentDistrictName = ref<string>("");
+const currentSubDistrictName = ref<string>("");
+const registProvinceName = ref<string>("");
+const registDistrictName = ref<string>("");
+const registSubDistrictName = ref<string>("");
+
+// Cache ข้อมูล
+const provincesCache = ref<any[]>([]);
+const districtsCache = ref<Map<string, any[]>>(new Map());
+const subDistrictsCache = ref<Map<string, any[]>>(new Map());
 
 /**หัวตาราง */
 const columns = ref<QTableProps["columns"]>([
@@ -92,6 +107,12 @@ async function fetchData() {
     .get(config.API.getDatapersonal(props.personalId))
     .then((res) => {
       personalForm.value = res.data.result;
+      if (res.data.result.dateOfBirth) {
+        // กำหนดอายุ ส่งวันเกิดไปคำนวน
+        age.value = calculateAge(res.data.result.dateOfBirth);
+      } else {
+        age.value = null;
+      }
       personalForm.value?.education.map((e: Education) => {
         rows.value.push({
           university: e.institute,
@@ -107,6 +128,137 @@ async function fetchData() {
     .finally(() => {
       hideLoader();
     });
+
+  // แปลง ID เป็นชื่อ
+  await convertAddressIds();
+}
+
+/**
+ * ฟังก์ชันแปลง ID เป็นชื่อจริงของที่อยู่ (แบบ optimize)
+ */
+async function convertAddressIds() {
+  if (!personalForm.value) return;
+
+  try {
+    // โหลดข้อมูลจังหวัดครั้งเดียวถ้ายังไม่มี
+    await loadProvinces();
+
+    // แปลงข้อมูลที่อยู่ปัจจุบัน
+    if (personalForm.value.currentProvinceId) {
+      currentProvinceName.value = getProvinceNameFromCache(
+        personalForm.value.currentProvinceId
+      );
+
+      if (personalForm.value.currentDistrictId) {
+        currentDistrictName.value = await getDistrictNameOptimized(
+          personalForm.value.currentProvinceId,
+          personalForm.value.currentDistrictId
+        );
+
+        if (personalForm.value.currentSubDistrictId) {
+          currentSubDistrictName.value = await getSubDistrictNameOptimized(
+            personalForm.value.currentDistrictId,
+            personalForm.value.currentSubDistrictId
+          );
+        }
+      }
+    }
+
+    // แปลงข้อมูลที่อยู่ตามทะเบียน
+    if (personalForm.value.registProvinceId) {
+      registProvinceName.value = getProvinceNameFromCache(
+        personalForm.value.registProvinceId
+      );
+
+      if (personalForm.value.registDistrictId) {
+        registDistrictName.value = await getDistrictNameOptimized(
+          personalForm.value.registProvinceId,
+          personalForm.value.registDistrictId
+        );
+
+        if (personalForm.value.registSubDistrictId) {
+          registSubDistrictName.value = await getSubDistrictNameOptimized(
+            personalForm.value.registDistrictId,
+            personalForm.value.registSubDistrictId
+          );
+        }
+      }
+    }
+  } catch (error) {
+    console.error("Error converting address IDs:", error);
+  }
+}
+
+/**
+ * โหลดข้อมูลจังหวัดทั้งหมด (ครั้งเดียว)
+ */
+async function loadProvinces() {
+  if (provincesCache.value.length === 0) {
+    try {
+      const res = await http.get(config.API.province);
+      provincesCache.value = res.data.result;
+    } catch (error) {
+      console.error("Error loading provinces:", error);
+    }
+  }
+}
+
+/**
+ * ดึงชื่อจังหวัดจาก cache
+ */
+function getProvinceNameFromCache(provinceId: string): string {
+  const province = provincesCache.value.find(
+    (p: any) => p.id.toString() === provinceId
+  );
+  return province ? province.name : "-";
+}
+
+/**
+ * ดึงชื่ออำเภอแบบ optimize (เรียก API เฉพาะจังหวัดที่ต้องการ)
+ */
+async function getDistrictNameOptimized(
+  provinceId: string,
+  districtId: string
+): Promise<string> {
+  try {
+    // เช็ค cache ก่อน
+    if (!districtsCache.value.has(provinceId)) {
+      const res = await http.get(config.API.listDistrict(provinceId));
+      districtsCache.value.set(provinceId, res.data.result.districts);
+    }
+
+    const districts = districtsCache.value.get(provinceId) || [];
+    const district = districts.find((d: any) => d.id.toString() === districtId);
+    return district ? district.name : "-";
+  } catch (error) {
+    console.error("Error loading district:", error);
+    return "-";
+  }
+}
+
+/**
+ * ดึงชื่อตำบลแบบ optimize (เรียก API เฉพาะอำเภอที่ต้องการ)
+ */
+async function getSubDistrictNameOptimized(
+  districtId: string,
+  subDistrictId: string
+): Promise<string> {
+  try {
+    // เช็ค cache ก่อน
+    if (!subDistrictsCache.value.has(districtId)) {
+      const res = await http.get(config.API.listSubDistrict(districtId));
+      subDistrictsCache.value.set(districtId, res.data.result.subDistricts);
+    }
+
+    const subDistricts = subDistrictsCache.value.get(districtId) || [];
+    const subDistrict = subDistricts.find(
+      (sd: any) => sd.id.toString() === subDistrictId
+    );
+    return subDistrict ? subDistrict.name : "-";
+  } catch (error) {
+    console.error("Error loading subdistrict:", error);
+    return "-";
+  }
 }
 
 /**
@@ -170,30 +322,58 @@ watch(props, () => {
 
               <div class="row q-pa-xs">
                 <div class="col-3 header-sub-text">
-                  <div class="q-pb-md">เลขประจำตัวประชาชน</div>
-                  <div>วัน/เดือน/ปีเกิด</div>
+                  <div class="q-pb-sm">เลขประจำตัวประชาชน</div>
+                  <div class="q-pb-sm">วัน/เดือน/ปีเกิด</div>
+                  <div class="q-pb-sm">อายุ</div>
+                  <div class="q-pb-sm">สัญชาติ</div>
+                  <div>หมู่เลือด</div>
                 </div>
 
                 <div class="col-4 sub-text">
-                  <div class="q-pb-md">
+                  <div class="q-pb-sm">
                     {{ personalForm?.idCard }}
                   </div>
-                  <div>
+                  <div class="q-pb-sm">
                     {{ date2Thai(personalForm?.dateOfBirth) }}
                   </div>
+                  <div class="q-pb-sm">
+                    {{ age ? age : "-" }}
+                  </div>
+                  <div class="q-pb-sm">
+                    {{
+                      personalForm?.nationality ? personalForm.nationality : "-"
+                    }}
+                  </div>
+                  <div>
+                    {{
+                      personalForm?.bloodGroup ? personalForm.bloodGroup : "-"
+                    }}
+                  </div>
                 </div>
 
                 <div class="col-2 header-sub-text">
-                  <div class="q-pb-md">ชื่อ-นามสกุล</div>
-                  <div>เพศ</div>
+                  <div class="q-pb-sm">ชื่อ-นามสกุล</div>
+                  <div class="q-pb-sm">เพศ</div>
+                  <div class="q-pb-sm">เชื้อชาติ</div>
+                  <div class="q-pb-sm">ศาสนา</div>
+                  <div>เบอร์โทรศัพท์</div>
                 </div>
                 <div class="col-3 sub-text">
-                  <div class="q-pb-md">
+                  <div class="q-pb-sm">
                     {{ personalForm?.fullName }}
                   </div>
-                  <div>
+                  <div class="q-pb-sm">
                     {{ personalForm?.gender }}
                   </div>
+                  <div class="q-pb-sm">
+                    {{ personalForm?.race ? personalForm.race : "-" }}
+                  </div>
+                  <div class="q-pb-sm">
+                    {{ personalForm?.religion ? personalForm.religion : "-" }}
+                  </div>
+                  <div class="q-mt-sm">
+                    {{ personalForm?.telephone ? personalForm.telephone : "-" }}
+                  </div>
                 </div>
               </div>
             </q-card>
@@ -203,9 +383,90 @@ watch(props, () => {
             <q-card bordered class="card-panding">
               <div class="row items-center q-pa-xs header-text">ภูมิลำเนา</div>
               <div class="row q-pa-xs">
-                <div class="col-3 header-sub-text">ที่อยู่</div>
-                <div class="col-9 sub-text">
-                  {{ personalForm?.registAddress }}
+                <!-- ที่อยู่ปัจจุบัน -->
+                <div class="col-6">
+                  <div class="q-pb-sm text-weight-medium text-primary">
+                    ที่อยู่ปัจจุบัน
+                  </div>
+                  <div class="row">
+                    <div class="col-4 header-sub-text">
+                      <div class="q-pb-sm">ที่อยู่</div>
+                      <div class="q-pb-sm">จังหวัด</div>
+                      <div class="q-pb-sm">เขต/อำเภอ</div>
+                      <div class="q-pb-sm">แขวง/ตำบล</div>
+                      <div>รหัสไปรษณีย์</div>
+                    </div>
+                    <div class="col-8 sub-text">
+                      <div class="q-pb-sm">
+                        {{
+                          personalForm?.currentAddress
+                            ? personalForm.currentAddress
+                            : "-"
+                        }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{ currentProvinceName ? currentProvinceName : "-" }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{ currentDistrictName ? currentDistrictName : "-" }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{
+                          currentSubDistrictName ? currentSubDistrictName : "-"
+                        }}
+                      </div>
+                      <div class="q-mt-sm">
+                        {{
+                          personalForm?.currentZipCode
+                            ? personalForm.currentZipCode
+                            : "-"
+                        }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <!-- ที่อยู่ตามทะเบียนบ้าน -->
+                <div class="col-6">
+                  <div class="q-pb-sm text-weight-medium text-primary">
+                    ที่อยู่ตามทะเบียนบ้าน
+                  </div>
+                  <div class="row">
+                    <div class="col-4 header-sub-text">
+                      <div class="q-pb-sm">ที่อยู่</div>
+                      <div class="q-pb-sm">จังหวัด</div>
+                      <div class="q-pb-sm">เขต/อำเภอ</div>
+                      <div class="q-pb-sm">แขวง/ตำบล</div>
+                      <div>รหัสไปรษณีย์</div>
+                    </div>
+                    <div class="col-8 sub-text">
+                      <div class="q-pb-sm">
+                        {{
+                          personalForm?.registAddress
+                            ? personalForm.registAddress
+                            : "-"
+                        }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{ registProvinceName ? registProvinceName : "-" }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{ registDistrictName ? registDistrictName : "-" }}
+                      </div>
+                      <div class="q-pb-sm">
+                        {{
+                          registSubDistrictName ? registSubDistrictName : "-"
+                        }}
+                      </div>
+                      <div class="q-mt-sm">
+                        {{
+                          personalForm?.registZipCode
+                            ? personalForm.registZipCode
+                            : "-"
+                        }}
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </q-card>

From c21cfa838f92d7962d6689d7d92a5e9774b2ebb1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Apr 2026 13:42:40 +0700
Subject: [PATCH 044/125] refactor(personal-detail): resetData  befor fetchData

---
 .../components/PersonalList/DialogDetail.vue  | 47 ++++++++++++++-----
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/DialogDetail.vue b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
index fca5acdfb..13aa09aef 100644
--- a/src/modules/05_placement/components/PersonalList/DialogDetail.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogDetail.vue
@@ -51,8 +51,8 @@ const registSubDistrictName = ref<string>("");
 
 // Cache ข้อมูล
 const provincesCache = ref<any[]>([]);
-const districtsCache = ref<Map<string, any[]>>(new Map());
-const subDistrictsCache = ref<Map<string, any[]>>(new Map());
+const districtsCache = ref<Map<string, any[]>>(new Map()); // key: provinceId, value: districts[]
+const subDistrictsCache = ref<Map<string, any[]>>(new Map()); // key: districtId, value: subDistricts[]
 
 /**หัวตาราง */
 const columns = ref<QTableProps["columns"]>([
@@ -102,6 +102,9 @@ const columns = ref<QTableProps["columns"]>([
  * ฟังก์ชันดึงข้อมูลรายละเอียด
  */
 async function fetchData() {
+  // Reset ข้อมูลเก่าก่อนโหลดข้อมูลใหม่
+  resetData();
+  
   showLoader();
   await http
     .get(config.API.getDatapersonal(props.personalId))
@@ -133,6 +136,24 @@ async function fetchData() {
   await convertAddressIds();
 }
 
+/**
+ * Reset ข้อมูลทุกครั้งที่เปิดคนใหม่
+ */
+function resetData() {
+  // Reset ข้อมูลส่วนตัว
+  personalForm.value = undefined;
+  age.value = "";
+  rows.value = [];
+  
+  // Reset ข้อมูลที่อยู่
+  currentProvinceName.value = "";
+  currentDistrictName.value = "";
+  currentSubDistrictName.value = "";
+  registProvinceName.value = "";
+  registDistrictName.value = "";
+  registSubDistrictName.value = "";
+}
+
 /**
  * ฟังก์ชันแปลง ID เป็นชื่อจริงของที่อยู่ (แบบ optimize)
  */
@@ -144,18 +165,18 @@ async function convertAddressIds() {
     await loadProvinces();
 
     // แปลงข้อมูลที่อยู่ปัจจุบัน
-    if (personalForm.value.currentProvinceId) {
+    if (personalForm.value.currentProvinceId && personalForm.value.currentProvinceId.trim() !== "") {
       currentProvinceName.value = getProvinceNameFromCache(
         personalForm.value.currentProvinceId
       );
 
-      if (personalForm.value.currentDistrictId) {
+      if (personalForm.value.currentDistrictId && personalForm.value.currentDistrictId.trim() !== "") {
         currentDistrictName.value = await getDistrictNameOptimized(
           personalForm.value.currentProvinceId,
           personalForm.value.currentDistrictId
         );
 
-        if (personalForm.value.currentSubDistrictId) {
+        if (personalForm.value.currentSubDistrictId && personalForm.value.currentSubDistrictId.trim() !== "") {
           currentSubDistrictName.value = await getSubDistrictNameOptimized(
             personalForm.value.currentDistrictId,
             personalForm.value.currentSubDistrictId
@@ -165,18 +186,18 @@ async function convertAddressIds() {
     }
 
     // แปลงข้อมูลที่อยู่ตามทะเบียน
-    if (personalForm.value.registProvinceId) {
+    if (personalForm.value.registProvinceId && personalForm.value.registProvinceId.trim() !== "") {
       registProvinceName.value = getProvinceNameFromCache(
         personalForm.value.registProvinceId
       );
 
-      if (personalForm.value.registDistrictId) {
+      if (personalForm.value.registDistrictId && personalForm.value.registDistrictId.trim() !== "") {
         registDistrictName.value = await getDistrictNameOptimized(
           personalForm.value.registProvinceId,
           personalForm.value.registDistrictId
         );
 
-        if (personalForm.value.registSubDistrictId) {
+        if (personalForm.value.registSubDistrictId && personalForm.value.registSubDistrictId.trim() !== "") {
           registSubDistrictName.value = await getSubDistrictNameOptimized(
             personalForm.value.registDistrictId,
             personalForm.value.registSubDistrictId
@@ -215,13 +236,15 @@ function getProvinceNameFromCache(provinceId: string): string {
 
 /**
  * ดึงชื่ออำเภอแบบ optimize (เรียก API เฉพาะจังหวัดที่ต้องการ)
+ * @param provinceId ID ของจังหวัด
+ * @param districtId ID ของอำเภอ
  */
 async function getDistrictNameOptimized(
   provinceId: string,
   districtId: string
 ): Promise<string> {
   try {
-    // เช็ค cache ก่อน
+    // เช็ค cache ว่ามีข้อมูล districts ของ province นี้หรือไม่
     if (!districtsCache.value.has(provinceId)) {
       const res = await http.get(config.API.listDistrict(provinceId));
       districtsCache.value.set(provinceId, res.data.result.districts);
@@ -238,13 +261,15 @@ async function getDistrictNameOptimized(
 
 /**
  * ดึงชื่อตำบลแบบ optimize (เรียก API เฉพาะอำเภอที่ต้องการ)
+ * @param districtId ID ของอำเภอ
+ * @param subDistrictId ID ของตำบล
  */
 async function getSubDistrictNameOptimized(
   districtId: string,
   subDistrictId: string
 ): Promise<string> {
   try {
-    // เช็ค cache ก่อน
+    // เช็ค cache ว่ามีข้อมูล subDistricts ของ district นี้หรือไม่
     if (!subDistrictsCache.value.has(districtId)) {
       const res = await http.get(config.API.listSubDistrict(districtId));
       subDistrictsCache.value.set(districtId, res.data.result.subDistricts);
@@ -283,7 +308,7 @@ function formBmaofficer(val: string) {
  */
 async function close() {
   props.close();
-  rows.value = [];
+  resetData(); // Reset ข้อมูลเมื่อปิด dialog
 }
 
 /**

From 0d5cb36fb2a52b011b296ac05d0b2355f5bbd165 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 10 Apr 2026 16:05:30 +0700
Subject: [PATCH 045/125] feat(registry): enable edit for items from command
 list

---
 .../GovernmentInformation/07_Position.vue     | 17 +++++++++-------
 .../detail/Salary/01_PositionSalary.vue       | 20 ++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 67062edde..e94467676 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -402,6 +402,7 @@ const modalDialogSalary = ref<boolean>(false); //แสดง popup ตำแห
 const isStatusEdit = ref<boolean>(false); //สถานะแก้ไขข้อมูลตำแหน่งเงินเดือน
 const salaryId = ref<string>(""); //id ที่ต้องการแก้ไข
 const dataLevel = ref<DataPosType[]>([]); //รายการ ตำแหน่งเงินเดือน
+const idCommandId = ref<boolean>(false); //เช็คว่ามี commandId หรือไม่
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
 const posTypeOptions = ref<DataOption[]>(store.posTypeData); //รายการประเภทตำแหน่ง | กลุ่มงาน
@@ -658,6 +659,7 @@ async function onClickOpenDialog(
   } else {
     await fetchOptionGroup();
   }
+  idCommandId.value = statusEdit ? (data.commandId ? true : false) : false;
   commandCodeOptions.value = store.commandCodeData;
   posTypeOptions.value = store.posTypeData;
   posLevelOptions.value = store.posLevelData;
@@ -978,6 +980,7 @@ onMounted(async () => {
               <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
             </q-btn>
 
+            <!-- :disable="(props.row.commandId !== null && props.row.commandId !== '') || props.row.commandType === 'C-PM-47'" -->
             <q-btn
               v-if="
                 !isLeave &&
@@ -985,11 +988,7 @@ onMounted(async () => {
                 checkPermission($route)?.attrOwnership === 'OWNER'
               "
               flat
-              :disable="
-                (props.row.commandId !== null && props.row.commandId !== '') ||
-                props.row.commandType === 'C-PM-47'
-              "
-              :color="props.row.commandId ? 'grey' : 'edit'"
+              color="edit"
               dense
               round
               icon="edit"
@@ -1154,7 +1153,8 @@ onMounted(async () => {
               <div class="row q-col-gutter-sm">
                 <div class="col-6">
                   <q-input
-                    :class="classInput(true)"
+                    :class="classInput(!idCommandId)"
+                    :readonly="idCommandId"
                     outlined
                     dense
                     lazy-rules
@@ -1174,7 +1174,8 @@ onMounted(async () => {
                     autoApply
                     year-picker
                     :enableTimePicker="false"
-                    class="inputgreen"
+                    :class="classInput(!idCommandId)"
+                    :disabled="idCommandId"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -1191,6 +1192,8 @@ onMounted(async () => {
                             : formData.commandYear + 543
                         "
                         label="ปี พ.ศ."
+                        :class="classInput(!idCommandId)"
+                        :readonly="idCommandId"
                       >
                         <template v-slot:prepend>
                           <q-icon
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 46e93dfbe..58205a802 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -66,6 +66,7 @@ const keyword = ref<string>(""); //คำค้นหา
 const modalCommand = ref<boolean>(false);
 const command = ref<string>("");
 const commandId = ref<string>("");
+const idCommandId = ref<boolean>(false); //สถานะการมีคำสั่ง
 const baseColumns = ref<QTableColumn[]>([
   {
     name: "commandDateAffect",
@@ -638,6 +639,7 @@ async function onClickOpenDialog(
   } else {
     await fetchOptionGroup();
   }
+  idCommandId.value = statusEdit && data.commandId ? true : false;
   commandCodeOptions.value = store.commandCodeData;
   posTypeOptions.value = store.posTypeData;
   posLevelOptions.value = store.posLevelData;
@@ -939,6 +941,10 @@ onMounted(async () => {
             >
               <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
             </q-btn>
+            <!-- :disable="
+              (props.row.commandId !== null && props.row.commandId !== '') ||
+              props.row.commandType === 'C-PM-47'
+            " -->
             <q-btn
               v-if="
                 !isLeave &&
@@ -946,11 +952,7 @@ onMounted(async () => {
                 checkPermission($route)?.attrOwnership === 'OWNER'
               "
               flat
-              :disable="
-                (props.row.commandId !== null && props.row.commandId !== '') ||
-                props.row.commandType === 'C-PM-47'
-              "
-              :color="props.row.commandId ? 'grey' : 'edit'"
+              color="edit"
               dense
               round
               icon="edit"
@@ -1119,7 +1121,8 @@ onMounted(async () => {
               <div class="row q-col-gutter-sm">
                 <div class="col-6">
                   <q-input
-                    :class="classInput(true)"
+                    :class="classInput(!idCommandId)"
+                    :readonly="idCommandId"
                     outlined
                     dense
                     lazy-rules
@@ -1139,7 +1142,8 @@ onMounted(async () => {
                     autoApply
                     year-picker
                     :enableTimePicker="false"
-                    class="inputgreen"
+                    :class="classInput(!idCommandId)"
+                    :disable="idCommandId"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -1156,6 +1160,8 @@ onMounted(async () => {
                             : formData.commandYear + 543
                         "
                         label="ปี พ.ศ."
+                        :class="classInput(!idCommandId)"
+                        :readonly="idCommandId"
                       >
                         <template v-slot:prepend>
                           <q-icon

From c700cf0abd629dd1ff68a2e496c97a81ae025fa5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 16 Apr 2026 13:40:48 +0700
Subject: [PATCH 046/125] feat(placement): add UpdateDraftStatus menu option

---
 src/api/05_placement/api.placement.ts         |  1 +
 .../components/PersonalList/Table.vue         | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts
index a810db909..b6459a850 100644
--- a/src/api/05_placement/api.placement.ts
+++ b/src/api/05_placement/api.placement.ts
@@ -27,6 +27,7 @@ export default {
   placementDefermentInfo: (id: string) => `${placement}/pass/deferment/${id}`,
   placementDisclaimInfo: (id: string) => `${placement}/pass/disclaim/${id}`,
   placementUpdatePass: `${placement}/pass/update-status`,
+  placementUpdateDraftStatus: `${placement}/update/draft-status`,
 
   //personal
   placementPersonalId: (personalId: string) =>
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index a88cb44a3..bdf4ae494 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -967,6 +967,28 @@ function onUpdateStatus(id: string) {
   );
 }
 
+function onUpdateDraftStatus(id: string) {
+  dialogConfirm(
+    $q,
+    async () => {
+      showLoader();
+      try {
+        await http.post(config.API.placementUpdateDraftStatus, {
+          personalId: id,
+        });
+        await success($q, "บันทึกสำเร็จ");
+        await getTable();
+      } catch (error) {
+        messageError($q, error);
+      } finally {
+        hideLoader();
+      }
+    },
+    "ยืนยันการยกเลิกการส่งตัว",
+    "ต้องการยกเลิกการส่งตัวรายชื่อนี้ใช่หรือไม่ ?"
+  );
+}
+
 onMounted(async () => {
   await getWorkFlow();
   await getTable();
@@ -1029,6 +1051,30 @@ onMounted(async () => {
                     </q-item-section>
                     <q-item-section>รายละเอียด</q-item-section>
                   </q-item>
+                  <q-item
+                    v-if="
+                      checkPermission($route)?.attrIsUpdate &&
+                      props.row.isDraft &&
+                      props.row.statusId === 'PREPARE-CONTAIN' &&
+                      DataStore.isOfficer
+                    "
+                    clickable
+                    v-close-popup
+                    @click="onUpdateDraftStatus(props.row.personalId)"
+                  >
+                    <q-item-section
+                      style="min-width: 0px"
+                      avatar
+                      class="q-py-sm"
+                    >
+                      <q-icon
+                        color="red"
+                        size="xs"
+                        name="mdi-account-arrow-left-outline"
+                      />
+                    </q-item-section>
+                    <q-item-section>ยกเลิกการส่งตัว</q-item-section>
+                  </q-item>
 
                   <q-item
                     v-if="

From 9d9cd92d6b27494710c9a06ed476742cd92758cd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 16 Apr 2026 16:14:33 +0700
Subject: [PATCH 047/125] refactor(retire-old): standardize API response by
 renaming data to result

---
 src/modules/06_retirement/views/09_retirementOld.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/06_retirement/views/09_retirementOld.vue b/src/modules/06_retirement/views/09_retirementOld.vue
index 0520a3c35..64c05c218 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.data;
+    const data: RetirementOld = response.data.result;
     pagination.value.rowsNumber = data.totalRecords;
     rows.value = data.dataRecords;
   } catch (error) {

From 73335d7dd50dffc69d289e468c96ff926231b384 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 16 Apr 2026 20:55:51 +0700
Subject: [PATCH 048/125] add permission owner

---
 src/modules/05_placement/components/PersonalList/Table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index bdf4ae494..557139d8b 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -1056,7 +1056,7 @@ onMounted(async () => {
                       checkPermission($route)?.attrIsUpdate &&
                       props.row.isDraft &&
                       props.row.statusId === 'PREPARE-CONTAIN' &&
-                      DataStore.isOfficer
+                      (DataStore.isOfficer || checkPermission($route)?.attrOwnership == 'OWNER')
                     "
                     clickable
                     v-close-popup

From 8a0a6ea873b56f01f50d0945c47547fd29d5456b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Apr 2026 14:59:22 +0700
Subject: [PATCH 049/125] fix(command): validate if isIdofficer  isBangkok
 fields to show warnings

---
 .../18_command/components/Step/1_Detail.vue   | 20 ++++---------------
 .../18_command/components/Step/View0_Live.vue | 13 +++++++-----
 src/modules/18_command/store/DetailStore.ts   |  6 ++++--
 src/modules/18_command/views/detail.vue       | 13 ++++++++++++
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index ff3f564a6..2a3f3b60f 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -61,7 +61,6 @@ 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"]>([
@@ -114,17 +113,7 @@ 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);
-    });
-}
+
 
 /**
  * ฟังก์ชันบันทึกข้อมูลรายละเอียดคำสั่ง
@@ -133,7 +122,7 @@ async function fetchCheckIdofficer() {
 async function onSubmit() {
   //ถ้าเป็น สกจ. ต้องเลือกประเภทคำสั่งด้วย
   if (
-    isIdofficer.value &&
+    store.isIdofficer &&
     formData.isBangkok !== "BANGKOK" &&
     formData.isBangkok !== "OFFICE"
   ) {
@@ -225,7 +214,6 @@ function onDeleteData(id: string) {
 onMounted(async () => {
   try {
     showLoader();
-    await fetchCheckIdofficer();
     await fetchDataOperatorList();
     formData.commandNo = props.formCommandList.commandNo;
     formData.commandYear = props.formCommandList.commandYear;
@@ -235,7 +223,7 @@ onMounted(async () => {
     formData.issue = props.formCommandList.issue;
     formData.commandAffectDate = props.formCommandList.commandAffectDate;
     formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
-    formData.isBangkok = !isIdofficer.value
+    formData.isBangkok = !store.isIdofficer
       ? null
       : props.formCommandList.isBangkok;
     commandCode.value = props.formCommandList.commandCode;
@@ -500,7 +488,7 @@ onMounted(async () => {
 
               <div
                 class="col-12 q-gutter-sm"
-                v-if="isIdofficer && commandCode !== 'C-PM-47'"
+                v-if="store.isIdofficer && commandCode !== 'C-PM-47'"
               >
                 <q-radio
                   :disable="store.readonly"
diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index 57a7d3ef6..a66025639 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -292,7 +292,10 @@ function onConfirmOrder() {
   if (
     store?.dataCommand?.commandNo !== "" &&
     store?.dataCommand?.commandAffectDate !== null &&
-    store?.dataCommand?.commandExcecuteDate !== null
+    store?.dataCommand?.commandExcecuteDate !== null &&
+    (!store.isIdofficer ||
+      store?.dataCommand?.isBangkok === "BANGKOK" ||
+      store?.dataCommand?.isBangkok === "OFFICE")
   ) {
     dialogConfirm(
       $q,
@@ -316,10 +319,10 @@ function onConfirmOrder() {
       "คุณต้องการยืนยันการส่งออกคำสั่งใช่หรือไม่?"
     );
   } else {
-    dialogMessageNotify(
-      $q,
-      "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม และวันที่คำสั่งมีผลให้ครบ"
-    );
+    const messageWarning = !store.isIdofficer
+      ? "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม และวันที่คำสั่งมีผลให้ครบ"
+      : "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม วันที่คำสั่งมีผล และเลือกประเภทคำสั่งให้ครบ";
+    dialogMessageNotify($q, messageWarning);
   }
 }
 
diff --git a/src/modules/18_command/store/DetailStore.ts b/src/modules/18_command/store/DetailStore.ts
index ffdfc035a..7a744d451 100644
--- a/src/modules/18_command/store/DetailStore.ts
+++ b/src/modules/18_command/store/DetailStore.ts
@@ -7,7 +7,8 @@ export const useCommandDetail = defineStore("commandDetailStore", () => {
   const readonly = ref<boolean>(false);
   const dataCommand = ref<FormDataDetail>();
   const status = ref<string>("");
-  const isSalary = ref<boolean>(false)
+  const isSalary = ref<boolean>(false);
+  const isIdofficer = ref<boolean>(false);
   function checkStep(val: string) {
     status.value = val;
     switch (val) {
@@ -39,6 +40,7 @@ export const useCommandDetail = defineStore("commandDetailStore", () => {
     readonly,
     status,
     dataCommand,
-    isSalary
+    isSalary,
+    isIdofficer,
   };
 });
diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue
index 37ab3326f..5e41124dc 100644
--- a/src/modules/18_command/views/detail.vue
+++ b/src/modules/18_command/views/detail.vue
@@ -92,12 +92,25 @@ 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 fetchDataCommandList();
+  await fetchCheckIdofficer();
   store.readonly =
     route.name === "commandViewDetailPage" ||
     formCommandList.status === "REPORTED" ||

From d6e75d6966a4d376d4978256d70a7004c16b81a0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 17 Apr 2026 15:29:11 +0700
Subject: [PATCH 050/125] refactor(command): dialogMessageNotify messageWarning

---
 src/modules/18_command/components/Step/View0_Live.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index a66025639..263445a25 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -321,7 +321,7 @@ function onConfirmOrder() {
   } else {
     const messageWarning = !store.isIdofficer
       ? "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม และวันที่คำสั่งมีผลให้ครบ"
-      : "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม วันที่คำสั่งมีผล และเลือกประเภทคำสั่งให้ครบ";
+      : "ไม่สามารถดำเนินการต่อได้ กรุณากรอกเลขที่คำสั่ง วันที่ลงนาม วันที่คำสั่งมีผล และเลือกคำสั่งให้ครบ";
     dialogMessageNotify($q, messageWarning);
   }
 }

From cba8f4b70308c2e538e63e68041f4b5f2b3d4d13 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 20 Apr 2026 09:40:16 +0700
Subject: [PATCH 051/125] =?UTF-8?q?fixed#2435=20=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?/=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99=20>>=20=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87/=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20(=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=8A=E0=B9=88=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=AD=E0=B8=81=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AB=E0=B8=B2=E0=B8=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryPerson/views/edit/components/FormPosition.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
index c30fec131..b6ef8c829 100644
--- a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
+++ b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
@@ -706,6 +706,7 @@ function classInput(val: boolean) {
             hide-bottom-space
             autocomplete="on"
             name="organization"
+            :label="`${'หน่วยงาน'}`"
           />
         </div>
 

From 0ccda33b37954ce32256cf0a31db12165852e04b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 20 Apr 2026 09:47:20 +0700
Subject: [PATCH 052/125] =?UTF-8?q?fixed#1565=20=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=8D=E0=B8=AB=E0=B8=B2=E0=B8=9A=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=81=E0=B8=AD=E0=B8=B5=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A5=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B8=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=A7=E0=B9=88=E0=B8=B2=20admin=20?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B0=E0=B8=95=E0=B8=B4=E0=B8=94=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=A5=E0=B8=B1=E0=B8=9A=E0=B8=97=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AD=E0=B8=B5=E0=B9=80=E0=B8=A1=E0=B8=A5=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9B=E0=B9=87=E0=B8=99=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=9A=E0=B9=81=E0=B8=A3=E0=B8=81=E0=B8=81=E0=B8=A3=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=93=E0=B8=B2=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AD=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/DialogDebug.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/Dialogs/DialogDebug.vue b/src/components/Dialogs/DialogDebug.vue
index e84ef99da..6443dff90 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -354,6 +354,11 @@ 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
@@ -363,10 +368,7 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                      (val: string) => !!val || 'กรุณากรอกอีเมลติดต่อกลับ',
                     ]"
                   />
                 </div>
@@ -378,12 +380,6 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
-                    :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
-                    ]"
                   />
                 </div>
               </div>

From 519372056780d3c5a67983f47cc367ee51c7de0a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 20 Apr 2026 09:55:27 +0700
Subject: [PATCH 053/125] fixed format email

---
 src/components/Dialogs/DialogDebug.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Dialogs/DialogDebug.vue b/src/components/Dialogs/DialogDebug.vue
index 6443dff90..42230b6f4 100644
--- a/src/components/Dialogs/DialogDebug.vue
+++ b/src/components/Dialogs/DialogDebug.vue
@@ -368,7 +368,11 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      (val: string) => !!val || 'กรุณากรอกอีเมลติดต่อกลับ',
+                      (val: string) => !!val || 'กรุณากรอกที่อยู่อีเมล',
+                      (val: string) => {
+                        const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+                        return emailPattern.test(val) || 'กรุณากรอกที่อยู่อีเมลในรูปแบบที่ถูกต้อง';
+                      }
                     ]"
                   />
                 </div>

From 1de3d3575254732e4c72bf792a95a744c0cd4149 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 21 Apr 2026 14:14:38 +0700
Subject: [PATCH 054/125] refactor(retirement): download retirementReport

---
 .../01_retirement/RetirementDetail.vue        | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 2f773e5e1..08d05ff47 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -370,18 +370,32 @@ async function uploadFile(event: any, date: any) {
  */
 async function downloadAttachment(type: string, id: string) {
   showLoader();
-  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();
-    });
+  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();
+  }
 }
 
 // ยืนยันการแก้ไขข้อมูล

From 5bf1f2f197d51b1785fd0b157b50ac92ae05172b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 23 Apr 2026 10:43:08 +0700
Subject: [PATCH 055/125] =?UTF-8?q?fixed=20=E0=B8=AA=E0=B8=B4=E0=B8=97?=
 =?UTF-8?q?=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/07_LeaveHistory/DialogForm.vue | 29 +++++++++----------
 .../09_leave/views/07_LeaveHistoryMain.vue    |  8 ++---
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index b33009b20..f62052426 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -453,7 +453,7 @@ watch(modal, async (val) => {
                     </template>
                   </q-select>
                 </div>
-                <div class="col-12">
+                <div v-show="leaveTypeCode === 'LV-005'" class="col-12">
                   <q-input
                     :class="classInput(leaveTypeCode == 'LV-005')"
                     :readonly="leaveTypeCode !== 'LV-005'"
@@ -461,8 +461,8 @@ watch(modal, async (val) => {
                     dense
                     outlined
                     label="จำนวนสิทธิ์การลา"
-                    hide-bottom-space
-                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
+                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                    hint="* สำหรับลาพักผ่อนเท่านั้น คือสิทธิ์ลาประจำปี + สิทธิ์สะสม"
                   />
                 </div>
                 <div class="col-12">
@@ -471,10 +471,11 @@ watch(modal, async (val) => {
                     v-model="formData.leaveDaysUsed"
                     dense
                     outlined
-                    label="ที่ใช้ไป (วัน)"
-                    hide-bottom-space
+                    label="ที่ใช้ไปทั้งหมด (วัน)"
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
+                    hint="* จำนวนวันรวม การลาที่บันทึกในระบบและการลาย้อนหลังในปีงบประมาณนี้"
                   />
+                    
                 </div>
                 <div class="col-12">
                   <q-input
@@ -482,10 +483,9 @@ watch(modal, async (val) => {
                     v-model="formData.leaveCount"
                     dense
                     outlined
-                    label="ที่ใช้ไป (ครั้ง)"
-                    hide-bottom-space
-                    mask="#"
-                    reverse-fill-mask
+                    label="ที่ใช้ไปทั้งหมด (ครั้ง)"
+                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                    hint="* จำนวนครั้งรวม การลาที่บันทึกในระบบและการลาย้อนหลังในปีงบประมาณนี้"
                   />
                 </div>
 
@@ -495,9 +495,9 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveDays"
                     dense
                     outlined
-                    label="ยกมา (วัน)"
-                    hide-bottom-space
+                    label="จำนวนวันลาก่อนใช้งานระบบ"
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
+                    hint="* จำนวนวันรวมการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
                   />
                 </div>
 
@@ -507,10 +507,9 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveCount"
                     dense
                     outlined
-                    label="ยกมา (ครั้ง)"
-                    hide-bottom-space
-                    mask="#"
-                    reverse-fill-mask
+                    label="จำนวนครั้งที่ลาก่อนใช้งานระบบ"
+                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                    hint="* จำนวนครั้งของการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
                   />
                 </div>
               </div>
diff --git a/src/modules/09_leave/views/07_LeaveHistoryMain.vue b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
index 8fdfcc774..190c80628 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",

From cf053cb306dded6c957e5ccd6a96eaf781b58f95 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Apr 2026 16:42:31 +0700
Subject: [PATCH 056/125] feat(registry-edit): uploadFile profileSalaryTemp

---
 src/api/02_organizational/api.organization.ts |  2 +
 .../views/edit/components/Table.vue           | 65 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index bcb7e54d9..b30ec3ec1 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -192,6 +192,8 @@ 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/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index 7d99fd725..74849426c 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -847,6 +847,58 @@ async function validateAndSave(
   }
 }
 
+/**
+ * ฟังก์ชันอัปโหลดไฟล์ Excel
+ * ส่งไฟล์ Excel ไปยัง API โดยตรง
+ */
+function handUploadFile() {
+  const input = document.createElement("input");
+  input.type = "file";
+  input.accept = ".xlsx,.xls";
+
+  input.onchange = async (e: Event) => {
+    try {
+      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("กรุณาเลือกไฟล์ Excel เท่านั้น (.xlsx, .xls)");
+        return;
+      }
+
+      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();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  };
+
+  input.click();
+}
+
 onMounted(async () => {
   await Promise.all([fetchData(), fetchType()]);
 });
@@ -886,6 +938,15 @@ onMounted(async () => {
         >
         <q-space />
         <div>
+          <q-btn
+            flat
+            round
+            color="blue"
+            icon="upload"
+            @click="handUploadFile()"
+          >
+            <q-tooltip>อัปโหลดไฟล์แก้ไข</q-tooltip>
+          </q-btn>
           <q-btn
             flat
             round
@@ -893,7 +954,9 @@ onMounted(async () => {
             icon="download"
             :disable="rows.length == 0"
             @click="exportToExcel()"
-          />
+          >
+            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
+          </q-btn>
         </div>
 
         <q-input

From 24d08ac0cf08ace2d54c8fe6c7aef08a0da75008 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Apr 2026 17:22:01 +0700
Subject: [PATCH 057/125] refactor(registry-edit): exportExcel

---
 package.json                                  |   1 +
 .../interface/response/Edit.ts                |   1 +
 .../04_registryPerson/utils/exportPosition.ts | 157 ++++++++++++++++++
 .../views/edit/components/Table.vue           | 114 ++++++-------
 4 files changed, 217 insertions(+), 56 deletions(-)
 create mode 100644 src/modules/04_registryPerson/utils/exportPosition.ts

diff --git a/package.json b/package.json
index 6e2ddd2c2..088a0ead7 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "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/modules/04_registryPerson/interface/response/Edit.ts b/src/modules/04_registryPerson/interface/response/Edit.ts
index 8af17bae8..d9deaf0bb 100644
--- a/src/modules/04_registryPerson/interface/response/Edit.ts
+++ b/src/modules/04_registryPerson/interface/response/Edit.ts
@@ -70,6 +70,7 @@ interface DataPosition {
   status: string;
   posNumCodeSitAbb: string;
   posNumCodeSit: string;
+  positionExecutiveField: string;
 }
 
 export type { DataSalaryPos, DataPosition };
diff --git a/src/modules/04_registryPerson/utils/exportPosition.ts b/src/modules/04_registryPerson/utils/exportPosition.ts
new file mode 100644
index 000000000..144033429
--- /dev/null
+++ b/src/modules/04_registryPerson/utils/exportPosition.ts
@@ -0,0 +1,157 @@
+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/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index 74849426c..470c010ac 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -8,6 +8,7 @@ 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";
@@ -430,66 +431,67 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
 
 /** ฟังก์ชันดาวน์โหลดไฟล Excel */
 function exportToExcel() {
-  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,
-    };
-  });
+  exportToExcelPosition(rows.value);
+  // const newData = rows.value.map((e: DataPosition) => {
+  //   return {
+  //     commandDateAffect: date2Thai(e.commandDateAffect),
+  //     positionName: e.positionName,
+  //     positionType: e.positionType,
+  //     positionLevel: e.positionLevel
+  //       ? e.positionLevel
+  //       : e.positionCee
+  //       ? e.positionCee
+  //       : "",
+  //     positionExecutive: e.positionExecutive,
+  //     amount: e.amount,
+  //     mouthSalaryAmount: e.mouthSalaryAmount,
+  //     positionSalaryAmount: e.positionSalaryAmount,
+  //     organization: findOrgName({
+  //       root: e.orgRoot,
+  //       child1: e.orgChild1,
+  //       child2: e.orgChild2,
+  //       child3: e.orgChild3,
+  //       child4: e.orgChild4,
+  //     }),
+  //     posNo:
+  //       e.posNoAbb && e.posNo
+  //         ? `${e.posNoAbb} ${e.posNo}`
+  //         : e.posNo
+  //         ? e.posNo
+  //         : "",
+  //     posNumCodeSit:
+  //       e.posNumCodeSitAbb && e.posNumCodeSit
+  //         ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
+  //         : e.posNumCodeSit
+  //         ? e.posNumCodeSit
+  //         : "",
+  //     commandNo:
+  //       e.commandNo && e.commandYear
+  //         ? `${e.commandNo}/${Number(e.commandYear) + 543}`
+  //         : "",
+  //     commandDateSign: date2Thai(e.commandDateSign),
+  //     commandCode: store.convertCommandCodeName(e.commandCode),
+  //     remark: e.remark,
+  //   };
+  // });
 
-  const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
-  const worksheet = XLSX.utils.json_to_sheet(newData, {
-    header: visibleColumns.value,
-  });
+  // 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); //รายการปรเภทคำสั่ง

From 874bedf7ebf2760671fc6add9716b1c271889f9a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 09:23:46 +0700
Subject: [PATCH 058/125] refactor(registry-edit): permisson handUploadFile

---
 .../04_registryPerson/views/edit/components/Table.vue        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index 470c010ac..ab1a275aa 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -941,6 +941,11 @@ onMounted(async () => {
         <q-space />
         <div>
           <q-btn
+            v-if="
+              tabs === 'PENDING' &&
+              statusCheckEdit == 'PENDING' &&
+              isConfirmEdit
+            "
             flat
             round
             color="blue"

From 433a0ce9b86c0c4d091ed2e6e00c8628613923ea Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 09:52:14 +0700
Subject: [PATCH 059/125] feat(leave): UI Show Card leaveWaitingSummary

---
 .../components/05_Leave/DetailLeavePage.vue   | 28 ++++++++++++++-----
 .../components/05_Leave/DetailLeaveReject.vue | 28 ++++++++++++++-----
 .../09_leave/interface/request/leave.ts       |  1 +
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index 1ba2c0a2b..4f4b2ee46 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -82,6 +82,7 @@ const formData = reactive<FormData>({
   status: "", //สถานะการของลา
   leaveLimit: 0, //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
   leaveSummary: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
+  leaveWaitingSummary: 0, //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: 0, //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
   leaveWrote: "", //เขียนที่
   leaveAddress: "", //สถานที่ติดต่อขณะลา
@@ -391,6 +392,9 @@ 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,
@@ -773,40 +777,50 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="col-xs-12 col-sm-7 row">
-                  <div class="row col-12 q-gutter-md">
+                  <div class="row col-12 q-col-gutter-md">
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-3"
+                      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-blue-10">
                           {{ formData.leaveLimit }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">ได้รับ</span>
+                          <span>ได้รับ</span>
                         </div>
                       </q-card>
                     </div>
-                    <div class="col-3">
+                    <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.leaveSummary }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">ใช้ไป</span>
+                          <span>ใช้ไป</span>
                         </div>
                       </q-card>
                     </div>
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-3"
+                      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-indigo-7">
                           {{ formData.leaveRemain }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">คงเหลือ</span>
+                          <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>
                         </div>
                       </q-card>
                     </div>
diff --git a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
index 6b0e4e44b..6653eed35 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue
@@ -151,6 +151,7 @@ const formData = reactive<FormData>({
   leaveSubTypeName: "",
   commanderPosition: "",
   leaveRangeEnd: "",
+  leaveWaitingSummary: 0, //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
 });
 
 const isLoadData = ref<boolean>(false);
@@ -217,6 +218,9 @@ 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;
@@ -626,40 +630,50 @@ onMounted(async () => {
                   </div>
                 </div>
                 <div class="col-xs-12 col-sm-7 row">
-                  <div class="row col-12 q-gutter-md">
+                  <div class="row col-12 q-col-gutter-md">
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-3"
+                      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-blue-10">
                           {{ formData.leaveLimit }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">ได้รับ</span>
+                          <span>ได้รับ</span>
                         </div>
                       </q-card>
                     </div>
-                    <div class="col-3">
+                    <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.leaveSummary }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">ใช้ไป</span>
+                          <span>ใช้ไป</span>
                         </div>
                       </q-card>
                     </div>
                     <div
                       v-if="formData.leaveTypeName == 'ลาพักผ่อน'"
-                      class="col-3"
+                      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-indigo-7">
                           {{ formData.leaveRemain }}
                         </div>
                         <div class="col-12 text-subtitle2 text-weight-regular">
-                          <span class="gt-xs">คงเหลือ</span>
+                          <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>
                         </div>
                       </q-card>
                     </div>
diff --git a/src/modules/09_leave/interface/request/leave.ts b/src/modules/09_leave/interface/request/leave.ts
index 95b81143e..27426c709 100644
--- a/src/modules/09_leave/interface/request/leave.ts
+++ b/src/modules/09_leave/interface/request/leave.ts
@@ -41,6 +41,7 @@ interface FormData {
   status: string; //สถานะการของลา
   leaveLimit: number; //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
   leaveSummary: number; //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
+  leaveWaitingSummary: number; //ลาอยู่ระหว่างการพิจารณา(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: number; //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
   // leaveStartDate: Date | null; //*วัน เดือน ปีเริ่มต้นลา
   // leaveEndDate: Date | null; //*วัน เดือน ปีสิ้นสุดลา

From 9132efed119adedc7a866c45d5c531364a8ae879 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 14:06:01 +0700
Subject: [PATCH 060/125] feat(registry-edit): previewFile excel Position

---
 .../04_registryPerson/utils/excelParser.ts    | 177 ++++++++++++
 .../edit/components/DialogExcelPreview.vue    | 263 ++++++++++++++++++
 .../views/edit/components/Table.vue           | 106 ++++---
 3 files changed, 512 insertions(+), 34 deletions(-)
 create mode 100644 src/modules/04_registryPerson/utils/excelParser.ts
 create mode 100644 src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue

diff --git a/src/modules/04_registryPerson/utils/excelParser.ts b/src/modules/04_registryPerson/utils/excelParser.ts
new file mode 100644
index 000000000..b954edfc0
--- /dev/null
+++ b/src/modules/04_registryPerson/utils/excelParser.ts
@@ -0,0 +1,177 @@
+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/views/edit/components/DialogExcelPreview.vue b/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
new file mode 100644
index 000000000..c100d9ba9
--- /dev/null
+++ b/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
@@ -0,0 +1,263 @@
+<script setup lang="ts">
+import { ref, computed, watch } from "vue";
+import moment from "moment";
+import {
+  parseExcelFile,
+  formatFileSize,
+  type ExcelPreviewData,
+} from "@/modules/04_registryPerson/utils/excelParser";
+
+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() {
+  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/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index ab1a275aa..f7cb3a8d6 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -21,6 +21,7 @@ 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,6 +54,11 @@ 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);
@@ -851,7 +857,7 @@ async function validateAndSave(
 
 /**
  * ฟังก์ชันอัปโหลดไฟล์ Excel
- * ส่งไฟล์ Excel ไปยัง API โดยตรง
+ * เปิด preview modal ก่อนอัปโหลด
  */
 function handUploadFile() {
   const input = document.createElement("input");
@@ -859,48 +865,73 @@ function handUploadFile() {
   input.accept = ".xlsx,.xls";
 
   input.onchange = async (e: Event) => {
-    try {
-      const file = (e.target as HTMLInputElement).files?.[0];
-      if (!file) return;
+    const file = (e.target as HTMLInputElement).files?.[0];
+    if (!file) return;
 
-      // ตรวจสอบชนิดไฟล์โดยตรวจสอบนามสกุล
-      const validExtensions = [".xlsx", ".xls"];
-      const fileExtension = file.name
-        .substring(file.name.lastIndexOf("."))
-        .toLowerCase();
+    // ตรวจสอบชนิดไฟล์โดยตรวจสอบนามสกุล
+    const validExtensions = [".xlsx", ".xls"];
+    const fileExtension = file.name
+      .substring(file.name.lastIndexOf("."))
+      .toLowerCase();
 
-      if (!validExtensions.includes(fileExtension)) {
-        messageError("กรุณาเลือกไฟล์ Excel เท่านั้น (.xlsx, .xls)");
-        return;
-      }
-
-      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",
+    if (!validExtensions.includes(fileExtension)) {
+      messageError($q, {
+        response: {
+          data: {
+            title: "กรุณาเลือกไฟล์ Excel เท่านั้น (.xlsx, .xls)",
           },
-        }
-      );
-
-      success($q, "อัปโหลดไฟล์สำเร็จ");
-      await fetchData();
-    } catch (error) {
-      messageError($q, error);
-    } finally {
-      hideLoader();
+        },
+      });
+      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()]);
 });
@@ -1794,6 +1825,13 @@ onMounted(async () => {
     :fetch-data="fetchData"
     :columns="columns"
   />
+
+  <DialogExcelPreview
+    v-model:modal="excelPreviewModal"
+    :file="selectedExcelFile"
+    @confirm="onConfirmUpload"
+    @cancel="onCancelUpload"
+  />
 </template>
 
 <style scoped></style>

From 7211081d14e20339c151fe9c3d804f48218cbbba Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 14:29:32 +0700
Subject: [PATCH 061/125] refactor(leave-history): replace overflow-hidden with
 overflow-auto for better scrollability

---
 src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index f62052426..60ca9409e 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -386,7 +386,7 @@ watch(modal, async (val) => {
             <q-separator vertical />
 
             <!-- input -->
-            <div class="col overflow-hidden q-pa-md">
+            <div class="col overflow-auto q-pa-md">
               <div class="row q-col-gutter-sm">
                 <div class="col-12">
                   <datepicker
@@ -475,7 +475,6 @@ watch(modal, async (val) => {
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                     hint="* จำนวนวันรวม การลาที่บันทึกในระบบและการลาย้อนหลังในปีงบประมาณนี้"
                   />
-                    
                 </div>
                 <div class="col-12">
                   <q-input

From 52f4db00a93f8c3cf331c31a13628f3742758592 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 14:51:31 +0700
Subject: [PATCH 062/125] refactor: dialogConfirm  onConfirmUpload

---
 .../edit/components/DialogExcelPreview.vue      | 17 ++++++++++++-----
 .../views/edit/components/Table.vue             |  1 -
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue b/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
index c100d9ba9..326a767c1 100644
--- a/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
+++ b/src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue
@@ -1,11 +1,16 @@
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
+import { useQuasar } from "quasar";
 import moment from "moment";
+
 import {
   parseExcelFile,
   formatFileSize,
-  type ExcelPreviewData,
 } from "@/modules/04_registryPerson/utils/excelParser";
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const { dialogConfirm } = useCounterMixin();
 
 interface Props {
   modal: boolean;
@@ -157,10 +162,12 @@ async function loadPreview() {
 }
 
 function onConfirm() {
-  if (props.file) {
-    isUploading.value = true;
-    emit("confirm", props.file);
-  }
+  dialogConfirm($q, () => {
+    if (props.file) {
+      isUploading.value = true;
+      emit("confirm", props.file);
+    }
+  });
 }
 
 function onClose() {
diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index f7cb3a8d6..f470254c6 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -1,7 +1,6 @@
 <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";

From 41a9f9cb89f8353926fdc67713fd4ff2db39a0f6 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 24 Apr 2026 15:01:50 +0700
Subject: [PATCH 063/125] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/07_LeaveHistory/DialogForm.vue | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index f62052426..97e54a501 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -108,12 +108,16 @@ async function onSubmit() {
         ? Number(formData.leaveDaysUsed)
         : 0,
       leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
-      beginningLeaveDays: formData.beginningLeaveDays
-        ? Number(formData.beginningLeaveDays)
-        : 0,
-      beginningLeaveCount: formData.beginningLeaveCount
-        ? Number(formData.beginningLeaveCount)
-        : 0,
+      beginningLeaveDays: !isStatusEdit.value
+        ? formData.leaveDaysUsed
+          ? Number(formData.leaveDaysUsed)
+          : 0
+        : undefined,
+      beginningLeaveCount: !isStatusEdit.value
+        ? formData.leaveCount
+          ? Number(formData.leaveCount)
+          : 0
+        : undefined,
     })
 
       .then(async () => {
@@ -471,11 +475,10 @@ watch(modal, async (val) => {
                     v-model="formData.leaveDaysUsed"
                     dense
                     outlined
-                    label="ที่ใช้ไปทั้งหมด (วัน)"
+                    label="ที่ใช้ไป (วัน)"
+                    hide-bottom-space
                     :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    hint="* จำนวนวันรวม การลาที่บันทึกในระบบและการลาย้อนหลังในปีงบประมาณนี้"
                   />
-                    
                 </div>
                 <div class="col-12">
                   <q-input
@@ -483,13 +486,13 @@ watch(modal, async (val) => {
                     v-model="formData.leaveCount"
                     dense
                     outlined
-                    label="ที่ใช้ไปทั้งหมด (ครั้ง)"
+                    label="ที่ใช้ไป (ครั้ง)"
+                    hide-bottom-space
                     :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
-                    hint="* จำนวนครั้งรวม การลาที่บันทึกในระบบและการลาย้อนหลังในปีงบประมาณนี้"
                   />
                 </div>
 
-                <div class="col-12">
+                <!-- <div class="col-12">
                   <q-input
                     :class="classInput(true)"
                     v-model="formData.beginningLeaveDays"
@@ -511,7 +514,7 @@ watch(modal, async (val) => {
                     :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
                     hint="* จำนวนครั้งของการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
                   />
-                </div>
+                </div> -->
               </div>
             </div>
           </div>

From 8a1fb4f9ed36d3e44ef6454bc6c90fc18874a78a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Apr 2026 15:59:07 +0700
Subject: [PATCH 064/125] refactor(worklist): formatDate colunm checkInTime 
 checkOutTime

---
 .../09_leave/components/02_WorkList/DialogDetail.vue   | 10 ++++++++--
 src/modules/09_leave/components/02_WorkList/Tab1.vue   |  6 ++++++
 src/modules/09_leave/components/02_WorkList/Tab2.vue   |  6 ++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 9202066c0..176b593bb 100644
--- a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -267,7 +267,9 @@ watch(
                 <div class="q-pa-md q-gutter-md">
                   <div class="row">
                     <div class="col text-grey-8">เวลาเข้างาน</div>
-                    <div class="col">{{ formData.checkInTime }}</div>
+                    <div class="col">
+                      {{ `${formData.checkInDate} ${formData.checkInTime} น.` }}
+                    </div>
                   </div>
                   <div class="row">
                     <div class="col text-grey-8">สถานที่ทำงาน</div>
@@ -337,7 +339,11 @@ watch(
                 <div class="q-pa-md q-gutter-md">
                   <div class="row">
                     <div class="col text-grey-8">เวลาออกงาน</div>
-                    <div class="col">{{ formData.checkOutTime }}</div>
+                    <div class="col">
+                      {{
+                        `${formData.checkOutDate} ${formData.checkOutTime} น.`
+                      }}
+                    </div>
                   </div>
                   <div class="row">
                     <div class="col text-grey-8">สถานที่ทำงาน</div>
diff --git a/src/modules/09_leave/components/02_WorkList/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
index c33afe3c8..e4939c42f 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -74,6 +74,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.checkInDate} ${val} น.`;
+    },
   },
   {
     name: "checkInLocation",
@@ -101,6 +104,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.checkOutDate} ${val} น.`;
+    },
   },
   {
     name: "checkOutLocation",
diff --git a/src/modules/09_leave/components/02_WorkList/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue
index 6c6af46b8..9475328a6 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -70,6 +70,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.checkInDate} ${val} น.`;
+    },
   },
   {
     name: "checkInLocation",
@@ -88,6 +91,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.checkOutDate} ${val} น.`;
+    },
   },
   {
     name: "checkOutLocation",

From 5b71a6a37bfa7950f7a0457f3de464b286a8ef61 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 24 Apr 2026 16:25:24 +0700
Subject: [PATCH 065/125] fix display gov age

---
 .../detail/GovernmentInformation/01_Info.vue  | 44 +++++++++----------
 .../interface/index/government.ts             |  4 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

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 5da73bfb0..edd6dea95 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -50,18 +50,10 @@ const formMain = reactive<FormMain>({
   workDate: null, //วันที่เริ่มปฏิบัติราชการ
   reasonSameDate: "",
   retireDate: null, //วันเกษียณอายุ
-  ageAll: {
-    year: 0,
-    month: 0,
-    day: 0,
-  }, //อายุราชการ
+  ageAll: "", //อายุราชการ
   absent: 0, //ขาดราชการ
   age: 0, //อายุราชการเกื้อกูล
-  govAgeBkk:{
-    year: 0,
-    month: 0,
-    day: 0,
-  }
+  govAgeBkk: "",
 });
 
 const modalEdit = ref<boolean>(false); //แสดง popup แก้ไขข้อมูลราชการ
@@ -165,10 +157,22 @@ async function getData() {
       formMain.reasonSameDate = data.reasonSameDate;
       formMain.retireDate = data.dateLeave;
       formMain.dateRetireLaw = data.dateRetireLaw;
-      formMain.ageAll = data.govAge;
+      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.absent = data.govAgeAbsent;
       formMain.age = data.govAgePlus;
-      formMain.govAgeBkk = data.govAgeBkk;
+      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() || "-"
+        : "-";
     })
     .catch((e) => {
       messageError($q, e);
@@ -455,25 +459,19 @@ onMounted(() => {
               <span class="text-grey-6 text-weight-medium">อายุราชการ</span>
             </div>
             <div class="col-12 col-sm-12 col-md-7">
-              <span>{{
-                formMain.ageAll
-                  ? `${formMain.ageAll.year} ปี ${formMain.ageAll.month} เดือน ${formMain.ageAll.day} วัน`
-                  : "-"
-              }}</span>
+              <span>{{ formMain.ageAll }}</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
-                  ? `${formMain.govAgeBkk.year} ปี ${formMain.govAgeBkk.month} เดือน ${formMain.govAgeBkk.day} วัน`
-                  : "-"
-              }}</span>
+              <span>{{ formMain.govAgeBkk }}</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 b9796889c..283173e4c 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;
-  govAgeBkk: GovAgeForm;
+  ageAll: GovAgeForm | string;
+  govAgeBkk: GovAgeForm | string;
   absent: number;
   age: number;
   [key: string]: any;

From 8d5384c1d3e85af623d2bd9daee4c23fa80b4d33 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 Apr 2026 10:07:00 +0700
Subject: [PATCH 066/125] refactor(UI work-list): display column time

Co-authored-by: Copilot <copilot@github.com>
---
 .../components/02_WorkList/DialogDetail.vue   | 12 ++++++---
 .../09_leave/components/02_WorkList/Tab1.vue  | 26 ++++++++++++-------
 .../09_leave/components/02_WorkList/Tab2.vue  | 26 ++++++++++++-------
 .../components/02_WorkList/TableList.vue      |  8 +++---
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 176b593bb..592c1a32e 100644
--- a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -268,7 +268,11 @@ watch(
                   <div class="row">
                     <div class="col text-grey-8">เวลาเข้างาน</div>
                     <div class="col">
-                      {{ `${formData.checkInDate} ${formData.checkInTime} น.` }}
+                      {{
+                        formData.checkInDate
+                          ? `${formData.checkInDate} ${formData.checkInTime} น.`
+                          : "-"
+                      }}
                     </div>
                   </div>
                   <div class="row">
@@ -341,14 +345,16 @@ watch(
                     <div class="col text-grey-8">เวลาออกงาน</div>
                     <div class="col">
                       {{
-                        `${formData.checkOutDate} ${formData.checkOutTime} น.`
+                        formData.checkOutDate
+                          ? `${formData.checkOutDate} ${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>
                       {{
diff --git a/src/modules/09_leave/components/02_WorkList/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
index e4939c42f..9c140b4e2 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -75,7 +75,10 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.checkInDate} ${val} น.`;
+      if (row.checkInDate && val) {
+        return `${row.checkInDate} ${val} น.`;
+      }
+      return "-";
     },
   },
   {
@@ -105,7 +108,10 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.checkOutDate} ${val} น.`;
+      if (row.checkOutDate && val) {
+        return `${row.checkOutDate} ${val} น.`;
+      }
+      return "-";
     },
   },
   {
@@ -166,19 +172,19 @@ async function fetchListTimeRecord() {
           id: e.id,
           fullName: e.fullName,
           profileType: e.profileType,
-          checkInDate: e.checkInDate ? date2Thai(e.checkInDate) : "-",
+          checkInDate: date2Thai(e.checkInDate),
           checkInTime: e.checkInTime,
           checkInLocation: e.checkInLocation,
-          checkInLat: e.checkInLat ? e.checkInLat : "",
-          checkInLon: e.checkInLon ? e.checkInLon : "",
+          checkInLat: e.checkInLat,
+          checkInLon: e.checkInLon,
           checkInStatus: e.checkInStatus
             ? workStore.convertSatatus(e.checkInStatus)
             : "-",
-          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 : "",
+          checkOutDate: date2Thai(e.checkOutDate),
+          checkOutLocation: e.checkOutLocation,
+          checkOutTime: e.checkOutTime,
+          checkOutLat: e.checkOutLat,
+          checkOutLon: 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 9475328a6..e385be482 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -71,7 +71,10 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.checkInDate} ${val} น.`;
+      if (row.checkInDate && val) {
+        return `${row.checkInDate} ${val} น.`;
+      }
+      return "-";
     },
   },
   {
@@ -92,7 +95,10 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.checkOutDate} ${val} น.`;
+      if (row.checkOutDate && val) {
+        return `${row.checkOutDate} ${val} น.`;
+      }
+      return "-";
     },
   },
   {
@@ -139,15 +145,15 @@ async function fetchListLogRecord() {
           profileType: e.profileType,
           fullName: e.fullName,
           checkInDate: e.checkInDate && date2Thai(e.checkInDate),
-          checkInTime: e.checkInTime ? e.checkInTime : "-",
-          checkInLocation: e.checkInLocation ? e.checkInLocation : "-",
-          checkInLat: e.checkInLat ? e.checkInLat : "",
-          checkInLon: e.checkInLon ? e.checkInLon : "",
+          checkInTime: e.checkInTime,
+          checkInLocation: e.checkInLocation,
+          checkInLat: e.checkInLat,
+          checkInLon: e.checkInLon,
           checkOutDate: e.checkOutDate && date2Thai(e.checkOutDate),
-          checkOutLocation: e.checkOutLocation ? e.checkOutLocation : "-",
-          checkOutTime: e.checkOutTime ? e.checkOutTime : "-",
-          checkOutLat: e.checkOutLat ? e.checkOutLat : "",
-          checkOutLon: e.checkOutLon ? e.checkOutLon : "",
+          checkOutLocation: e.checkOutLocation,
+          checkOutTime: e.checkOutTime,
+          checkOutLat: e.checkOutLat,
+          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 9fd478cea..f3f6305f6 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">
+            <q-item style="padding: 0" v-if="props.row.checkInLocation">
               <q-item-section>
                 <q-item-label> {{ props.row.checkInLocation }}</q-item-label>
                 <q-item-label caption lines="2">{{
@@ -131,9 +131,10 @@ 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">
+            <q-item style="padding: 0" v-if="props.row.checkOutLocation">
               <q-item-section>
                 <q-item-label> {{ props.row.checkOutLocation }}</q-item-label>
                 <q-item-label caption lines="2">{{
@@ -141,6 +142,7 @@ onMounted(() => {
                 }}</q-item-label>
               </q-item-section>
             </q-item>
+            <div v-else>-</div>
           </div>
           <div v-else-if="col.name == 'profileType'">
             {{
@@ -150,7 +152,7 @@ onMounted(() => {
             }}
           </div>
           <div v-else>
-            {{ col.value }}
+            {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
       </q-tr>

From df5268705c4719ebeca2723a8ea9ef3241bd1ca4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 Apr 2026 11:02:34 +0700
Subject: [PATCH 067/125] refactor(UI):display  checkOutLocationName

---
 src/modules/09_leave/components/02_WorkList/DialogDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
index 592c1a32e..7b093166b 100644
--- a/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
+++ b/src/modules/09_leave/components/02_WorkList/DialogDetail.vue
@@ -358,8 +358,8 @@ watch(
                     </div>
                     <div class="col" v-else>
                       {{
-                        formData.checkInLocationName
-                          ? `นอกสถานที่ (${formData.checkInLocationName})`
+                        formData.checkOutLocationName
+                          ? `นอกสถานที่ (${formData.checkOutLocationName})`
                           : ""
                       }}
                     </div>

From 1f0ec397ff68e37c43437ad9b7562ec7e79b3fb3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 Apr 2026 13:55:11 +0700
Subject: [PATCH 068/125] fix: delete hide-bottom Table Expand

---
 src/modules/02_organization/components/TableMain.vue | 1 -
 src/modules/19_condition/view/Main.vue               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 91e1e5083..7d8a2756b 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -1004,7 +1004,6 @@ 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/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index 9fc3ec703..585e60005 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -454,7 +454,6 @@ onMounted(async () => {
                         table-class="text-grey-9"
                         row-key="id"
                         dense
-                        hide-bottom
                         bordered
                         separator="vertical"
                         class="custom-header-table-expand"

From bad9bd3adfebc88473ca4fb4574f910d533f05c1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Apr 2026 13:31:31 +0700
Subject: [PATCH 069/125] refactor(leave-history): change leaveDays from
 integer to float

---
 src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index 4c921be15..93be3fbb0 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -401,6 +401,7 @@ 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 }">{{
@@ -465,8 +466,8 @@ watch(modal, async (val) => {
                     dense
                     outlined
                     label="จำนวนสิทธิ์การลา"
-                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
                     hint="* สำหรับลาพักผ่อนเท่านั้น คือสิทธิ์ลาประจำปี + สิทธิ์สะสม"
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
                 <div class="col-12">

From ebf34aa0c22dd40c0fa99830747bf96bb0bad91c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Apr 2026 13:46:31 +0700
Subject: [PATCH 070/125] refactor(placement): hide positionDate input when
 typeCommand is MOVE

---
 .../components/AppointMent/AppointMentDetail.vue           | 7 ++++++-
 src/modules/05_placement/views/06_appointPromoteMain.vue   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
index b5b55e00a..2d8ef8a7b 100644
--- a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
+++ b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue
@@ -45,6 +45,7 @@ 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() {
@@ -61,6 +62,7 @@ async function fecthappointmentByid() {
       }`;
 
       status.value = data.status;
+      typeCommand.value = data.typeCommand;
       educationOld.value = data.educationOld ?? "-";
       organizationPositionOld.value = data.organizationPositionOld;
       positionTypeOld.value = data.positionTypeOld;
@@ -313,7 +315,10 @@ onMounted(() => {
             </div>
 
             <div class="col-12"><q-separator /></div>
-            <div class="col-xs-6 col-sm-6 row items-center">
+            <div
+              class="col-xs-6 col-sm-6 row items-center"
+              v-if="typeCommand !== 'MOVE'"
+            >
               <div class="col-12">
                 <datepicker
                   :readonly="!edit"
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 9abaa643d..051985d84 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.positionDate
+          (e.typeCommand === "MOVE" || e.positionDate)
       );
       rows2.value = listData;
       rows2Data.value = listData;

From 9e550fc5bf118287ae8cfc1cb880974abe753a81 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Apr 2026 13:58:01 +0700
Subject: [PATCH 071/125] refactor(placement-emp): hide positionDate input when
 typeCommand is MOVE

---
 .../components/AppointEmployee/AppointEmployeeDetail.vue   | 7 ++++++-
 src/modules/05_placement/views/07_appointEmployeeMain.vue  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
index 41c3854b9..810983d6a 100644
--- a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue
@@ -54,6 +54,7 @@ const reason = ref<string>(""); //หมายเหตุ
 const status = ref<string>("");
 const fullName = ref<string>("");
 const mianData = ref<MainData>();
+const typeCommand = ref<string>(""); //ประเภทคำสั่ง
 
 /** fetch รายละเอียดการปรับระดับชั้นงานลูกจ้าง*/
 async function fecthappointmentByid() {
@@ -79,6 +80,7 @@ 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);
@@ -323,7 +325,10 @@ onMounted(async () => {
             </div>
 
             <div class="col-12"><q-separator /></div>
-            <div class="col-xs-6 col-sm-6 row items-center">
+            <div
+              class="col-xs-6 col-sm-6 row items-center"
+              v-if="typeCommand !== 'MOVE'"
+            >
               <div class="col-12">
                 <datepicker
                   :readonly="!edit"
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue
index af63c652a..3a1da2bea 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.positionDate || e.typeCommand === "MOVE")
       );
       rows2.value = listData;
       rows2Data.value = listData;

From 598492b61ef63c03e73b021e95aff9bbfa8d190b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 30 Apr 2026 16:07:02 +0700
Subject: [PATCH 072/125] refactor(change-round): add permission check using
 attrIsUpdate for change round button

Co-authored-by: Copilot <copilot@github.com>
---
 src/modules/09_leave/interface/request/changeRound.ts | 4 ++--
 src/modules/09_leave/views/03_ChangeRoundMain.vue     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/09_leave/interface/request/changeRound.ts b/src/modules/09_leave/interface/request/changeRound.ts
index 7dfc20841..bdc339a04 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/views/03_ChangeRoundMain.vue b/src/modules/09_leave/views/03_ChangeRoundMain.vue
index 5bbb76fc5..92f50c679 100644
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@@ -410,6 +410,7 @@ onMounted(() => {
                 @click="selectAllRows()"
               /> -->
               <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
                 :disable="selected.length === 0 || isLoadingAll"
                 :color="selected.length === 0 ? 'grey' : 'info'"
                 dense

From c20e67d1a1e726f36dc8d876310d535c0df38b5e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 May 2026 15:31:18 +0700
Subject: [PATCH 073/125] fix(command): loadFile

---
 src/modules/18_command/components/Step/View0_Live.vue | 1 -
 src/modules/18_command/views/detail.vue               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/18_command/components/Step/View0_Live.vue b/src/modules/18_command/components/Step/View0_Live.vue
index 263445a25..ffaa97790 100644
--- a/src/modules/18_command/components/Step/View0_Live.vue
+++ b/src/modules/18_command/components/Step/View0_Live.vue
@@ -191,7 +191,6 @@ async function uploadFileDoc(
  * @param group ประเภพไฟล์ "คำสั่ง","แนบท้าย"
  */
 async function fetchDoc(group: string) {
-  showLoader();
   let type = group === "order" ? "คำสั่ง" : "แนบท้าย";
   if (group === "order") {
     await fetchDocOrder(type);
diff --git a/src/modules/18_command/views/detail.vue b/src/modules/18_command/views/detail.vue
index 5e41124dc..e9020037e 100644
--- a/src/modules/18_command/views/detail.vue
+++ b/src/modules/18_command/views/detail.vue
@@ -109,8 +109,8 @@ async function fetchCheckIdofficer() {
  * กำหนดค่า `store.readonly` เมื่อ  route.name เป็น "commandViewDetailPage" จะอ่านข้อมูลได้อย่างเดียว
  */
 onMounted(async () => {
-  await fetchDataCommandList();
   await fetchCheckIdofficer();
+  await fetchDataCommandList();
   store.readonly =
     route.name === "commandViewDetailPage" ||
     formCommandList.status === "REPORTED" ||

From de95ae61c0b11024bd4402bc77a86ac508db151b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 1 May 2026 16:00:08 +0700
Subject: [PATCH 074/125] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=AA=E0=B8=B4=E0=B8=97?=
 =?UTF-8?q?=E0=B8=98=E0=B8=B4=E0=B9=8C=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=20staff=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20OWNER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/07_LeaveHistory/DialogForm.vue | 86 +++++++++++--------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index 93be3fbb0..d235c8c65 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -10,6 +10,7 @@ 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";
@@ -104,20 +105,24 @@ async function onSubmit() {
       leaveTypeId: formData.leaveTypeId,
       leaveYear: formData.leaveYear,
       leaveDays: formData.leaveDays ? Number(formData.leaveDays) : 0,
-      leaveDaysUsed: formData.leaveDaysUsed
-        ? Number(formData.leaveDaysUsed)
+      leaveDaysUsed:
+        checkPermission(route)?.attrOwnership === "OWNER"
+          ? formData.leaveDaysUsed
+            ? Number(formData.leaveDaysUsed)
+            : 0
+          : undefined,
+      leaveCount:
+        checkPermission(route)?.attrOwnership === "OWNER"
+          ? formData.leaveCount
+            ? Number(formData.leaveCount)
+            : 0
+          : undefined,
+      beginningLeaveDays: formData.beginningLeaveDays
+        ? Number(formData.beginningLeaveDays)
+        : 0,
+      beginningLeaveCount: formData.beginningLeaveCount
+        ? Number(formData.beginningLeaveCount)
         : 0,
-      leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
-      beginningLeaveDays: !isStatusEdit.value
-        ? formData.leaveDaysUsed
-          ? Number(formData.leaveDaysUsed)
-          : 0
-        : undefined,
-      beginningLeaveCount: !isStatusEdit.value
-        ? formData.leaveCount
-          ? Number(formData.leaveCount)
-          : 0
-        : undefined,
     })
 
       .then(async () => {
@@ -470,30 +475,8 @@ watch(modal, async (val) => {
                     :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
-                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
-                  />
-                </div>
 
-                <!-- <div class="col-12">
+                <div class="col-12">
                   <q-input
                     :class="classInput(true)"
                     v-model="formData.beginningLeaveDays"
@@ -515,7 +498,36 @@ watch(modal, async (val) => {
                     :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
                     hint="* จำนวนครั้งของการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
                   />
-                </div> -->
+                </div>
+
+                <div
+                  v-if="checkPermission(route)?.attrOwnership === 'OWNER'"
+                  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
+                  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) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                  />
+                </div>
               </div>
             </div>
           </div>

From 05afc1fe5bf4a8e753b1febe1fbcc74e94b220ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 May 2026 16:21:44 +0700
Subject: [PATCH 075/125] refactor(exam): API candidate-exam

---
 src/api/recruiting/api.period-exam.ts                   | 4 ++++
 src/modules/03_recruiting/components/TableCandidate.vue | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/api/recruiting/api.period-exam.ts b/src/api/recruiting/api.period-exam.ts
index 0df5e58ed..bf777e193 100644
--- a/src/api/recruiting/api.period-exam.ts
+++ b/src/api/recruiting/api.period-exam.ts
@@ -96,4 +96,8 @@ 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/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index 883d9257c..7a832784f 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.exportExamPassExamList(examId.value))
+    .get(config.API.downloadPassExam(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.exportExamCandidateList(examId.value))
+    .get(config.API.downloadCandidateExam(examId.value))
     .then(async (res) => {
       const data = res.data.result;
       data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;

From c69c4c1fa85234ce5c3702110f017e7ead990242 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 May 2026 17:52:41 +0700
Subject: [PATCH 076/125] fix

---
 src/modules/03_recruiting/components/TableCandidate.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index 7a832784f..f5b1b2b21 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -397,8 +397,6 @@ async function clickCandidateList() {
 }
 
 async function onCheckShowExaminfo() {
-  console.log(props.isShowExaminfo);
-
   dialogMessage(
     $q,
     `ยืนยันการ${props.isShowExaminfo ? "ปิด" : "เปิด"}`,

From 44487139ea32646396a97004917fca0512ab1c37 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 5 May 2026 10:35:29 +0700
Subject: [PATCH 077/125] feat(file):add validateFileSize

---
 .../components/PersonalList/Table.vue         |  9 ++++++--
 src/utils/function.ts                         | 21 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 557139d8b..1d43085e9 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -10,6 +10,7 @@ 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";
@@ -1056,7 +1057,8 @@ onMounted(async () => {
                       checkPermission($route)?.attrIsUpdate &&
                       props.row.isDraft &&
                       props.row.statusId === 'PREPARE-CONTAIN' &&
-                      (DataStore.isOfficer || checkPermission($route)?.attrOwnership == 'OWNER')
+                      (DataStore.isOfficer ||
+                        checkPermission($route)?.attrOwnership == 'OWNER')
                     "
                     clickable
                     v-close-popup
@@ -1543,7 +1545,10 @@ onMounted(async () => {
               :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
               outlined
               use-chips
-              :rules="[(val:string) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
+              :rules="[
+                (val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน',
+                (val) => validateFileSize(val),
+              ]"
               multiple
               @update:model-value="clickEditRow"
               class="q-py-sm"
diff --git a/src/utils/function.ts b/src/utils/function.ts
index 43d08e0b8..e3f5e836f 100644
--- a/src/utils/function.ts
+++ b/src/utils/function.ts
@@ -73,3 +73,24 @@ 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`;
+}

From 7bbd9ae933520eacc2e37ee0ad750705eb851aa5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 5 May 2026 15:56:14 +0700
Subject: [PATCH 078/125] fix(DialogOrgSelect): fetch position

---
 src/components/Dialogs/DialogOrgSelect.vue | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 259d7154b..af860b60e 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -318,9 +318,7 @@ async function getDataTable(id: string, level: number = 0) {
       messageError($q, err);
     })
     .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1000);
+      hideLoader();
     });
 }
 
@@ -403,15 +401,15 @@ async function fetchPosFind(level: number, id: string) {
   };
   await http
     .post(config.API.orgPosFind, body)
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
       expanded.value = data;
       nodeId.value = id;
       positionId.value = props?.dataRows?.posmasterId;
       seletcId.value = props?.dataRows?.positionId;
       datePos.value = props?.dataRows?.reportingDate;
-
-      getDataTable(nodeId.value, level);
+      await getDataTable(nodeId.value, level);
+      await onClickSelectPos(positionId.value);
     })
     .catch((e) => {
       messageError($q, e);
@@ -427,11 +425,6 @@ 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 = [];
       }
@@ -534,6 +527,7 @@ onMounted(async () => {
   await fetchTree();
 });
 </script>
+
 <template>
   <q-dialog v-model="modal" persistent full-width>
     <q-card class="no-scroll">
@@ -929,6 +923,7 @@ onMounted(async () => {
     </q-card>
   </q-dialog>
 </template>
+
 <style scoped>
 .my-list-link {
   color: rgb(118, 168, 222);

From a7341c744097dfd173b16ff4c0117e7d55790eaa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 5 May 2026 17:12:56 +0700
Subject: [PATCH 079/125] refactor(placement): DialogSelectOrg LoadPosition

---
 .../components/PersonalList/CardPosition.vue  | 22 ++++++++-----
 .../PersonalList/DialogSelectOrg.vue          | 32 ++++++++++++-------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 4c9b0a277..70b0b117d 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,
@@ -23,13 +23,13 @@ const store = useSelectOrgStore();
 const selected = defineModel("selectedPos", { required: true }); //ตำแหน่งที่เลือก
 const positionId = defineModel<string>("positionId", { required: true }); //id ตำแหน่งที่เลือก
 const seletcId = defineModel<string>("seletcId", { required: true }); // ตำแหน่งที่เลือก
-const date = defineModel<Date>("datePos", { required: true }); //วันยที่รายงานคัว
+const date = defineModel<Date | null>("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>("posType", { required: true }); //ตำแหน่งประเภท
+const posType = defineModel<FormPosType | null>("posType", { required: true }); //ตำแหน่งประเภท
 const posLevel = defineModel<string>("posLevel", { required: true }); //ระดับตำแหน่ง
 const optionPosType = defineModel<FormPosType[]>("optionPosType", {
   required: true,
@@ -47,6 +47,7 @@ const props = defineProps({
   onPosType: Function,
   nodeId: String,
   nodeLevel: Number,
+  isLoadPosition: Boolean,
 });
 
 //Table
@@ -248,15 +249,20 @@ watch(positionData, (newVal, oldVal) => {
   }
 });
 
+watch(
+  () => props.isLoadPosition,
+  (newVal) => {
+    if (newVal && positionId.value) {
+      onClickSelectPos(positionId.value);
+    }
+  }
+);
+
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  */
 onMounted(async () => {
-  if (positionId.value) {
-    setTimeout(async () => {
-      await onClickSelectPos(positionId.value);
-    }, 1000);
-  } else {
+  if (!positionId.value) {
     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 9d06a7da3..2eb316763 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, reactive } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import { useRoute } from "vue-router";
@@ -69,11 +69,12 @@ const seletcId = ref<string>("");
 const posType = ref<FormPosType | null>(null);
 const posLevel = ref<string>("");
 const selectedPos = ref<any[]>([]);
-const datePos = ref<Date>(new Date());
+const datePos = ref<Date | null>(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() {
@@ -93,7 +94,9 @@ function updateSelected(data: TreeMain) {
   if (props?.dataRow?.nodeId === data.orgTreeId) {
     positionId.value = props?.dataRow?.posmasterId;
     seletcId.value = props?.dataRow?.positionId;
-    datePos.value = props?.dataRow?.reportingDate;
+    datePos.value = props?.dataRow?.reportingDate
+      ? new Date(props.dataRow.reportingDate)
+      : new Date();
   } else {
     positionId.value = "";
     seletcId.value = "";
@@ -117,6 +120,8 @@ 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,
@@ -168,15 +173,14 @@ async function fetchDataTable(id: string, level: number = 0) {
           (e: any) => !positionUse.value.includes(e.id)
         );
       }
+
+      isLoadPosition.value = true;
     })
     .catch((err) => {
       messageError($q, err);
-      hideLoader();
     })
     .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1000);
+      hideLoader();
     });
 }
 
@@ -200,7 +204,9 @@ async function fetchPosFind(level: number, id: string) {
       nodeId.value = id;
       positionId.value = props?.dataRow?.posmasterId;
       seletcId.value = props?.dataRow?.positionId;
-      datePos.value = props?.dataRow?.reportingDate;
+      datePos.value = props?.dataRow?.reportingDate
+        ? new Date(props.dataRow.reportingDate)
+        : new Date();
 
       fetchDataTable(nodeId.value, level);
     })
@@ -272,6 +278,9 @@ function clearData() {
   posLevel.value = "";
   isPosition.value = "exam";
   filterTree.value = "";
+  datePos.value = new Date();
+  isLoadPosition.value = false;
+  positionNo.value = [];
 }
 
 /** callback function เมื่อมีการเปิด popup*/
@@ -280,7 +289,6 @@ watch(
   async () => {
     if (modal.value) {
       await fetchPositionUes();
-
       if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
         await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId);
       } else {
@@ -323,8 +331,7 @@ async function getOrgPosType() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {});
+    });
 }
 
 function onPosType() {
@@ -466,7 +473,7 @@ onMounted(() => {
                   v-model:is-all="isAll"
                   v-model:is-blank="isBlank"
                   v-model:is-position="isPosition"
-                  v-model:pos-type="posType as FormPosType"
+                  v-model:pos-type="posType as FormPosType | null"
                   v-model:pos-level="posLevel"
                   v-model:option-pos-type="optionPosType"
                   v-model:option-pos-level="optionPosLevel"
@@ -475,6 +482,7 @@ onMounted(() => {
                   :node-id="nodeId"
                   :node-level="nodeLevel"
                   :bma-officer="props.dataRow?.bmaOfficer"
+                  :is-load-position="isLoadPosition"
                 />
               </q-tab-panel>
             </q-tab-panels>

From 999a2d1b4568ebcb3e68dbbe5e89e2dfa103cb1a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 5 May 2026 17:39:52 +0700
Subject: [PATCH 080/125] refactor(DialogOrgSelect): reset positionData to
 default values

---
 src/components/Dialogs/DialogOrgSelect.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index af860b60e..b6a4ed6ae 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -244,10 +244,16 @@ 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,
@@ -261,7 +267,7 @@ async function getDataTable(id: string, level: number = 0) {
 
   await http
     .post(config.API.orgPosPlacement, body)
-    .then((res) => {
+    .then(async (res) => {
       const dataMain: PositionMain[] = [];
       posMasterMain.value = res.data.result.data;
 
@@ -299,7 +305,6 @@ 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(
@@ -313,6 +318,7 @@ async function getDataTable(id: string, level: number = 0) {
           (e: any) => !positionUse.value.includes(e.id)
         );
       }
+      await onClickSelectPos(positionId.value);
     })
     .catch((err) => {
       messageError($q, err);
@@ -409,7 +415,6 @@ async function fetchPosFind(level: number, id: string) {
       seletcId.value = props?.dataRows?.positionId;
       datePos.value = props?.dataRows?.reportingDate;
       await getDataTable(nodeId.value, level);
-      await onClickSelectPos(positionId.value);
     })
     .catch((e) => {
       messageError($q, e);

From e513586b65471e6418fcb350b42df922afe04640 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 6 May 2026 09:39:53 +0700
Subject: [PATCH 081/125] refactor(DialogOrgSelect): fetch data

---
 src/components/Dialogs/DialogOrgSelect.vue | 106 +++++++++++----------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index b6a4ed6ae..8acabf448 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,
-    require: true,
+    required: true,
   },
   onSubmit: Function,
 });
 const $q = useQuasar();
 const route = useRoute();
 const storeTree = useStructureTree();
-const { fetchStructureTree } = useStructureTree();
+const { fetchStructureTree } = storeTree;
 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<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 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 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 seletcId = ref<string>("");
+const selectId = ref<string>("");
 const datePos = ref<Date>(new Date());
 const rowsPosition = ref<Positions[]>([]);
 const positionData = ref<any[]>([]);
@@ -79,7 +79,6 @@ 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
@@ -150,7 +149,7 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const columnsPostition = ref<QTableProps["columns"]>([
+const columnsPosition = ref<QTableProps["columns"]>([
   {
     name: "no",
     align: "left",
@@ -181,7 +180,7 @@ const columnsPostition = ref<QTableProps["columns"]>([
   {
     name: "posTypeName",
     align: "left",
-    label: "ประเภทตำเเหน่ง",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "posTypeName",
     headerStyle: "font-size: 14px",
@@ -335,11 +334,11 @@ async function getDataTable(id: string, level: number = 0) {
 function updateSelected(data: DataTree) {
   if (props?.dataRows?.nodeId === data.orgTreeId) {
     positionId.value = props?.dataRows?.posmasterId;
-    seletcId.value = props?.dataRows?.positionId;
+    selectId.value = props?.dataRows?.positionId;
     datePos.value = props?.dataRows?.reportingDate;
   } else {
     positionId.value = "";
-    seletcId.value = "";
+    selectId.value = "";
     selectedPos.value = [];
     datePos.value = new Date();
   }
@@ -386,9 +385,9 @@ async function onClickSelectPos(id: string) {
   // หาตำแหน่ง
   if (position) {
     rowsPosition.value = position.positions;
-    if (seletcId.value) {
+    if (selectId.value) {
       selectedPos.value = rowsPosition.value.filter(
-        (e) => e.id === seletcId.value
+        (e) => e.id === selectId.value
       );
     }
   }
@@ -412,12 +411,14 @@ async function fetchPosFind(level: number, id: string) {
       expanded.value = data;
       nodeId.value = id;
       positionId.value = props?.dataRows?.posmasterId;
-      seletcId.value = props?.dataRows?.positionId;
+      selectId.value = props?.dataRows?.positionId;
       datePos.value = props?.dataRows?.reportingDate;
       await getDataTable(nodeId.value, level);
     })
     .catch((e) => {
       messageError($q, e);
+    })
+    .finally(() => {
       hideLoader();
     });
 }
@@ -461,19 +462,15 @@ function fetchPositionUes() {
 
 watch(
   () => isAll.value,
-  (value, oldVal) => {
-    if (value !== oldVal) {
-      getDataTable(nodeId.value, nodeLevel.value);
-    }
+  () => {
+    getDataTable(nodeId.value, nodeLevel.value);
   }
 );
 
 watch(
   () => isBlank.value,
-  (value, oldVal) => {
-    if (value !== oldVal) {
-      getDataTable(nodeId.value, nodeLevel.value);
-    }
+  () => {
+    getDataTable(nodeId.value, nodeLevel.value);
   }
 );
 
@@ -489,35 +486,42 @@ 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, "กรุณาเลือกตำแหน่ง");
-  } 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();
-    });
+    return;
   }
+
+  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() {
@@ -564,7 +568,7 @@ onMounted(async () => {
             <q-tree
               class="q-pa-sm q-gutter-sm"
               dense
-              :nodes="lazy"
+              :nodes="nodes"
               node-key="orgTreeId"
               label-key="labelName"
               :filter="filter"
@@ -830,7 +834,7 @@ onMounted(async () => {
                             </q-toolbar>
                             <d-table
                               ref="table"
-                              :columns="columnsPostition"
+                              :columns="columnsPosition"
                               :rows="rowsPosition"
                               row-key="id"
                               flat

From ebdea05f4df45b34c547fa2901e358bc8f9c29ff Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 6 May 2026 09:48:19 +0700
Subject: [PATCH 082/125] fix

---
 src/components/Dialogs/DialogOrgSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 8acabf448..e3c5e4634 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -24,7 +24,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const props = defineProps({
   dataRows: {
     type: Object,
-    required: true,
+    default: () => ({}),
   },
   onSubmit: Function,
 });

From 5ac50fc1f2c4f702985c1019400a76fef9ce6121 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 6 May 2026 10:53:53 +0700
Subject: [PATCH 083/125] refactor(placement): PersonalList DialogSelectOrg

---
 .../components/PersonalList/CardPosition.vue  |  6 +-
 .../PersonalList/DialogSelectOrg.vue          | 85 ++++++++-----------
 2 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 70b0b117d..a4e1f18b7 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -22,7 +22,7 @@ const store = useSelectOrgStore();
 /** props*/
 const selected = defineModel("selectedPos", { required: true }); //ตำแหน่งที่เลือก
 const positionId = defineModel<string>("positionId", { required: true }); //id ตำแหน่งที่เลือก
-const seletcId = defineModel<string>("seletcId", { required: true }); // ตำแหน่งที่เลือก
+const selectId = defineModel<string>("selectId", { required: true }); // ตำแหน่งที่เลือก
 const date = defineModel<Date | null>("datePos", { required: true }); //วันยที่รายงานคัว
 const positionData = defineModel<any[]>("position", { required: true }); //ข้อมูลรายการเลขที่ตำแหน่ง
 const isAll = defineModel<boolean>("isAll", { required: true }); //แสดงตำแหน่งทั้งหมด
@@ -214,9 +214,9 @@ async function onClickSelectPos(id: string) {
   // หาตำแหน่ง
   if (position) {
     rowsPosition.value = position.positions;
-    if (seletcId.value) {
+    if (selectId.value) {
       selected.value = rowsPosition.value.filter(
-        (e) => e.id === seletcId.value
+        (e) => e.id === selectId.value
       );
     }
   }
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index 2eb316763..e54741069 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -11,6 +11,7 @@ import { useStructureTree } from "@/stores/structureTree";
 
 /** importType*/
 import type {
+  DataList,
   PositionMaim,
   PositionNo,
   Positions,
@@ -41,17 +42,14 @@ const {
 
 /**props*/
 const modal = defineModel<boolean>("modal", { required: true });
-const props = defineProps({
-  dataRow: {
-    type: Object,
-    require: true,
-  },
-  fetchTable: {
-    type: Function,
-    require: true,
-  },
-  fetchStatCard: { type: Function, require: true },
-});
+
+interface Props {
+  dataRow?: DataList;
+  fetchTable?: () => Promise<void>;
+  fetchStatCard?: () => Promise<void>;
+}
+
+const props = defineProps<Props>();
 
 /** Tree*/
 const nodeId = ref<string>("");
@@ -65,12 +63,12 @@ const expanded = ref<string[]>([]);
 const positionUse = ref<string[]>([]);
 const positionNo = ref<DataPositionNo[]>([]);
 const positionId = ref<string>("");
-const seletcId = ref<string>("");
+const selectId = ref<string>("");
 const posType = ref<FormPosType | null>(null);
 const posLevel = ref<string>("");
-const selectedPos = ref<any[]>([]);
+const selectedPos = ref<Positions[]>([]);
 const datePos = ref<Date | null>(new Date());
-const posMasterMain = ref<any[]>([]);
+const posMasterMain = ref<PositionMaim[]>([]);
 const orgRevisionId = ref<string>("");
 const optionPosType = ref<FormPosType[]>([]);
 const optionPosLevel = ref<FormPosLevel[]>([]);
@@ -92,14 +90,14 @@ async function fetchStructure() {
  */
 function updateSelected(data: TreeMain) {
   if (props?.dataRow?.nodeId === data.orgTreeId) {
-    positionId.value = props?.dataRow?.posmasterId;
-    seletcId.value = props?.dataRow?.positionId;
+    positionId.value = props?.dataRow?.posmasterId ?? "";
+    selectId.value = props?.dataRow?.positionId ?? "";
     datePos.value = props?.dataRow?.reportingDate
       ? new Date(props.dataRow.reportingDate)
       : new Date();
   } else {
     positionId.value = "";
-    seletcId.value = "";
+    selectId.value = "";
     selectedPos.value = [];
     datePos.value = new Date();
   }
@@ -155,7 +153,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: any = { ...e, ...rest };
+          const data: PositionMaim = { ...e, ...rest } as PositionMaim;
           dataMain.push(data);
         }
       });
@@ -167,10 +165,10 @@ async function fetchDataTable(id: string, level: number = 0) {
           (e) => e !== props.dataRow?.posmasterId
         );
 
-        positionNo.value = posMain.filter((e: any) => !newUse.includes(e.id));
+        positionNo.value = posMain.filter((e: DataPositionNo) => !newUse.includes(e.id));
       } else {
         positionNo.value = posMain.filter(
-          (e: any) => !positionUse.value.includes(e.id)
+          (e: DataPositionNo) => !positionUse.value.includes(e.id)
         );
       }
 
@@ -202,8 +200,8 @@ async function fetchPosFind(level: number, id: string) {
 
       expanded.value = data;
       nodeId.value = id;
-      positionId.value = props?.dataRow?.posmasterId;
-      seletcId.value = props?.dataRow?.positionId;
+      positionId.value = props?.dataRow?.posmasterId ?? "";
+      selectId.value = props?.dataRow?.positionId ?? "";
       datePos.value = props?.dataRow?.reportingDate
         ? new Date(props.dataRow.reportingDate)
         : new Date();
@@ -218,12 +216,14 @@ async function fetchPosFind(level: number, id: string) {
 
 /** function บันทึกข้อมูลตำแหน่ง*/
 async function onClickSubmit() {
-  const dataPosMaster = await posMasterMain.value?.find(
-    (e: any) => e.id === positionId.value
+  const dataPosMaster = posMasterMain.value?.find(
+    (e) => e.id === positionId.value
   );
 
   if (selectedPos.value.length === 0) {
     dialogMessageNotify($q, "กรุณาเลือกตำแหน่ง");
+  } else if (!dataPosMaster) {
+    dialogMessageNotify($q, "ไม่พบข้อมูลตำแหน่ง");
   } else {
     dialogConfirm($q, async () => {
       showLoader();
@@ -290,7 +290,7 @@ watch(
     if (modal.value) {
       await fetchPositionUes();
       if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
-        await fetchPosFind(props?.dataRow?.node, props?.dataRow?.nodeId);
+        await fetchPosFind(props?.dataRow?.node ?? 0, props?.dataRow?.nodeId ?? "");
       } else {
         expanded.value = [];
       }
@@ -343,28 +343,15 @@ function onPosType() {
 }
 
 watch(
-  () => isAll.value,
-  (value, oldVal) => {
-    if (value !== oldVal) {
+  [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) {
       fetchDataTable(nodeId.value, nodeLevel.value);
     }
-  }
-);
-
-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);
+    if (isSelectMode) {
       getOrgPosType();
     }
   }
@@ -465,15 +452,15 @@ onMounted(() => {
                 :name="item"
               >
                 <CardPosition
-                  v-model:position="positionNo as []"
+                  v-model:position="positionNo"
                   v-model:selectedPos="selectedPos"
                   v-model:datePos="datePos"
                   v-model:positionId="positionId"
-                  v-model:seletcId="seletcId"
+                  v-model:selectId="selectId"
                   v-model:is-all="isAll"
                   v-model:is-blank="isBlank"
                   v-model:is-position="isPosition"
-                  v-model:pos-type="posType as FormPosType | null"
+                  v-model:pos-type="posType"
                   v-model:pos-level="posLevel"
                   v-model:option-pos-type="optionPosType"
                   v-model:option-pos-level="optionPosLevel"
@@ -481,7 +468,7 @@ onMounted(() => {
                   :on-pos-type="onPosType"
                   :node-id="nodeId"
                   :node-level="nodeLevel"
-                  :bma-officer="props.dataRow?.bmaOfficer"
+                  :bma-officer="props.dataRow?.bmaOfficer ?? ''"
                   :is-load-position="isLoadPosition"
                 />
               </q-tab-panel>

From 29b45f77ea882dfc2890b16cfafa6dd97c884b39 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 6 May 2026 10:54:37 +0700
Subject: [PATCH 084/125] refactor(placement): interface DataList

---
 src/modules/05_placement/interface/response/SelectOrg.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/05_placement/interface/response/SelectOrg.ts b/src/modules/05_placement/interface/response/SelectOrg.ts
index d5fa88ed5..5e264e51e 100644
--- a/src/modules/05_placement/interface/response/SelectOrg.ts
+++ b/src/modules/05_placement/interface/response/SelectOrg.ts
@@ -1,17 +1,24 @@
 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;

From 0739f2b9d7ffdb2a7c45b2b6526ba5ee9150fc42 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 7 May 2026 10:40:58 +0700
Subject: [PATCH 085/125] feat(receive): add input rank

---
 .../components/Receive/ReceiveAddPerson.vue   | 72 ++++++++++++++++---
 .../components/Receive/receiveDetail.vue      | 68 +++++++++++++++++-
 .../interface/index/ProfileType.ts            |  3 +
 3 files changed, 132 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue b/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
index e6d2da0ce..fa0551e99 100644
--- a/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
+++ b/src/modules/05_placement/components/Receive/ReceiveAddPerson.vue
@@ -48,6 +48,7 @@ const informaData = ref<FormAddPerson>({
   employeeType: null,
   employeeClass: null,
   profileType: null,
+  rank: "",
 });
 
 // รายการข้อมูลทั้งหมด
@@ -60,6 +61,7 @@ const Ops = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
+  rankOps: [],
 });
 // ข้อมูลเมื่อเลือกแล้ว
 const OpsFilter = ref<InformationOps>({
@@ -71,6 +73,7 @@ const OpsFilter = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
+  rankOps: [],
 });
 
 // รูป profile
@@ -135,6 +138,16 @@ 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);
@@ -204,7 +217,13 @@ 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;
   }
@@ -227,7 +246,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)
+  if (informaData.value.prefix != undefined && informaData.value.prefix != "")
     formData.append("prefix", informaData.value.prefix);
   if (informaData.value.firstName != undefined)
     formData.append("firstName", informaData.value.firstName);
@@ -256,6 +275,8 @@ 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();
@@ -289,6 +310,15 @@ function updateBirthDate(v: Date) {
   age.value = calculateAge(v);
 }
 
+function prefixRankRule() {
+  return [
+    () =>
+      !!informaData.value.rank ||
+      !!informaData.value.prefix ||
+      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
+  ];
+}
+
 /**
  * ทำงานเมื่อมีการเรียกใช้ Components
  */
@@ -383,7 +413,7 @@ onMounted(async () => {
             </div>
             <q-card-section class="q-px-lg">
               <div class="row q-col-gutter-sm">
-                <div class="col-3">
+                <div class="col-2">
                   <q-input
                     bg-color="white"
                     outlined
@@ -404,13 +434,14 @@ onMounted(async () => {
                     mask="#############"
                   />
                 </div>
-                <div class="col-3">
+                <div class="col-2">
                   <q-select
                     bg-color="white"
                     v-model="informaData.prefix"
                     label="คำนำหน้าชื่อ"
                     outlined
                     dense
+                    clearable
                     lazy-rules
                     class="inputgreen"
                     :options="Ops.prefixOps"
@@ -418,11 +449,8 @@ onMounted(async () => {
                     option-value="name"
                     map-options
                     hide-bottom-space
-                    :rules="[
-                      (val:string) => {
-                        return val.length > 0 || 'กรุณาเลือกคำนำหน้าชื่อ';
-                      },
-                    ]"
+                    :rules="prefixRankRule()"
+                    reactive-rules
                     emit-value
                     use-input
                     hide-selected
@@ -432,6 +460,32 @@ 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 2b680ec90..cae4da5bc 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail.vue
@@ -113,6 +113,7 @@ const Ops = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
+  rankOps: [],
 });
 const OpsFilter = ref<InformationOps>({
   prefixOps: [],
@@ -129,6 +130,7 @@ const OpsFilter = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
+  rankOps: [],
 });
 
 /** ฟังก์ชันดึงข้อมูลรายการข้อมูลเกี่ยวกับบุคคล (dropdown list)*/
@@ -186,6 +188,16 @@ 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);
@@ -230,6 +242,7 @@ async function getData() {
           (data.prefix == "00000000-0000-0000-0000-000000000000"
             ? null
             : data.prefix) ?? "",
+        rank: data.rank ?? "",
         firstname: data.firstName ?? "",
         lastname: data.lastName ?? "",
         birthDate:
@@ -295,6 +308,7 @@ 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,
@@ -436,6 +450,14 @@ 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;
   }
@@ -470,6 +492,7 @@ function saveData() {
         positionNumberOld: posNo.value,
         amount: 0,
         amountOld: salary.value,
+        rank: informaData.value.rank,
       };
       showLoader();
       http
@@ -517,6 +540,15 @@ function updateBirthDate(v: Date) {
   informaData.value.age = calculateAge(v);
 }
 
+function prefixRankRule() {
+  return [
+    () =>
+      !!informaData.value.rank ||
+      !!informaData.value.prefixId ||
+      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
+  ];
+}
+
 /** ทำงานเมื่อมีการเรียกใช้ Components*/
 onMounted(async () => {
   await fetchPerson();
@@ -598,7 +630,7 @@ onMounted(async () => {
               <div class="col-xs-12">
                 <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
               </div>
-              <div class="col-xs-6 col-sm-3 col-md-3">
+              <div class="col-xs-6 col-sm-2 col-md-2">
                 <q-input
                   :class="getClass(edit)"
                   hide-bottom-space
@@ -614,7 +646,7 @@ onMounted(async () => {
                   mask="#############"
                 />
               </div>
-              <div class="col-xs-6 col-sm-3 col-md-3">
+              <div class="col-xs-6 col-sm-2 col-md-2">
                 <selector
                   :hide-dropdown-icon="!edit"
                   hide-bottom-space
@@ -634,10 +666,42 @@ 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/interface/index/ProfileType.ts b/src/modules/05_placement/interface/index/ProfileType.ts
index 9086ce40f..c24f44ca2 100644
--- a/src/modules/05_placement/interface/index/ProfileType.ts
+++ b/src/modules/05_placement/interface/index/ProfileType.ts
@@ -7,6 +7,7 @@ interface InformationOps {
   religionOps: DataOption[];
   employeeClassOps: DataOption[];
   employeeTypeOps: DataOption[];
+  rankOps: DataOption[];
 }
 
 //ข้อมูลส่วนตัว
@@ -63,6 +64,7 @@ interface FormAddPerson {
   employeeType: string | null;
   employeeClass: string | null;
   profileType: string | null;
+  rank?: string;
 }
 
 const defaultInformation: Information = {
@@ -83,6 +85,7 @@ const defaultInformation: Information = {
   employeeType: null,
   employeeClass: null,
   profileType: null,
+  rank: null,
 };
 
 export { defaultInformation };

From 3cc8d9e97441cc383be856a410ebfc437ad2786f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 7 May 2026 16:24:30 +0700
Subject: [PATCH 086/125] refactor(timestamp-special): filter date and status

---
 .../09_leave/stores/SpecialTimeStore.ts       |  10 +-
 .../09_leave/views/04_SpecialTimeMain.vue     | 146 +++++++++++-------
 2 files changed, 97 insertions(+), 59 deletions(-)

diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 4196c93b6..83024a8ef 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -11,7 +11,14 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     { id: "NOT_COMPLETE", name: "ปฏิบัติงานไม่ครบตามกำหนดเวลา" },
   ]);
 
-  // convertSatatus
+  const optionStatusMain = ref<DataOption[]>([
+    { id: "ALL", name: "ทั้งหมด" },
+    { id: "PENDING", name: "รอดำเนินการ" },
+    { id: "APPROVE", name: "อนุมัติ" },
+    { id: "REJECT", name: "ไม่อนุมัติ" },
+  ]);
+
+  // convertStatus
   function convertStatus(val: string) {
     const value = val ? val.toUpperCase() : null;
     switch (value) {
@@ -29,5 +36,6 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   return {
     optionStatus,
     convertStatus,
+    optionStatusMain,
   };
 });
diff --git a/src/modules/09_leave/views/04_SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
index 10b9dc8df..1ea9ec44b 100644
--- a/src/modules/09_leave/views/04_SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -10,8 +10,10 @@ import { useSpecialTimeStore } from "@/modules/09_leave/stores/SpecialTimeStore"
 import { checkPermission } from "@/utils/permissions";
 import { usePagination } from "@/composables/usePagination";
 
-import type { DataDateMonthObject } from "@/modules/09_leave/interface/request/specialTime";
-import type { DataSpecialTime } from "@/modules/09_leave/interface/index/Main";
+import type {
+  DataSpecialTime,
+  DataOption,
+} 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";
@@ -21,23 +23,17 @@ 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>("");
 
 /**ตัวแปรที่ใช้ */
@@ -51,16 +47,12 @@ 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",
@@ -144,9 +136,10 @@ 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) => {
@@ -246,40 +239,43 @@ 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>
@@ -291,25 +287,31 @@ 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-3 col-md-2">
+      <div class="col-xs-12 col-sm-6 col-md-3">
         <datepicker
-          v-model="dateMonth"
+          v-model="filterDate"
           :locale="'th'"
           autoApply
-          month-picker
+          borderless
+          range
           :enableTimePicker="false"
-          @update:modelValue="updateMonth"
+          week-start="0"
+          @update:modelValue="onSearchData()"
         >
-          <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
-              :model-value="monthYearThai(dateMonth)"
-              dense
               outlined
-              hide-bottom-space
+              dense
+              class="full-width datepicker"
+              :model-value="
+                filterDate != null ? dateThaiRange(filterDate) : null
+              "
             >
               <template v-slot:prepend>
                 <q-icon
@@ -323,9 +325,37 @@ 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 />
-      <div class="col-xs-12 col-sm-3 col-md-2">
+      <q-space v-if="!$q.screen.xs && !$q.screen.sm" />
+      <div class="col-xs-12 col-sm-6 col-md-2">
         <q-input
           standout
           dense
@@ -340,7 +370,7 @@ onMounted(async () => {
         </q-input>
       </div>
 
-      <div class="col-xs-12 col-sm-3 col-md-2">
+      <div class="col-xs-12 col-sm-6 col-md-2">
         <q-select
           v-model="visibleColumns"
           multiple

From b22ae37eecb48be3f904fb251aed2d9ced7f4f32 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 10:19:21 +0700
Subject: [PATCH 087/125] reafactor(issues): add status HELPDESK_IN_PROGRESS
 and REPLIED

---
 src/modules/22_issues/store.ts       |  8 +++-
 src/modules/22_issues/views/Main.vue | 66 ++++++++++++++++------------
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/modules/22_issues/store.ts b/src/modules/22_issues/store.ts
index f7d19d0a6..a13c173c6 100644
--- a/src/modules/22_issues/store.ts
+++ b/src/modules/22_issues/store.ts
@@ -13,8 +13,10 @@ export const useIssueStore = defineStore("issue", () => {
   const statusOptions = ref<Options[]>([
     { label: "ทั้งหมด", value: "" },
     { label: "ใหม่", value: "NEW" },
-    { label: "กำลังดำเนินการ", value: "IN_PROGRESS" },
+    { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
+    { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
+    { label: "แจ้งกลับแล้ว", value: "REPLIED " },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 
@@ -29,6 +31,10 @@ 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 7e7d27c32..72d6b6c5d 100644
--- a/src/modules/22_issues/views/Main.vue
+++ b/src/modules/22_issues/views/Main.vue
@@ -22,6 +22,7 @@ const { convertStatus, convertSystem } = store;
 const { systemOptions, statusOptions } = storeToRefs(store);
 
 const visibleColumns = ref<string[]>([
+  "codeIssue",
   "title",
   "description",
   "system",
@@ -34,6 +35,43 @@ 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",
@@ -72,15 +110,6 @@ 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",
@@ -100,25 +129,6 @@ 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",

From ba392dec4127402752361e0d6d9add76302bbd83 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 10:41:14 +0700
Subject: [PATCH 088/125] fix(issues): statusOptions value

---
 src/modules/22_issues/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/22_issues/store.ts b/src/modules/22_issues/store.ts
index a13c173c6..0ab403a7e 100644
--- a/src/modules/22_issues/store.ts
+++ b/src/modules/22_issues/store.ts
@@ -16,7 +16,7 @@ export const useIssueStore = defineStore("issue", () => {
     { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
     { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
-    { label: "แจ้งกลับแล้ว", value: "REPLIED " },
+    { label: "แจ้งกลับแล้ว", value: "REPLIED" },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 

From e998de2b951690e1053118cc82bb31973ea6f30d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 11:01:33 +0700
Subject: [PATCH 089/125] fix: remove max-height style from TableCandidate

---
 src/modules/03_recruiting/views/02_qualify/manageDetail.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 46f60a5cd..badb61bf4 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -260,7 +260,6 @@ 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({
@@ -402,6 +401,7 @@ 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,6 +603,7 @@ 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">

From 852f3226c134271d78e02c9fa07ca0263d4c4079 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 11 May 2026 15:07:00 +0700
Subject: [PATCH 090/125] refactor(qualify-period): hide type column in Table
 Position

---
 .../views/02_qualify/PeriodAdd.vue            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index e02f71ad4..2631acf53 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>

From 8dc473eec0f99d6bbfe5ae7a104e6362124a07a7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 11 May 2026 15:54:10 +0700
Subject: [PATCH 091/125] refactor(leave): validate isAct commander

---
 .../components/05_Leave/DetailLeavePage.vue   | 33 +++++++++++++++----
 .../05_Leave/Dialog/DialogAddCommander.vue    | 11 +++++--
 .../09_leave/interface/response/leave.ts      |  2 ++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index 4f4b2ee46..b74df44e6 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -150,21 +150,41 @@ const rows = ref<RowsType>();
 // เช็คสิทธิ์การอนุมัติ
 const idCheck = computed(() => {
   if (typeAdd.value == "COMMANDER") {
-    return rows.value?.commanders.map((items: SeqTypeRow) => items.profileId);
+    return rows.value?.commanders.map((items: SeqTypeRow) => items.keyId);
   } else if (typeAdd.value == "APPROVER") {
-    return rows.value?.approvers.map((items: SeqTypeRow) => items.profileId);
+    return rows.value?.approvers.map((items: SeqTypeRow) => items.keyId);
   }
 });
 
 // เช็คสิทธิ์การเลือกผู้มีอำนาจ
 const commanderList = computed(() => {
-  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);
+  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,
+    }));
   }
+  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;
@@ -1272,5 +1292,6 @@ 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/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
index c3eac2353..f3c2e682f 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -30,6 +30,7 @@ const props = defineProps({
   fetchDetailLeave: Function,
   idCheck: Array,
   commandersList: Array,
+  commandersIsAct: Boolean,
 });
 
 const pageId = ref<string>(route.params.id as string);
@@ -117,7 +118,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.id);
+        return props.idCheck?.some((i: any) => i === items.key);
       });
     })
     .catch((err) => {
@@ -153,10 +154,14 @@ function onSubmit() {
       ]
         .filter(Boolean)
         .join(" "),
+      isAct: isAct.value,
+      keyId: items.key,
     }));
 
     const hasCommander = selected.value.some((e) =>
-      props.commandersList?.some((i: any) => i === e.id)
+      props.commandersList?.some(
+        (i: any) => i.profileId === e.id && i.isAct === isAct.value
+      )
     );
 
     if (hasCommander) {
@@ -205,6 +210,7 @@ watch(
   () => modal.value,
   () => {
     if (modal.value) {
+      isAct.value = props.commandersIsAct ?? false;
       getSearch();
     }
   }
@@ -233,6 +239,7 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
+                  @keydown.enter.prevent="onSearchData()"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
diff --git a/src/modules/09_leave/interface/response/leave.ts b/src/modules/09_leave/interface/response/leave.ts
index 8ad8f42f4..81dd4b42d 100644
--- a/src/modules/09_leave/interface/response/leave.ts
+++ b/src/modules/09_leave/interface/response/leave.ts
@@ -50,6 +50,8 @@ interface SeqTypeRow {
   keycloakId: string;
   approveStatus: string;
   comment: string;
+  keyId?: string;
+  isAct?: boolean;
 }
 interface DataDateMonthObject {
   month: number;

From 3c91c0db1645f027d75bccaf03d3d0068072f253 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 11 May 2026 17:34:45 +0700
Subject: [PATCH 092/125] fix(resign): add  @keydown search keyword

---
 src/modules/06_retirement/components/DialogAddCommander.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/06_retirement/components/DialogAddCommander.vue b/src/modules/06_retirement/components/DialogAddCommander.vue
index 506e5b5ea..1bbb81a43 100644
--- a/src/modules/06_retirement/components/DialogAddCommander.vue
+++ b/src/modules/06_retirement/components/DialogAddCommander.vue
@@ -229,6 +229,7 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
+                  @keydown.enter.prevent="onSearchData"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>

From b1a7983b00b0022e9941ae9cc9e61f49844c5a77 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 11:42:03 +0700
Subject: [PATCH 093/125] refactor: add keydown event listener to search input

---
 src/components/Dialogs/AddPersonal.vue                           | 1 +
 src/components/Workflow/DialogSelectPerson.vue                   | 1 +
 .../probation/FormEvaluation/DialogSelectAuthority.vue           | 1 +
 src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue   | 1 +
 .../components/6_BasicInformation/Director/Form.vue              | 1 +
 src/modules/12_evaluatePersonal/components/Director/Form.vue     | 1 +
 src/modules/14_KPI/views/report.vue                              | 1 +
 src/modules/18_command/components/Step/View0_Digital.vue         | 1 +
 8 files changed, 8 insertions(+)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 42bd3965b..89b5f803a 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -332,6 +332,7 @@ watch(
               outlined
               dense
               label="คำค้น"
+              @keydown.enter.prevent="searchInput()"
             >
               <template v-slot:after>
                 <q-btn
diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index 80734855f..10e969781 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -187,6 +187,7 @@ watch(modal, (val) => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
+                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index 26e35a5cd..c26536d90 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -201,6 +201,7 @@ watch(modal, (val) => {
                 hide-bottom-space
                 dense
                 label="คำค้น"
+                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index d235c8c65..d30d19755 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -322,6 +322,7 @@ watch(modal, async (val) => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
+                    @keydown.enter.prevent="onSearchData(true)"
                   >
                     <template v-slot:after>
                       <q-btn
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 c5cf71505..940687fe7 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -294,6 +294,7 @@ 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 884f8d470..3228dfe3a 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -280,6 +280,7 @@ 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 23d14d89b..978d5358c 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -905,6 +905,7 @@ 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/View0_Digital.vue b/src/modules/18_command/components/Step/View0_Digital.vue
index 8cc2469f8..1601a21b6 100644
--- a/src/modules/18_command/components/Step/View0_Digital.vue
+++ b/src/modules/18_command/components/Step/View0_Digital.vue
@@ -719,6 +719,7 @@ onMounted(async () => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
+                @keydown.enter.prevent="onSearchData"
               />
             </div>
             <q-checkbox

From 94d80409c3df9bfe2b607b2aee2d7e74fa888132 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 12:03:03 +0700
Subject: [PATCH 094/125] fix(discipline): import path  interface

---
 .../DialogSendTerminate.vue                   | 24 +++++++------------
 .../2_InvestigateFacts/EditPage.vue           |  2 +-
 .../components/2_InvestigateFacts/Form.vue    |  2 +-
 .../3_InvestigateDisciplinary/Form.vue        |  2 +-
 .../4_Result/DialogSendToCommand.vue          |  4 ++--
 .../components/4_Result/EditPage.vue          |  4 ++--
 .../Director/DialogInvestigateTotal.vue       |  2 +-
 7 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue b/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
index 16f858475..0605fe50d 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue
@@ -2,6 +2,7 @@
 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";
@@ -22,21 +23,12 @@ const checkRoutePermisson = ref<boolean>(
   route.name == "disciplineInvestigatefactsDetail"
 );
 
-const props = defineProps({
-  rows: {
-    type: Array,
-    default: [],
-  },
-  columns: {
-    type: Array,
-    default: [],
-  },
-  visibleColumns: {
-    type: Array,
-    default: [],
-  },
-  fetchData: Function,
-});
+const props = defineProps<{
+  rows?: any[];
+  columns?: QTableColumn[];
+  visibleColumns?: string[];
+  fetchData?: () => void;
+}>();
 
 const remark = ref<string>("");
 const selected = ref<any[]>([]);
@@ -100,7 +92,7 @@ function onSubmit() {
                 <q-card-section class="q-pa-xs">
                   <q-table
                     :columns="props.columns"
-                    :rows="rows"
+                    :rows="props.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 14b87568a..9b30c5ae0 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 2eb919bb2..3d3c7c3d7 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 60d0d8066..b59b44744 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 18a6c494a..5608acb62 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 fb8e9ab73..64b2f70d2 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 78027708d..83180daca 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(index, item.director)"
+                      @click="clickList(Number(index), item.director)"
                     >
                       <q-item-section>{{ item.title }}</q-item-section>
                     </q-item>

From 9228132052849e055fb3cdc40bf71de4b7065885 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 14:25:33 +0700
Subject: [PATCH 095/125] refactor: display getColumnLabel

---
 src/components/Workflow/DialogSelectPerson.vue               | 3 +--
 src/modules/06_retirement/components/DialogAddCommander.vue  | 5 +----
 .../components/05_Leave/Dialog/DialogAddCommander.vue        | 5 +----
 .../18_command/components/Step/Dialog1_AddOperetor.vue       | 5 +----
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index 10e969781..baac6052f 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -5,7 +5,6 @@ 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";
 
@@ -254,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">
-                    {{ getColumnLabel(col, isAct) }}
+                    {{ col.label }}
                   </span>
                 </q-th>
               </q-tr>
diff --git a/src/modules/06_retirement/components/DialogAddCommander.vue b/src/modules/06_retirement/components/DialogAddCommander.vue
index 1bbb81a43..e4d3c697a 100644
--- a/src/modules/06_retirement/components/DialogAddCommander.vue
+++ b/src/modules/06_retirement/components/DialogAddCommander.vue
@@ -4,7 +4,6 @@ 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";
@@ -309,9 +308,7 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{
-                        getColumnLabel(col, isAct)
-                      }}</span>
+                      <span class="text-weight-medium">{{ col.label }}</span>
                     </q-th>
                   </q-tr>
                 </template>
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 f3c2e682f..e7697ce5b 100644
--- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
+++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
@@ -4,7 +4,6 @@ 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";
@@ -319,9 +318,7 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{
-                        getColumnLabel(col, isAct)
-                      }}</span>
+                      <span class="text-weight-medium">{{ col.label }}</span>
                     </q-th>
                   </q-tr>
                 </template>
diff --git a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
index 3084779b3..35293eb89 100644
--- a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
+++ b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
@@ -4,7 +4,6 @@ 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";
 
@@ -274,9 +273,7 @@ watch(modal, (newVal) => {
                     :key="col.name"
                     :props="props"
                   >
-                    <span class="text-weight-medium">{{
-                      getColumnLabel(col, isAct)
-                    }}</span>
+                    <span class="text-weight-medium">{{ col.label }}</span>
                   </q-th>
                 </q-tr>
               </template>

From e14ba58df0a8707caf326272f18fc22e7d3e2e52 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 15:24:53 +0700
Subject: [PATCH 096/125] refactor(receive): display prefix

---
 src/components/CardProfile.vue                              | 6 +++---
 .../05_placement/components/Receive/receiveDetail.vue       | 6 +++---
 src/modules/05_placement/views/03_receiveMain.vue           | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index d6b9fe4cf..72fe7aad0 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.prefix ?? ""}${data.firstName ?? ""} ${
-    data.lastName ?? ""
-  } `;
+  profile.fullName = `${data.rank ? data.rank : data.prefix ?? ""}${
+    data.firstName ?? ""
+  } ${data.lastName ?? ""} `;
 
   if (data["posTypeNameOld"] !== undefined) {
     profile.position =
diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue
index cae4da5bc..950cfa42c 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail.vue
@@ -227,9 +227,9 @@ async function getData() {
       }
       rows.value = list;
       profileId.value = data.profileId;
-      title.value.fullname = `${data.prefix ?? ""}${data.firstName ?? ""} ${
-        data.lastName ?? ""
-      }`;
+      title.value.fullname = `${data.rank ? data.rank : data.prefix ?? ""}${
+        data.firstName ?? ""
+      } ${data.lastName ?? ""}`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index f34bf8a48..58b7a544b 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -110,7 +110,9 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format(val, row) {
-      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
+      return ` ${row.rank ? row.rank : row.prefix ?? ""}${
+        row.firstName ?? ""
+      } ${row.lastName ?? ""}`;
     },
   },
   {

From 95f37cf68d1487d399e88ffb87ecc52c997fd9df Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 17:14:53 +0700
Subject: [PATCH 097/125] fix(leave): fetch checkOfficer

---
 src/modules/09_leave/components/05_Leave/DetailLeavePage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index b74df44e6..d8192d5ce 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -692,10 +692,10 @@ onMounted(async () => {
         fetchOptionType(),
         fetchKeycloakPositionData(),
         fetchDetailLeave(paramsId),
-        checkOfficer(),
       ]);
 
       await checkLeaveType(formData.leaveTypeId, formData);
+      await checkOfficer();
     } finally {
       hideLoader();
     }

From 5ead16e52869acc3cb38c46f554bd446126da6b2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 17:45:54 +0700
Subject: [PATCH 098/125] fix(receive): diaplay rank

---
 src/modules/05_placement/components/Receive/DialogOrders.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index 55777e2c7..e347d89bf 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -89,7 +89,9 @@ const columns2 = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format(val, row) {
-      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
+      return `${row.rank ? row.rank : row.prefix ?? ""}${row.firstName ?? ""} ${
+        row.lastName ?? ""
+      }`;
     },
   },
   {

From 50fdb30920d81711039b523cb6fbc68ed0201ef1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 12 May 2026 18:07:29 +0700
Subject: [PATCH 099/125] fix(receive): Display columns posTypeOld

---
 .../05_placement/components/Receive/DialogOrders.vue        | 6 ++++--
 src/modules/05_placement/views/03_receiveMain.vue           | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index e347d89bf..3d7315c78 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -112,9 +112,11 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.positionTypeOld
+      return row.positionTypeOld && row.positionTypeOl !== "-"
         ? `${row.positionTypeOld}${
-            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+            row.positionLevelOld && row.positionLevelOld !== "-"
+              ? `(${row.positionLevelOld})`
+              : ""
           }`
         : "";
     },
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 58b7a544b..7cfd48a32 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -133,9 +133,11 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.positionTypeOld
+      return row.positionTypeOld && row.positionTypeOld !== "-"
         ? `${row.positionTypeOld}${
-            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+            row.positionLevelOld && row.positionLevelOld !== "-"
+              ? `(${row.positionLevelOld})`
+              : ""
           }`
         : "";
     },

From 01b1ee399856a6a4c6029d4fbafd1951dbf77c8e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 14 May 2026 10:24:50 +0700
Subject: [PATCH 100/125] refactor(leave): getStatusColor

---
 .../09_leave/components/05_Leave/Calendar.vue |  8 +++--
 .../components/05_Leave/TableList.vue         | 29 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/Calendar.vue b/src/modules/09_leave/components/05_Leave/Calendar.vue
index 14665b235..eff336884 100644
--- a/src/modules/09_leave/components/05_Leave/Calendar.vue
+++ b/src/modules/09_leave/components/05_Leave/Calendar.vue
@@ -228,8 +228,12 @@ onMounted(async () => {
 <template>
   <div class="q-mt-sm">
     <div class="row q-gutter-sm">
-      <div class="col-3">
-        <q-list bordered class="rounded-borders">
+      <div class="col-3 scrollable-list">
+        <q-list
+          bordered
+          class="rounded-borders"
+          style="max-height: 80vh; overflow-y: auto"
+        >
           <q-item
             v-for="(item, i) in filterLists"
             :key="i"
diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index 65a8a2c3c..ea81a2688 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -248,6 +248,22 @@ function updatePagination(newPagination: any) {
   pagination.value.rowsPerPage = newPagination.rowsPerPage;
 }
 
+/**
+ * ฟังก์ชันสำหรับดึงชื่อ CSS Class ตามสถานะ
+ * @param statusText สถานะของรายการ
+ */
+function getStatusColor(statusText: string) {
+  const statusMap: Record<string, string> = {
+    APPROVE: "text-green-6",
+    REJECT: "text-red",
+    NEW: "text-blue",
+    PENDING: "text-warning",
+    // DELETE  DELETING
+  };
+
+  return statusMap[statusText.toUpperCase()] ?? "";
+}
+
 /** Hook*/
 onMounted(() => {
   if (leaveStore.tabMenu === "1") {
@@ -302,18 +318,7 @@ onMounted(() => {
           v-for="col in props.cols"
           :key="col.name"
           :props="props"
-          :class="
-            props.row.statusText == 'REJECT'
-              ? 'text-red'
-              : props.row.statusText == 'NEW'
-              ? 'text-blue'
-              : props.row.statusText == 'PENDING'
-              ? 'text-warning'
-              : props.row.statusText == 'DELETE' ||
-                props.row.statusText == 'DELETING'
-              ? 'text-orange'
-              : ''
-          "
+          :class="getStatusColor(props.row.statusText)"
         >
           <div v-if="col.name == 'no'">
             {{

From e85ea0c47513bf918fc37a74d3e873d9b0d48c99 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 14 May 2026 13:35:24 +0700
Subject: [PATCH 101/125] feat(socket): add socket.on  "socket-notification"

---
 src/stores/socket.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/socket.ts b/src/stores/socket.ts
index 0d5ea4c64..854a281d5 100644
--- a/src/stores/socket.ts
+++ b/src/stores/socket.ts
@@ -43,6 +43,11 @@ export const useSocketStore = defineStore("socket", () => {
         notifyStatusOrg("current", body.message, body.success);
       }
     });
+
+    socket.on("socket-notification", (payload) => {
+      let body: sockeBackup = JSON.parse(payload);
+      notifyStatus(body.message, body.success);
+    });
   }
 
   function notifyStatus(message: string, success?: boolean) {

From ded0a634d2e7090e10f1d50c34ad3eb3b6182538 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 14 May 2026 17:27:40 +0700
Subject: [PATCH 102/125] feat(compete): upload file

---
 package.json                                  |   1 +
 src/api/recruiting/api.recruit.ts             |   1 +
 src/main.ts                                   |   2 +
 .../03_recruiting/views/01_compete/Period.vue | 239 +++++++++++++++---
 src/stores/uploadProgress.ts                  |  46 ++++
 5 files changed, 250 insertions(+), 39 deletions(-)
 create mode 100644 src/stores/uploadProgress.ts

diff --git a/package.json b/package.json
index 088a0ead7..75b2a4f43 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "moment": "^2.29.4",
     "pdf-lib": "^1.17.1",
     "pinia": "^2.0.29",
+    "pinia-plugin-persistedstate": "^3.2.3",
     "quasar": "^2.11.1",
     "socket.io-client": "^4.7.4",
     "structure-chart": "^0.0.9",
diff --git a/src/api/recruiting/api.recruit.ts b/src/api/recruiting/api.recruit.ts
index 3a9f220a8..8bfda023b 100644
--- a/src/api/recruiting/api.recruit.ts
+++ b/src/api/recruiting/api.recruit.ts
@@ -23,6 +23,7 @@ export default {
   uploadCandidates: (id: string) => `${recruit}candidate/${id}`,
   uploadResult: (id: string) => `${recruit}result/${id}`,
   getImportHistory: (id: string) => `${recruit}history/${id}`,
+  getImportStatus: (jobId: string) => `${recruit}import/status/${jobId}`,
 
   //upload
   periodRecruitDoc: (examId: string) => `${recruit}doc/${examId}`,
diff --git a/src/main.ts b/src/main.ts
index 570937672..d75e834e2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ import th from "quasar/lang/th";
 import "@vuepic/vue-datepicker/dist/main.css";
 import http from "./plugins/http";
 import { createPinia } from "pinia";
+import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
 
 // import './assets/main.css'
 
@@ -20,6 +21,7 @@ import filters from "./plugins/filters";
 
 const app = createApp(App);
 const pinia = createPinia();
+pinia.use(piniaPluginPersistedstate);
 
 // เพิ่ม Global Filters ลงใน App
 app.config.globalProperties.$filters = filters;
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index d281f6d49..487de668c 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -11,6 +11,7 @@ import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { calculateFiscalYear } from "@/utils/function";
+import { useUploadProgressStore } from "@/stores/uploadProgress";
 
 import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 import type {
@@ -33,9 +34,11 @@ const {
   messageError,
   onSearchDataTable,
   dialogRemove,
+  dialogMessage,
 } = mixin;
 
 const router = useRouter();
+const uploadProgress = useUploadProgressStore();
 const name = ref<string>("");
 const year = ref<number>(calculateFiscalYear(new Date()) + 543);
 const order = ref<number>(1);
@@ -49,6 +52,11 @@ const modalScore = ref<boolean>(false);
 const modalCandidate = ref<boolean>(false);
 const modalResult = ref<boolean>(false);
 const selected_row_id = ref<string>("");
+const jobStatus = ref<{
+  candidate?: "running" | "completed" | "failed";
+  score?: "running" | "completed" | "failed";
+  result?: "running" | "completed" | "failed";
+}>({});
 const rowsHistory = ref<ResponseHistoryObject[]>([]); //select data history
 const tittleHistory = ref<string>("ประวัติการนำเข้าข้อมูล"); //
 const filterHistory = ref<string>(""); //search data table history
@@ -62,6 +70,54 @@ const textTittle = ref<string>("");
 const textTittleScore = ref<string>("");
 const textTittleCandidate = ref<string>("");
 const textTittleResult = ref<string>("");
+
+// Dialog message constants
+const UPLOAD_RUNNING_DIALOG = {
+  title: "ไม่สามารถอัปโหลดไฟล์ได้",
+  message: "อยู่ระหว่างนำเข้าข้อมูล ระบบจะแจ้งผลให้ทราบทันทีเมื่อเสร็จสิ้น",
+  icon: "mdi-progress-alert",
+  btnLabel: "ตกลง",
+  color: "primary",
+};
+
+const UPLOAD_SUCCESS_DIALOG = {
+  title: "อัปโหลดไฟล์สำเร็จ",
+  message:
+    "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีเมื่อเสร็จสิ้น",
+  icon: "check",
+  btnLabel: "ตกลง",
+  color: "primary",
+};
+
+// Function to show upload running dialog
+function showUploadRunningDialog() {
+  dialogMessage(
+    $q,
+    UPLOAD_RUNNING_DIALOG.title,
+    UPLOAD_RUNNING_DIALOG.message,
+    UPLOAD_RUNNING_DIALOG.icon,
+    UPLOAD_RUNNING_DIALOG.btnLabel,
+    UPLOAD_RUNNING_DIALOG.color,
+    undefined,
+    undefined,
+    true
+  );
+}
+
+// Function to show upload success dialog
+function showUploadSuccessDialog() {
+  dialogMessage(
+    $q,
+    UPLOAD_SUCCESS_DIALOG.title,
+    UPLOAD_SUCCESS_DIALOG.message,
+    UPLOAD_SUCCESS_DIALOG.icon,
+    UPLOAD_SUCCESS_DIALOG.btnLabel,
+    UPLOAD_SUCCESS_DIALOG.color,
+    undefined,
+    undefined,
+    true
+  );
+}
 const rows = ref<ResponseRecruitPeriod[]>([]);
 const rowsData = ref<ResponseRecruitPeriod[]>([]);
 const initialPagination = ref<Pagination>({
@@ -335,9 +391,15 @@ function clickDetail(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickUpload(id: string) {
-  modalCandidate.value = true;
-  textTittleCandidate.value = "นำเข้าผู้สมัครสอบแข่งขัน";
   selected_row_id.value = id;
+  const isRunning = await checkJobStatus(id, "candidate");
+
+  if (isRunning) {
+    showUploadRunningDialog();
+  } else {
+    modalCandidate.value = true;
+    textTittleCandidate.value = "นำเข้าผู้สมัครสอบแข่งขัน";
+  }
 }
 
 /**
@@ -345,9 +407,15 @@ async function clickUpload(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickEdit(id: string) {
-  modalScore.value = true;
-  textTittleScore.value = "นำเข้าบัญชีรวมคะแนน";
   selected_row_id.value = id;
+  const isRunning = await checkJobStatus(id, "score");
+
+  if (isRunning) {
+    showUploadRunningDialog();
+  } else {
+    modalScore.value = true;
+    textTittleScore.value = "นำเข้าบัญชีรวมคะแนน";
+  }
 }
 
 /**
@@ -355,9 +423,57 @@ async function clickEdit(id: string) {
  * @param id รอบสอบเเข่งขัน
  */
 async function clickResult(id: string) {
-  modalResult.value = true;
-  textTittleResult.value = "นำเข้าไฟล์ผลการสอบ";
   selected_row_id.value = id;
+  const isRunning = await checkJobStatus(id, "result");
+
+  if (isRunning) {
+    showUploadRunningDialog();
+  } else {
+    modalResult.value = true;
+    textTittleResult.value = "นำเข้าไฟล์ผลการสอบ";
+  }
+}
+
+/**
+ * ตรวจสอบสถานะการนำเข้าข้อมูล
+ * @param id รอบสอบเเข่งขัน
+ * @param type ประเภทไฟล์ที่ต้องการตรวจสอบ
+ * @return true ถ้ากำลัง running, false ถ้าไม่มี job หรือ job เสร็จแล้ว
+ */
+async function checkJobStatus(
+  id: string,
+  type: "candidate" | "score" | "result"
+): Promise<boolean> {
+  const uploads = uploadProgress.pendingUploads.filter(
+    (u) => u.periodId === id && u.type === type
+  );
+
+  let hasRunningJob = false;
+
+  for (const upload of uploads) {
+    try {
+      const res = await http.get(config.API.getImportStatus(upload.jobId));
+      const status = res.data.result.status.toLowerCase(); // 'running', 'completed', 'failed'
+
+      if (status === "completed" || status === "failed") {
+        status === "completed" && fetchData();
+        uploadProgress.removeUpload(upload.jobId);
+      } else if (status === "running") {
+        jobStatus.value[type] = "running";
+        hasRunningJob = true;
+      }
+    } catch (e) {
+      // if error, remove from pending
+      uploadProgress.removeUpload(upload.jobId);
+    }
+  }
+
+  // if no running jobs, clear status
+  if (!uploadProgress.isUploading(id, type)) {
+    jobStatus.value[type] = undefined;
+  }
+
+  return hasRunningJob;
 }
 
 /**
@@ -463,11 +579,25 @@ async function checkSaveCandidate() {
   await http
     .post(config.API.uploadCandidates(selected_row_id.value), fd)
     .then((res) => {
-      success($q, "นำเข้าข้อมูลผู้สมัครสอบสำเร็จ");
+      const jobId = res.data.result.jobId;
+      uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
+
+      dialogMessage(
+        $q,
+        "อัปโหลดไฟล์สำเร็จ",
+        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
+        "check",
+        "ตกลง",
+        "primary",
+        undefined,
+        undefined,
+        true
+      );
+
       modalCandidate.value = false;
       files_candidate.value = null;
       selected_row_id.value = "";
-      fetchData();
+      // fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -477,7 +607,7 @@ async function checkSaveCandidate() {
     });
 }
 
-/** บันทึด คะเเนน */
+/** บันทึด คะเแนน */
 async function checkSaveScore() {
   const fd = new FormData();
   fd.append("attachment", files_score.value[0]);
@@ -485,11 +615,24 @@ async function checkSaveScore() {
   await http
     .post(config.API.saveScores(selected_row_id.value), fd)
     .then((res) => {
-      success($q, "นำเข้าข้อมูลผลคะแนนสอบสำเร็จ");
+      const jobId = res.data.result.jobId;
+      uploadProgress.addUpload(jobId, selected_row_id.value, "score");
+
+      dialogMessage(
+        $q,
+        "อัปโหลดไฟล์สำเร็จ",
+        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
+        "check",
+        "ตกลง",
+        "primary",
+        undefined,
+        undefined,
+        true
+      );
       modalScore.value = false;
       files_score.value = null;
       selected_row_id.value = "";
-      fetchData();
+      // fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -507,7 +650,21 @@ async function checkSaveResult() {
   await http
     .post(config.API.uploadResult(selected_row_id.value), fd)
     .then((res) => {
-      success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
+      const jobId = res.data.result.jobId;
+      uploadProgress.addUpload(jobId, selected_row_id.value, "result");
+
+      // success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
+      dialogMessage(
+        $q,
+        "อัปโหลดไฟล์สำเร็จ",
+        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
+        "check",
+        "ตกลง",
+        "primary",
+        undefined,
+        undefined,
+        true
+      );
       modalResult.value = false;
       files_result.value = null;
       selected_row_id.value = "";
@@ -532,6 +689,9 @@ async function checkSave() {
   await http
     .post(config.API.saveCandidates, fd)
     .then((res) => {
+      const jobId = res.data.result.jobId;
+      uploadProgress.addUpload(jobId, selected_row_id.value, "period");
+
       success($q, "นำเข้าข้อมูลผู้สมัครสอบแข่งขันสำเร็จ");
       modalAdd.value = false;
       fetchData();
@@ -563,6 +723,7 @@ onMounted(async () => {
   <div class="toptitle text-dark col-12 row items-center">
     จัดการรอบสอบแข่งขัน
   </div>
+
   <q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
     <div>
       <Table
@@ -669,16 +830,16 @@ onMounted(async () => {
               </div>
               <div v-else-if="col.name == 'examCount'" class="table_ellipsis2">
                 <q-btn
+                  v-if="
+                    (col.value == null || col.value == '0') &&
+                    checkPermission($route)?.attrIsUpdate
+                  "
                   flat
                   dense
                   size="12px"
                   color="green"
                   round
                   @click.stop.prevent="clickUpload(props.row.id)"
-                  v-if="
-                    (col.value == null || col.value == '0') &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <q-tooltip>นำเข้าไฟล์ผู้สมัครสอบ</q-tooltip>
@@ -715,6 +876,9 @@ onMounted(async () => {
               </div>
               <div v-else-if="col.name == 'scoreCount'" class="table_ellipsis2">
                 <q-btn
+                  v-if="
+                    col.value == null && checkPermission($route)?.attrIsUpdate
+                  "
                   :disable="props.row.examCount == 0"
                   flat
                   dense
@@ -722,9 +886,6 @@ onMounted(async () => {
                   round
                   color="green"
                   @click.stop.prevent="clickEdit(props.row.id)"
-                  v-if="
-                    col.value == null && checkPermission($route)?.attrIsUpdate
-                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <!-- นำเข้าไฟล์ผลคะแนนสอบ -->
@@ -751,6 +912,11 @@ onMounted(async () => {
 
               <div v-else-if="col.name == 'result'" class="table_ellipsis2">
                 <q-btn
+                  v-if="
+                    (props.row.score == null ||
+                      props.row.score.resultCount == 0) &&
+                    checkPermission($route)?.attrIsUpdate
+                  "
                   :disable="props.row.score == null"
                   flat
                   dense
@@ -758,11 +924,6 @@ onMounted(async () => {
                   color="green"
                   round
                   @click.stop.prevent="clickResult(props.row.id)"
-                  v-if="
-                    (props.row.score == null ||
-                      props.row.score.resultCount == 0) &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
                 >
                   <q-icon name="mdi-file-excel-outline" size="20px" />
                   <q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
@@ -921,12 +1082,12 @@ onMounted(async () => {
 
   <q-dialog v-model="modalCandidate" persistent>
     <q-card style="width: 600px">
+      <DialogHeadTemplate
+        :title="textTittleCandidate"
+        :close="clickCloseCandidate"
+        title-type="ข้อมูลผู้สมัครสอบ"
+      />
       <q-form ref="myFormScore">
-        <DialogHeadTemplate
-          :title="textTittleCandidate"
-          :close="clickCloseCandidate"
-          title-type="ข้อมูลผู้สมัครสอบ"
-        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
@@ -965,12 +1126,12 @@ onMounted(async () => {
 
   <q-dialog v-model="modalScore" persistent>
     <q-card style="width: 600px">
+      <DialogHeadTemplate
+        :title="textTittleScore"
+        :close="clickCloseScore"
+        title-type="บัญชีรวมคะแนน"
+      />
       <q-form ref="myFormScore">
-        <DialogHeadTemplate
-          :title="textTittleScore"
-          :close="clickCloseScore"
-          title-type="บัญชีรวมคะแนน"
-        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
@@ -1009,12 +1170,12 @@ onMounted(async () => {
 
   <q-dialog v-model="modalResult" persistent>
     <q-card style="width: 600px">
+      <DialogHeadTemplate
+        :title="textTittleResult"
+        :close="clickCloseResult"
+        title-type="ผลการสอบ (บัญชีรายชื่อ)"
+      />
       <q-form ref="myFormScore">
-        <DialogHeadTemplate
-          :title="textTittleResult"
-          :close="clickCloseResult"
-          title-type="ผลการสอบ (บัญชีรายชื่อ)"
-        />
         <q-separator />
         <q-card-section>
           <div class="col-12 row items-center q-col-gutter-sm">
diff --git a/src/stores/uploadProgress.ts b/src/stores/uploadProgress.ts
new file mode 100644
index 000000000..94fcc7536
--- /dev/null
+++ b/src/stores/uploadProgress.ts
@@ -0,0 +1,46 @@
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+
+interface PendingUpload {
+	jobId: string;
+	type: 'candidate' | 'score' | 'result' | 'period';
+	periodId: string;
+}
+
+export const useUploadProgressStore = defineStore('uploadProgress', () => {
+	const pendingUploads = ref<PendingUpload[]>([]);
+
+	function addUpload(jobId: string, periodId: string, uploadType: 'candidate' | 'score' | 'result' | 'period') {
+		pendingUploads.value.push({
+			jobId,
+			type: uploadType,
+			periodId
+		});
+	}
+
+	function removeUpload(jobId: string) {
+		const index = pendingUploads.value.findIndex(u => u.jobId === jobId);
+		if (index !== -1) {
+			pendingUploads.value.splice(index, 1);
+		}
+	}
+
+	function removeByPeriodAndType(periodId: string, uploadType: string) {
+		const index = pendingUploads.value.findIndex(
+			u => u.periodId === periodId && u.type === uploadType
+		);
+		if (index !== -1) {
+			pendingUploads.value.splice(index, 1);
+		}
+	}
+
+	function isUploading(periodId: string, uploadType: string): boolean {
+		return pendingUploads.value.some(
+			u => u.periodId === periodId && u.type === uploadType
+		);
+	}
+
+	return { pendingUploads, addUpload, removeUpload, removeByPeriodAndType, isUploading };
+}, {
+	persist: true
+});

From 4f6d14ef973ce59b8d8ff89cf2c06e3365a6ba8a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 14 May 2026 17:48:50 +0700
Subject: [PATCH 103/125] refactor(compete): use showUploadSuccessDialog

---
 .../03_recruiting/views/01_compete/Period.vue | 43 ++-----------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 487de668c..7af8a3059 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -581,23 +581,11 @@ async function checkSaveCandidate() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
-
-      dialogMessage(
-        $q,
-        "อัปโหลดไฟล์สำเร็จ",
-        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
-        "check",
-        "ตกลง",
-        "primary",
-        undefined,
-        undefined,
-        true
-      );
+      showUploadSuccessDialog();
 
       modalCandidate.value = false;
       files_candidate.value = null;
       selected_row_id.value = "";
-      // fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -617,22 +605,10 @@ async function checkSaveScore() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "score");
-
-      dialogMessage(
-        $q,
-        "อัปโหลดไฟล์สำเร็จ",
-        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
-        "check",
-        "ตกลง",
-        "primary",
-        undefined,
-        undefined,
-        true
-      );
+      showUploadSuccessDialog();
       modalScore.value = false;
       files_score.value = null;
       selected_row_id.value = "";
-      // fetchData();
     })
     .catch((e) => {
       messageError($q, e);
@@ -652,23 +628,10 @@ async function checkSaveResult() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "result");
-
-      // success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
-      dialogMessage(
-        $q,
-        "อัปโหลดไฟล์สำเร็จ",
-        "ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีผ่านหน้าจอเมื่อเสร็จสิ้น",
-        "check",
-        "ตกลง",
-        "primary",
-        undefined,
-        undefined,
-        true
-      );
+      showUploadSuccessDialog();
       modalResult.value = false;
       files_result.value = null;
       selected_row_id.value = "";
-      fetchData();
     })
     .catch((e) => {
       messageError($q, e);

From f909ac418695df4d92b91d8b1533bc215c333f0d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 15 May 2026 16:01:36 +0700
Subject: [PATCH 104/125] fix(compete): message upload

---
 src/modules/03_recruiting/views/01_compete/Period.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 7af8a3059..60419cec2 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -581,7 +581,7 @@ async function checkSaveCandidate() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
-      showUploadSuccessDialog();
+      success($q, UPLOAD_SUCCESS_DIALOG.message);
 
       modalCandidate.value = false;
       files_candidate.value = null;
@@ -605,7 +605,7 @@ async function checkSaveScore() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "score");
-      showUploadSuccessDialog();
+      success($q, UPLOAD_SUCCESS_DIALOG.message);
       modalScore.value = false;
       files_score.value = null;
       selected_row_id.value = "";
@@ -628,7 +628,7 @@ async function checkSaveResult() {
     .then((res) => {
       const jobId = res.data.result.jobId;
       uploadProgress.addUpload(jobId, selected_row_id.value, "result");
-      showUploadSuccessDialog();
+      success($q, UPLOAD_SUCCESS_DIALOG.message);
       modalResult.value = false;
       files_result.value = null;
       selected_row_id.value = "";

From 463a35059e3796f1da3c35f1b006e118308556e1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 15 May 2026 17:01:59 +0700
Subject: [PATCH 105/125] refactor(receive): send prefix rank

---
 src/modules/05_placement/components/Receive/DialogOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index 3d7315c78..2bdb14319 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -20,7 +20,7 @@ const dataMapToSend = computed(() => {
   return selected.value.map((i: any) => ({
     id: i.id,
     profileId: i.profileId,
-    prefix: i.prefix,
+    prefix: i.rank ? i.rank : i.prefix,
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,

From 985f1bcf23f145adde993a8052cd96a47a289a62 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 18 May 2026 13:44:38 +0700
Subject: [PATCH 106/125] feat(persons): add router for persons feature

---
 .../23_persons/components/TablePersons.vue    | 306 ++++++++++++++++++
 src/modules/23_persons/interface/Main.ts      |  38 +++
 src/modules/23_persons/router.ts              |  14 +
 src/modules/23_persons/stores/PersonsStore.ts |  45 +++
 src/modules/23_persons/views/Main.vue         |  77 +++++
 src/router/index.ts                           |   2 +
 6 files changed, 482 insertions(+)
 create mode 100644 src/modules/23_persons/components/TablePersons.vue
 create mode 100644 src/modules/23_persons/interface/Main.ts
 create mode 100644 src/modules/23_persons/router.ts
 create mode 100644 src/modules/23_persons/stores/PersonsStore.ts
 create mode 100644 src/modules/23_persons/views/Main.vue

diff --git a/src/modules/23_persons/components/TablePersons.vue b/src/modules/23_persons/components/TablePersons.vue
new file mode 100644
index 000000000..f3e5b9467
--- /dev/null
+++ b/src/modules/23_persons/components/TablePersons.vue
@@ -0,0 +1,306 @@
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
+import { useQuasar } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+import { usePersonsStore } from "@/modules/23_persons/stores/PersonsStore";
+import { usePagination } from "@/composables/usePagination";
+
+import type { QTableProps } from "quasar";
+import type {
+  DataOptions,
+  PosTypes,
+  PosLevels,
+  Person,
+} from "@/modules/23_persons/interface/Main";
+
+const $q = useQuasar();
+const { showLoader, hideLoader, messageError } = useCounterMixin();
+const { pagination, params, onRequest } = usePagination("", fetchData);
+const store = usePersonsStore();
+
+const props = defineProps<{ type: "current" | "draft" }>();
+
+const options = reactive({
+  posType: [] as DataOptions[],
+  posLevel: [] as DataOptions[],
+});
+
+const filters = reactive({
+  keyword: "",
+  position: "",
+  posTypeId: "",
+  posLevelId: "",
+});
+
+const rows = ref<Person[]>([]);
+const visibleColumns = ref<string[]>([
+  "citizenId",
+  "fullName",
+  "position",
+  "posType",
+  "posLevel",
+]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขบัตรประชาชน",
+    sortable: false,
+    field: "citizenId",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fullName",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: false,
+    field: "fullName",
+    format(val, row) {
+      return `${row.prefix || ""}${row.firstName || ""} ${
+        row.lastName || ""
+      }`.trim();
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่งในสายงาน",
+    sortable: false,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posType",
+    align: "left",
+    label: "ประเภทตำแหน่ง",
+    sortable: false,
+    field: "posType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posLevel",
+    align: "left",
+    label: "ระดับตำแหน่ง",
+    sortable: false,
+    field: "posLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+
+/** ฟังก์ชันดึงข้อมูลรายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง */
+async function fetchData() {
+  try {
+    showLoader();
+    const payload = {
+      ...params.value,
+      posTypeId: filters.posTypeId,
+      posLevelId: filters.posLevelId,
+      position: filters.position.trim(),
+      keyword: filters.keyword.trim(),
+    };
+    const endpoint =
+      props.type === "current"
+        ? config.API.orgSearchCurrentProfile
+        : config.API.orgSearchProfile;
+
+    const res = await http.post(endpoint, payload);
+    const result = res.data.result;
+
+    pagination.value.rowsNumber = result?.total || 0;
+    rows.value = result?.data || [];
+  } catch (error) {
+    messageError($q, error);
+  } finally {
+    hideLoader();
+  }
+}
+
+/** ฟังก์ชันดึงข้อมูลประเภทตำแหน่ง */
+async function getPosType() {
+  try {
+    options.posType = await store.fetchPosType();
+  } catch (error) {
+    messageError($q, error);
+  }
+}
+
+/**
+ * ฟังก์ชันอัปเดตตัวเลือกระดับตำแหน่งเมื่อเลือกประเภทตำแหน่ง
+ * @param val ID เภทตำแหน่ง
+ */
+function updateSelectType(val: string) {
+  const listLevel: PosTypes | undefined = store.optionsData.dataType.find(
+    (e: PosTypes) => e.id === val
+  );
+
+  store.optionsData.posLevel =
+    listLevel?.posLevels?.map((e: PosLevels) => ({
+      id: e.id,
+      name: e.posLevelName,
+    })) || [];
+
+  options.posLevel = store.optionsData.posLevel;
+
+  filters.posLevelId = "";
+  searchData();
+}
+
+/** ฟังก์ชันค้นหาข้อมูล*/
+function searchData() {
+  pagination.value.page = 1;
+  fetchData();
+}
+
+/**
+ * ฟังก์ชันเปิดหน้าทะเบียนขรก. ในแท็บใหม่
+ * @param personId ID ของขรก.
+ */
+function handleRedirect(personId: string) {
+  window.open(`/registry-officer/${personId}`, "_blank");
+}
+
+onMounted(() => {
+  fetchData();
+  getPosType();
+});
+</script>
+
+<template>
+  <div class="col-12">
+    <!-- Filter Section -->
+    <div class="row col-12 q-col-gutter-sm q-mb-sm">
+      <div class="col-xs-12 col-sm-6 col-md-2">
+        <q-input
+          v-model="filters.position"
+          dense
+          outlined
+          label="ตำแหน่งในสายงาน"
+          @keydown.enter.prevent="searchData"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-6 col-md-2">
+        <q-select
+          label="ตำแหน่งประเภท"
+          v-model="filters.posTypeId"
+          :options="options.posType"
+          emit-value
+          dense
+          map-options
+          outlined
+          option-label="name"
+          option-value="id"
+          clearable
+          @clear="filters.posTypeId = ''"
+          @update:model-value="updateSelectType"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-6 col-md-2">
+        <q-select
+          label="ระดับตำแหน่ง"
+          v-model="filters.posLevelId"
+          :disable="!filters.posTypeId"
+          :options="options.posLevel"
+          emit-value
+          dense
+          map-options
+          outlined
+          option-label="name"
+          option-value="id"
+          clearable
+          @clear="filters.posLevelId = ''"
+          @update:model-value="searchData"
+        />
+      </div>
+
+      <q-space />
+
+      <div class="col-xs-12 col-sm-6 col-md-2">
+        <q-input
+          v-model="filters.keyword"
+          dense
+          outlined
+          label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
+          @keydown.enter.prevent="searchData"
+        >
+          <template v-slot:append>
+            <q-icon name="search" class="cursor-pointer" @click="searchData" />
+          </template>
+        </q-input>
+      </div>
+      <div class="col-xs-12 col-sm-6 col-md-2">
+        <q-select
+          for="visibleColumns"
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+        />
+      </div>
+    </div>
+
+    <!-- Table Section -->
+    <div class="col-12">
+      <p-table
+        ref="table"
+        :columns="columns"
+        :rows="rows"
+        row-key="id"
+        flat
+        bordered
+        dense
+        class="custom-header-table"
+        :visible-columns="visibleColumns"
+        :rows-per-page-options="[1, 10, 25, 50, 100]"
+        v-model:pagination="pagination"
+        @request="onRequest"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th auto-width></q-th>
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props">
+            <q-td auto-width>
+              <q-btn
+                flat
+                dense
+                round
+                color="info"
+                icon="mdi-eye"
+                @click.prevent="handleRedirect(props.row.id)"
+              >
+                <q-tooltip>ดูรายละเอียด</q-tooltip>
+              </q-btn>
+            </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+              <div>
+                {{ col.value ? col.value : "-" }}
+              </div>
+            </q-td>
+          </q-tr>
+        </template>
+      </p-table>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/23_persons/interface/Main.ts b/src/modules/23_persons/interface/Main.ts
new file mode 100644
index 000000000..b92ae3cd2
--- /dev/null
+++ b/src/modules/23_persons/interface/Main.ts
@@ -0,0 +1,38 @@
+interface DataOptions {
+  id: string;
+  name: string;
+}
+
+interface PosTypes {
+  createdAt: Date;
+  id: string;
+  lastUpdateFullName: string;
+  lastUpdatedAt: Date;
+  posTypeName: string;
+  posTypeRank: number;
+  posLevels: PosLevels[];
+}
+
+interface PosLevels {
+  createdAt: Date;
+  id: string;
+  lastUpdateFullName: string;
+  lastUpdatedAt: Date;
+  posLevelAuthority: string;
+  posLevelName: string;
+  posLevelRank: number;
+}
+
+interface Person {
+  citizenId: string;
+  firstName: string;
+  id: string;
+  lastName: string;
+  posLevel: string;
+  posType: string;
+  position: string;
+  prefix: string;
+  rank: string;
+}
+
+export type { DataOptions, PosTypes, PosLevels, Person };
diff --git a/src/modules/23_persons/router.ts b/src/modules/23_persons/router.ts
new file mode 100644
index 000000000..0ad543b53
--- /dev/null
+++ b/src/modules/23_persons/router.ts
@@ -0,0 +1,14 @@
+const Main = () => import("@/modules/23_persons/views/Main.vue");
+
+export default [
+  {
+    path: "/persons",
+    name: "personsMain",
+    component: Main,
+    meta: {
+      Auth: true,
+      Key: "PERSONS",
+      Role: "PERSONS",
+    },
+  },
+];
diff --git a/src/modules/23_persons/stores/PersonsStore.ts b/src/modules/23_persons/stores/PersonsStore.ts
new file mode 100644
index 000000000..e19b5e29f
--- /dev/null
+++ b/src/modules/23_persons/stores/PersonsStore.ts
@@ -0,0 +1,45 @@
+import { defineStore } from "pinia";
+import { reactive } from "vue";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import type {
+  DataOptions,
+  PosTypes,
+} from "@/modules/23_persons/interface/Main";
+
+export const usePersonsStore = defineStore("personsStore", () => {
+  const routeCheck = {
+    registry: {
+      meta: { Auth: true, Key: "SYS_REGISTRY_OFFICER", Role: "OWNER" },
+    },
+    org: {
+      meta: { Auth: true, Key: "SYS_ORG", Role: "OWNER" },
+    },
+  };
+
+  const optionsData = reactive({
+    posType: [] as DataOptions[],
+    posLevel: [] as DataOptions[],
+    dataType: [] as PosTypes[],
+  });
+
+  /** ฟังก์ชันดึงข้อมูลประเภทตำแหน่ง */
+  async function fetchPosType() {
+    if (optionsData.posType.length > 0) {
+      return optionsData.posType;
+    }
+
+    const res = await http.get(config.API.orgPosType);
+    optionsData.dataType = res.data.result;
+    optionsData.posType = res.data.result.map((e: PosTypes) => ({
+      id: e.id,
+      name: e.posTypeName,
+    }));
+
+    return optionsData.posType;
+  }
+
+  return { routeCheck, optionsData, fetchPosType };
+});
diff --git a/src/modules/23_persons/views/Main.vue b/src/modules/23_persons/views/Main.vue
new file mode 100644
index 000000000..ce5c336d8
--- /dev/null
+++ b/src/modules/23_persons/views/Main.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { watch, computed, ref } from "vue";
+
+import { useRouter } from "vue-router";
+import { usePersonsStore } from "@/modules/23_persons/stores/PersonsStore";
+import { checkPermission } from "@/utils/permissions";
+
+import TablePersons from "@/modules/23_persons/components/TablePersons.vue";
+
+const router = useRouter();
+const { routeCheck } = usePersonsStore();
+
+/// คำนวณสิทธิ์การเข้าถึงหน้ารายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง
+const hasPermission = computed(() => {
+  const registryPermission = checkPermission(routeCheck.registry);
+  const orgPermission = checkPermission(routeCheck.org);
+
+  if (registryPermission === null || orgPermission === null) {
+    return null;
+  }
+
+  return (
+    registryPermission?.attrOwnership === "OWNER" &&
+    orgPermission?.attrOwnership === "OWNER"
+  );
+});
+
+const tabs = ref("1");
+
+watch(
+  () => hasPermission.value,
+  (allowed) => {
+    if (!allowed) {
+      router.push("/404");
+    }
+  }
+);
+</script>
+
+<template>
+  <div class="row items-center">
+    <div class="toptitle text-dark row items-center q-py-xs">
+      รายชื่อขรก. ที่ไม่อยู่ในโครงสร้าง
+    </div>
+  </div>
+
+  <q-card bordered flat>
+    <q-tabs
+      v-model="tabs"
+      dense
+      align="left"
+      inline-label
+      class="rounded-borders"
+      indicator-color="primary"
+      active-bg-color="teal-1"
+      active-class="text-primary"
+    >
+      <q-tab name="1" label="ปัจจุบัน" />
+      <q-tab name="2" label="แบบร่าง" />
+    </q-tabs>
+
+    <q-separator />
+    <div class="q-pa-sm">
+      <q-tab-panels v-model="tabs" animated>
+        <q-tab-panel name="1">
+          <TablePersons v-if="hasPermission" type="current" />
+        </q-tab-panel>
+
+        <q-tab-panel name="2">
+          <TablePersons v-if="hasPermission" type="draft" />
+        </q-tab-panel>
+      </q-tab-panels>
+    </div>
+  </q-card>
+</template>
+
+<style scoped></style>
diff --git a/src/router/index.ts b/src/router/index.ts
index f570ed6ce..565174cf3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -29,6 +29,7 @@ import ModulePositionCondition from "@/modules/19_condition/router";
 import ModulePositionTemp from "@/modules/20_positionTemp/router";
 import ModuleReport from "@/modules/21_report/router";
 import ModuleIssues from "@/modules/22_issues/router";
+import ModulePersons from "@/modules/23_persons/router";
 
 // TODO: ใช้หรือไม่?
 import { authenticated, logout } from "@/plugins/auth";
@@ -81,6 +82,7 @@ const router = createRouter({
         ...ModulePositionTemp,
         ...ModuleReport,
         ...ModuleIssues,
+        ...ModulePersons,
       ],
     },
     /**

From 4ecf307c32b2a72727a5172073f5e2a54d2fba95 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 18 May 2026 14:23:52 +0700
Subject: [PATCH 107/125] refactor(compete): replace file compete

---
 public/File/ข้อมูลผู้สมัครสอบ.xlsx        | Bin 12355 -> 19752 bytes
 public/File/บัญชีรวมคะแนน.xlsx         | Bin 54513 -> 51260 bytes
 public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx | Bin 48063 -> 50132 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/File/ข้อมูลผู้สมัครสอบ.xlsx b/public/File/ข้อมูลผู้สมัครสอบ.xlsx
index 0611f9be0c69bec3627f7876bbcc98a0f8654f7b..8506e75b60fd7da79850181e18920e1fecf2ca26 100644
GIT binary patch
literal 19752
zcmeEuWpo`qlcpUzhQ!QFF*7s7%y`Yr6f?79W@ct)W@hG?nVFgP=KW@7XV1)!{Xf&^
zN?od3-D*isRY_{K<RrnsQ9vL-pg=%C2to8OGEB8WK|rFxK|qi}puT7bT3b07Svlw^
zy4o1oYtgz`S`g%de<9BX`2v*x-{XI94V1@^$@I}92tSIw3GUHItkwR6VmbF6LZX!C
z?e32oEH%)`G&B3m40%Nm$U!w{t3jGtb7#DsFs-$+Z1fEtY*T;<^BL||(#B?^8yGqx
z=|abhwNqES%tpcf$$+V&6JeYNl5E@5r@$<<%`Z`oWr~W%`+GNIWk?xubFc-bRK1vE
zc(rFsMtK8~eY9i_VRr_3-rS7BUHf*IMjSkh$bAjXNxMLfP!&L-uh3%mk|fz_Pu|S5
zplk4DgFZ0218#kC6QZq?4NsaGtF|Qcu2g+6`WID~ho*;H7kOmZo!m<+E2^mujYj5A
zA41>RB@nq^VfAPgj8;>g{d}l-Qe#)W1naLP+sHWmo7je}nNiV(G8jab)LR8ZnL@H0
zY?QuUMZ+V_?A@~G1~?v8g)@+Q;KEOzC=ZCot+(9*2qWEu#GXOtTf@g(?q}2c8h#ho
ziO1fI9}plQpPyhLa{rH7HYm~mxC3HM3aEA8foiE^XJlbdNBcMaUv>N+tb_ll=;g7}
zvVHV0ftO-$LBo#=>(K}TlFs~MZG?(mzs1+!8zS<EvDdrEa1a!+{J=!LJG|aTSJ$~C
zPKF5|c9_e<kWjdOG&)xVCcW4?LQ<02C5qUVZ}%fQE!;0Wq=-tmk~?)oQI<6q=SYrh
z{t%hF7OFv*qE*3yMlQe!MB_>EQ6H36+t7ci1YHmSoL2-^H?d`(#7(7nFD4cq!}0}l
zNS)25pbp#Xn=Ds)3|kQ1KVvBYOgYS|^)u}_iClFIExK=o(z=k}J!oXohZTsJk)9Z*
zM2ASS@4eOQnXkt(T>IIe`^tu|MtsBYi#LEC>c1+94{v<ZEwDyffl7h}0tM<~LH92`
zakjSmrEhKh>#z6vcbx$Rx-j5f{%0TM3euAO^avf_KZ59;)0|KdmmTPc&Xi8!p+@Q{
zR!Iq&yzVx!DO<Hv|47n-SqHjaP7FCcvcT<tA>a2<6^9~$yCGX#a(%U)xSarl(m$`j
z^A-JyjC6K#T6X>&F4Z2ng*SGXIunKc;E9|BGbpc+Na(I*HjvqTlHQTg+<qE&6o{Fz
z`n}&T{(!Rz-}<H|f>a9Q{m&M`)dz?yUswE@TTEziZdg~4nWK3^s;3^|2dJC&H)Cnn
z$zMHrFEIN!Ws-QMEIb~84g^8NqWInvvG)79DQ!xZ+YSP+qZD1MH`HTym&SV|LkpY0
zmj17h;n^y;Jp#hu1PlZO9w-5X%zp+;K0q>Rl>nhr<;45v8e62wYVogS?S^ILG)YuP
zog_`D%zpCj=HI9JU7cVX^=9_VrRYpxPrL3vUF+CVJs}TKS3(ctC`@!oSVyg>KAx_g
zcX&*Ap;n<H&?vn?rmRnztVcoDts<HYz;!(bRuNi>#@a1<p!j;=s4Fa{F%gR$SI3><
zgmyK4>pD1bWK1&th~NJqu&wRqlNJ$c6IRQn+XuDtGwkP`XBnrr5Yr8djYzZBrj{5p
zE`ND~@^<u34yIaF3mVRvKg8}?U0g%}R|v~^ha+2LQt*Tb;;FlXIqE6V5yuvJtW1&B
zl%rO<-hKeHiTcx3i9Bd(=v46l=tr`R=VOgZs`71F*%-ytiH<xqE=&KbAKX?s6ul_+
za3Q+i=VGisk9Eu!U7c->Djd0snUvQ2s^|dK*8(V-(~Qcec2yoXh2~nyVk^fmzXh@9
zDw%MULyC951ObtIObR@;i2KcxQ%3DMvaf!hmP!^W*0#-pMPAX;0-FH;RF}E$!QWA2
z<Zdipc(penky2SNvJxz9#O}BA@n-Mp%mpMlwC1!9Ez;Y-8Z5zt-FYOJjmY+9=LllW
z3|X~89JKK$W?I6MIZZ0%6q|+P$lixGgUdBJ(Sn+7{rPz3UdaAiPz>U%7@EO=fb>v<
zfS~*f6!xZic1DH(2Rkz>6Z^krq&-z53TFUyX!FNDSNH>kt8U>XPsEw<1C~CXh1&H2
zp{%ld;j)>#mDHnpauJ3c3^)puZ8bj;sINe9bZ}43<LaI0NL6X8iOK7H`679!QQ|VE
zQqknS_hiX+3%Yiiw7YYyQViX}q4Qd2-Q3tg-T-?Re){I~#E0Y*th1YN%H+_o1H;th
z<=RAO2D+2?N1eT}`~y1|-Q=azsNM6Mu3R|jGBwRhm=SBx&8R+$q@<S?E==e?rR2~6
z@!06H!xo1Ob8^A6M-iJk&g9rFSIAID(CynopT$)9lXiQZd*!h6R6^VR%;m{RS*u%K
zC2vI;-RVhNt6N)TXH^-b<Nampi>Q_-KxOmK0@)$N{zZ!qr;*GDr~Cd%?|G%R28vNg
z=lcEFE<^sBNNQ1?)RlY~`hjzs#eA)a#@&8yD^<opfo|<+;j@qMVA^wOx@POmDs5Ru
zU#{kO?ZQ}6Yy8ax<LXpsZChpp{9~b+{L+Jt28~DxF-?<dk=EvvHu7S4ou5*o)&S{x
znDKGNKxvzcFpYY+gbfYa+{J}3$B6P`1#v-RMl4d8lLRY%7dtObK_k@DLc{m<RkG(E
z!&9$VJ%`o82W?4&>-s{~JDoWp!wL$bb}JeyCt>4}Ud;-9l(B=;pjGl!#;@9ob7rkb
zh&+=hM1}?$?OL2*(#evp%{=7gwc;p&%ft{xBgmN|;X>SobNj5)q^ZgWCBfSc+}dh(
z=LdScO61hF#x+N@sA27G_3HV()4T2DD$inurkolwaKc2iDq&pD9>lc|_a5S|2xDW=
z`}{v)2<Yw>LTr1;Ju!z*@XXH$*VeIw5RAV=UndKl0ay{kD&)a?RE4RVj1m0@X=A4p
za1qrbXO9(g{FXM6sLfVlg{qst5swrRVT}ifb)3%2;k4>pX;_eSMlEJIM}~GSJ`{K-
z6jP8p=R|czOU$%pZGB=%IT6BFZcJ)?X|Z4TydEI{X4GU@0T#NN<DsWU>Ug1)E)+C%
z@0#XMH!OOh(RJg4Yzi@|a~|;%bW87D;&llV(ws<@qh&#LX(_`B>UB!4f81H0&ZMov
z3^Sr+4HT*C5RV*Fl;yT$1;6aH=7UL;#=9}Mc&?|{@E1=sedCqo(AQr`WLz$-zmBt<
z-Oz88I&^-dUMhUcBkH6&8*uPiZT##NYie+cI<J~_&B-krlSZ~6Tr`fP@p`OVI3vOl
zMed<Zld(MC+MvWf+%GuOr`=gFCU5<odQ+BrpqX64t3~|0w_qtUBmK5|Kf~pC-(2~j
zq!P6<g}=BE_Yxeq;qZ_(J+!#s*>Ntf)ltCpI(2$d*ZRVL|6-1jeOa{rS<CBIMdfn|
z<uc>$J<rB{vLM=Zi8mwFf>*;TB=2iCg#N<IyM{azi4Xy%Bjy#XZnn}#J8=ss!+s@T
zy;MLgG9X6&LoE#yO0d1^lZdIY+eX$xox+a-y1`24Gz&)J0EE@p;ib5ecizeKYX0`|
z&b87_Bx)XYvTrkZG`o=k@dqvu0j|{Z@3ELjSOv6w`+dJwx1{cvOcy}FoEy7hoBZo9
zy|*O{J`}>8M?Y1pZj6%;ifi9t>1_49U3*-IV!HO-RxrBbbot%8+W|&g24f~V^yL$o
z#=0^kWuK)vPJO&5iXX>MqP9|H7q%UlC@6UrJOs`LOx!+MHqeC!3h}RX#)OuYy&#aO
z(oYcvP=P`Cl7sYq3>3CHCdiM`gr~*y;vYtj$*2C6b?fD$BUyh$#fG09H%`JUBIDN=
zApE^^7x-!Y35KEES-p!&JXjUkJ!W%bgaP%t1E4W8Gya&N8uR}6T+vWQ-qUZ?IiZTC
z9|pfT{9J960^<|861ZV-MODT68$AxMaOiA^tX=wGaaGrBg7jj$M`4i`&o|XWQv|cS
zj($RdQE-)%>X%41yO7xGGdP;1=tFOCqdH=;_Yq?6E}>(bh(um~|090}8UOVz?s^aA
ztGhFXBa^*z6;<B?`XfW~%a8ok+DIrg6HE1t)K1p#ZX4Z><U~Gl_r{!j%^e688PheD
zAIfngu<^-fB=b){m8_<bL3rdD3@doRYHtlib^GGa+Ds&>S%yc(;T`O9FICoYwf$CO
zx=pL_g9)aq{jJuTt=KN$9X?`>HNkU0&(SV}713JMe@8b$!$+LPLHyYMf|J~8-aX;K
zbjC~oaz!p}%2rJ(;xhf+y=&Uyw=}h-O`<yk2L?D1_eTLUOn;VFlfR4*M+Ybqk5A9s
zr)gSyjvfp;5g{vTC1HV~;-aW&c%~`@EIX->bczu&L=8CWK=zQW+1L0Y%bOo%+@DqI
zdeI9J*3Ffd?u4KAZx~WH9mIE*!&oiv{pYXzIsyQ{S)v22>M6vsU(xo&AnJ*ld<Ym`
z0;*=76677=$-3qx(E1)v$gdJ3N8Xz%NKM3xY&7|VomiOa(XYx?$gZW(M<=Ik(p4DW
zm`}ncBdp00HXPhF(nQ<>X(^9UTpuQj8(K~TSOb$FdMAhPFjAQlE3jb$WMzeOS-cn{
zZ7O=0*S}F_i_*T3NTvyYU-e<0OrrqlX8!pSuC+5#gCv)Tv6)a)mcdo8J7_-(aeA34
zWsv9oE5Kk6tVaserRp$m8-ILl$^PA^cxsf=e0IRHFnVdUP1y_?r)5N!@hRNZCc$Wh
ztFI7E-l{nU+YQk(E3Us@cuO#LX&Sm1G&%5{_{6=^BAy6K^m@-_&5}dFb0~%edp&)C
zaL6tLGdP|KD#tr@W*Dp2dnVDkOmpt2y<iOWBF_{tY@Xoi_fJMlpE`&8U(MbN;m{|G
zjx;21wqv3zMaI+n<>Hf$s&NPh+VbB~XZs!OW9SPOANN4=F|r!kwncbC$@AnmLU{Ul
zjUriLb(uzOF}jJ%#nk41jKc2a9a0Ft`0JHdaaS{OjD9^}S{umjH`O<zrsOvL@;-jx
z2_Z{wy8_e6ada{@fsMxCEB~2K5<9mwlV+L0A!GDQvN7g()Wznj4n503&y>g0@XdGu
zk85KEA_Z-4v5)Uj;Gvt~;#Wj{mM^osE&RFxzDwsro{P>eR;HLK+>7V|H_asC)J*B%
zLF_2{7g}BIM(Lb{)sA+(Y~4MLUh6+8E)?-l2Xq9IuI*mM3Pvm29WtzbA-F7kVU3NJ
z`W*raYIoFUIc0UqIBDfT50z_-Ov#EM{PQYQ-<$+@NTfw6U|?Ri*Yus}OQxC-$&rj_
zEEja4EdJMZ(=BjigxlB7BW7Xj={sb_DR<9%9a&HF28KTWKN_GAG;3TFf@3ugM-dfL
zmjM;*ub!)Fs@h7djOr;U$ZD*(d^;!d1I<$Yqk~eS-dCU+ZMKN7cc-}_^Ro0X-(+?M
za;hM{4%ut+MGEk(BzmKqbYhcuvNghVG{=$Y`AQYf!jWiUHgm?bSk$uGq<1&WTR*QE
zmK~>!sxn;OF*w+BvZ+bE_m(wBQ1(OSCjHFL-*NIH5w3p6Z+IZ>f&w>!zSSpN`TmYZ
zoRxayq{u{kNK{8VYG0?LTB3&Tk_@hwo4Jld7h8pPXHbJ5q>bQS)4#X`??)bDuo$P+
zJB{ylXV1Swmf6g7)yEFqHw-JlfzIkXdK%u_I0C>Np6xU13sGU}(~)VMXmu&E_!9tz
z#2m#VOOZM(Ww*}0#S+~wmVb&wc9q;6)Yp%04&k%Ql;)m^4fl1mAOD6d5-EyJ7?Gb)
z{1i5hy_Zf)e@CQ`0IJ;(1C9m^<or9~uO4hLq3I>P<4X#X!cU^7kuUnMzch5F@07bg
z1*tGuMZN%xpWeD#r<l82U#BZJ0Yij8<0*p6e>_UP*n(wbd}V;O7BXydQ)+5_ity!}
zn?c7R*dKAg`!kT_C8752QKUvWK`iMni2aU}y+nY?N8@zBEV5k`t57@hz$9%or{ULn
zro5na5eNzX((-uU28MN2w%&zey~kvZ_o`l-{|EtjUTcpC6HW$WW5t58NcfG7=ylUl
zr-g+yz{lL_?$2EB<Q-l=sh-8!eP=vwGwVxQr3H_i0XpsTk~!bqbWi!u%@4<KSaSFT
z*p)a>Ql#as6EPJ~pGXVWrkaMYqbd$B30htgTPzcidj}9;Wb$joXmF4xTzuaL^gaMc
z;9rcN3YTn<r}qP3*+8G9;wpg-aGI2N``YRiil0oJ{$1(aGPTr%BA;wiySxt%)R<J~
z<fgUUzQ9$U^?2r8!dsF>#mtk41o91eZ~YTEiSb{@tD{o;Nvx0{An3|}r|16}uR53-
zSsKy(6EplBnVe}_0#?}(KD?M7@wq?T=13>MBNXO<(WGp^EE+?xJ*wI6^$RC@CJOlI
zc(+k4*VGWU$N&27iy2+8uzE66>7??|_LvlMMe9<zqZs+VWx4p+3^ON8on-KNSvQi#
zvk6EY`HEb!XYd(H_4(d&+0|k2>NbFU!S7k}u)L&WmT~UPN$GD<xKW6iB!^bu+RMy+
zFg8hKvYEXu<lwe`Aw#BDbH_7+Wcnb9GC=q^SuOsVZThC#oj3oDNg!sb+RRHMV!-vc
z1EtO+U+`L+uKt<x@z5ns`)ReOB!NSml>lGjBog(cd&C2r^L3L&6qLW!EbQx(Mx!V=
zHH;qZM5o`jjB}NV8I=&}vc;=QJ@(z{UBbg_1OsGVM&3sDA6~?i2T18mX^|oPAQm?w
z#=AaJ+18Fcd4|PrG2$1@N0387Z5_MnuR`@mHQd%(JtO@JNyPG$ybZCkr0Z7VojJY>
zbk}}bLM8Lgc@%m&a~@v|#b}cw3yP{3@oEsJUqZsZSMEl;W<96wZY}YeXg~=#l7Yh1
z{4qfq`}77$<JDuwCPf^JrNIf)Cp3PMxIz||0+a-!BM;}Z6jW$jj9GjYZ!2bLHJU7r
zOe%WGQmrzkN(Ai#i-ndnO4FvKlSH+!9wiOwv#ytBBu-oz_8}Yvt&<5o?wSo4xlkDp
zT!w)TBZ1Dy&EsXY*_?c7lRc%T&udMvyf696%<QXcX}%w?N0J8c8;?z^j^Pg6;avi4
z2{(9D90u1R*o-)$PW;;DRY+1>$BL|0^Oa3fajcSBYZ|*p7BuIJ7LDX1y_K?0ttSHb
z_ud6SvL<u29-~z!cANO{$p+HwE9--3-^TQ#Kw`u@ln@GW91NQDNWmpT4Y()X$y&D4
zsWx%Fr7^d;sM0j<+Ti^P>!e))A7caKFEQZ&#&}{mv$u|Ike&xmQr+J#!SZ*HAVho?
zDAn`#1^e>-f?8T<5^xk)L?Gg(#%t;l3tdzU;dLCf&q({PQ<Qh0niT?{RwKc_Gp6W(
z&rE$6xn=qUOJ=tfgo_{T^MzbUo6;<c*l2#Ml!c6iDtI5D%ZP_L^g*^LA|}TaTeE(G
z4cl2oLmz28d9*i-_HdkihFA{z01<MHfsb&k{4;cv4TJbMuoUT_AT;Am&%$ELjUa~A
z+K$0f%6JV`*o^hH++y|6I2;-nHCrV?stoUdfDb6q^#=OFq|vRA2Y%LxV{hpUMcB$z
zLM7xu5hE5Muez2O@fj>3OOpYOc$n3xxdu&)H)sVm5j)Hn=&j+GM#bgl@wtHo<{>7s
zObVWafH(~1C1`-#s9m)s7`~<9`_~U4qOS{SEAf{Vvu~|5_{TlufeM?iiFuLApOtEp
zp0aNg+h?2@7ZAD{rze8ip2;fsdz{bFy&HZ$-ACkR_sW%Dd3u{uU~;-b|4hLxa%S`^
z1CrHZUz9|8blrOLD8_m8o}s1jkc#4i_rIJeNu>7qU-1y|8r&|kr1SWKQdl2licPDs
z=QBb2@#@8zGG+|ty`_h$*mQ%>dABAKvY5ev)=@K8e=8zTAJ*SYe+)OKrilCo6$q#(
zcht!y`p#Am6jQ@ntIVmvspHpT<0Kw5@$BZLMLM%Xh0p6Z<R_-PQq-My>xe{lytwom
zJQ-nn1k@0ZesiyKsMBBlh-qZkzFO0eGcTS;cd3^;pHp|6M5=%B4Vh;$Wyc01NPX}R
z{Z>M?uYlsVW>dM<z4QF=iH2^3^or{Sv(=~A9(ImKxH|RLILdsu8Z}e`YJkcJE7PLQ
zT(cpR2YBFj#BM7OWt`pv*Bo~6g+uo)X1EzX(YA0KLKrM+dN(+XC{#H*1dL#a@8O+b
zfnX57L8HE*f0@zsVX*18=_dE_F|F>#;M8T;jqm=+tg3s){(s5;#O3%8Za5A-4!wjf
z0akc`f^92hJDHwGb`kf@&cOZwqu>3Z4?emFCqe=pH&*~80;R5W_y~7(Wrc4;1lN_%
z{g}i&pNquU%if=QL{%o1aAs6JFhc8oc!?xZ2tJ0`^WHDQsvvJC@A53vAn>Hrx{|DV
zpyaM{sy|<wtr!Qgf8O=^eVN2`htvDg`g%3@_3O!`Dl(y+jN4u}z*l%uJW3@N4_DaX
z%dQF{##Wf4%*!RBwwDi5AIC8+{ndu>kB!sxJ2;GrZW|dl$Z%y{cCrpI5i0uhxDC)e
zRE$aS%ilBK!WU2T={#>=?9$?Rk9xu)7SIdAxt2F%0vA;bChTSVp*5|lI>E0gFSoEw
z+U(e_CfuLW(q1kgcsmrfthTz!+4$4#H#r_PbP$1m;?iq>rw68&RVG_LElk$YizR?5
zahSt3XQV!DF&f^P>Y7MwTm6619FH0O&0YO29h07?bC8%TZ^iIk^BjIv*~wG7iCM^b
zQ=qtSKxg`2-7Gj8ebwbx5Rgd{5D?gZn*nriwJ`c;>Th0sJ#vQ?rL$_@Iar~@Sqe!&
zLBMAQu5PBXUR^1*WIk*oS(jjixG-cnpu%k?=txN?5B-+?mYipZH2U{MHOv?zW&}aw
z6vyUsL(O`Jc7Dip%z^NDZRWA&av^_RaKw(qER%N!JhtT=Is1qRu^#4milln-;`?RS
zDVj&hbQ?v%8VH)&3{z416lbE65Fj;nCv?ITg2y1S$iMFwZ%wG0%t-OiT;`h8#&Zpd
z5GH`#QT_~}ltQd`@)Q=Lq>2AfAA88N!WCl#^GSP#AvIYacs6Z1T1a@n?%{-jujvY6
z?4bPQH`W7{?s@%PTbvoKavxMx;uV`OjYGC}++$V}1F!2AnSm5^;lUG38%$}&%Z9_5
zO+T(eHyL5ghCs1>jDJuyBwoEe4W(aa!9Fvb=bIIgOG%FOl-WORJMX@{toVB4SXap1
zwHYK@cK=q?tDX!B_Z$^C`$GR4LG-?Dz-0G_c=iB49-^eGRsV7@ExE4McO2pZyK$bB
z+IT3nSeLK>Z;&vyL0r(qNv2(%cmLfX;)u8cl<Bo?9)HAN!8$&lsZGujXNgxJM`&at
zoRpgN9L#rZ2sh~mYEX28C$H~z5QH)OP7=t$wzA=wdxpo%Uu`7eJbklu#kmDg;`rC6
zK)>Nus*j{Ig(JX}d{c0VI~x!M-BsiDjRin>e#aOq^kT~~fZKEBPT3(dVcMHw4;nvn
z7G+4O4ksqh&M#IFDDf?wXL?2{9hH&dZ2TEWq>KcIMOO_)4hai6OtRxQD7l|mmNv|G
zs=Kgvr8QAVJn0NeCQ5~}%J!CfrvTYMa<BfC#NS0IZV%4yy6Kv8vc`dSFrgPNj;4_7
zkIUP)l(rX21Gjqt<2u7<uS_^IywDNFaI^|lNLFh$q6*f_uD$TN;II^}KrhsUepR1C
z{S=NboBEnxL+8N%fCz$kB=pBo7t})6HV$^8THHbUDtISXu)PSnXLzq86r{H*nkCj&
zF^};lQ_`0F^!<}6*@-i&Em$0&osIh-$eDty{2ea^GYJVZ*dU?&Ff80W^!Ig_c<5bQ
z{<yxu=*<(8D(IpoVm`~nKzu8Pb%E1>Djl>F2_jXsZ2J4q(k->oaZ2Qea)=w}68hGW
zWHNFTgDGlL8HM5#Q+uN_`?cl=xYgRhmhGM5ajPNx){C~5O_Z7d4v)?$jHkMbNhlnT
z=@5Dw>82B=9i>KAN#k*at60GA(d%AHp@KgP)NhRD>!80@s@}oQTH+$CXuK})BU8=t
z&`^?0$H0^mxvFI!1Z4rp<|6KxEc|RLn*N_%4%!>=FX3Z>k}{>9rx3Q<b#+$kzo;#&
z8*$?f=^UymI^UZ*ZjHA|$t~QKA54F7)t~Yx{P5c?%Y1&iy4>yCjDr8<=6zF9%Y-?!
z?cJ5K^4xLlPlaQTLQB)qskt4!7E?HbtTGC5vNeYQFSBQ|ZT?dAY)C$(wk0_QBdEdM
ze6x80J&<?7PoxxO`9stZ{^5A9*ep6J6=KzqhttB%Q#-^29otUf^hZUZ06|R2T}=Bt
zGpDCTTg5dzt3ehP%R`CViaOR_L1B-R<5c$`Uj`0~G)UA61piiRC%bfoXm0(4Zgwma
zM)5Al<frGG%8Y-G41WIf2*0?F@h`2ri?HZ-+w9vC&K)EFBahNa>iikA(k7ON;`6`_
z=zji-Mp?g~WRMgN+S3DYqbg%P$qMe1j*wTy9-%jmnB|wyUvOaub0s3-qXs#>K)g>}
z=8Qs4A$&M@ELR;Dpfp|Pd6FYu@EUOT3U9wWguEA2JP%VIQnYSeeq-kek~PR2;<=q#
zWaInVRMlskXSrFAO_Ssn(cRW!=~B@%ac+sRB<+5svi~u`WVIRGCSWtYRnIB>#o6Iz
z!JjkNfKm2oy|BVWS$kt!>x(M|sIE#4r1YlOK8Mo}2g{<F8}YW82dyeZH<{Z%*6ZyL
z0#&~2TsNIjmK-v!n<m>XxOhd(A$4{<)xO?3mggx?t)kFncm546!3&@G|D9*RG~&Mp
zB>(|g8V3Qv_?Kt+`@+!P)X2!ep6;L1Kclen3=R8LvDko3HvLaO0r=PYABY4bu^o+M
zP}8ldDjIC7))py^s5BwkAs3k&I$d9hkjc~SVS3l+kQoZcAk~!AQUYG&gs%qpKJRV1
zu3z7dpRKN+?3k8MEUm`zt<keC@VeU9+FRFNhfM8vT{+y}nA>!?Cv~hoIJ`IB4$D5@
zqR_pmGrinDIJ4;3d;^9KlhSmO#;m(6tob&*GWf<bo6t57qPBH-=`!(*$F3HO=vJpT
zGY{%y%fj$3n&z~vonQ5w9-GzFpY}__A_fkpoSSZscOG8*-fY#dTvIov5_8_CbS^u2
z+8TmZX%Fy>WxG5-AEH(V`kHii7TaFi_Oqz+(y-y1x^TQ)HMu9eI^f?wR2Y-jThAAC
zhTr<u&*yeruU%VE$1Rg!_j#k5hE{uK%Yfw)fdAHH%{{@_wU$oYB{dcMaqv)vP6e;E
zIq~Td$!pE+t@T#(>F{{`bYY9Ph6`cN@p`ZC#n+`Z$rq5by7tsHu(Q46<iy8ElkSB-
z>c+1GGhY=pU>(rYM{pL<nx&G2>NsVU<lHrN`|KHgIAVoy_Nm2E^n{aItJOgAady6<
z0ekU0H(2z1xcvBP)Y;tC@>>7)VrO5^a#Gac6?<Xv!q=(sW=r4odgJ(P$Ak+miw5_;
zKbJN4d~1m@GF@3AFTZ=f!<!8M*>!EBB4mgWyxgVi{UM(!^AdA@xSus}M4Xe=HJO#<
z?%X5Sy!Y^WYj>?{DL!stM$h86Ez8ziw}9<xu&(=b7zy!eO#fyE@j9a1b<%+e^PrA}
z`c`vd^fZT!st|*<(2>-0P6fP#2_s6Zh&4b}H3iB$HRM{EA^m;;7nhk?aC@q2C6OMw
zVg>1={QXvCg^^Vdn8Cb(s5AZ>(beb^HDiQ9S6opX<#1n+w`?8vXdL;tppBY+Z*(KL
zL9&0jtfN@i5k>2U@qhtmiJx0Nix@=5I(euUku7r6@s8km!S!bK5ux_DJ0D)VBkui^
z%n8WnGbX_`0v)f*WuP72ak5j$klS?+&BX_9SP7*2bq_Tf;8}JGssz&Gx(5c<&D+vR
zybQVn?mpL(Z<8FTBXF<zP4_CsDZLbBYB^7GL8Yw}4jsQ-uh3g|(dH`F*Nr(Hvzis6
z-go@qdvtI>Wq;pUk6)Dxd0*!^sda=tJzw8F$>u%5!@ZaZdcwc%__1031T4#zV{pH{
z&YZm^sVi6TsGFQTG>C5cH9W~}Y9$<M6ux#s9%bWoWog^Ncnmw85CWVtuc~OIm+!AB
zc@^hS_9Yl-8r81(S1iw`IjJ`Cwl{|(at=kVdpPIee{7i9GL)-NpUgdAV75qx!7F`p
zu;?jP-?;k-M2^*V45H?B{Q(YB?@V&6^f<6H__4eCfyFeFThSR(Kv6fs$+e(Bqh02R
zyPmIIF3h%{CDWeY`h%?PUA|oxdG4oA07*f`mJO%Iq;`jk`dbYm2ygSw^J=*ZPV`$W
zN(&;dlB@F0js)>Bovx0afdYnW3#L9v_nLk7!lur>w#BFRym@H3qCb5xiZ~#qE~369
zxi)uGvE6teyJX2=Kn74V6}n!y^Bc9Va3>lyuW$#JYEXIrkqXJ?q{fEQ<z7e?v?=o&
z^wYhRSa;2#z?V!<D&nmbXMr!B9SBG^7X{J3ovT!1eVwZUz}ww_5O1wN3VhjkCjb&r
zKq4cUSgNN3S+b8^9&mLjL_);wLZra(6<$_|@u6n`IVRHc>RO1{5I>z8kzyH=PF6_a
zp=Sa)Ceib*PHdd_Wtoxb!5;seTA?n=3$0~YlrL-#Cp$~n32u6dhzIh>Bqj?CC^!xJ
zqGosm0u*!j?S;m{`I9e<7#Ap(_*YEY85qercTc4Z&*5I#lioN$zNLq7uY>ZL{3mvy
zRod2})ZQ`N69=+uE11`$Q0B#sxxn5r?Tgy~e}wQ(ed7@9h33jB#23bmo0}z^2{!}G
zJqY-uMS^#A!*hgB9O$l`;CzQb=GLL+-Z9i$I#6=^MfKlFpDg>Bq90fGv^NgmUXu$%
z=>G`h0B;rfw;-Z_Z)NcJRt$fi4C8N(;eT@!`I}?jU$MVA4*fr3W=jp=$;ct8chhr3
zfH=HX^?dVLFdbRpN>U!12SwsvvtZV;!i~VhqhdZV;VmoN8AwL-yPim|Zx;?BBwRZB
zYY~xA&n6(IM%<SurdHgSxN?iRhaXWqjhLPMn;bF@N<c9*T&VASK3@F!RePS>kvw;+
zCHI}FXRCa1A5-*Ibb*^o%q-2K(8$U0kZyAL96wScywg=?YFf1(jKL7|c8bD#GqF##
z%S0fO;Sx`Q58|eYG``>SPcwo<cqJ_acI$YEodYp50*lCn=&jHlAy<ZgCC&t*;0h)R
zUw*DjMpJ9yLnNC$u6>YcO$UrO$%39k0^Bpr@366N5wkzDJ5;csqTwaLKyT#DqUp&>
z4T1wxYW;D{p}ABu#MOAt(_f4Rwv&{^6T*PORVie+&L0m)HCH%6O<kBIQAj?dKuS>`
z8Y#hrwIA?}C$8Een6_>@N`iVa59#|!alZgNWzFvh32N@V*s|Fw`H%o@#T_3s)~b_|
zn9MYn;tCm|1i`%+7ES4C_F+7LbX~9%o+2zNuf+&=X)0wuX%{@R5|j*{xio5ST#ybR
z;A)Rhjf><qIXu*()Otl=_-3Tj5rZ-7;>Rs-+nC<4hjtY0RkLLyq|ap0b>X*}<wIb+
zy-apf_|1TSV(*EY901_pLCBpSCTC%khzM8sQ8!;4M^eWeEHVEkA)7T19u}2l$I`QN
zTePN-WA#&}&diDs&x|@9SeW%<p^3t!7)@#oB#(~-4f4zQ?@bxi4y!BDqJDbnZ$V*|
z?dm;G?U{3XX~3Tbg6Mfs3hU!mI2o%4LK2WO#xBI0|IA*LJ+@${7es(mbd<hBU&KC6
z0cRi9H%y4;@V-DFE(*@ixPeeK4~vUWFEj9syN4`%?gS5i-S`S|SCOWtgtGx+2r_1l
zGM%TqkkaXTc~7yT<$8Nhk*4+f7)ZBXU+>Kq9kL5uKLdHp(TRn;I&9R0kEP+kHl_Ry
z0}t-bxm5E)4(xqt#l)@Gx@?$mq8;*lID!5_xTF>&oOAWaxY!a`wx`-9CCDaObSDNk
zI8d;>KiN?dih`{r{GJLqL7gHKKCksIL+mgaH%d@?Mh~SzY&LJ($Dle;Gk$mgWCVc0
zx4N}Irc(jEN6I?_eZ4qLSJ|76xq0A)f7wUdQxR)TB#rzLA-Mz%F}bB!pq%2t>jwBj
z^XI+_jPeyJBY6+m9kOIju#jT!mf-6M_6(wjIUk1t(VFsodWeaXhZWy-x>*qSO)QDn
zJjYld5Mz9luA)w~#s0o7`tmq}cv}1X8UkOe1l*ekZA|dy(Oon}6u0FuP>qc9YR-nV
zqNtN7`w_qQ@2t5?mo(qTxZ1EP1^>XSW@uFVp>Gj)p4+j&%4dXE&QRH)y~TjJi^Vo^
zc;qznLcFdx15t8DY8g}NpUa~_sL$HBG)|t&6nYeHygg3DY0OkxUZ`r!G-JMUpkPm3
zhsjFNv=oW9&zy6BR>zPQgUgb`m`3q9hi5=hx@6JR#DYP>^=|7;hPi$0t0~=B-(eDG
zIS(4PQ`}!TgRxi~hgWspERs}$3NDW~QO+?@-ZG%aj-fn7AO1^`FThwPCuJ2J+i_EX
zX|Q3|F637p_@WU2)7SqOWwLG6h{+lRWw+PvJlR?xR8wQ=z|TF#wUrFzQ$JOI4Gks#
z#pc3R-!v`rk>9T!0L+2r<$^?*@L##o;lCvO!S(?zT$L2)Z@OTWPjCv(npE?_zZ{eY
zgc?EFF7AVl>CZav0c%dIdQ_Duq<6(eU@{oJb0+Quq`fSi#Zm6nkP={Kw!^9ZHqvGY
zi;7zGu=tXnen&zr;WpBt2#fK-HWh!N0!N^UjKz&^o5Nh)_zzY#hL{G+p>=Ald9|An
zovxzK+zWatSd`HB21N^c?jMC5!=Yr<1PVvA6p?Y<Z2#f~z|d1NY9l&bOG(P^h^cUZ
zP10*$EGpqod(9k5hR2P-c+G51#(p!4nUD?$F%p!r$*&QMVn$g+{(hFcH5>_P32o?b
zvAWBmeOB}|Z+_F$zEXLUY*~DDtbD+~YECt#7{ShCg4Z~KWp*mFl3T%*BN2Vd1pk~2
zdfuB1T0o=!6L6d}!o9JIyAQfqc@u1nj|Kniq*0U+ICzr{x<P@bGfK_&Ge9u!0*{&T
zlKmFBP;5LZyp}Sre6;eIa;!9&NPJg(ZtF|9G|SZPOu6R7tyIj?@3q<=g<`Wy`FH?g
zvxfweYlm!A$`IVnS%r?i#nlyDxW1-?*$i6=-BMBy?wCZ4w;>d9-0J2?idbeKTu{W5
zN~R4%^T$k`rfA?6<%ltJr^hLn?bCJ*LW#N1f<$6GeUUMJg<^>0piWB*MB1}NQ7EXd
z3w4rCN?9Zv45MYJl@YZ8#H%uSOyOm5)PR~hSz9Hp1o?1m3;pF-dSS|<Eg#_qi*0E>
zqY&12|L?g55fRc|HbYO)q15w2F)q|YLLxC-e*E4TaJHmiZ<JbAy~?4?(p<vd1Ti{*
z5Xlwm45m=P3>3a5{FO|U070S90Esp-H2X=wDNmcnl&0Ws!dd_|W#NRG)6@$p6eA#r
zLIDAeFQd65rc)BOMe72zCc%HU9yK<;!&<(Sj9xPr&Q6<2$zyt6GXrRHrTNeohJ!n@
z+DRiw<if*CmsOWRQ_!H}W}7TFp;p1!L`y;a!zI8UyFw17xEK{wCX4sdC8+NV42dVc
zCdeVkQimEC=9h7sitd9>Y%8laseDRaol+x5ZR!?z35g0`_uycZVKDPK$r~XT^i~1E
zF%W@;_?xNAv%ah_cM!bGCe5{(&2l?p0ze=l#)SVPzdT09JGFFG&L|VULNLKqpdL=?
zz&XY#p-5<sM2x@4{O7g%ZpywmGTL<-@C;WxZM&l!yMuXkmcdfi1J0fv?}%xnC8Cxz
zlR;Eh9u`wu&P#bsY%VHc<rsQ6W-pr)Nb;tTZX^c|mq^2)5V~R$IzhvrKic29|2n!X
zlp-PIo={M{QHEn3G3b|}$4E_%++|jDf#?#>(-a>}5yz>Ug9jir<Mv;rh@%C3$1jv>
z4HsZ)n${FdF$~USDKecnXGH*zF4r8dliUB)agCD~kEhW8O#ujgGA%)x(KZ6Y#z<Ny
z<;g4940W5uD0HvKnn7wo0&)|RK}kNGE+RQJAu?NPfppDDi3+z+YF|57N=b_ck%hd@
zWx(pOV^lyoKExRhIUznJ+}S-(`&!6693I;axly6eOn+4BS{k!z83CV$h6T~+M%eQ$
z@z7_Mz$kRotV+Qwno&us+K@N#19B$BM$P5g)_(I`F*KU70E(jSuXz!SxD;|NVs@!l
z<Uqo6(4ypen)sR1bJ?V6(7zTu3e6o5*bPvMbWe~FbWa$?u2(5h7uq_`#p14cjH4Vo
zsREr<dd*#aQo0W@QtFos%8j@?$zU5LX+Cz#hro9~HJk5LDR~Q=Y+w#;wG;8;Dnc3y
z#NZaU=O;m1oKaHA&q>a3nNDOz-f(Hhen*FkW-baCaX)qRc$*LHl`b%r=bqwy7DG2i
zrXBUKh}S;bWeaQ`jMqMAN@%>2DiF1tL(42#+bwh>A9^e1_Nh7<=1y*N<-V<soGNg-
zb~%v8$&%f-dJ@_^<MVQ#&25Bs*|QBZl*<`f(2O#9WMo(l%McE~47Vf5!x<)rWE}Is
z02{f1wAbQ-s14p8>g&V>s{w8K>KX2nU!xnD62+|lP3Fm?^n`{%haz;U=wZn3!^*p%
zAy_9fZjPx_d!X<z`MDUZ(JKTf3bZlfqDdjsQpwLpjHzMv4TC>XMu7(A+eA7LIGF6l
zyynr;jU=}L0W5gg@q}XIWWFg6U;|iM9vN~%$d}YkC6kBS5J+1o%apyp4gifYRsBRi
z_N$O7C8IF_HNyzwMd<=uVG=@zfP~;=S(f(5Fo@d#Hnv#}+c0PEq^hio7xlGXiKp}U
zrxwxBON240_)0wYrkZSMgURn2aaWZD$N|#xFIp_%e!U73WGd42fR0Cf9TpIs69)oe
z7Z;^qmreOl1ZXA4W)5eIT>6g&z*QO#S+D)Lzk<IMx$v;R7Q{&f4mrk+vx2`Oc}9pT
zISnB?C87`E*Qp3|kenPOMC?%r0vrj%nVh?C+c_4f*Lnq|pfT<At`ns^v<fMSjKsCi
zf(wd+LdQ5eLYT1Np%Mc{>IL7SQCkE}G#w^|Gs*5XS+2{2LusFSC23oCa(~g@*wDhu
zSDJ{_$$e=5IngM>FDGyR)e(Vt+-uP*>;)fU32ltR^36D&QeUKm$at^N&2%wy_$_hf
z3Y;l#`Q+gG3|7T+eqc9clR6jTrGk)>GvS@g_-xM>{^;Ncktwxe&_Fv-BnN3;3^c=*
z)G!?y(?sAPMUG7UA#=jLo-I<~Itkkd-}ZDIIomAE39$sxby65WdqdHBA$I|AP|Pnh
z1&y&|4<?dSda6m?NkWF;^1EUgVhxYiCW_q4bTt)SznYE=<*v^o$_hxs3xb+()t_AW
zBC<uymT-8o_M<)qL@M4Q%#ZajdxFE%9)4vQ8Q-#aGy{7e!LA>gdI5n^jZ&jMgIuXT
zYpG<=jRvVA{@I8np#qDpz;#Emq}N*fWquvUlt^mXvfl&#S!D0VnV^8iSE__)G~V+K
z)EJF#Va4-TjojQHBCn1<q0=TbNxkbivxOHw+u8DlOPW;jLMqN4b@SW~VPNkhY6U(X
z;t@@)kGO;xDmIta<9V^Bh58LjzCXsrSE)IiLm@Q!M*$Q^?Oz-6L&!Z$!VjecCj_D7
zj6m=kEFrPTctmkJh=OS_zS4ehl!V}2aXbH2vAWRNQ7#rP&~_~5FXzR2&R7hJFnW@&
z3{Mwp3XGEr-Sy!mibNFYONEbGgNM&2Fi~>+wHPkeG0f<ScH$%|igwZ@c=cM3Xcdds
z8@Z?z%NqIL>!8t%dK0&VN_z9c0VPB-@svA4R;599?M=npJ?W;UmF{7h_wwjbKqqv)
zLA1(w4m1KQj_zR@+?5AzgF;LTOE|ed3Jb_rkn{gB1EW6Ub_5$5#AEo1en%Q%)JX1O
zqewl3tOQdf{a?6OjA|*^H#G9g`cbH><r-p&t5F=+H55AuN%IfXQAD*k2_pt<@~>Si
zH#LX_iI~5_%o;JHAEE_Ca6!cp{HvF7`{<AmU_AdGRd6um9%k+W4Lb0f0rZ<B%x?*y
zx5a{1bKw~YZ>y3(KBKfH*$}Ar_~2pL`=oB!5L0XU5UAJq;9^;pH^^y~w?Sj)BP#Eh
zy60WwC#T+Vq0^iylu94ox<7E9q~>Q#zTS@#(%_yR^7!69`#;Te9pKgari+-NJacK^
zpd$?I)sSDZi^zJ7U_2H4r^$q&JheoQDzFIGxD>JcdH2Qqd5s`*WKE%7==H6H_Q5>`
z1gDEAMUMbjzP$UezPt-WzP#uQ(?S1qBK8&Eq(x>d0(luL?1FP-Tl}+SVR_GyOO<EY
zFcUVRUW%zq6zyb45@8wcVh(&IXiN4&B`Qn${Tiw6)T#`Q>T+48MgN-ln>4}K>p{(V
za#qNK&}`XKsF&uFSIxa9zd$mKm$Tl=>7jcZ$7>g3Hb3G(-bP2tSJ^bb3~sBK_KTk-
z%b}NpFrL&%8h!=jfxMJC|8CP?h9@Bx2!IdFvVx?T2=!9^*QVFkXT=T{ZehHL?b@z7
zF|wk6$G$F2opn+<0(24{<pG;=Xj&92Y#ZYxKFSO}8YaXj_&0BB_`%NF!4B|Q1IhoI
z@;4qWqZ~{@oswsUJBmkyyAV)=BjiNjCBfNMl8y_Zxu`E|3b3A|to&I>h<6l-{8=Y-
z|3LydC4rwHFR|V5pMl5)R7@`UD4U#FE#~hj3M#D5pfgpK=6p(}76tW)N2N!aC7lTR
z$3M$#xa3NbVH>_3%W*-*o~gn^gU^T95hCX*6B3!DGU^xcyHj;YxcjLGWEXdY78hF*
zQcIw26G6^JSb!7eDIzkTh!C)vqx$4Mz~$swVfGl%lwHSkFu2k<xaV5vIQcRtDB6;1
zjFXqF3(->;wFeciO8zYA5Er9pbtD~~6jn>%zupGqv>_NJ<(^5zYlYQPPPgIlJ7QmB
zD$;#tt8El4_Ap~bG+OW^V<me)SE}%3X$aQ^j0Lj_yO(80!RJXN(c83^pV}(Qzsr+d
znk>MQ^2Sh(XPAp3I62*Vp`J|C2wk4OLgp2ztZ?&-aYfRG!NrB*j0i;<5{cGQithB4
z<VM1`y87ozkU9}Gu=L7XiDib>mXMbf-akc`PLG&ror#{H%|+&qaN;X2d=ULag{|`C
z<t?LhP?{bpQgXD0QVQU}ocy9PP@wNMRkoyMZ>*Gzyqz9qGr1Y|tIQ@6zVc=1{b{e%
z37fDSM=?;<EP_FK49c)g39G_FU9YiGdAGdM=QogL))1bp{Fqq{BrO`kr-3IcM|3a$
zrtO+>SqpR00Gz1Woy%OKO7*S^Gl``|;_wFbRW{a+KZCJQU+kuYX8sg5Qx9x9aYPfX
zttrB0FYb#Wf|ffr+xDYhm=C#86X3{bE;RehQQ6mrJ}HF@3h-U!Sj@ObY*0oqcGlw0
zg3eHdA+5o5#xEeYg`Qw&Ny_8$voT%~jBHXN+LxJw=#?QcG*DL2*MC#WN?A}stj$IL
zQWHB`N3(IK2u5g=Fpf_N`At=6QcqdQR+uZRwnVCQGytY_K8J}3|J)+eKITxo{d1)B
zJMB$y6m7fy0t>p*_L?L5{5p!YpWAY(r(7rVRmn5cN@<xD`L9L+rHWA5ioima0|12q
z@BYI@7_VYeGz)gFm)Rn&y!-;Nts!~$6IGhRhF^<TD#nXubzI(-3_R8ci&a)SnJ5+Y
zf5rQ9@18+fgi>Hl$A@xr?Yzq?dq$t@Q!B-xTE<9dz!WUacjqfI?-OM;?s_UHD<Q6T
z0w~i)nbjN1fO9b6;KuSN<wMTxTBAI-N0Dq&Mr;^@B_a*Q@(2>>H*dHIir|o03Hxxi
z(-0r|Se`scj;nsG8(a<Fz1v+WwFZt#UVO`suCeOxnWRB8EvUBHZp1G2BJN-EGdMd2
zp*WR-k~tDWV*n+|>`K7STSBNSpag?0A=C`e@F7}_soj6eRIN4)&Dt}jre6wItwy=n
zQ@E@FmR4xaBl1f+Ob?(LXg$n#g~!sF1l?y(E~MWUUnZ&GD~)z9?{K!j;uL%R7$&RP
z0Kpm%g#7mPH<M);t7KdFAB}zaKxvkI@U+pqdO#^PqQy7FK4XedJpl7>XYqhwJpjvZ
zT|fv1Yk~>}t5O*Ts}^bxsT*N8X~{#gsZK=OZ)rxlI?3)rJGj2WP>4Y3oE<uq((<9C
zds!K?jT9GF7TvhkbJyA5(h6GD&;QoPYQ2VY43xG9fU#Cs;9ATUfU>rfx8{`lNz0e{
zN>dmt#WMy<TUn#-U9-`4=$z`#jRU1CKg5&+E~jCuN0OAA!XPXpMCmP@Za!MfHAAZg
z#`oU&&jRd1DVO^Fp{vD(({Vvr#rKzIfVq0g#eM0@6`csUJ4I6xU}lffL&iqbjSDT*
z+?#U(V?7pNu`KJ5Wx;_-D=1~MsGYeoh?{U`Il#M>XXEa~t`_InP2s5e!*RYjVyIJ^
ztyC=@vGvT=U3k>^Te^0DA6qw0@v>#uuMsqDKY*sXL?m4ga37!tSVF2UQEVSsE*Nz4
zoP|rXqVknC%G3k4Cu;(*W*yW1g9LJvPQAg?Kn1)YSif`hkZw350UUo%D73(_PHbQ;
zF)MLdB<5nU4j36+9s4|zZ<zP%)bgPafu?C@{025H;OeGEWzk<+tPNSE!bf^r4>V0d
zxO&;Be&d@-0Zf{?7&L2wC@_%tN)zfY^+UDF?@m@zsE<^aVEwEv5rRn@rGiN-Rf0*Y
z4An*MKmZoUU9-MwP^+6XC25&N7r+su2M`A9E0lv?Ql#C>kUp7Cam@uy%fI0^144jy
z=?@9ImhH?xii^oQ0SdcRU+Y*co&>S9S35rTr>C%3si!cW!9oJFkF=@j+YN*TWm0fl
z6X_{Tn&x|qoeGg|99@MKI_y$>r0&w$-n%_dqQ}jj@`~kU!vx<61yoQX6Vat*VpJ1R
zc6-UvN6kC_btG_$Qr?@%!jm6;q>WVFq^Qy@!$s#17PA57E6UX+siW0urJQ|*H%NV?
z4a?|auuH@X6m9(`2ZLzX?-Id~c81zC<|q~lKU_ZGswrA&bmJ_5`np7n3Tb)4zxsRP
zrWb8V@yBF!$xClFg$1zGlz|hpEPqbpoR%Ck5G^QgVbUZ9fQ<{RwblP1|8mr$s$1UQ
z9C>wQOvaYW&^L{B4#?_?=$xabupe)y^pM+{P_-#v9Uk|~ytQdND<t~PKNbh<T3oKW
zJTs<vC$d7j0@V5F&?G-4F;aRj20WhMR|j{Ftv;I5X)e*C=-9ewG81L%+KjHb@b~xK
zf%d3F)#Jqw|MS<w)w%c0!lyOf_@#Fi-KCWYcG2zS?WY&p=gqs<Lw(E35V6*~?Yzc&
z(~HN4ep}<Mew$j~1AbW1rm~jz{oiHV|ILCj0;}c>D&Tj<Pr!f({50Lr+Ca|E+Qy#F
zz}n8}@2YL!E)M_uMLMwREMg>qyBHw&|7#b6ei<-%Ba#yEVzSU^a>^a!<<)s2uVL2w
z=f`F<=zZII<A>E{+lHkw+Gmi%f*F=kCSRoKHK>wRES{>QV;mA*dKy&|=6O?)D71-v
z;Q^Zc!Ja%OG|lL(II-DGJB>Uos6_p<XE>BwHHRZ|s|Wyff6=cRqqm5L-zNU?s{FdX
zUjyO0=VgQ(1itYSp0}Nf{NBRgl*{%Ta!uT|wgxGB>jKNOJ5XeVVcl>Db)Q6gBbT}8
zNQ$eud@ZLN#9;7_)KPwv-7P7Z52|F(KA4sr@=zV1Y(navnC2cPsIcV>ajfT=vkdr5
zrR*6>R?L8iYfizl_YzOrd9dmbng|~sjn^!C_K=ovQ&Lc9SAJs4#$0@RD?0!#{Qs{@
z7BB7QH1mMyf(L%dj_{umre|aGzW@Uw>)(!ag&wPU;FbqJuHj=YwM@R3PLJ9KsLR0<
zD6d#v4yIU8w>ufi=4r{;2x~rnfqMfHJKlT(Bom*oYPjvNGF?7DPt*-OTm7m-6JXvz
zwcs67gOGWhZI<q-T(p+euA$DgE2!Pz?|DF2Zt?h#qV}^U$o5H&@eli2hM4yCP=2vm
z$yTKLNB)goS@cTvc4ujLpk$SG(^hoW!82wMt}j&%w;7zTg`#HtQ&(=mVn>(D|Jmky
z<|z?f*L{<F!#tu-eRpG*uWh|KdoG*y4-t_kd91(8B<`G!`H-m{78SWeAu&=@+VMks
z;|`{)?b|}sTr{I%wk){Vt~2Yr$ZgHjcB?q{&TZPNCGm7Z&ets)C9`h3@EF~#^}M_O
z%3r^`=S#lZmc|Ev*Db9N`tDp{Ww@!WsH!4r_Vgk<ffW{N-<TE~Gxgc7=Z)%+U$vC$
z#}Tg2FS(lA3mY$<Tg7(Z<GGdl6`6OvocPW9vE9+vX>avK57o{%?!0kTXv3sW_ARv%
z9onZ1Z^S)W6qd*Q)b@G&g8E;xKh~fAc~hr;;^ozTX-)QjQhtiV5;h}~E^y~P_A{wq
z5ecKQoKO|ujcNeu={YcsAbL75w;-LRgRT+vL=j|-dw|FE;67gj-5m5|CJ-jQ2OhhH
zcIX7UX7u9-5Sm%I!J07+CqOp=eb*4eg!#ZA2U?H5hX~yO^!3mP1K5D8<bVbg!&gV6
zYeio$htR43TwD$HI>z!jbW>34PlOo^4B@T}3>dX3x^~pU5n20AcO>o5qB6jn6&Sk=
P3|v6i0Ibg^d4YHUz>vGV

literal 12355
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
Di5_za

diff --git a/public/File/บัญชีรวมคะแนน.xlsx b/public/File/บัญชีรวมคะแนน.xlsx
index 3fda2b8dce8cf1e641dc3a6131107c751ad7b96a..7da415c4c1c56fbb580b1d88efc7433957fcef03 100644
GIT binary patch
delta 11895
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
T^8f%iAE(a8Xzb%#0O0=sxJd1+

delta 14204
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
b{GGc~mV<vu>-`>Sgi!1+)ri88-$(xkC96tl

diff --git a/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx b/public/File/ผลการสอบ (บัญชีรายชื่อ).xlsx
index 3e012c58cd1ee6c5065d59091d60bc076fa55184..2e584fc5748adf71083fdaddb103fa5ae9b5fb15 100644
GIT binary patch
delta 18897
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
D1^7f8

delta 16662
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
Q5(2**K(dN+#m}?<1<}&c_y7O^


From 99b98c7ec2d042e4da3e5057ead0206549103d12 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 18 May 2026 15:16:05 +0700
Subject: [PATCH 108/125] refact:or(compete): replace file Score summary

---
 public/File/บัญชีรวมคะแนน.xlsx | Bin 51260 -> 50864 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/File/บัญชีรวมคะแนน.xlsx b/public/File/บัญชีรวมคะแนน.xlsx
index 7da415c4c1c56fbb580b1d88efc7433957fcef03..9c555c8144baabc03319805d94b2182b73c19da9 100644
GIT binary patch
delta 12008
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

delta 11357
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
KcC7m^oc{-pKijqd


From 233118e4a325e517de905b18e02520c598ed8b58 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 19 May 2026 10:08:22 +0700
Subject: [PATCH 109/125] faet(compete): Trigger fetchData on socket
 notification

---
 .../03_recruiting/views/01_compete/Period.vue | 12 +++++++-
 src/stores/socket.ts                          | 30 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 60419cec2..925462154 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -1,7 +1,7 @@
 <!-- page:จัดการรอบการสอบ สรรหา -->
 <script setup lang="ts">
 import type { QTableProps } from "quasar";
-import { onMounted, ref } from "vue";
+import { onMounted, ref, watch } from "vue";
 import { useRouter } from "vue-router";
 import { useQuasar } from "quasar";
 import genReport from "@/plugins/genreport";
@@ -12,6 +12,8 @@ import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { calculateFiscalYear } from "@/utils/function";
 import { useUploadProgressStore } from "@/stores/uploadProgress";
+import { useSocketStore } from "@/stores/socket";
+import { storeToRefs } from "pinia";
 
 import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 import type {
@@ -39,6 +41,9 @@ const {
 
 const router = useRouter();
 const uploadProgress = useUploadProgressStore();
+const socketStore = useSocketStore();
+const { notificationCounter } = storeToRefs(socketStore);
+
 const name = ref<string>("");
 const year = ref<number>(calculateFiscalYear(new Date()) + 543);
 const order = ref<number>(1);
@@ -680,6 +685,11 @@ onMounted(async () => {
   hideLoader();
   await fetchData();
 });
+
+/** Watch notification counter on socket */
+watch(notificationCounter, () => {
+  fetchData();
+});
 </script>
 
 <template>
diff --git a/src/stores/socket.ts b/src/stores/socket.ts
index 854a281d5..b7951a9df 100644
--- a/src/stores/socket.ts
+++ b/src/stores/socket.ts
@@ -3,6 +3,7 @@ import { getToken } from "@/plugins/auth";
 import { defineStore } from "pinia";
 import { Notify } from "quasar";
 import { io, Socket } from "socket.io-client";
+import { ref } from "vue";
 interface sockeBackup {
   message: string;
   success?: boolean;
@@ -10,6 +11,7 @@ interface sockeBackup {
 
 export const useSocketStore = defineStore("socket", () => {
   let socket: Socket;
+  const notificationCounter = ref(0);
 
   async function init() {
     socket = io(new URL(config.API.socket).origin, {
@@ -46,7 +48,8 @@ export const useSocketStore = defineStore("socket", () => {
 
     socket.on("socket-notification", (payload) => {
       let body: sockeBackup = JSON.parse(payload);
-      notifyStatus(body.message, body.success);
+      notifyStatusWithProgress(body.message, body.success);
+      notificationCounter.value++;
     });
   }
 
@@ -67,6 +70,27 @@ export const useSocketStore = defineStore("socket", () => {
     });
   }
 
+  function notifyStatusWithProgress(message: string, success?: boolean) {
+    Notify.create({
+      group: false,
+      type: success === undefined || success ? "positive" : "negative",
+      message: `${message}`,
+      position: "top",
+      timeout: success === undefined || success ? 3000 : 0,
+      actions:
+        success === undefined || success
+          ? []
+          : [
+              {
+                icon: "close",
+                color: "white",
+                round: true,
+              },
+            ],
+      progress: true,
+    });
+  }
+
   function fnStyleNotiOrg() {
     if (document.getElementById("notify-link-style")) return;
     const style = document.createElement("style");
@@ -89,10 +113,12 @@ export const useSocketStore = defineStore("socket", () => {
   `;
     document.head.appendChild(style);
   }
+
   (window as any).resetOrgPage = (type: string) => {
     localStorage.setItem("org_type", type);
     window.location.reload();
   };
+
   function notifyStatusOrg(type: string, message: string, success?: boolean) {
     fnStyleNotiOrg();
     Notify.create({
@@ -116,5 +142,5 @@ export const useSocketStore = defineStore("socket", () => {
 
   init();
 
-  return {};
+  return { notificationCounter };
 });

From d978ba870baf3a5366461a54a3d3aca33085d6a9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 20 May 2026 15:59:10 +0700
Subject: [PATCH 110/125] refactor(placement): display columns posMasterNo

---
 src/components/Dialogs/DialogOrgSelectEmployee.vue | 8 ++++----
 src/modules/05_placement/stores/storeSelect.ts     | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index 80d5950f4..b9a7b1ee5 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -232,7 +232,8 @@ function close() {
 
 async function getDataTable(id: string, level: number = 0) {
   showLoader();
-
+  positionNo.value = [];
+  rowsData.value = [];
   const body = {
     node: level,
     nodeId: id,
@@ -265,6 +266,7 @@ async function getDataTable(id: string, level: number = 0) {
         posMasterNo:
           e.orgShortname +
           (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
+          " " +
           e.posMasterNo +
           (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
         positionName: e.positionName,
@@ -302,9 +304,7 @@ async function getDataTable(id: string, level: number = 0) {
       messageError($q, err);
     })
     .finally(() => {
-      setTimeout(() => {
-        hideLoader();
-      }, 1000);
+      hideLoader();
     });
 }
 
diff --git a/src/modules/05_placement/stores/storeSelect.ts b/src/modules/05_placement/stores/storeSelect.ts
index 48020472d..c07f26fcb 100644
--- a/src/modules/05_placement/stores/storeSelect.ts
+++ b/src/modules/05_placement/stores/storeSelect.ts
@@ -14,9 +14,10 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
       isPosition: e.isPosition,
       posMasterNo:
         e.orgShortname +
-        (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : " ") +
+        (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
+        " " +
         e.posMasterNo +
-        (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : " "),
+        (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
       positionName: e.positionName,
       posTypeName: e.posTypeName,
       posLevelName: e.posLevelName,

From 019b43b450621587a3bf52a83c452c84271aa53d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 20 May 2026 18:09:13 +0700
Subject: [PATCH 111/125] feat(registry-edit): add function SortDataByDate

---
 .../views/edit/components/Table.vue           | 89 ++++++-------------
 1 file changed, 28 insertions(+), 61 deletions(-)

diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index f470254c6..cef3e5e81 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -437,66 +437,6 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
 /** ฟังก์ชันดาวน์โหลดไฟล Excel */
 function exportToExcel() {
   exportToExcelPosition(rows.value);
-  // const newData = rows.value.map((e: DataPosition) => {
-  //   return {
-  //     commandDateAffect: date2Thai(e.commandDateAffect),
-  //     positionName: e.positionName,
-  //     positionType: e.positionType,
-  //     positionLevel: e.positionLevel
-  //       ? e.positionLevel
-  //       : e.positionCee
-  //       ? e.positionCee
-  //       : "",
-  //     positionExecutive: e.positionExecutive,
-  //     amount: e.amount,
-  //     mouthSalaryAmount: e.mouthSalaryAmount,
-  //     positionSalaryAmount: e.positionSalaryAmount,
-  //     organization: findOrgName({
-  //       root: e.orgRoot,
-  //       child1: e.orgChild1,
-  //       child2: e.orgChild2,
-  //       child3: e.orgChild3,
-  //       child4: e.orgChild4,
-  //     }),
-  //     posNo:
-  //       e.posNoAbb && e.posNo
-  //         ? `${e.posNoAbb} ${e.posNo}`
-  //         : e.posNo
-  //         ? e.posNo
-  //         : "",
-  //     posNumCodeSit:
-  //       e.posNumCodeSitAbb && e.posNumCodeSit
-  //         ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
-  //         : e.posNumCodeSit
-  //         ? e.posNumCodeSit
-  //         : "",
-  //     commandNo:
-  //       e.commandNo && e.commandYear
-  //         ? `${e.commandNo}/${Number(e.commandYear) + 543}`
-  //         : "",
-  //     commandDateSign: date2Thai(e.commandDateSign),
-  //     commandCode: store.convertCommandCodeName(e.commandCode),
-  //     remark: e.remark,
-  //   };
-  // });
-
-  // const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
-  // const worksheet = XLSX.utils.json_to_sheet(newData, {
-  //   header: visibleColumns.value,
-  // });
-
-  // //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
-  // XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
-
-  // // Create a new workbook and append the worksheet
-  // const workbook = XLSX.utils.book_new();
-
-  // XLSX.utils.book_append_sheet(
-  //   workbook,
-  //   worksheet,
-  //   `รายการประวัติตำแหน่งเงินเดือน`
-  // );
-  // XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
 }
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
@@ -931,6 +871,18 @@ function onCancelUpload() {
   excelPreviewModal.value = false;
 }
 
+async function handleSortByDate() {
+  try {
+    showLoader();
+    // http.get(config.API.SortByDate)
+   await fetchData()
+  } catch (error) {
+    messageError($q, error);
+  } finally {
+    hideLoader();
+  }
+}
+
 onMounted(async () => {
   await Promise.all([fetchData(), fetchType()]);
 });
@@ -966,8 +918,23 @@ onMounted(async () => {
           icon="mdi-sort"
           @click="modalSort = true"
         >
-          <q-tooltip>จัดลำดับข้อมูล</q-tooltip></q-btn
+          <q-tooltip>จัดลำดับข้อมูล</q-tooltip>
+        </q-btn>
+
+        <q-btn
+          v-if="
+            tabs === 'PENDING' && statusCheckEdit == 'PENDING' && isConfirmEdit
+          "
+          class="q-ml-sm"
+          round
+          flat
+          dense
+          color="indigo-5"
+          icon="mdi-sort-alphabetical-descending"
+          @click="handleSortByDate()"
         >
+          <q-tooltip>เรียงลำดับข้อมูล</q-tooltip>
+        </q-btn>
         <q-space />
         <div>
           <q-btn

From b03fe7d44aede16544681cefde04cc9031cd8216 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 09:53:21 +0700
Subject: [PATCH 112/125] fix(placement): send posExecutiveId field in payload

---
 src/components/Dialogs/DialogOrgSelect.vue           |  2 ++
 .../components/PersonalList/DialogSelectOrg.vue      | 12 +++++++++---
 .../05_placement/components/PersonalList/Table.vue   |  4 ++--
 src/modules/05_placement/interface/request/Main.ts   |  1 +
 src/modules/05_placement/views/03_receiveMain.vue    |  1 +
 .../05_placement/views/06_appointPromoteMain.vue     |  1 +
 src/modules/05_placement/views/08_otherMain.vue      |  1 +
 7 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index e3c5e4634..e0173febc 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -512,12 +512,14 @@ function onSubmit() {
       posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
       posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
       posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
+      posExecutiveId: selectedPos.value[0].posExecutiveId, //ชื่อตำแหน่ง
       reportingDate: convertDateToAPI(datePos.value),
       posmasterId: dataPosMaster.id,
       typeCommand: type.value,
       positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
       positionArea: selectedPos.value[0].positionArea, //ด้าน/สาขา
     };
+    console.log(body);
 
     await props.onSubmit?.(body);
     close();
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index e54741069..ad1028738 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -165,7 +165,9 @@ 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: DataPositionNo) => !newUse.includes(e.id)
+        );
       } else {
         positionNo.value = posMain.filter(
           (e: DataPositionNo) => !positionUse.value.includes(e.id)
@@ -241,6 +243,7 @@ async function onClickSubmit() {
         posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
         posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
         posExecutiveName: selectedPos.value[0].posExecutiveName,
+        posExecutiveId: selectedPos.value[0].posExecutiveId,
         reportingDate: convertDateToAPI(datePos.value),
         posmasterId: dataPosMaster.id,
         positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
@@ -290,7 +293,10 @@ watch(
     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 ?? 0,
+          props?.dataRow?.nodeId ?? ""
+        );
       } else {
         expanded.value = [];
       }
@@ -345,7 +351,7 @@ function onPosType() {
 watch(
   [isAll, isBlank, () => isPosition.value],
   ([newAll, newBlank, newPos], [oldAll, oldBlank, oldPos]) => {
-    const shouldFetch = (newAll !== oldAll) || (newBlank !== oldBlank);
+    const shouldFetch = newAll !== oldAll || newBlank !== oldBlank;
     const isSelectMode = newPos === "select" && oldPos !== "select";
 
     if (shouldFetch || isSelectMode) {
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 1d43085e9..1e151ee01 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, watch, reactive, computed } from "vue";
+import { ref, onMounted, watch, reactive, computed, type PropType } from "vue";
 import { useQuasar, QForm } from "quasar";
 
 import http from "@/plugins/http";
@@ -48,7 +48,7 @@ const {
 /** รับค่ามาจากหน้าหลัก */
 const props = defineProps({
   statCard: {
-    type: Function,
+    type: Function as PropType<() => Promise<void>>,
     default: () => console.log("getStat"),
   },
 });
diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts
index d28d1cbc5..d40ed1f50 100644
--- a/src/modules/05_placement/interface/request/Main.ts
+++ b/src/modules/05_placement/interface/request/Main.ts
@@ -152,6 +152,7 @@ interface FormDataAppoint {
   reportingDate: string;
   posmasterId: string;
   posExecutiveName?: string;
+  posExecutiveId?: string;
   typeCommand: string;
   positionExecutiveField?: string;
   positionArea?: string;
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 7cfd48a32..ddfa21175 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -382,6 +382,7 @@ async function onSave(data: FormDataAppoint) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
+    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 051985d84..e04778221 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -457,6 +457,7 @@ async function onSave(data: FormDataAppoint) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
+    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue
index 19ba41342..bfa730364 100644
--- a/src/modules/05_placement/views/08_otherMain.vue
+++ b/src/modules/05_placement/views/08_otherMain.vue
@@ -286,6 +286,7 @@ async function onSaveSelectOrg(data: any) {
     typeCommand: data.typeCommand,
     positionExecutiveField: data.positionExecutiveField,
     positionArea: data.positionArea,
+    posExecutiveId: data.posExecutiveId,
   };
 
   showLoader();

From 10c047ffe2d2df6d7037c3a600bb549494e2a529 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 14:03:41 +0700
Subject: [PATCH 113/125] feat(registry-edit): implement API sortOrderByDate

---
 src/api/02_organizational/api.organization.ts |  1 +
 .../views/edit/components/Table.vue           | 31 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index b30ec3ec1..d370d9b29 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -194,6 +194,7 @@ export default {
     `${orgProfile}${type}/profileid/position`,
   uploadProfile: (type: string, id: string) =>
     `${organization}/upload/${type}-profileSalaryTemp/${id}`,
+  sortOrderByDate: `${orgProfile}/salaryTemp/sort-order`,
 
   workflowCommanderOperate: `${workflow}/commander/operate`,
   workflowCommanderSign: `${workflow}/commander/sign`,
diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index cef3e5e81..b85f00bb9 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -871,16 +871,27 @@ function onCancelUpload() {
   excelPreviewModal.value = false;
 }
 
-async function handleSortByDate() {
-  try {
-    showLoader();
-    // http.get(config.API.SortByDate)
-   await fetchData()
-  } catch (error) {
-    messageError($q, error);
-  } finally {
-    hideLoader();
-  }
+/** ฟังก์ชันจัดเรียงข้อมูลตามวันที่*/
+function handleSortByDate() {
+  dialogConfirm(
+    $q,
+    async () => {
+      try {
+        showLoader();
+        await http.put(config.API.sortOrderByDate, {
+          type: empType.value.toLocaleUpperCase(),
+          profileId: profileId.value,
+        });
+        await fetchData();
+      } catch (error) {
+        messageError($q, error);
+      } finally {
+        hideLoader();
+      }
+    },
+    "ยืนยันการเรียงลำดับข้อมูล",
+    "ต้องการยืนยันการเรียงลำดับข้อมูลนี้ใช่หรือไม่?"
+  );
 }
 
 onMounted(async () => {

From ce9d8be1b25df65f6c844fc35d293b6ac36009b3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 17:49:36 +0700
Subject: [PATCH 114/125] feat(leave): add delete

---
 .../components/05_Leave/TableList.vue         | 99 ++++++++++++++-----
 src/modules/09_leave/stores/LeaveStore.ts     |  3 +
 2 files changed, 75 insertions(+), 27 deletions(-)

diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index ea81a2688..f7cb6df78 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -1,17 +1,58 @@
 <script setup lang="ts">
-import { ref, onMounted, watch } from "vue";
+import { ref, onMounted, computed } from "vue";
+import { useQuasar } from "quasar";
 import type { QTableProps } from "quasar";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 
 import { checkPermission } from "@/utils/permissions";
 import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
+import { useCounterMixin } from "@/stores/mixin";
+import http from "@/plugins/http";
+import config from "@/app.config";
 
+const q = useQuasar();
 const leaveStore = useLeavelistDataStore();
+const route = useRoute();
 const router = useRouter();
+const { showLoader, hideLoader, messageError, dialogRemove } =
+  useCounterMixin();
 
 const total = defineModel<number>("total", { required: true });
 const totalList = defineModel<number>("totalList", { required: true });
 const pagination = defineModel<any>("pagination", { required: true });
+const props = defineProps({
+  getList: Function,
+  rows: {
+    type: Object,
+    require: true,
+  },
+  page: {
+    type: Number,
+    require: true,
+  },
+  rowsPerPage: {
+    type: Number,
+    require: true,
+  },
+  maxPage: {
+    type: Number,
+    require: true,
+  },
+  totalList: {
+    type: Number,
+    require: true,
+  },
+  dataToobar: Object,
+});
+
+const isPermissionDelete = computed(() => {
+  return (status: string) => {
+    return (
+      checkPermission(route)?.attrOwnership === "OWNER" &&
+      !leaveStore.statusDelete.includes(status)
+    );
+  };
+});
 
 /** ข้อมูลหัวตาราง รายการลา */
 const columnsLeave = ref<QTableProps["columns"]>([
@@ -212,31 +253,6 @@ const visibleReject = ref<string[]>([
   "status",
 ]);
 
-const props = defineProps({
-  getList: Function,
-  rows: {
-    type: Object,
-    require: true,
-  },
-  page: {
-    type: Number,
-    require: true,
-  },
-  rowsPerPage: {
-    type: Number,
-    require: true,
-  },
-  maxPage: {
-    type: Number,
-    require: true,
-  },
-  totalList: {
-    type: Number,
-    require: true,
-  },
-  dataToobar: Object,
-});
-
 /** ไปหน้ารายละเอียด */
 function redirectToDetail(id: string) {
   const routePrefix = leaveStore.tabMenu === "1" ? "/leave" : "/leave-reject";
@@ -264,6 +280,24 @@ function getStatusColor(statusText: string) {
   return statusMap[statusText.toUpperCase()] ?? "";
 }
 
+function handleDelete(id: string) {
+  dialogRemove(q, async () => {
+    try {
+      showLoader();
+      const API =
+        leaveStore.tabMenu === "1"
+          ? config.API.leaveList()
+          : config.API.leaveListDelete();
+      await http.delete(API + `/${id}`);
+      await props.getList?.();
+    } catch (error) {
+      messageError(q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 /** Hook*/
 onMounted(() => {
   if (leaveStore.tabMenu === "1") {
@@ -313,6 +347,17 @@ onMounted(() => {
           >
             <q-tooltip>รายละเอียด</q-tooltip>
           </q-btn>
+          <q-btn
+            v-if="isPermissionDelete(props.row.statusText)"
+            flat
+            round
+            dense
+            icon="mdi-delete"
+            color="red"
+            @click.prevent="handleDelete(props.row.id)"
+          >
+            <q-tooltip>รายละเอียด</q-tooltip>
+          </q-btn>
         </q-td>
         <q-td
           v-for="col in props.cols"
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 6c0665db3..280ae58cb 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -44,6 +44,8 @@ export const useLeavelistDataStore = defineStore("leave", () => {
 
   const leaveType = ref<LeaveType[]>([]);
 
+  const statusDelete = ["APPROVE", "DELETING", "DELETE"];
+
   /**
    * ฟังก์ชั่น fetchListLeave
    * @param data รับข้อมูลจาก Page
@@ -264,5 +266,6 @@ export const useLeavelistDataStore = defineStore("leave", () => {
     leaveTypeOption,
     leaveTypeList,
     fetchKeycloakPosition,
+    statusDelete,
   };
 });

From d73fbf80f91ad4af7efcfdd6d7c0de18b12d7010 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 17:51:03 +0700
Subject: [PATCH 115/125] fix(organization): prevent displaying null for prefix

---
 src/modules/02_organization/components/DialogHistoryPos.vue | 6 ++++--
 .../16_positionEmployee/components/DialogMovePos.vue        | 2 +-
 src/modules/16_positionEmployee/components/TableMain.vue    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 4b9651bcf..eed16a660 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -213,7 +213,9 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
   return data.map((item) => ({
     ...item,
     fullname: item.firstName
-      ? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
+      ? `${item.prefix || ""}${item.firstName || ""} ${
+          item.lastName || ""
+        }`.trim()
       : "ว่าง",
   }));
 }
@@ -275,7 +277,7 @@ watch(
                         (store.typeOrganizational === "draft" ||
                           store.typeOrganizational === "old")
                       ? "2 (ปัจจุบัน)"
-                      : props.rowIndex + 1 
+                      : props.rowIndex + 1
                   }}
                 </div>
 
diff --git a/src/modules/16_positionEmployee/components/DialogMovePos.vue b/src/modules/16_positionEmployee/components/DialogMovePos.vue
index 97fd67813..96539fc61 100644
--- a/src/modules/16_positionEmployee/components/DialogMovePos.vue
+++ b/src/modules/16_positionEmployee/components/DialogMovePos.vue
@@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
 let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
 const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
-const columns = defineModel<QTableProps[]>("columns", {});
+const columns = defineModel<QTableProps["columns"]>("columns", { required: true });
 const rows = defineModel<PosMaster2[]>("rows", { required: true });
 const props = defineProps({
   fetchDataTree: {
diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue
index f56a0ab4e..8943c2423 100644
--- a/src/modules/16_positionEmployee/components/TableMain.vue
+++ b/src/modules/16_positionEmployee/components/TableMain.vue
@@ -777,7 +777,7 @@ watch(
   <DialogMovePos
     v-model:modal="modalDialogMMove"
     v-model:nodeTree="nodeTree"
-    v-model:columns="columns as QTableProps[]"
+    v-model:columns="columns"
     v-model:rows="posMaster"
     v-model:totalPage="totalPage"
     v-model:reqMaster="reqMaster"

From a50733c457f2ffd3a803c57997025d1afc05f7ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 18:14:01 +0700
Subject: [PATCH 116/125] fix(registry): icon sortOrderByDate

---
 .../04_registryPerson/views/edit/components/Table.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index b85f00bb9..c63eb6a5f 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -889,8 +889,8 @@ function handleSortByDate() {
         hideLoader();
       }
     },
-    "ยืนยันการเรียงลำดับข้อมูล",
-    "ต้องการยืนยันการเรียงลำดับข้อมูลนี้ใช่หรือไม่?"
+    "ยืนยันการเรียงลำดับ",
+    "ต้องการยืนยันการเรียงลำดับข้อมูลตามวันที่คำสั่งมีผลใช่หรือไม่?"
   );
 }
 
@@ -941,7 +941,7 @@ onMounted(async () => {
           flat
           dense
           color="indigo-5"
-          icon="mdi-sort-alphabetical-descending"
+          icon="mdi-calendar-export"
           @click="handleSortByDate()"
         >
           <q-tooltip>เรียงลำดับข้อมูล</q-tooltip>

From 7d46985570ace4918fac19fa600d6ecbbb56e5c6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 May 2026 18:18:40 +0700
Subject: [PATCH 117/125] fix

---
 .../04_registryPerson/views/edit/components/Table.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index c63eb6a5f..da180ac32 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -889,8 +889,8 @@ function handleSortByDate() {
         hideLoader();
       }
     },
-    "ยืนยันการเรียงลำดับ",
-    "ต้องการยืนยันการเรียงลำดับข้อมูลตามวันที่คำสั่งมีผลใช่หรือไม่?"
+    "ยืนยันการจัดลำดับ",
+    "ต้องการยืนยันการจัดลำดับข้อมูลตามวันที่คำสั่งมีผลใช่หรือไม่?"
   );
 }
 
@@ -944,7 +944,7 @@ onMounted(async () => {
           icon="mdi-calendar-export"
           @click="handleSortByDate()"
         >
-          <q-tooltip>เรียงลำดับข้อมูล</q-tooltip>
+          <q-tooltip>จัดลำดับตามวันที่คำสั่งมีผล</q-tooltip>
         </q-btn>
         <q-space />
         <div>

From 176b22e756088f57a8e1cede54d9f7033513fa66 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 25 May 2026 13:17:13 +0700
Subject: [PATCH 118/125] fix: await API fileByFile

---
 src/components/CardProfile.vue                   |  6 +++++-
 src/components/Dialogs/PopupPersonalNew.vue      | 16 ++++++++++------
 .../04_registryPerson/views/detailView.vue       |  8 ++++----
 .../13_salary/components/DialogInfoMain.vue      |  9 ++++++---
 src/modules/14_KPI/views/detail.vue              |  8 +++++---
 src/views/MainLayout.vue                         | 12 ++++++++----
 6 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index 72fe7aad0..2b90d2468 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import type { PropType } from "vue";
 import type { FormProfile } from "@/interface/main";
 import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
+import avatarMain from "@/assets/avatar_user.jpg";
 
 /** importComponents*/
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
@@ -91,8 +92,11 @@ function fetchProfile(id: string, name: string) {
   if (profile.avatar === "") {
     http
       .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `${name}`))
-      .then(async (res) => {
+      .then((res) => {
         profile.avatar = res.data.downloadUrl;
+      })
+      .catch(() => {
+        profile.avatar = avatarMain;
       });
   }
 }
diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 1b17f7efd..ffc275ee7 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -14,6 +14,7 @@ import type {
   GovermentEmpTemp,
 } from "@/components/information/interface/response/Government";
 import type { Avatar } from "@/components/information/interface/response/avatar";
+import avatarMain from "@/assets/avatar_user.jpg";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@@ -167,9 +168,9 @@ async function fetchInformation(id: string) {
       avatar.position = data.position ? data.position : "-";
       //ถ้ามีรูปเรียก Function  fetchProfile เรียกข้อมูลรูปโปรไฟล์
       if (data.avatarName) {
-        await fetchProfile(data.id as string, data.avatarName);
+        fetchProfile(data.id as string, data.avatarName);
       } else {
-        avatar.avatar = "";
+        avatar.avatar = avatarMain;
       }
 
       if (props.id) {
@@ -260,11 +261,14 @@ async function fetchProfileGovTemp(id: string) {
  * @param id profileID
  * @param avatarName ชื่อไฟล์
  */
-async function fetchProfile(id: string, avatarName: string) {
-  await http
+function fetchProfile(id: string, avatarName: string) {
+  http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
-    .then(async (res) => {
-      avatar.avatar = await res.data.downloadUrl;
+    .then((res) => {
+      avatar.avatar = res.data.downloadUrl;
+    })
+    .catch(() => {
+      avatar.avatar = avatarMain;
     });
 }
 
diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index 33ca37200..4fdec72a9 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -323,10 +323,10 @@ async function uploadFileURL(uploadUrl: string, file: any) {
  * ฟังก์ชันดึงข้อมูลรูปโปรไฟล์
  * @param id โปรไฟล์
  */
-async function fetchProfile(id: string) {
-  await http
+function fetchProfile(id: string) {
+  http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, fileName.value))
-    .then(async (res) => {
+    .then((res) => {
       profilePicture.value = res.data.downloadUrl;
     })
     .catch(() => {
@@ -403,7 +403,7 @@ async function fetchDataPersonal() {
 
       fileName.value = res.data.result.avatarName;
       if (formDetail.value?.avatarName) {
-        await fetchProfile(profileId.value);
+        fetchProfile(profileId.value);
       } else {
         profilePicture.value = avatar;
       }
diff --git a/src/modules/13_salary/components/DialogInfoMain.vue b/src/modules/13_salary/components/DialogInfoMain.vue
index 3da947277..c5bfc6762 100644
--- a/src/modules/13_salary/components/DialogInfoMain.vue
+++ b/src/modules/13_salary/components/DialogInfoMain.vue
@@ -52,7 +52,7 @@ function fetchInformation() {
       citizenId.value = data.citizenId;
 
       if (data.avatarName) {
-        await fetchProfile(data.id as string, data.avatarName);
+        fetchProfile(data.id as string, data.avatarName);
       } else {
         avatar.value = avatarMain;
       }
@@ -70,11 +70,14 @@ function fetchInformation() {
  * @param id profileId
  * @param avatarName ชื้อไฟล์
  */
-async function fetchProfile(id: string, avatarName: string) {
+function fetchProfile(id: string, avatarName: string) {
   http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
-    .then(async (res) => {
+    .then((res) => {
       avatar.value = res.data.downloadUrl;
+    })
+    .catch(() => {
+      avatar.value = avatarMain;
     });
 }
 
diff --git a/src/modules/14_KPI/views/detail.vue b/src/modules/14_KPI/views/detail.vue
index aede8c187..81d3df41a 100644
--- a/src/modules/14_KPI/views/detail.vue
+++ b/src/modules/14_KPI/views/detail.vue
@@ -8,6 +8,7 @@ import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
+import avatar from "@/assets/avatar_user.jpg";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
@@ -65,7 +66,7 @@ async function fetchEvaluation() {
       await store.checkCompetency();
       await store.checkCompetencyDefaultCompetencyLevel();
 
-      await fetchProfile(data.profileId);
+      fetchProfile(data.profileId);
 
       plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
       rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
@@ -81,8 +82,8 @@ async function fetchEvaluation() {
   // });
 }
 
-async function fetchProfile(id: string) {
-  await http
+function fetchProfile(id: string) {
+  http
     .get(
       config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `profile-${id}`)
     )
@@ -90,6 +91,7 @@ async function fetchProfile(id: string) {
       store.dataEvaluation.avartar = res.data.downloadUrl;
     })
     .catch(() => {
+      store.dataEvaluation.avartar = avatar;
       // profilePicture.value = avatar;
     });
 }
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 3812a311d..33e733b0b 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -532,25 +532,29 @@ async function fetchKeycloakPosition() {
   await http
     .get(config.API.keycloakPosition())
     .then(async (res) => {
-      const data = await res.data.result;
+      const data = res.data.result;
       usePositionKeycloakStore().setPositionKeycloak(data);
       if (data.avatarName) {
-        await getImg(data.profileId, data.avatarName);
+        getImg(data.profileId, data.avatarName);
       } else {
         profileImg.value = avatar;
       }
     })
     .catch((err) => {
       messageError($q, err);
+      profileImg.value = avatar;
     });
 }
 
 const profileImg = ref<string>("");
-async function getImg(id: string, pathName: string) {
-  await http
+function getImg(id: string, pathName: string) {
+  http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
     .then((res) => {
       profileImg.value = res.data.downloadUrl;
+    })
+    .catch((err) => {
+      profileImg.value = avatar;
     });
 }
 

From f726aece81037396ded4900cb10fde03a2bfa3c3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 25 May 2026 16:49:18 +0700
Subject: [PATCH 119/125] fix(registry-officer): set profile name field to
 readonly in edit mode

---
 .../detail/PersonalInformation/01_Profile.vue         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index 7730029f7..ace941cf4 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -408,7 +408,8 @@ function calculateMinDate() {
 
 function prefixRankRule() {
   return [
-    () => !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
+    () =>
+      !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
   ];
 }
 
@@ -588,6 +589,7 @@ onMounted(() => {
 
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
+                readonly
                 dense
                 outlined
                 use-input
@@ -602,7 +604,6 @@ onMounted(() => {
                 option-value="name"
                 v-model="formData.prefix"
                 clearable
-                class="inputgreen"
                 :options="store.Ops.prefixOps"
                 :label="dataLabel.prefix"
                 :rules="prefixRankRule()"
@@ -640,24 +641,24 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
+                readonly
                 dense
                 outlined
                 lazy-rules
                 hide-bottom-space
                 v-model="formData.firstName"
-                class="inputgreen"
                 :label="dataLabel.firstName"
                 :rules="[(val: string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
               />
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
+                readonly
                 dense
                 outlined
                 lazy-rules
                 hide-bottom-space
                 v-model="formData.lastName"
-                class="inputgreen"
                 :label="dataLabel.lastName"
                 :rules="[(val: string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
               />
@@ -721,6 +722,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
+                readonly
                 dense
                 outlined
                 use-input
@@ -735,7 +737,6 @@ onMounted(() => {
                 option-label="name"
                 option-value="name"
                 v-model="formData.gender"
-                class="inputgreen"
                 :options="store.Ops.genderOps"
                 :label="dataLabel.gender"
                 @filter="(inputValue: string,

From 47bd6611b2525de3bd65565c81b6ca42e6e8e089 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 May 2026 10:23:36 +0700
Subject: [PATCH 120/125] fix(Dialog): prevent enter key from closing the
 dialog

---
 src/components/DialogHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DialogHeader.vue b/src/components/DialogHeader.vue
index 77d936c93..325277f16 100644
--- a/src/components/DialogHeader.vue
+++ b/src/components/DialogHeader.vue
@@ -9,6 +9,7 @@
       round
       dense
       @click="close"
+      @keydown.enter.prevent
       style="color: #ff8080; background-color: #ffdede"
     />
   </q-toolbar>

From 1b36cab885fced1386ceb3900eb6f62692351543 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 May 2026 10:35:49 +0700
Subject: [PATCH 121/125] fix(help-government): clearable  dateEnd

---
 .../components/Help-Government/HelpGovernmentDetail.vue        | 3 ++-
 src/modules/05_placement/views/04_helpGovernmentMain.vue       | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
index ce4a0284b..dd8d3ba5f 100644
--- a/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
+++ b/src/modules/05_placement/components/Help-Government/HelpGovernmentDetail.vue
@@ -316,9 +316,10 @@ onMounted(() => {
                       :model-value="
                         dateEnd !== null ? date2Thai(dateEnd) : null
                       "
-                      :rules="edit ? [(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]:[]"
                       hide-bottom-space
                       :label="`${'ถึงวันที่'}`"
+                      clearable
+                      @clear="dateEnd = null"
                     >
                       <template v-slot:prepend>
                         <q-icon
diff --git a/src/modules/05_placement/views/04_helpGovernmentMain.vue b/src/modules/05_placement/views/04_helpGovernmentMain.vue
index f25af0cfc..6c167b6a7 100644
--- a/src/modules/05_placement/views/04_helpGovernmentMain.vue
+++ b/src/modules/05_placement/views/04_helpGovernmentMain.vue
@@ -236,8 +236,7 @@ function openModalOrder() {
         item.status == "APPROVE") &&
       item.organizationPositionOld &&
       item.organization &&
-      item.dateStart &&
-      item.dateEnd
+      item.dateStart
   );
   rows2.value = row;
   rows2Data.value = row;

From 7b21b1d934b31c0205770cf1192a7db8c54b9331 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 May 2026 12:16:17 +0700
Subject: [PATCH 122/125] fix(Dialog): prevent space key from closing the
 dialog

---
 src/components/DialogHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DialogHeader.vue b/src/components/DialogHeader.vue
index 325277f16..19ee3f536 100644
--- a/src/components/DialogHeader.vue
+++ b/src/components/DialogHeader.vue
@@ -10,6 +10,7 @@
       dense
       @click="close"
       @keydown.enter.prevent
+      @keydown.space.prevent
       style="color: #ff8080; background-color: #ffdede"
     />
   </q-toolbar>

From e323e28f7393ee4b9841ff166b3fc5dbd4e146d5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 May 2026 15:17:02 +0700
Subject: [PATCH 123/125] fix(HelpGovernment): delete rules  dateEnd

---
 .../detail/GovernmentInformation/06_HelpGovernment.vue         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
index c97cbb2c3..71a7e3bd5 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/06_HelpGovernment.vue
@@ -866,7 +866,8 @@ onMounted(() => {
                     outlined
                     dense
                     :model-value="date2Thai(formData.dateEnd)"
-                    :rules="[(val:string) => !!val || `${'กรุณาเลือก วันที่สิ้นสุด'}`]"
+                    clearable
+                    @clear="formData.dateEnd = null"
                     hide-bottom-space
                     :label="`${'วันที่สิ้นสุด'}`"
                   >

From d0a7511bbe23f4226327033471ad44a61e1293e5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 28 May 2026 10:43:13 +0700
Subject: [PATCH 124/125] =?UTF-8?q?fixed=20OWNER=20=E0=B8=AA=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=A3=E0=B8=96=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=20=E0=B8=99=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=AA=E0=B8=81=E0=B8=B8=E0=B8=A5=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=A8=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=84=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/PersonalInformation/01_Profile.vue  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
index ace941cf4..1d686dfe8 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@@ -589,7 +589,7 @@ onMounted(() => {
 
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                readonly
+                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 use-input
@@ -641,7 +641,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                readonly
+                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 lazy-rules
@@ -653,7 +653,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
-                readonly
+                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 lazy-rules
@@ -722,7 +722,7 @@ onMounted(() => {
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-select
-                readonly
+                :readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
                 dense
                 outlined
                 use-input

From 21401ed5191b099a0f35877f132ea9e54c1cbae5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 29 May 2026 10:12:16 +0700
Subject: [PATCH 125/125] feat: add delete is OWNER

---
 src/modules/05_placement/store.ts             | 51 ++++++++++---------
 .../05_placement/views/02_transferMain.vue    | 50 ++++++++++++++++--
 .../05_placement/views/03_receiveMain.vue     |  6 ++-
 .../components/02_resign/Table.vue            | 44 +++++++++++++++-
 .../components/03_resignEmp/Table.vue         | 48 +++++++++++++++--
 .../components/05_Leave/TableList.vue         | 20 ++++----
 6 files changed, 174 insertions(+), 45 deletions(-)

diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index af28e52c2..2dd18e96d 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -10,25 +10,25 @@ import type {
 } from "@/modules/05_placement/interface/request/Main";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 
-export const useProfileDataStore = defineStore("profilePlacenent", () => {
-  interface profile {
-    main: { columns: String[] };
-    education: { columns: String[] };
-    certicate: { columns: String[] };
-    train: { columns: String[] };
-    insignia: { columns: String[] };
-    coined: { columns: String[] };
-    assessment: { columns: String[] };
-    salary: { columns: String[] };
-    discipline: { columns: String[] };
-    leave: { columns: String[] };
-    talent: { columns: String[] };
-    work: { columns: String[] };
-    record: { columns: String[] };
-    other: { columns: String[] };
-    document: { columns: String[] };
-  }
+interface profile {
+  main: { columns: String[] };
+  education: { columns: String[] };
+  certicate: { columns: String[] };
+  train: { columns: String[] };
+  insignia: { columns: String[] };
+  coined: { columns: String[] };
+  assessment: { columns: String[] };
+  salary: { columns: String[] };
+  discipline: { columns: String[] };
+  leave: { columns: String[] };
+  talent: { columns: String[] };
+  work: { columns: String[] };
+  record: { columns: String[] };
+  other: { columns: String[] };
+  document: { columns: String[] };
+}
 
+export const useProfileDataStore = defineStore("profilePlacenent", () => {
   const birthDate = ref<Date>(new Date());
   const retireText = ref<string | null>(null);
   const changeRetireText = (val: string | null) => {
@@ -87,15 +87,15 @@ export const useProfileDataStore = defineStore("profilePlacenent", () => {
     changeRetireText,
   };
 });
+interface placement {
+  mappingPosition: { columns: String[] };
+}
 export const usePlacementDataStore = defineStore("placement", () => {
   const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
   const tabsMain = ref<string>("probation");
   const isOfficer = ref<boolean | null>(null);
   const isStaff = ref<boolean | null>(null);
   const { hideLoader } = mixin;
-  interface placement {
-    mappingPosition: { columns: String[] };
-  }
   const placementData = ref<placement>({
     mappingPosition: { columns: [] },
   });
@@ -218,10 +218,10 @@ export const usePlacementDataStore = defineStore("placement", () => {
     isStaff,
   };
 });
+interface placementOrder {
+  mappingPosition: { columns: String[] };
+}
 export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
-  interface placementOrder {
-    mappingPosition: { columns: String[] };
-  }
   const placementOrderData = ref<placementOrder>({
     mappingPosition: { columns: [] },
   });
@@ -369,6 +369,8 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
   ]);
   const statusOp = ref<DataOptions[]>(statusMainOp.value);
 
+  const statusDelete = ["REPORT", "WAITING", "DONE"];
+
   const statusText = (val: string) => {
     switch (val) {
       case "WAITTING":
@@ -438,5 +440,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
     statusOp,
     statusMainOp,
     filterOption,
+    statusDelete,
   };
 });
diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue
index efd36dc90..181222caa 100644
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from "vue";
 import { useQuasar } from "quasar";
 
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import {
   checkPermission,
   checkPermissionList,
@@ -20,11 +20,19 @@ import DialogOrders from "@/modules/05_placement/components/Transfer/DialogOrder
 
 const $q = useQuasar();
 const router = useRouter();
+const route = useRoute();
 const mixin = useCounterMixin();
 const store = useTransferDataStore();
 const { statusText, filterOption } = useTransferDataStore();
-const { date2Thai, messageError, showLoader, hideLoader, onSearchDataTable } =
-  mixin;
+const {
+  date2Thai,
+  messageError,
+  showLoader,
+  hideLoader,
+  onSearchDataTable,
+  dialogRemove,
+  success,
+} = mixin;
 
 const modal = ref<boolean>(false); //ส่งไปออกคำสั่ง
 const dataTransfer = ref<ResponseData[]>([]); //ช่อมูลรายการขอโอน
@@ -141,6 +149,15 @@ const visibleColumns = ref<string[]>([
   "createdAt",
 ]);
 
+const isPermissionDelete = computed(() => {
+  return (status: string) => {
+    return (
+      checkPermission(route)?.attrOwnership === "OWNER" &&
+      !store.statusDelete.includes(status)
+    );
+  };
+});
+
 /** ฟังก์ชันดึงข้อมูรายการขอโอน*/
 async function fetchData() {
   showLoader();
@@ -194,6 +211,21 @@ function onSearch() {
   );
 }
 
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    try {
+      showLoader();
+      await http.delete(config.API.transfer + `/admin/${id}`);
+      await fetchData();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 /**
  * ทำงานเมื่อ Components ถูกเรียกใช้งาน
  * จะเรียกใช้ fetchData เพื่อดึงข้อมูลรายการขอโอน
@@ -337,6 +369,18 @@ onMounted(async () => {
                 >
                   <q-tooltip>รายละเอียด</q-tooltip>
                 </q-btn>
+
+                <q-btn
+                  v-if="isPermissionDelete(props.row.status)"
+                  flat
+                  round
+                  dense
+                  icon="mdi-delete"
+                  color="red"
+                  @click.prevent="handleDelete(props.row.id)"
+                >
+                  <q-tooltip>ลบข้อมูล</q-tooltip>
+                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div v-if="col.name === 'no'">
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index ddfa21175..2541ce000 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -313,7 +313,7 @@ function openDelete(id: string) {
   dialogRemove($q, async () => {
     showLoader();
     await http
-      .delete(config.API.receiveDataId(id))
+      .delete(config.API.receiveData() + `/admin/${id}`)
       .then(async () => {
         await fecthlistRecevice();
         await success($q, "ลบข้อมูลสำเร็จ");
@@ -606,8 +606,10 @@ onMounted(async () => {
 
                         <q-item
                           v-if="
-                            checkPermission($route)?.attrIsDelete &&
+                            checkPermission($route)?.attrOwnership ===
+                              'OWNER' &&
                             props.row.status !== 'REPORT' &&
+                            props.row.status !== 'WAITING' &&
                             props.row.status !== 'DONE'
                           "
                           clickable
diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue
index b5769dc33..c4a1001b8 100644
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@@ -33,7 +33,8 @@ const {
   showLoader,
   hideLoader,
   onSearchDataTable,
-  findOrgName,
+  dialogRemove,
+  success,
 } = mixin;
 
 /** Table */
@@ -257,6 +258,21 @@ function onSearch() {
   );
 }
 
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    try {
+      showLoader();
+      await http.delete(config.API.listResign() + `/admin/${id}`);
+      await fecthlist();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 /**Hook */
 onMounted(async () => {
   status.value = stroeResign.formQurey.status;
@@ -308,7 +324,11 @@ onMounted(async () => {
             color="primary"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
+            <q-tooltip>{{
+              `ส่งไปออกคำสั่ง${
+                stroeResign.mainTabs == "2" ? "ยกเลิกการ" : ""
+              }ลาออก`
+            }}</q-tooltip>
           </q-btn>
         </div>
         <q-space />
@@ -393,6 +413,26 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
+
+                <q-btn
+                  v-if="
+                    checkPermission($route)?.attrOwnership === 'OWNER' &&
+                    props.row.status !== 'REPORT' &&
+                    props.row.status !== 'WAITING' &&
+                    props.row.status !== 'DONE' &&
+                    props.row.status !== 'CANCELING' &&
+                    props.row.status !== 'CANCEL' &&
+                    stroeResign.mainTabs === '1'
+                  "
+                  flat
+                  dense
+                  round
+                  color="red"
+                  icon="delete"
+                  @click.prevent="handleDelete(props.row.id)"
+                >
+                  <q-tooltip>ลบข้อมูล</q-tooltip>
+                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div
diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue
index 89a181576..7eeee2f80 100644
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@@ -27,8 +27,15 @@ const stroeResign = useDataStore();
 const { statusText } = stroe;
 const router = useRouter();
 const mixin = useCounterMixin();
-const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
-  mixin;
+const {
+  messageError,
+  date2Thai,
+  showLoader,
+  hideLoader,
+  onSearchDataTable,
+  dialogRemove,
+  success,
+} = mixin;
 
 /** Table */
 const rows = ref<ResponseItems[]>([]);
@@ -129,7 +136,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "status",
     format(val, row) {
-      return stroeResign.mainTabs === "1"
+      return stroeResign.mainTabsEMP === "1"
         ? statusText(row.status)
         : statusText(row.status, "อนุญาต");
     },
@@ -252,6 +259,21 @@ function onSearch() {
   );
 }
 
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    try {
+      showLoader();
+      await http.delete(config.API.listResignEMP() + `/admin/${id}`);
+      await fecthlist();
+      success($q, "ลบข้อมูลสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 /**Hook */
 onMounted(async () => {
   statusEMP.value = stroeResign.formQureyEMP.status;
@@ -391,6 +413,26 @@ onMounted(async () => {
                 >
                   <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                 </q-btn>
+
+                <q-btn
+                  v-if="
+                    checkPermission($route)?.attrOwnership === 'OWNER' &&
+                    props.row.status !== 'REPORT' &&
+                    props.row.status !== 'WAITING' &&
+                    props.row.status !== 'DONE' &&
+                    props.row.status !== 'CANCELING' &&
+                    props.row.status !== 'CANCEL' &&
+                    stroeResign.mainTabsEMP === '1'
+                  "
+                  flat
+                  dense
+                  round
+                  color="red"
+                  icon="delete"
+                  @click.prevent="handleDelete(props.row.id)"
+                >
+                  <q-tooltip>ลบข้อมูล</q-tooltip>
+                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.id">
                 <div
diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index f7cb6df78..74b2de08c 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -10,11 +10,11 @@ import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const q = useQuasar();
+const $q = useQuasar();
 const leaveStore = useLeavelistDataStore();
 const route = useRoute();
 const router = useRouter();
-const { showLoader, hideLoader, messageError, dialogRemove } =
+const { showLoader, hideLoader, messageError, dialogRemove, success } =
   useCounterMixin();
 
 const total = defineModel<number>("total", { required: true });
@@ -49,7 +49,8 @@ const isPermissionDelete = computed(() => {
   return (status: string) => {
     return (
       checkPermission(route)?.attrOwnership === "OWNER" &&
-      !leaveStore.statusDelete.includes(status)
+      !leaveStore.statusDelete.includes(status) &&
+      leaveStore.tabMenu === "1"
     );
   };
 });
@@ -281,17 +282,14 @@ function getStatusColor(statusText: string) {
 }
 
 function handleDelete(id: string) {
-  dialogRemove(q, async () => {
+  dialogRemove($q, async () => {
     try {
       showLoader();
-      const API =
-        leaveStore.tabMenu === "1"
-          ? config.API.leaveList()
-          : config.API.leaveListDelete();
-      await http.delete(API + `/${id}`);
+      await http.delete(config.API.leaveList() + `/${id}`);
       await props.getList?.();
+      success($q, "ลบข้อมูลสำเร็จ");
     } catch (error) {
-      messageError(q, error);
+      messageError($q, error);
     } finally {
       hideLoader();
     }
@@ -356,7 +354,7 @@ onMounted(() => {
             color="red"
             @click.prevent="handleDelete(props.row.id)"
           >
-            <q-tooltip>รายละเอียด</q-tooltip>
+            <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn>
         </q-td>
         <q-td