Merge branch 'develop' into dev

Co-authored-by: Copilot <copilot@github.com>

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",

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`,

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) =>

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`,
 };

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}`,
 };

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}`,
+
 };

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 ?? ""} ${
+  profile.fullName = `${data.rank ? data.rank : data.prefix ?? ""}${
-    data.lastName ?? ""
+    data.firstName ?? ""
-  } `;
+  } ${data.lastName ?? ""} `;
 
   if (data["posTypeNameOld"] !== undefined) {
     profile.position =

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>
@@ -332,6 +332,7 @@ watch(
               outlined
               dense
               label="คำค้น"
+              @keydown.enter.prevent="searchInput()"
             >
               <template v-slot:after>
                 <q-btn

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();
@@ -353,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
@@ -362,10 +368,11 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      () =>
+                      (val: string) => !!val || 'กรุณากรอกที่อยู่อีเมล',
-                        !!formData.email ||
+                      (val: string) => {
-                        !!formData.phone ||
+                        const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                        return emailPattern.test(val) || 'กรุณากรอกที่อยู่อีเมลในรูปแบบที่ถูกต้อง';
+                      }
                     ]"
                   />
                 </div>
@@ -377,12 +384,6 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
-                    :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
-                    ]"
                   />
                 </div>
               </div>
@@ -391,7 +392,11 @@ function onClose() {
         </q-card-section>
 
         <q-separator />
-        <q-card-actions align="right">
+        <q-card-actions class="q-px-sm items-center">
+          <div class="row items-center q-pa-sm">
+            <FooterContact />
+          </div>
+          <q-space />
           <q-btn
             type="submit"
             for="#submitForm"

src/components/Dialogs/DialogOrgSelect.vue

@@ -24,14 +24,14 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const props = defineProps({
   dataRows: {
     type: Object,
-    require: true,
+    default: () => ({}),
   },
   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 type = defineModel<string | null>("type", { required: true });
-const posType = defineModel<any>("posType", { required: true });
+const posType = defineModel<string | null>("posType", { required: true });
-const posLevel = defineModel<any>("posLevel", { required: true });
+const posLevel = defineModel<string | null>("posLevel", { required: true });
-const position = defineModel<any>("position", { 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",
@@ -244,10 +243,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 +266,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 +304,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,14 +317,13 @@ async function getDataTable(id: string, level: number = 0) {
           (e: any) => !positionUse.value.includes(e.id)
         );
       }
+      await onClickSelectPos(positionId.value);
     })
     .catch((err) => {
       messageError($q, err);
     })
     .finally(() => {
-      setTimeout(() => {
+      hideLoader();
-        hideLoader();
-      }, 1000);
     });
 }
 
@@ -331,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();
   }
@@ -382,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
       );
     }
   }
@@ -403,18 +406,19 @@ 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;
+      selectId.value = props?.dataRows?.positionId;
       datePos.value = props?.dataRows?.reportingDate;
-
+      await getDataTable(nodeId.value, level);
-      getDataTable(nodeId.value, level);
     })
     .catch((e) => {
       messageError($q, e);
+    })
+    .finally(() => {
       hideLoader();
     });
 }
@@ -427,11 +431,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 = [];
       }
@@ -463,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);
-    }
   }
 );
 
@@ -491,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 {
+    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();
-    });
   }
+
+  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() {
@@ -534,6 +536,7 @@ onMounted(async () => {
   await fetchTree();
 });
 </script>
+
 <template>
   <q-dialog v-model="modal" persistent full-width>
     <q-card class="no-scroll">
@@ -565,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"
@@ -831,7 +834,7 @@ onMounted(async () => {
                             </q-toolbar>
                             <d-table
                               ref="table"
-                              :columns="columnsPostition"
+                              :columns="columnsPosition"
                               :rows="rowsPosition"
                               row-key="id"
                               flat
@@ -929,6 +932,7 @@ onMounted(async () => {
     </q-card>
   </q-dialog>
 </template>
+
 <style scoped>
 .my-list-link {
   color: rgb(118, 168, 222);

src/components/FooterContact.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="row items-center justify-center q-gutter-sm">
+    <q-icon name="support_agent" color="primary" size="sm" />
+    <span class="text-body2">
+      พบปัญหาการใช้งานกรุณาติดต่อผู้ดูแลระบบ
+      <span class="text-weight-medium text-primary"
+        ><a href="tel:0882649800" style="text-decoration: none; color: inherit"
+          >088-264-9800</a
+        >
+      </span>
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped></style>

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";
 
@@ -187,6 +186,7 @@ watch(modal, (val) => {
                 dense
                 label="คำค้น"
                 @clear="search = ''"
+                @keydown.enter.prevent="onSearchData()"
               />
             </div>
             <q-checkbox
@@ -253,7 +253,7 @@ watch(modal, (val) => {
                 <q-th auto-width />
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">
-                    {{ getColumnLabel(col, isAct) }}
+                    {{ col.label }}
                   </span>
                 </q-th>
               </q-tr>

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"

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())}`;
@@ -397,8 +397,6 @@ async function clickCandidateList() {
 }
 
 async function onCheckShowExaminfo() {
-  console.log(props.isShowExaminfo);
-
   dialogMessage(
     $q,
     `ยืนยันการ${props.isShowExaminfo ? "ปิด" : "เปิด"}`,

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>

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,
   },

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",
+  //   name: "type",
-    align: "left",
+  //   align: "left",
-    label: "ประเภทแบบฟอร์ม",
+  //   label: "ประเภทแบบฟอร์ม",
-    sortable: true,
+  //   sortable: true,
-    field: "type",
+  //   field: "type",
-    headerStyle: "font-size: 14px",
+  //   headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+  //   style: "font-size: 14px",
-    sort: (a: string, b: string) =>
+  //   sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  //     a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
+  // },
 ]);
 
 const shouldShowPaymentFields = computed(() => {
@@ -400,7 +400,7 @@ async function checkSave() {
 
     // เช็ค validation form ตำแหน่ง
     const isPositionFormValid = await myFormPosition.value?.validate();
-    if (!isPositionFormValid) 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];
@@ -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>

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">

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()
@@ -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 ||

src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue

@@ -50,18 +50,10 @@ const formMain = reactive<FormMain>({
   workDate: null, //วันที่เริ่มปฏิบัติราชการ
   reasonSameDate: "",
   retireDate: null, //วันเกษียณอายุ
-  ageAll: {
+  ageAll: "", //อายุราชการ
-    year: 0,
-    month: 0,
-    day: 0,
-  }, //อายุราชการ
   absent: 0, //ขาดราชการ
   age: 0, //อายุราชการเกื้อกูล
-  govAgeBkk:{
+  govAgeBkk: "",
-    year: 0,
-    month: 0,
-    day: 0,
-  }
 });
 
 const modalEdit = ref<boolean>(false); //แสดง popup แก้ไขข้อมูลราชการ
@@ -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>{{
+              <span>{{ formMain.ageAll }}</span>
-                formMain.ageAll
-                  ? `${formMain.ageAll.year} ปี ${formMain.ageAll.month} เดือน ${formMain.ageAll.day} วัน`
-                  : "-"
-              }}</span>
             </div>
           </div>
         </div>
         <div class="col-12 col-sm-6 col-md-6">
           <div class="row">
             <div class="col-12 col-sm-12 col-md-5">
-              <span class="text-grey-6 text-weight-medium">อายุราชการ (กทม.)</span>
+              <span class="text-grey-6 text-weight-medium"
+                >อายุราชการ (กทม.)</span
+              >
             </div>
             <div class="col-12 col-sm-12 col-md-7">
-                    <span>{{
+              <span>{{ formMain.govAgeBkk }}</span>
-                formMain.govAgeBkk
-                  ? `${formMain.govAgeBkk.year} ปี ${formMain.govAgeBkk.month} เดือน ${formMain.govAgeBkk.day} วัน`
-                  : "-"
-              }}</span>
             </div>
           </div>
         </div>

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"

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="
+              color="edit"
-                (props.row.commandId !== null && props.row.commandId !== '') ||
-                props.row.commandType === 'C-PM-47'
-              "
-              :color="props.row.commandId ? 'grey' : '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

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>

src/modules/04_registryPerson/components/detail/GovernmentInformation/08_DialogAbsentLate.vue

@@ -0,0 +1,263 @@
+<script setup lang="ts">
+import { reactive, ref, computed, watch } from "vue";
+import { useQuasar } from "quasar";
+
+import { useRoute } from "vue-router";
+import { useCounterMixin } from "@/stores/mixin";
+import { useAbsentLateStore } from "@/modules/04_registryPerson/stores/AbsentLate";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+/** import components*/
+import DialogHeader from "@/components/DialogHeader.vue";
+
+//use
+const $q = useQuasar();
+const route = useRoute();
+const absentLateStore = useAbsentLateStore();
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  date2Thai,
+  convertDateToAPI,
+  dialogConfirm,
+  pathRegistryEmp,
+} = useCounterMixin();
+
+//props
+const modal = defineModel<boolean>("modal", { required: true });
+const isStatusEdit = defineModel<boolean>("isStatusEdit", { required: true });
+const rowId = defineModel<string>("rowId", { required: true });
+
+const props = defineProps<{
+  fetchData: () => Promise<void>;
+  dataAbsentLate: any;
+}>();
+
+const profileId = ref<string>(route.params.id?.toString() ?? ""); //ProfileId
+const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
+
+const form = reactive({
+  status: "",
+  stampDate: new Date(),
+  stampType: "FULL_DAY",
+  stampAmount: "1.0",
+  remark: "",
+});
+
+const tittle = computed(() => {
+  return isStatusEdit.value
+    ? "แก้ไขข้อมูลขาดราชการ/มาสาย"
+    : "เพิ่มข้อมูลขาดราชการ/มาสาย";
+});
+
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    try {
+      showLoader();
+      const payload = {
+        ...form,
+        stampDate: convertDateToAPI(form.stampDate),
+        profileId:
+          !isStatusEdit.value && empType.value === ""
+            ? profileId.value
+            : undefined,
+        profileEmployeeId:
+          !isStatusEdit.value && empType.value !== ""
+            ? profileId.value
+            : undefined,
+      };
+      const method = isStatusEdit.value ? "patch" : "post";
+      const url = isStatusEdit.value
+        ? config.API.profileAbsentLate(empType.value) + `/${rowId.value}`
+        : config.API.profileAbsentLate(empType.value);
+      await http[method](url, payload);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      props.fetchData();
+      closeDialog();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/** function ปิด popup*/
+function closeDialog() {
+  modal.value = false;
+}
+
+watch(
+  () => form.stampType,
+  (stampType) => {
+    if (stampType === "FULL_DAY") {
+      form.stampAmount = "1.0";
+    } else if (stampType === "MORNING" || stampType === "AFTERNOON") {
+      form.stampAmount = "0.5";
+    }
+  }
+);
+
+watch(
+  () => modal.value,
+  (newVal) => {
+    if (newVal) {
+      form.status = isStatusEdit.value ? props.dataAbsentLate.status : "";
+      form.stampDate = isStatusEdit.value
+        ? new Date(props.dataAbsentLate.stampDate)
+        : new Date();
+      form.stampType = isStatusEdit.value
+        ? props.dataAbsentLate.stampType
+        : "FULL_DAY";
+      form.stampAmount = isStatusEdit.value
+        ? props.dataAbsentLate.stampAmount
+        : "1.0";
+      form.remark = isStatusEdit.value ? props.dataAbsentLate.remark : "";
+    }
+  }
+);
+</script>
+
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card style="min-width: 50vw">
+      <q-form greedy @submit.prevent="onSubmit">
+        <DialogHeader :tittle="tittle" :close="closeDialog" />
+        <q-separator />
+
+        <q-card-section class="q-pa-md">
+          <div class="col-12 row q-col-gutter-sm">
+            <div class="col-12 row">
+              <div class="col-md-4 col-sm-12">
+                <q-select
+                  class="full-width inputgreen cursor-pointer"
+                  outlined
+                  dense
+                  lazy-rules
+                  v-model="form.status"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกสถานะ'}`]"
+                  hide-bottom-space
+                  :label="`${'สถานะ'}`"
+                  map-options
+                  emit-value
+                  option-label="name"
+                  option-value="id"
+                  :options="absentLateStore.statusOps"
+                  use-input
+                  hide-selected
+                  fill-input
+                  input-debounce="0"
+                />
+              </div>
+            </div>
+
+            <div class="col-md-4 col-sm-12">
+              <datepicker
+                class="inputgreen"
+                menu-class-name="modalfix"
+                v-model="form.stampDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    outlined
+                    dense
+                    hide-bottom-space
+                    class="full-width"
+                    :model-value="
+                      form.stampDate != null ? date2Thai(form.stampDate) : null
+                    "
+                    :label="`${'วันที่ลงเวลา'}`"
+                    :rules="[
+                              (val: string) =>
+                                !!val || `${'กรุณาเลือกวันที่ลงเวลา'}`,
+                            ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-md-4 col-xs-12">
+              <q-select
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                v-model="form.stampType"
+                :rules="[(val:string) => !!val || `${'กรุณาเลือกประเภทการลงเวลา'}`]"
+                hide-bottom-space
+                :label="`${'ประเภทการลงเวลา'}`"
+                map-options
+                emit-value
+                option-label="name"
+                :options="absentLateStore.stampTypeOps"
+                option-value="id"
+                use-input
+                hide-selected
+                fill-input
+                input-debounce="0"
+              />
+            </div>
+
+            <div class="col-md-4 col-xs-12">
+              <q-input
+                class="inputgreen"
+                dense
+                outlined
+                v-model="form.stampAmount"
+                label="จำนวน"
+                hide-bottom-space
+                readonly
+                :rules="[(val:string) => !!val ||
+              `${'กรุณากรอกจำนวน'}`]"
+                mask="#.#"
+              />
+            </div>
+
+            <div class="col-12">
+              <q-input
+                class="inputgreen"
+                dense
+                outlined
+                v-model="form.remark"
+                label="เหตุผล"
+                hide-bottom-space
+                type="textarea"
+              />
+            </div>
+          </div>
+        </q-card-section>
+        <q-separator />
+
+        <q-card-actions align="right">
+          <q-btn type="submit" :label="`บันทึก`" color="public">
+            <q-tooltip>บันทึก</q-tooltip>
+          </q-btn>
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>

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"

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"

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="
+              color="edit"
-                (props.row.commandId !== null && props.row.commandId !== '') ||
-                props.row.commandType === 'C-PM-47'
-              "
-              :color="props.row.commandId ? 'grey' : '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

src/modules/04_registryPerson/interface/index/government.ts

@@ -13,8 +13,8 @@ interface FormMain {
   workDate: any;
   reasonSameDate: string;
   retireDate: any;
-  ageAll: GovAgeForm;
+  ageAll: GovAgeForm | string;
-  govAgeBkk: GovAgeForm;
+  govAgeBkk: GovAgeForm | string;
   absent: number;
   age: number;
   [key: string]: any;

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 {

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 };

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 };

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 };
+});

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 };

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);
+}

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");
     }
   }
 }

src/modules/04_registryPerson/views/edit/components/DialogExcelPreview.vue

@@ -0,0 +1,270 @@
+<script setup lang="ts">
+import { ref, computed, watch } from "vue";
+import { useQuasar } from "quasar";
+import moment from "moment";
+
+import {
+  parseExcelFile,
+  formatFileSize,
+} from "@/modules/04_registryPerson/utils/excelParser";
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const { dialogConfirm } = useCounterMixin();
+
+interface Props {
+  modal: boolean;
+  file: File | null;
+}
+
+interface Emits {
+  (e: "update:modal", value: boolean): void;
+  (e: "confirm", file: File): void;
+  (e: "cancel"): void;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits<Emits>();
+
+const isLoading = ref(false);
+const isUploading = ref(false);
+const previewData = ref<Record<string, any>[]>([]);
+const excelHeaders = ref<string[]>([]); // Headers จาก Excel
+
+const fileName = computed(() => props.file?.name ?? "");
+const fileSize = computed(() => props.file?.size ?? 0);
+const totalRows = computed(() => previewData.value.length);
+const previewRows = computed(() => previewData.value.length);
+
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 50,
+});
+
+// ฟังก์ชันแปลงวันที่เป็นภาษาไทย (ไม่บวก 543 เพราะ Excel เป็น พ.ศ. อยู่แล้ว)
+function formatDateForDisplay(value: any): string {
+  if (!value) return "-";
+
+  // ถ้าเป็น string format dd/mm/yyyy (จาก Excel ที่เป็น พ.ศ.)
+  if (typeof value === "string") {
+    const parts = value.split("/");
+    if (parts.length === 3) {
+      const day = parts[0];
+      const monthNum = parseInt(parts[1], 10);
+      const year = parts[2];
+
+      // แปลงเลขเดือนเป็นชื่อเดือนภาษาไทย
+      const thaiMonths = [
+        "ม.ค.",
+        "ก.พ.",
+        "มี.ค.",
+        "เม.ย.",
+        "พ.ค.",
+        "มิ.ย.",
+        "ก.ค.",
+        "ส.ค.",
+        "ก.ย.",
+        "ต.ค.",
+        "พ.ย.",
+        "ธ.ค.",
+      ];
+      const thaiMonth = thaiMonths[monthNum - 1] || parts[1];
+
+      return `${day} ${thaiMonth} ${year}`;
+    }
+    return value;
+  }
+
+  // ถ้าเป็น Date object ให้แปลงโดยไม่บวก 543 (เพราะ Excel serial date แปลงเป็น ค.ศ. แล้วแต่เดิมเป็น พ.ศ.)
+  const dateMoment = moment(value);
+  const day = dateMoment.format("DD");
+  const month = dateMoment.format("MMM");
+  const year = +dateMoment.format("YYYY"); // ไม่บวก 543
+  return `${day} ${month} ${year}`;
+}
+
+// Headers ที่เป็นวันที่
+const DATE_HEADERS = ["วันที่คำสั่งมีผล", "วันที่ลงนาม"];
+const SALARY_HEADERS = [
+  "เงินเดือน",
+  "ค่าจ้าง",
+  "เงินค่าตอบแทนรายเดือน",
+  "เงินประจำตำแหน่ง",
+  "เงินค่าตอบแทนพิเศษ",
+];
+
+// สร้าง columns จาก Excel headers
+const tableColumns = computed(() => {
+  if (excelHeaders.value.length === 0) return [];
+  return excelHeaders.value.map((header, index) => {
+    const isDateColumn = DATE_HEADERS.includes(header);
+    const isSalaryColumn = SALARY_HEADERS.includes(header);
+
+    return {
+      name: `col_${index}`,
+      label: header,
+      field: header,
+      align: "left" as const,
+      sortable: false,
+      style: "white-space: nowrap;",
+      headerStyle: "font-size: 13px; font-weight: bold;",
+      format: (val: any) => {
+        // ถ้าค่าว่าง แสดง -
+        if (val == null || val === "") return "-";
+
+        // ถ้าเป็น column วันที่
+        if (isDateColumn) {
+          // ถ้าเป็น string วันที่ format dd/mm/yyyy (จาก Excel)
+          if (
+            typeof val === "string" &&
+            val.match(/^\d{1,2}\/\d{1,2}\/\d{4}$/)
+          ) {
+            return formatDateForDisplay(val);
+          }
+          // ถ้าเป็น number (Excel serial date) ให้แปลงเป็น Date object ก่อน
+          if (typeof val === "number") {
+            return formatDateForDisplay((val - 25569) * 86400 * 1000);
+          }
+        }
+
+        // ถ้าเป็น column เงินให้ format มี comma separator (ตรวจสอบชื่อ label)
+        if (isSalaryColumn) {
+          const numericValue = Number(val);
+          if (typeof numericValue === "number" && !isNaN(numericValue)) {
+            return numericValue.toLocaleString("en-US");
+          }
+        }
+
+        return val;
+      },
+    };
+  });
+});
+
+async function loadPreview() {
+  if (!props.file) return;
+
+  isLoading.value = true;
+  try {
+    const result = await parseExcelFile(props.file, {
+      maxPreviewRows: 0, // 0 = แสดงทั้งหมด
+      sheetIndex: 0, // ใช้ sheet แรกเสมอ
+    });
+    previewData.value = result.rows;
+    excelHeaders.value = result.headers; // เก็บ headers จาก Excel
+  } catch (error) {
+    console.error("Error parsing Excel file:", error);
+    previewData.value = [];
+    excelHeaders.value = [];
+  } finally {
+    isLoading.value = false;
+  }
+}
+
+function onConfirm() {
+  dialogConfirm($q, () => {
+    if (props.file) {
+      isUploading.value = true;
+      emit("confirm", props.file);
+    }
+  });
+}
+
+function onClose() {
+  emit("cancel");
+  emit("update:modal", false);
+}
+
+function onModalUpdate(value: boolean) {
+  emit("update:modal", value);
+}
+
+watch(
+  () => props.modal,
+  (newValue) => {
+    if (newValue && props.file) {
+      isUploading.value = false;
+      loadPreview();
+    }
+  }
+);
+</script>
+
+<template>
+  <q-dialog :model-value="modal" @update:model-value="onModalUpdate" persistent>
+    <q-card style="min-width: 80vw; max-width: 95vw">
+      <q-card-section class="row items-center q-pb-none">
+        <div class="text-h6">ตัวอย่างข้อมูลไฟล์ Excel</div>
+        <q-space />
+        <q-btn icon="close" flat round dense v-close-popup @click="onClose" />
+      </q-card-section>
+
+      <q-separator />
+
+      <!-- File Info Section -->
+      <q-card-section>
+        <div class="row q-col-gutter-md">
+          <div class="col-12">
+            <div class="text-subtitle2 text-grey-7">ข้อมูลไฟล์</div>
+          </div>
+          <div class="col-md-4 col-sm-6 col-12">
+            <div class="flex items-center">
+              <q-icon
+                name="insert_drive_file"
+                class="q-mr-sm"
+                color="primary"
+              />
+              <span class="text-body2">ชื่อไฟล์: {{ fileName }}</span>
+            </div>
+          </div>
+          <div class="col-md-4 col-sm-6 col-12">
+            <div class="flex items-center">
+              <q-icon name="folder" class="q-mr-sm" color="primary" />
+              <span class="text-body2"
+                >ขนาด: {{ formatFileSize(fileSize) }}</span
+              >
+            </div>
+          </div>
+          <div class="col-md-4 col-sm-12 col-12">
+            <div class="flex items-center">
+              <q-icon name="table_chart" class="q-mr-sm" color="primary" />
+              <span class="text-body2">จำนวนแถว: {{ totalRows }} แถว</span>
+            </div>
+          </div>
+        </div>
+      </q-card-section>
+
+      <q-separator />
+
+      <!-- Preview Table -->
+      <q-card-section style="max-height: 70vh" class="scroll">
+        <div class="text-subtitle2 q-mb-md">
+          รายการตำแหน่ง ({{ previewRows }} รายการ)
+        </div>
+        <d-table
+          :columns="tableColumns"
+          :rows="previewData"
+          :paging="true"
+          :rows-per-page-options="[20, 50, 100, 0]"
+          v-model:pagination="pagination"
+          :loading="isLoading"
+          row-key="id"
+          flat
+          bordered
+          dense
+        />
+      </q-card-section>
+
+      <!-- Actions -->
+      <q-card-actions align="right" class="q-pa-md">
+        <q-btn
+          type="submit"
+          color="public"
+          label="ยืนยันการอัปโหลด"
+          @click="onConfirm"
+          :loading="isUploading"
+        />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>

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>
 

src/modules/04_registryPerson/views/edit/components/Table.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, onMounted, computed, reactive } from "vue";
 import { useQuasar } from "quasar";
-import * as XLSX from "xlsx";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useEditPosDataStore } from "@/modules/04_registryPerson/stores/Edit";
+import { exportToExcelPosition } from "@/modules/04_registryPerson/utils/exportPosition";
 
 import type { QTableColumn } from "quasar";
 import type { FormDataSalary } from "@/modules/04_registryPerson/interface/index/Edit";
@@ -20,6 +20,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();
@@ -52,6 +53,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);
@@ -430,66 +436,67 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
 
 /** ฟังก์ชันดาวน์โหลดไฟล Excel */
 function exportToExcel() {
-  const newData = rows.value.map((e: DataPosition) => {
+  exportToExcelPosition(rows.value);
-    return {
+  // const newData = rows.value.map((e: DataPosition) => {
-      commandDateAffect: date2Thai(e.commandDateAffect),
+  //   return {
-      positionName: e.positionName,
+  //     commandDateAffect: date2Thai(e.commandDateAffect),
-      positionType: e.positionType,
+  //     positionName: e.positionName,
-      positionLevel: e.positionLevel
+  //     positionType: e.positionType,
-        ? e.positionLevel
+  //     positionLevel: e.positionLevel
-        : e.positionCee
+  //       ? e.positionLevel
-        ? e.positionCee
+  //       : e.positionCee
-        : "",
+  //       ? e.positionCee
-      positionExecutive: e.positionExecutive,
+  //       : "",
-      amount: e.amount,
+  //     positionExecutive: e.positionExecutive,
-      mouthSalaryAmount: e.mouthSalaryAmount,
+  //     amount: e.amount,
-      positionSalaryAmount: e.positionSalaryAmount,
+  //     mouthSalaryAmount: e.mouthSalaryAmount,
-      organization: findOrgName({
+  //     positionSalaryAmount: e.positionSalaryAmount,
-        root: e.orgRoot,
+  //     organization: findOrgName({
-        child1: e.orgChild1,
+  //       root: e.orgRoot,
-        child2: e.orgChild2,
+  //       child1: e.orgChild1,
-        child3: e.orgChild3,
+  //       child2: e.orgChild2,
-        child4: e.orgChild4,
+  //       child3: e.orgChild3,
-      }),
+  //       child4: e.orgChild4,
-      posNo:
+  //     }),
-        e.posNoAbb && e.posNo
+  //     posNo:
-          ? `${e.posNoAbb} ${e.posNo}`
+  //       e.posNoAbb && e.posNo
-          : e.posNo
+  //         ? `${e.posNoAbb} ${e.posNo}`
-          ? e.posNo
+  //         : e.posNo
-          : "",
+  //         ? e.posNo
-      posNumCodeSit:
+  //         : "",
-        e.posNumCodeSitAbb && e.posNumCodeSit
+  //     posNumCodeSit:
-          ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
+  //       e.posNumCodeSitAbb && e.posNumCodeSit
-          : e.posNumCodeSit
+  //         ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
-          ? e.posNumCodeSit
+  //         : e.posNumCodeSit
-          : "",
+  //         ? e.posNumCodeSit
-      commandNo:
+  //         : "",
-        e.commandNo && e.commandYear
+  //     commandNo:
-          ? `${e.commandNo}/${Number(e.commandYear) + 543}`
+  //       e.commandNo && e.commandYear
-          : "",
+  //         ? `${e.commandNo}/${Number(e.commandYear) + 543}`
-      commandDateSign: date2Thai(e.commandDateSign),
+  //         : "",
-      commandCode: store.convertCommandCodeName(e.commandCode),
+  //     commandDateSign: date2Thai(e.commandDateSign),
-      remark: e.remark,
+  //     commandCode: store.convertCommandCodeName(e.commandCode),
-    };
+  //     remark: e.remark,
-  });
+  //   };
+  // });
 
-  const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
+  // const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
-  const worksheet = XLSX.utils.json_to_sheet(newData, {
+  // const worksheet = XLSX.utils.json_to_sheet(newData, {
-    header: visibleColumns.value,
+  //   header: visibleColumns.value,
-  });
+  // });
 
-  //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
+  // //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
-  XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
+  // XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
 
-  // Create a new workbook and append the worksheet
+  // // Create a new workbook and append the worksheet
-  const workbook = XLSX.utils.book_new();
+  // const workbook = XLSX.utils.book_new();
 
-  XLSX.utils.book_append_sheet(
+  // XLSX.utils.book_append_sheet(
-    workbook,
+  //   workbook,
-    worksheet,
+  //   worksheet,
-    `รายการประวัติตำแหน่งเงินเดือน`
+  //   `รายการประวัติตำแหน่งเงินเดือน`
-  );
+  // );
-  XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
+  // XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
 }
 
 const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
@@ -847,6 +854,83 @@ async function validateAndSave(
   }
 }
 
+/**
+ * ฟังก์ชันอัปโหลดไฟล์ Excel
+ * เปิด preview modal ก่อนอัปโหลด
+ */
+function handUploadFile() {
+  const input = document.createElement("input");
+  input.type = "file";
+  input.accept = ".xlsx,.xls";
+
+  input.onchange = async (e: Event) => {
+    const file = (e.target as HTMLInputElement).files?.[0];
+    if (!file) return;
+
+    // ตรวจสอบชนิดไฟล์โดยตรวจสอบนามสกุล
+    const validExtensions = [".xlsx", ".xls"];
+    const fileExtension = file.name
+      .substring(file.name.lastIndexOf("."))
+      .toLowerCase();
+
+    if (!validExtensions.includes(fileExtension)) {
+      messageError($q, {
+        response: {
+          data: {
+            title: "กรุณาเลือกไฟล์ Excel เท่านั้น (.xlsx, .xls)",
+          },
+        },
+      });
+      return;
+    }
+
+    // เก็บไฟล์และเปิด preview modal
+    selectedExcelFile.value = file;
+    excelPreviewModal.value = true;
+  };
+
+  input.click();
+}
+
+/**
+ * ฟังก์ชันยืนยันการอัปโหลดไฟล์
+ * ส่งไฟล์ไปยัง API เมื่อ user ยืนยันจาก preview modal
+ */
+async function onConfirmUpload(file: File) {
+  try {
+    isParsingExcel.value = true;
+    showLoader();
+
+    const type = empType.value === "officer" ? "office" : "employee";
+    const formData = new FormData();
+    formData.append("file", file);
+
+    await http.post(config.API.uploadProfile(type, profileId.value), formData, {
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+    });
+
+    success($q, "อัปโหลดไฟล์สำเร็จ");
+    await fetchData();
+    excelPreviewModal.value = false;
+  } catch (error) {
+    messageError($q, error);
+  } finally {
+    hideLoader();
+    isParsingExcel.value = false;
+  }
+}
+
+/**
+ * ฟังก์ชันยกเลิกการอัปโหลด
+ * ปิด preview modal และล้างค่า
+ */
+function onCancelUpload() {
+  selectedExcelFile.value = null;
+  excelPreviewModal.value = false;
+}
+
 onMounted(async () => {
   await Promise.all([fetchData(), fetchType()]);
 });
@@ -886,6 +970,20 @@ onMounted(async () => {
         >
         <q-space />
         <div>
+          <q-btn
+            v-if="
+              tabs === 'PENDING' &&
+              statusCheckEdit == 'PENDING' &&
+              isConfirmEdit
+            "
+            flat
+            round
+            color="blue"
+            icon="upload"
+            @click="handUploadFile()"
+          >
+            <q-tooltip>อัปโหลดไฟล์แก้ไข</q-tooltip>
+          </q-btn>
           <q-btn
             flat
             round
@@ -893,7 +991,9 @@ onMounted(async () => {
             icon="download"
             :disable="rows.length == 0"
             @click="exportToExcel()"
-          />
+          >
+            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
+          </q-btn>
         </div>
 
         <q-input
@@ -1724,6 +1824,13 @@ onMounted(async () => {
     :fetch-data="fetchData"
     :columns="columns"
   />
+
+  <DialogExcelPreview
+    v-model:modal="excelPreviewModal"
+    :file="selectedExcelFile"
+    @confirm="onConfirmUpload"
+    @cancel="onCancelUpload"
+  />
 </template>
 
 <style scoped></style>

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"

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"

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);

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>(
+const isEdit = computed(() => {
-  checkPermission(route)?.attrIsUpdate ? true : false
+  return checkPermission(route)?.attrIsUpdate ? true : false;
-);
+});
 
 const updateEdit = (value: any) => {
   emit("update:edit", value);

src/modules/05_placement/components/PersonalList/CardPosition.vue

@@ -2,7 +2,7 @@
 import { ref, onMounted, watch } from "vue";
 
 /** importType*/
-import type { QTableProps } from "quasar";
+import { type QTableProps } from "quasar";
 import type {
   Positions,
   FormPosType,
@@ -22,14 +22,14 @@ const store = useSelectOrgStore();
 /** props*/
 const selected = defineModel("selectedPos", { required: true }); //ตำแหน่งที่เลือก
 const positionId = defineModel<string>("positionId", { required: true }); //id ตำแหน่งที่เลือก
-const seletcId = defineModel<string>("seletcId", { required: true }); // ตำแหน่งที่เลือก
+const selectId = defineModel<string>("selectId", { 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
@@ -213,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
       );
     }
   }
@@ -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) {
+  if (!positionId.value) {
-    setTimeout(async () => {
-      await onClickSelectPos(positionId.value);
-    }, 1000);
-  } else {
     positionRows.value = positionData.value;
     positionRowsData.value = positionData.value;
   }

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()); // key: provinceId, value: districts[]
+const subDistrictsCache = ref<Map<string, any[]>>(new Map()); // key: districtId, value: subDistricts[]
 
 /**หัวตาราง */
 const columns = ref<QTableProps["columns"]>([
@@ -87,11 +102,20 @@ const columns = ref<QTableProps["columns"]>([
  * ฟังก์ชันดึงข้อมูลรายละเอียด
  */
 async function fetchData() {
+  // Reset ข้อมูลเก่าก่อนโหลดข้อมูลใหม่
+  resetData();
+  
   showLoader();
   await http
     .get(config.API.getDatapersonal(props.personalId))
     .then((res) => {
       personalForm.value = res.data.result;
+      if (res.data.result.dateOfBirth) {
+        // กำหนดอายุ ส่งวันเกิดไปคำนวน
+        age.value = calculateAge(res.data.result.dateOfBirth);
+      } else {
+        age.value = null;
+      }
       personalForm.value?.education.map((e: Education) => {
         rows.value.push({
           university: e.institute,
@@ -107,6 +131,159 @@ async function fetchData() {
     .finally(() => {
       hideLoader();
     });
+
+  // แปลง ID เป็นชื่อ
+  await convertAddressIds();
+}
+
+/**
+ * Reset ข้อมูลทุกครั้งที่เปิดคนใหม่
+ */
+function resetData() {
+  // Reset ข้อมูลส่วนตัว
+  personalForm.value = undefined;
+  age.value = "";
+  rows.value = [];
+  
+  // Reset ข้อมูลที่อยู่
+  currentProvinceName.value = "";
+  currentDistrictName.value = "";
+  currentSubDistrictName.value = "";
+  registProvinceName.value = "";
+  registDistrictName.value = "";
+  registSubDistrictName.value = "";
+}
+
+/**
+ * ฟังก์ชันแปลง ID เป็นชื่อจริงของที่อยู่ (แบบ optimize)
+ */
+async function convertAddressIds() {
+  if (!personalForm.value) return;
+
+  try {
+    // โหลดข้อมูลจังหวัดครั้งเดียวถ้ายังไม่มี
+    await loadProvinces();
+
+    // แปลงข้อมูลที่อยู่ปัจจุบัน
+    if (personalForm.value.currentProvinceId && personalForm.value.currentProvinceId.trim() !== "") {
+      currentProvinceName.value = getProvinceNameFromCache(
+        personalForm.value.currentProvinceId
+      );
+
+      if (personalForm.value.currentDistrictId && personalForm.value.currentDistrictId.trim() !== "") {
+        currentDistrictName.value = await getDistrictNameOptimized(
+          personalForm.value.currentProvinceId,
+          personalForm.value.currentDistrictId
+        );
+
+        if (personalForm.value.currentSubDistrictId && personalForm.value.currentSubDistrictId.trim() !== "") {
+          currentSubDistrictName.value = await getSubDistrictNameOptimized(
+            personalForm.value.currentDistrictId,
+            personalForm.value.currentSubDistrictId
+          );
+        }
+      }
+    }
+
+    // แปลงข้อมูลที่อยู่ตามทะเบียน
+    if (personalForm.value.registProvinceId && personalForm.value.registProvinceId.trim() !== "") {
+      registProvinceName.value = getProvinceNameFromCache(
+        personalForm.value.registProvinceId
+      );
+
+      if (personalForm.value.registDistrictId && personalForm.value.registDistrictId.trim() !== "") {
+        registDistrictName.value = await getDistrictNameOptimized(
+          personalForm.value.registProvinceId,
+          personalForm.value.registDistrictId
+        );
+
+        if (personalForm.value.registSubDistrictId && personalForm.value.registSubDistrictId.trim() !== "") {
+          registSubDistrictName.value = await getSubDistrictNameOptimized(
+            personalForm.value.registDistrictId,
+            personalForm.value.registSubDistrictId
+          );
+        }
+      }
+    }
+  } catch (error) {
+    console.error("Error converting address IDs:", error);
+  }
+}
+
+/**
+ * โหลดข้อมูลจังหวัดทั้งหมด (ครั้งเดียว)
+ */
+async function loadProvinces() {
+  if (provincesCache.value.length === 0) {
+    try {
+      const res = await http.get(config.API.province);
+      provincesCache.value = res.data.result;
+    } catch (error) {
+      console.error("Error loading provinces:", error);
+    }
+  }
+}
+
+/**
+ * ดึงชื่อจังหวัดจาก cache
+ */
+function getProvinceNameFromCache(provinceId: string): string {
+  const province = provincesCache.value.find(
+    (p: any) => p.id.toString() === provinceId
+  );
+  return province ? province.name : "-";
+}
+
+/**
+ * ดึงชื่ออำเภอแบบ optimize (เรียก API เฉพาะจังหวัดที่ต้องการ)
+ * @param provinceId ID ของจังหวัด
+ * @param districtId ID ของอำเภอ
+ */
+async function getDistrictNameOptimized(
+  provinceId: string,
+  districtId: string
+): Promise<string> {
+  try {
+    // เช็ค cache ว่ามีข้อมูล districts ของ province นี้หรือไม่
+    if (!districtsCache.value.has(provinceId)) {
+      const res = await http.get(config.API.listDistrict(provinceId));
+      districtsCache.value.set(provinceId, res.data.result.districts);
+    }
+
+    const districts = districtsCache.value.get(provinceId) || [];
+    const district = districts.find((d: any) => d.id.toString() === districtId);
+    return district ? district.name : "-";
+  } catch (error) {
+    console.error("Error loading district:", error);
+    return "-";
+  }
+}
+
+/**
+ * ดึงชื่อตำบลแบบ optimize (เรียก API เฉพาะอำเภอที่ต้องการ)
+ * @param districtId ID ของอำเภอ
+ * @param subDistrictId ID ของตำบล
+ */
+async function getSubDistrictNameOptimized(
+  districtId: string,
+  subDistrictId: string
+): Promise<string> {
+  try {
+    // เช็ค cache ว่ามีข้อมูล subDistricts ของ district นี้หรือไม่
+    if (!subDistrictsCache.value.has(districtId)) {
+      const res = await http.get(config.API.listSubDistrict(districtId));
+      subDistrictsCache.value.set(districtId, res.data.result.subDistricts);
+    }
+
+    const subDistricts = subDistrictsCache.value.get(districtId) || [];
+    const subDistrict = subDistricts.find(
+      (sd: any) => sd.id.toString() === subDistrictId
+    );
+    return subDistrict ? subDistrict.name : "-";
+  } catch (error) {
+    console.error("Error loading subdistrict:", error);
+    return "-";
+  }
 }
 
 /**
@@ -131,7 +308,7 @@ function formBmaofficer(val: string) {
  */
 async function close() {
   props.close();
-  rows.value = [];
+  resetData(); // Reset ข้อมูลเมื่อปิด dialog
 }
 
 /**
@@ -170,30 +347,58 @@ watch(props, () => {
 
               <div class="row q-pa-xs">
                 <div class="col-3 header-sub-text">
-                  <div class="q-pb-md">เลขประจำตัวประชาชน</div>
+                  <div class="q-pb-sm">เลขประจำตัวประชาชน</div>
-                  <div>วัน/เดือน/ปีเกิด</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 class="q-pb-sm">ชื่อ-นามสกุล</div>
-                  <div>เพศ</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 +408,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">
+                <div class="col-6">
-                  {{ personalForm?.registAddress }}
+                  <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>

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";
@@ -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: {
+interface Props {
-    type: Object,
+  dataRow?: DataList;
-    require: true,
+  fetchTable?: () => Promise<void>;
-  },
+  fetchStatCard?: () => Promise<void>;
-  fetchTable: {
+}
-    type: Function,
+
-    require: true,
+const props = defineProps<Props>();
-  },
-  fetchStatCard: { type: Function, require: true },
-});
 
 /** Tree*/
 const nodeId = ref<string>("");
@@ -65,15 +63,16 @@ 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>(new Date());
+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[]>([]);
+const isLoadPosition = ref<boolean>(false);
 
 /** function เรียกข้อมูลโครงสร้าง แบบปัจุบันและ แบบร่าง*/
 async function fetchStructure() {
@@ -91,12 +90,14 @@ async function fetchStructure() {
  */
 function updateSelected(data: TreeMain) {
   if (props?.dataRow?.nodeId === data.orgTreeId) {
-    positionId.value = props?.dataRow?.posmasterId;
+    positionId.value = props?.dataRow?.posmasterId ?? "";
-    seletcId.value = props?.dataRow?.positionId;
+    selectId.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 = "";
+    selectId.value = "";
     selectedPos.value = [];
     datePos.value = new Date();
   }
@@ -117,6 +118,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,
@@ -150,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);
         }
       });
@@ -162,21 +165,20 @@ 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)
         );
       }
+
+      isLoadPosition.value = true;
     })
     .catch((err) => {
       messageError($q, err);
-      hideLoader();
     })
     .finally(() => {
-      setTimeout(() => {
+      hideLoader();
-        hideLoader();
-      }, 1000);
     });
 }
 
@@ -198,9 +200,11 @@ async function fetchPosFind(level: number, id: string) {
 
       expanded.value = data;
       nodeId.value = id;
-      positionId.value = props?.dataRow?.posmasterId;
+      positionId.value = props?.dataRow?.posmasterId ?? "";
-      seletcId.value = props?.dataRow?.positionId;
+      selectId.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);
     })
@@ -212,12 +216,14 @@ async function fetchPosFind(level: number, id: string) {
 
 /** function บันทึกข้อมูลตำแหน่ง*/
 async function onClickSubmit() {
-  const dataPosMaster = await posMasterMain.value?.find(
+  const dataPosMaster = posMasterMain.value?.find(
-    (e: any) => e.id === positionId.value
+    (e) => e.id === positionId.value
   );
 
   if (selectedPos.value.length === 0) {
     dialogMessageNotify($q, "กรุณาเลือกตำแหน่ง");
+  } else if (!dataPosMaster) {
+    dialogMessageNotify($q, "ไม่พบข้อมูลตำแหน่ง");
   } else {
     dialogConfirm($q, async () => {
       showLoader();
@@ -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,9 +289,8 @@ watch(
   async () => {
     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 = [];
       }
@@ -323,8 +331,7 @@ async function getOrgPosType() {
     })
     .catch((e) => {
       messageError($q, e);
-    })
+    });
-    .finally(() => {});
 }
 
 function onPosType() {
@@ -336,28 +343,15 @@ function onPosType() {
 }
 
 watch(
-  () => isAll.value,
+  [isAll, isBlank, () => isPosition.value],
-  (value, oldVal) => {
+  ([newAll, newBlank, newPos], [oldAll, oldBlank, oldPos]) => {
-    if (value !== oldVal) {
+    const shouldFetch = (newAll !== oldAll) || (newBlank !== oldBlank);
+    const isSelectMode = newPos === "select" && oldPos !== "select";
+
+    if (shouldFetch || isSelectMode) {
       fetchDataTable(nodeId.value, nodeLevel.value);
     }
-  }
+    if (isSelectMode) {
-);
-
-watch(
-  () => isBlank.value,
-  (value, oldVal) => {
-    if (value !== oldVal) {
-      fetchDataTable(nodeId.value, nodeLevel.value);
-    }
-  }
-);
-
-watch(
-  () => isPosition.value === "select",
-  (value, oldVal) => {
-    if (value !== oldVal) {
-      fetchDataTable(nodeId.value, nodeLevel.value);
       getOrgPosType();
     }
   }
@@ -458,15 +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"
+                  v-model:pos-type="posType"
                   v-model:pos-level="posLevel"
                   v-model:option-pos-type="optionPosType"
                   v-model:option-pos-level="optionPosLevel"
@@ -474,7 +468,8 @@ 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>
             </q-tab-panels>

src/modules/05_placement/components/PersonalList/Table.vue

@@ -9,6 +9,8 @@ import { useRoute, useRouter } from "vue-router";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePlacementDataStore } from "@/modules/05_placement/store";
+import { useMenuDataStore } from "@/stores/menuList";
+import { validateFileSize } from "@/utils/function";
 import avatar from "@/assets/avatar_user.jpg";
 
 import type { PartialTableName } from "@/modules/05_placement/interface/request/placement";
@@ -27,6 +29,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 +58,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 ขอผ่อนผัน + สละสิทธิ์
@@ -84,7 +94,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>([]);
@@ -92,6 +101,13 @@ const personal_selected = ref<any>([]);
 const filterlistAdd = ref<string>("");
 const paging = ref<boolean>(true);
 
+const displayAdd = computed(() => {
+  if (!storeMenu.permissions) return true;
+
+  const permission = checkPermission(route);
+  return roleAdmin.value || permission?.attrOwnership === "OWNER";
+});
+
 // เช็ตสถานะการเลือกคนไปยังหน่วยงาน
 const checkSelected = computed(() => {
   if (selected.value.length === 0) {
@@ -248,16 +264,17 @@ const columnsBase = ref<QTableProps["columns"]>([
   },
 ]);
 
-const columns = computed(() =>
+const columns = computed(() => {
-  roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
+  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 +423,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 +572,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 +877,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);
@@ -950,6 +968,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();
@@ -1012,6 +1052,31 @@ onMounted(async () => {
                     </q-item-section>
                     <q-item-section>รายละเอียด</q-item-section>
                   </q-item>
+                  <q-item
+                    v-if="
+                      checkPermission($route)?.attrIsUpdate &&
+                      props.row.isDraft &&
+                      props.row.statusId === 'PREPARE-CONTAIN' &&
+                      (DataStore.isOfficer ||
+                        checkPermission($route)?.attrOwnership == 'OWNER')
+                    "
+                    clickable
+                    v-close-popup
+                    @click="onUpdateDraftStatus(props.row.personalId)"
+                  >
+                    <q-item-section
+                      style="min-width: 0px"
+                      avatar
+                      class="q-py-sm"
+                    >
+                      <q-icon
+                        color="red"
+                        size="xs"
+                        name="mdi-account-arrow-left-outline"
+                      />
+                    </q-item-section>
+                    <q-item-section>ยกเลิกการส่งตัว</q-item-section>
+                  </q-item>
 
                   <q-item
                     v-if="
@@ -1480,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"

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 ?? ""
+      }`;
     },
   },
   {
@@ -110,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})`
+              : ""
           }`
         : "";
     },

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="[
+                    :rules="prefixRankRule()"
-                      (val:string) => {
+                    reactive-rules
-                        return val.length > 0 || 'กรุณาเลือกคำนำหน้าชื่อ';
-                      },
-                    ]"
                     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"

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);
@@ -215,9 +227,9 @@ async function getData() {
       }
       rows.value = list;
       profileId.value = data.profileId;
-      title.value.fullname = `${data.prefix ?? ""}${data.firstName ?? ""} ${
+      title.value.fullname = `${data.rank ? data.rank : data.prefix ?? ""}${
-        data.lastName ?? ""
+        data.firstName ?? ""
-      }`;
+      } ${data.lastName ?? ""}`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
@@ -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)"

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

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 };

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;

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 ?? ""}`;
     },
   },
   {
@@ -131,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})`
+              : ""
           }`
         : "";
     },

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;

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;

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
+  try {
-    .get(config.API.reportRetireList(type, id))
+    const response = await http.get(
-    .then(async (res) => {
+      config.API.retirementReport + `/${type}/${id}`,
-      const data = res.data.result;
+      {
-      await genReport(data, `รายชื่อผู้เกษียณอายุราชการ`, type);
+        headers: {
-    })
+          accept:
-    .catch(async (e) => {
+            type === "pdf"
-      messageError($q, JSON.parse(await e.response.data.text()));
+              ? "application/pdf"
-    })
+              : "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    .finally(() => {
+          "content-Type": "application/json",
-      hideLoader();
+        },
-    });
+        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();
+  }
 }
 
 // ยืนยันการแก้ไขข้อมูล

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

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>("");

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

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,

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";
@@ -229,6 +228,7 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
+                  @keydown.enter.prevent="onSearchData"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
@@ -308,9 +308,7 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{
+                      <span class="text-weight-medium">{{ col.label }}</span>
-                        getColumnLabel(col, isAct)
-                      }}</span>
                     </q-th>
                   </q-tr>
                 </template>

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) {

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",

src/modules/09_leave/components/02_WorkList/DialogDetail.vue

@@ -267,7 +267,13 @@ 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.checkInDate} ${formData.checkInTime} น.`
+                          : "-"
+                      }}
+                    </div>
                   </div>
                   <div class="row">
                     <div class="col text-grey-8">สถานที่ทำงาน</div>
@@ -337,17 +343,23 @@ 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.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>
                       {{
-                        formData.checkInLocationName
+                        formData.checkOutLocationName
-                          ? `นอกสถานที่ (${formData.checkInLocationName})`
+                          ? `นอกสถานที่ (${formData.checkOutLocationName})`
                           : ""
                       }}
                     </div>

src/modules/09_leave/components/02_WorkList/Tab1.vue

@@ -74,6 +74,12 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      if (row.checkInDate && val) {
+        return `${row.checkInDate} ${val} น.`;
+      }
+      return "-";
+    },
   },
   {
     name: "checkInLocation",
@@ -101,6 +107,12 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      if (row.checkOutDate && val) {
+        return `${row.checkOutDate} ${val} น.`;
+      }
+      return "-";
+    },
   },
   {
     name: "checkOutLocation",
@@ -160,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 : "",
+          checkInLat: e.checkInLat,
-          checkInLon: e.checkInLon ? e.checkInLon : "",
+          checkInLon: e.checkInLon,
           checkInStatus: e.checkInStatus
             ? workStore.convertSatatus(e.checkInStatus)
             : "-",
-          checkOutDate: e.checkOutDate ? date2Thai(e.checkOutDate) : "-",
+          checkOutDate: date2Thai(e.checkOutDate),
-          checkOutLocation: e.checkOutLocation ? e.checkOutLocation : "-",
+          checkOutLocation: e.checkOutLocation,
-          checkOutTime: e.checkOutTime ? e.checkOutTime : "-",
+          checkOutTime: e.checkOutTime,
-          checkOutLat: e.checkOutLat ? e.checkOutLat : "",
+          checkOutLat: e.checkOutLat,
-          checkOutLon: e.checkOutLat ? e.checkOutLon : "",
+          checkOutLon: e.checkOutLon,
           checkOutStatus: e.checkOutStatus
             ? workStore.convertSatatus(e.checkOutStatus)
             : "-",

src/modules/09_leave/components/02_WorkList/Tab2.vue

@@ -70,6 +70,12 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkInTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      if (row.checkInDate && val) {
+        return `${row.checkInDate} ${val} น.`;
+      }
+      return "-";
+    },
   },
   {
     name: "checkInLocation",
@@ -88,6 +94,12 @@ const columns = ref<QTableProps["columns"]>([
     field: "checkOutTime",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      if (row.checkOutDate && val) {
+        return `${row.checkOutDate} ${val} น.`;
+      }
+      return "-";
+    },
   },
   {
     name: "checkOutLocation",
@@ -133,15 +145,15 @@ async function fetchListLogRecord() {
           profileType: e.profileType,
           fullName: e.fullName,
           checkInDate: e.checkInDate && date2Thai(e.checkInDate),
-          checkInTime: e.checkInTime ? e.checkInTime : "-",
+          checkInTime: e.checkInTime,
-          checkInLocation: e.checkInLocation ? e.checkInLocation : "-",
+          checkInLocation: e.checkInLocation,
-          checkInLat: e.checkInLat ? e.checkInLat : "",
+          checkInLat: e.checkInLat,
-          checkInLon: e.checkInLon ? e.checkInLon : "",
+          checkInLon: e.checkInLon,
           checkOutDate: e.checkOutDate && date2Thai(e.checkOutDate),
-          checkOutLocation: e.checkOutLocation ? e.checkOutLocation : "-",
+          checkOutLocation: e.checkOutLocation,
-          checkOutTime: e.checkOutTime ? e.checkOutTime : "-",
+          checkOutTime: e.checkOutTime,
-          checkOutLat: e.checkOutLat ? e.checkOutLat : "",
+          checkOutLat: e.checkOutLat,
-          checkOutLon: e.checkOutLon ? e.checkOutLon : "",
+          checkOutLon: e.checkOutLon,
         }));
       } else {
         rows.value = [];

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: "completedDate",
+    align: "left",
+    label: "วันที่เสร็จสิ้น",
+    sortable: true,
+    field: "completedDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val, false, true) : "-";
+    },
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return convertStatus(val);
+    },
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return val ? date2Thai(val, false, true) : "-";
+    },
+  },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ผู้สร้าง",
+    sortable: true,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "startDate",
+  "endDate",
+  "processingDate",
+  "completedDate",
+  "status",
+  "createdAt",
+  "createdFullName",
+]);
+
+const modal = ref<boolean>(false); // dialog
+const isEdit = ref<boolean>(false); // แก้ไขหรือเพิ่ม
+const editId = ref<string>(""); // id ที่จะแก้ไข
+const formData = reactive<FormDataProcess>({
+  startDate: null,
+  endDate: null,
+});
+
+/** ฟังก์ชันดึงข้อมูลจาก API */
+async function fetchData() {
+  try {
+    showLoader();
+    // เรียก API เพื่อดึงข้อมูล
+    const res = await http.get(`${config.API.leaveTask}`);
+    rowsMain.value = res.data.result;
+    serchDataTable();
+  } catch (error) {
+    messageError($q, error);
+  } finally {
+    hideLoader();
+  }
+}
+
+/** ฟังก์ชันค้นหาข้อมูลในตาราง */
+function serchDataTable() {
+  rows.value = onSearchDataTable(
+    keyword.value,
+    rowsMain.value,
+    columns.value ? columns.value : []
+  );
+}
+
+/** ฟังก์ชันเปิด dialog เพื่อเพิ่มข้อมูล */
+function handleOpenDialog() {
+  modal.value = true;
+  isEdit.value = false;
+}
+
+/** ฟังก์ชันปิด dialog และรีเซ็ตข้อมูล */
+function handleCloseDialog() {
+  modal.value = false;
+  formData.startDate = null;
+  formData.endDate = null;
+  editId.value = "";
+}
+
+/** ฟังก์ชันส่งข้อมูล */
+function onSubmit() {
+  dialogConfirm($q, async () => {
+    showLoader();
+
+    // สร้าง payload สำหรับส่งข้อมูลไปยัง API
+    const payload = {
+      startDate: convertDateToAPI(formData.startDate),
+      endDate: convertDateToAPI(formData.endDate),
+    };
+
+    //กำหนด URL และ method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
+    const url = isEdit.value
+      ? `${config.API.leaveTask}/${editId.value}`
+      : config.API.leaveTask;
+
+    // กำหนด method สำหรับเรียก API โดยตรวจสอบว่าเป็นการแก้ไขหรือเพิ่มข้อมูล
+    const method = isEdit.value ? "put" : "post";
+
+    try {
+      await http[method](url, payload);
+      success($q, "บันทึกข้อมูลสำเร็จ");
+      fetchData();
+      handleCloseDialog();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/** ฟังก์ชันตรวจสอบและอัปเดตวันที่สิ้นสุดให้เป็น null หากวันที่เริ่มต้นมากกว่าวันที่สิ้นสุด*/
+function updateDate() {
+  if (
+    formData.startDate &&
+    formData.endDate &&
+    new Date(formData.startDate) > new Date(formData.endDate)
+  ) {
+    formData.endDate = null;
+  }
+}
+
+/**
+ * ฟังก์ชันแก้ไขข้อมูล
+ * @param data ข้อมูลที่ต้องการแก้ไข
+ */
+function handleEdit(data: DataProcess) {
+  isEdit.value = true;
+  editId.value = data.id;
+  formData.startDate = data.startDate;
+  formData.endDate = data.endDate;
+  modal.value = true;
+}
+
+/**
+ * ฟังก์ชันลบข้อมูล
+ * @param id ที่ต้องการลบ
+ */
+function handleDelete(id: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.delete(`${config.API.leaveTask}/${id}`);
+      success($q, "ลบข้อมูลสำเร็จ");
+      fetchData();
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
+/**
+ * ฟังก์ชันแปลงสถานะเป็นข้อความ
+ * @param val
+ */
+function convertStatus(val: string) {
+  switch (val) {
+    case "PENDING":
+      return "รอดำเนินการ";
+    case "COMPLETED":
+      return "ดำเนินการเสร็จสิ้น";
+    default:
+      break;
+  }
+}
+
+onMounted(() => {
+  fetchData();
+});
+</script>
+
+<template>
+  <div class="row items-center q-gutter-x-sm q-pb-sm">
+    <q-btn
+      round
+      dense
+      flat
+      color="primary"
+      icon="add"
+      @click="handleOpenDialog"
+    >
+      <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+    </q-btn>
+
+    <q-space />
+
+    <q-input
+      dense
+      outlined
+      v-model="keyword"
+      label="ค้นหา"
+      @keydown.enter.prevent="serchDataTable"
+    >
+      <template v-slot:append>
+        <q-icon name="search" />
+      </template>
+    </q-input>
+    <q-select
+      v-model="visibleColumns"
+      multiple
+      outlined
+      dense
+      options-dense
+      :display-value="$q.lang.table.columns"
+      emit-value
+      map-options
+      :options="columns"
+      option-value="name"
+      style="min-width: 140px"
+    />
+  </div>
+  <d-table
+    :columns="columns"
+    :rows="rows"
+    row-key="id"
+    flat
+    bordered
+    :paging="true"
+    dense
+    class="custom-header-table"
+    :visible-columns="visibleColumns"
+  >
+    <template v-slot:header="props">
+      <q-tr :props="props">
+        <q-th auto-width />
+        <q-th
+          v-for="col in props.cols"
+          :key="col.name"
+          :props="props"
+          style="color: #000000; font-weight: 500"
+        >
+          <span class="text-weight-medium">{{ col.label }}</span>
+        </q-th>
+      </q-tr>
+    </template>
+    <template v-slot:body="props">
+      <q-tr :props="props" class="cursor-pointer">
+        <q-td auto-width>
+          <q-btn
+            v-if="props.row.status === 'PENDING'"
+            dense
+            flat
+            round
+            color="edit"
+            icon="edit"
+            @click.stop.prevent="handleEdit(props.row)"
+          >
+            <q-tooltip>แก้ไข</q-tooltip>
+          </q-btn>
+
+          <q-btn
+            v-if="props.row.status === 'PENDING'"
+            dense
+            flat
+            round
+            color="red"
+            icon="delete"
+            @click.stop.prevent="handleDelete(props.row.id)"
+          >
+            <q-tooltip>ลบ</q-tooltip>
+          </q-btn>
+        </q-td>
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
+          <div v-if="col.name == 'no'">
+            {{ props.rowIndex + 1 }}
+          </div>
+          <div v-else>
+            {{ col.value ? col.value : "-" }}
+          </div>
+        </q-td>
+      </q-tr>
+    </template>
+  </d-table>
+
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 320px">
+      <q-form greedy @submit.prevent @validation-success="onSubmit">
+        <HeaderDialog
+          :tittle="'ประมวลผลการขาดราชการ/มาสาย'"
+          :close="handleCloseDialog"
+        />
+
+        <q-separator />
+        <q-card-section>
+          <div class="row q-col-gutter-md">
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="formData.startDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+                @update:model-value="updateDate"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    ref="dateRef"
+                    outlined
+                    dense
+                    hide-bottom-space
+                    :model-value="
+                      formData.startDate != null
+                        ? date2Thai(formData.startDate)
+                        : null
+                    "
+                    label="วันที่เริ่มต้น"
+                    :rules="[
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`,
+                    ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                v-model="formData.endDate"
+                :locale="'th'"
+                autoApply
+                borderless
+                :enableTimePicker="false"
+                week-start="0"
+                :min-date="formData.startDate"
+              >
+                <template #year="{ year }">
+                  {{ year + 543 }}
+                </template>
+                <template #year-overlay-value="{ value }">
+                  {{ parseInt(value + 543) }}
+                </template>
+                <template #trigger>
+                  <q-input
+                    ref="dateRef"
+                    outlined
+                    dense
+                    hide-bottom-space
+                    :model-value="
+                      formData.endDate != null
+                        ? date2Thai(formData.endDate)
+                        : null
+                    "
+                    label="วันที่สิ้นสุด"
+                    :rules="[
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
+                    ]"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        style="color: var(--q-primary)"
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
+        </q-card-section>
+
+        <q-separator />
+        <q-card-actions align="right">
+          <q-btn color="secondary" label="บันทึก" type="submit" />
+        </q-card-actions>
+      </q-form>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>

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>

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,43 @@ 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,
+      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 = {
       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 +275,10 @@ watch(
                 ? "เปลี่ยนรอบการปฏิบัติงาน"
                 : "ประวัติการเปลี่ยนรอบการปฏิบัติงาน"
             }}
-            <span class="text-teal-6">{{
+            <span class="text-teal-6" v-if="!isMultiple">
-              props.DataRow ? props.DataRow.fullName : ""
+              {{ props.DataRow ? props.DataRow.fullName : "" }}
-            }}</span></q-toolbar-title
+            </span>
-          >
+          </q-toolbar-title>
           <q-btn
             icon="close"
             unelevated
@@ -259,7 +292,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 +300,12 @@ watch(
                   size="md"
                 >
                 </q-icon>
-                <span class="self-center text-bold text-blue text-subtitle1"
+                <span class="self-center text-bold text-blue text-subtitle1">
-                  >รอบปัจจุบัน</span
+                  รอบปัจจุบัน
-                >
+                </span>
-                <span class="self-center text-subtitle1 q-ml-sm">{{
+                <span class="self-center text-subtitle1 q-ml-sm">
-                  props.DataRow ? `${props.DataRow.currentRound} น.` : ""
+                  {{ props.DataRow ? `${props.DataRow.currentRound} น.` : "" }}
-                }}</span>
+                </span>
               </div>
               <div class="row q-mt-sm q-col-gutter-sm">
                 <div class="col-6">

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: "", //สถานที่ติดต่อขณะลา
@@ -149,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") {
+  if (typeAdd.value === "COMMANDER") {
-    return rows.value?.approvers.map((items: SeqTypeRow) => items.profileId);
+    return rows.value?.approvers.map((items: SeqTypeRow) => ({
-  } else if (typeAdd.value == "APPROVER") {
+      profileId: items.profileId,
-    return rows.value?.commanders.map((items: SeqTypeRow) => 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;
@@ -391,6 +412,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,
@@ -668,10 +692,10 @@ onMounted(async () => {
         fetchOptionType(),
         fetchKeycloakPositionData(),
         fetchDetailLeave(paramsId),
-        checkOfficer(),
       ]);
 
       await checkLeaveType(formData.leaveTypeId, formData);
+      await checkOfficer();
     } finally {
       hideLoader();
     }
@@ -773,40 +797,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>
@@ -1258,5 +1292,6 @@ onMounted(async () => {
     :id-check="idCheck"
     :keycloak-user-id="keycloakUserId"
     :commanders-list="commanderList"
+    :commanders-is-act="isAct"
   />
 </template>

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>

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";
@@ -30,6 +29,7 @@ const props = defineProps({
   fetchDetailLeave: Function,
   idCheck: Array,
   commandersList: Array,
+  commandersIsAct: Boolean,
 });
 
 const pageId = ref<string>(route.params.id as string);
@@ -117,7 +117,7 @@ async function getData() {
       total.value = data.total;
       rows.value = data.data;
       selected.value = data.data.filter((items: any) => {
-        return props.idCheck?.some((i: any) => i === items.id);
+        return props.idCheck?.some((i: any) => i === items.key);
       });
     })
     .catch((err) => {
@@ -153,10 +153,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 +209,7 @@ watch(
   () => modal.value,
   () => {
     if (modal.value) {
+      isAct.value = props.commandersIsAct ?? false;
       getSearch();
     }
   }
@@ -233,6 +238,7 @@ watch(
                   label="ค้นหา"
                   v-model="keyword"
                   style="width: 300px"
+                  @keydown.enter.prevent="onSearchData()"
                 >
                   <template v-slot:append>
                     <q-icon name="search"></q-icon>
@@ -312,9 +318,7 @@ watch(
                       :key="col.name"
                       :props="props"
                     >
-                      <span class="text-weight-medium">{{
+                      <span class="text-weight-medium">{{ col.label }}</span>
-                        getColumnLabel(col, isAct)
-                      }}</span>
                     </q-th>
                   </q-tr>
                 </template>

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,10 +105,18 @@ async function onSubmit() {
       leaveTypeId: formData.leaveTypeId,
       leaveYear: formData.leaveYear,
       leaveDays: formData.leaveDays ? Number(formData.leaveDays) : 0,
-      leaveDaysUsed: formData.leaveDaysUsed
+      leaveDaysUsed:
-        ? Number(formData.leaveDaysUsed)
+        checkPermission(route)?.attrOwnership === "OWNER"
-        : 0,
+          ? formData.leaveDaysUsed
-      leaveCount: formData.leaveCount ? Number(formData.leaveCount) : 0,
+            ? Number(formData.leaveDaysUsed)
+            : 0
+          : undefined,
+      leaveCount:
+        checkPermission(route)?.attrOwnership === "OWNER"
+          ? formData.leaveCount
+            ? Number(formData.leaveCount)
+            : 0
+          : undefined,
       beginningLeaveDays: formData.beginningLeaveDays
         ? Number(formData.beginningLeaveDays)
         : 0,
@@ -265,7 +274,6 @@ watch(modal, async (val) => {
       await Promise.all([
         filterLeaveTypeData(),
         isStatusEdit.value && defineDataLeaveBeginning(rowData.value),
-        console.log(rowData.value),
       ]);
     } finally {
       hideLoader();
@@ -314,6 +322,7 @@ watch(modal, async (val) => {
                     hide-bottom-space
                     dense
                     label="คำค้น"
+                    @keydown.enter.prevent="onSearchData(true)"
                   >
                     <template v-slot:after>
                       <q-btn
@@ -387,7 +396,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
@@ -398,6 +407,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 }">{{
@@ -454,7 +464,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'"
@@ -462,31 +472,8 @@ watch(modal, async (val) => {
                     dense
                     outlined
                     label="จำนวนสิทธิ์การลา"
-                    hide-bottom-space
+                    hint="* สำหรับลาพักผ่อนเท่านั้น คือสิทธิ์ลาประจำปี + สิทธิ์สะสม"
-                  />
+                    :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
-                    mask="#"
-                    reverse-fill-mask
-                  />
-                </div>
-                <div class="col-12">
-                  <q-input
-                    :class="classInput(true)"
-                    v-model="formData.leaveCount"
-                    dense
-                    outlined
-                    label="ที่ใช้ไป (ครั้ง)"
-                    hide-bottom-space
-                    mask="#"
-                    reverse-fill-mask
                   />
                 </div>
 
@@ -496,10 +483,9 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveDays"
                     dense
                     outlined
-                    label="ยกมา (วัน)"
+                    label="จำนวนวันลาก่อนใช้งานระบบ"
-                    hide-bottom-space
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    mask="#"
+                    hint="* จำนวนวันรวมการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
-                    reverse-fill-mask
                   />
                 </div>
 
@@ -509,10 +495,38 @@ watch(modal, async (val) => {
                     v-model="formData.beginningLeaveCount"
                     dense
                     outlined
-                    label="ยกมา (ครั้ง)"
+                    label="จำนวนครั้งที่ลาก่อนใช้งานระบบ"
+                    :rules="[(val: string) => !val || /^\d+$/.test(val) || 'กรุณากรอกเฉพาะตัวเลขที่เป็นจำนวนเต็ม']"
+                    hint="* จำนวนครั้งของการลาในปีงบประมาณนี้ที่เกิดขึ้นก่อนเริ่มใช้ระบบ"
+                  />
+                </div>
+
+                <div
+                  v-if="checkPermission(route)?.attrOwnership === 'OWNER'"
+                  class="col-12"
+                >
+                  <q-input
+                    :class="classInput(true)"
+                    v-model="formData.leaveDaysUsed"
+                    dense
+                    outlined
+                    label="ที่ใช้ไปทั้งหมด (วัน)"
                     hide-bottom-space
-                    mask="#"
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    reverse-fill-mask
+                  />
+                </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>

src/modules/09_leave/interface/request/changeRound.ts

@@ -4,6 +4,8 @@ interface DataPost {
   lastName: string;
   page: number;
   pageSize: number;
+  selectedNodeId?: string | null;
+  selectedNode?: string;
 }
 
 interface DataOption {

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; //*วัน เดือน ปีสิ้นสุดลา

src/modules/09_leave/interface/request/work.ts

@@ -0,0 +1,6 @@
+interface FormDataProcess {
+  startDate: Date | null;
+  endDate: Date | null;
+}
+
+export type { FormDataProcess };

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;

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,
+};

src/modules/09_leave/stores/ChangeRoundStore.ts

@@ -125,7 +125,7 @@ export const useChangeRoundDataStore = defineStore(
 
     async function fetchDataForCardId(dataDetail: any, type?: string) {
       if (dataDetail) {
-        showLoader();
+        // showLoader();
         const url =
           type && type == "emp"
             ? config.API.leaveSearchEMP()
@@ -138,6 +138,8 @@ export const useChangeRoundDataStore = defineStore(
             page: dataDetail.page, //หน้า
             pageSize: dataDetail.pageSize || 10, //จำนวนแถวต่อหน้า
             keyword: dataDetail.keyword || "", //keyword ค้นหา
+            selectedNodeId: dataDetail.selectedNodeId, //id ต้นไม้ที่เลือก
+            selectedNode: dataDetail.selectedNode, //ระดับต้นไม้ที่เลือก
           })
           .then((res) => {
             const apiData = res.data.result.data;
@@ -148,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,
@@ -167,7 +170,7 @@ export const useChangeRoundDataStore = defineStore(
             console.log(e);
           })
           .finally(() => {
-            hideLoader();
+            // hideLoader();
           });
       }
     }

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,
   };
 });

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>

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";
@@ -7,22 +7,20 @@ 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,
+const { showLoader, hideLoader, success, messageError, dialogConfirm } = mixin;
-  hideLoader,
-  success,
-  messageError,
-  dialogMessageNotify,
-  dialogConfirm,
-} = mixin;
 const dataStore = useChangeRoundDataStore();
+const { fetchStructureTree } = useStructureTree();
 
 /** use */
 const $q = useQuasar();
@@ -37,9 +35,42 @@ const formData = reactive<DataPost>({
   firstName: "",
   lastName: "",
   page: 1,
-  pageSize: 10,
+  pageSize: 100,
+  selectedNodeId: null,
+  selectedNode: "",
 });
 
+const pagination = ref({
+  page: 1,
+  rowsPerPage: 0,
+});
+
+/** โครงสร้างข้อมูลต้นไม้ขององค์กร **/
+const nodeTree = ref<any[]>([]);
+const expanded = ref<string[]>([]);
+const orgTreeId = ref<string | null>(null);
+const filter = ref<string>("");
+const selected = ref<any[]>([]);
+const isMultiple = ref<boolean>(false);
+
+/** client-side data & batch loading **/
+const allRows = ref<any[]>([]);
+const isLoadingAll = ref<boolean>(false);
+const loadAllProgress = ref<number>(0);
+const totalToLoad = ref<number | null>(null);
+const BATCH_SIZE = 250;
+
+function waitForUi() {
+  return new Promise((resolve) => {
+    setTimeout(resolve, 0);
+  });
+}
+
+/** function fetch ข้อมูลของ Tree*/
+async function fetchDataTree() {
+  nodeTree.value = await fetchStructureTree(route.meta.Key as string, true);
+}
+
 /**
  * Function openPopup
  * @param check action edit,history
@@ -87,6 +118,7 @@ async function OpenmodalFix(detail: any) {
 function closeDialog() {
   modal.value = false;
   modalFix.value = false;
+  isMultiple.value = false;
 }
 
 function save() {
@@ -110,214 +142,416 @@ function save() {
   });
 }
 
-/**
+/** Function โหลดข้อมูลทั้งหมดแบบ batch แล้วให้ QTable ทำ pagination เอง */
- * function updatePagination
+async function fetchAllData() {
- * @param newPagination ข้อมูล Pagination ใหม่
+  isLoadingAll.value = true;
- */
+  allRows.value = [];
-function updatePagination(newPagination: any) {
+  loadAllProgress.value = 0;
-  formData.pageSize = newPagination.rowsPerPage;
+  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() {
-  if (formData.cardId || formData.firstName || formData.lastName) {
+  await fetchAllData();
-    await dataStore.fetchDataForCardId(formData);
+}
-  } else {
+
-    dialogMessageNotify($q, "กรุณากรอกข้อมูลอย่างน้อย 1 ช่อง");
+function submitSearchByEnter() {
-  }
+  if (isLoadingAll.value) return;
+  if (!checkPermission(route)?.attrIsGet) return;
+  formData.page = 1;
+  searchData();
+}
+
+/** Function เลือกทั้งหมด */
+function selectAllRows() {
+  selected.value = [...allRows.value];
+}
+
+function onSelectedOrgTree(data: any) {
+  if (isLoadingAll.value) return;
+  selected.value = [];
+  allRows.value = [];
+  orgTreeId.value = data.orgTreeId;
+  formData.selectedNodeId = data.orgTreeDnaId;
+  formData.selectedNode = data.orgLevel;
+  formData.page = 1;
+}
+
+function handleSelectMultiple() {
+  modal.value = true;
+  isMultiple.value = true;
+  editCheck.value = "edit";
+}
+
+function resetSelected() {
+  selected.value = [];
 }
 
 watch(
   () => formData.pageSize,
   () => {
-    formData.page = 1;
+    // pageSize ถูกควบคุมโดย QTable (client-side) ไม่ต้อง fetch API ใหม่
-    searchData();
   }
 );
 
 onMounted(() => {
+  fetchDataTree();
   dataStore.rows = [];
+  allRows.value = [];
 });
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     เปลี่ยนแปลงรอบการปฏิบัติงานของข้าราชการ
   </div>
-  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+
-    <div class="row col-12 q-mb-sm">
+  <q-card>
-      <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
+    <q-card-section :horizontal="$q.screen.gt.xs">
-        <div class="text-dark col-12 text-weight-bold text-subtitle1">
+      <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">
+        <div class="bg-white tree-container q-pa-xs">
-          <q-input
+          <q-tree
-            :readonly="!checkPermission($route)?.attrIsGet"
+            class="q-pa-sm q-gutter-sm"
-            v-model="formData.cardId"
-            outlined
-            label="เลขประจำตัวประชาชน"
-            class="col-6 col-md-4 bg-white inputgreen"
             dense
-            hide-bottom-space
+            :nodes="nodeTree"
-            maxlength="13"
+            node-key="orgTreeId"
-          />
+            label-key="labelName"
-          <q-input
+            :filter="filter.trim()"
-            :readonly="!checkPermission($route)?.attrIsGet"
+            no-results-label="ไม่พบข้อมูลที่ค้นหา"
-            v-model="formData.firstName"
+            no-nodes-label="ไม่มีข้อมูล"
-            outlined
+            v-model:expanded="expanded"
-            label="ชื่อ"
+          >
-            class="col-5 col-md-3 bg-white inputgreen"
+            <template v-slot:default-header="prop">
-            dense
+              <q-item
-            hide-bottom-space
+                clickable
-          />
+                :active="orgTreeId == prop.node.orgTreeId"
-          <q-input
+                @click.stop="onSelectedOrgTree(prop.node)"
-            :readonly="!checkPermission($route)?.attrIsGet"
+                active-class="my-list-link text-primary text-weight-medium"
-            v-model="formData.lastName"
+                class="row col-12 text-dark items-center q-py-xs q-pl-sm rounded-borders my-list"
-            outlined
+              >
-            label="นามสกุล"
+                <div>
-            class="col-6 col-md-3 bg-white inputgreen"
+                  <div class="text-weight-medium">
-            dense
+                    {{ prop.node.orgTreeName }}
-            hide-bottom-space
+                  </div>
-          />
+                  <div class="text-weight-light text-grey-8">
-          <q-btn
+                    {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
-            v-if="checkPermission($route)?.attrIsGet"
+                    {{
-            @click="(formData.page = 1), searchData()"
+                      prop.node.orgTreeShortName == null
-            for="#search"
+                        ? null
-            dense
+                        : prop.node.orgTreeShortName
-            unelevated
+                    }}
-            color="primary"
+                  </div>
-            class="q-px-sm col-5 col-md-1"
+                </div>
-            style="max-height: 40px"
+              </q-item>
-            >ค้นหา</q-btn
+            </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"
+      >
+        <div class="row col-xs-12 col-sm-9">
+          <q-card flat bordered class="bg-grey-2 col-12 bg-white q-pa-lg">
+            <div class="text-dark col-12 text-weight-bold text-subtitle1">
+              ค้นหารายชื่อ
+            </div>
+            <div class="row justify-between q-gutter-y-sm">
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
+                v-model="formData.cardId"
+                outlined
+                label="เลขประจำตัวประชาชน"
+                class="col-6 col-md-4 bg-white inputgreen"
+                dense
+                hide-bottom-space
+                maxlength="13"
+                @keyup.enter="submitSearchByEnter"
+              />
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
+                v-model="formData.firstName"
+                outlined
+                label="ชื่อ"
+                class="col-5 col-md-3 bg-white inputgreen"
+                dense
+                hide-bottom-space
+                @keyup.enter="submitSearchByEnter"
+              />
+              <q-input
+                :readonly="!checkPermission($route)?.attrIsGet || isLoadingAll"
+                v-model="formData.lastName"
+                outlined
+                label="นามสกุล"
+                class="col-6 col-md-3 bg-white inputgreen"
+                dense
+                hide-bottom-space
+                @keyup.enter="submitSearchByEnter"
+              />
+              <q-btn
+                v-if="checkPermission($route)?.attrIsGet"
+                @click="(formData.page = 1), searchData()"
+                :disable="isLoadingAll"
+                for="#search"
+                dense
+                unelevated
+                color="primary"
+                class="q-px-sm col-5 col-md-1"
+                style="max-height: 40px"
+                >ค้นหา</q-btn
+              >
+            </div>
+          </q-card>
+        </div>
+        <div
+          v-if="
+            allRows.length === 0 &&
+            dataStore.checkCilck === true &&
+            !isLoadingAll
+          "
+        >
+          <q-card
+            flat
+            bordered
+            class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
+            >ไม่พบข้อมูล</q-card
           >
         </div>
-      </q-card>
+        <div v-if="allRows.length !== 0 || isLoadingAll" class="col-12">
-    </div>
+          <q-banner
-    <div v-if="dataStore.rows.length === 0 && dataStore.checkCilck === true">
+            v-if="isLoadingAll"
-      <q-card
+            rounded
-        flat
+            class="bg-blue-1 text-primary q-mb-sm"
-        bordered
+          >
-        class="bg-grey-2 col-12 q-pa-lg text-center text-subtitle1 text-bold"
+            <div class="row items-center q-gutter-sm">
-        >ไม่พบข้อมูล</q-card
+              <q-spinner color="primary" size="22px" />
-      >
+              <div v-if="totalToLoad === null || totalToLoad <= 500">
-    </div>
+                กำลังค้นหาข้อมูล กรุณารอสักครู่
-    <div v-if="dataStore.rows.length !== 0" class="col-12 q-mt-xl">
+              </div>
-      <d-table
+              <div v-else>
-        ref="table"
+                กำลังโหลดข้อมูลจำนวนมาก กรุณารอสักครู่
-        :columns="dataStore.columns"
+                <div class="text-caption text-grey-7">
-        :rows="dataStore.rows"
+                  ระบบกำลังดึงข้อมูลทั้งหมด
-        row-key="interrogated"
+                  {{ totalToLoad.toLocaleString() }} รายการ
-        flat
+                </div>
-        bordered
+              </div>
-        dense
+            </div>
-        class="custom-header-table"
+          </q-banner>
-        :visible-columns="dataStore.visibleColumns"
+          <q-linear-progress
-        :rows-per-page-options="[10, 25, 50, 100]"
+            v-if="isLoadingAll && totalToLoad === null"
-        @update:pagination="updatePagination"
+            indeterminate
-      >
+            color="primary"
-        <!-- :paging="true" -->
+            class="q-mb-xs"
-        <template v-slot:header="props">
+          />
-          <q-tr :props="props">
+          <q-linear-progress
-            <q-th auto-width />
+            v-if="isLoadingAll && totalToLoad !== null"
-            <q-th
+            :value="loadAllProgress / 100"
-              v-for="col in props.cols"
+            color="primary"
-              :key="col.name"
+            class="q-mb-xs"
-              :props="props"
+          />
-              style="color: #000000; font-weight: 500"
+          <div
-            >
+            v-if="isLoadingAll && totalToLoad !== null"
-              <span class="text-weight-medium">{{ col.label }}</span>
+            class="text-caption text-grey-6 q-mb-xs"
-            </q-th>
+          >
-          </q-tr>
+            กำลังโหลด... {{ allRows.length.toLocaleString() }} /
-        </template>
+            {{ totalToLoad.toLocaleString() }} รายการ
-        <template v-slot:body="props">
+          </div>
-          <q-tr :props="props">
+          <div class="row justify-between items-center q-mb-sm">
-            <q-td>
+            <div class="row q-gutter-sm">
-              <div>
+              <!-- <q-btn
-                <q-btn
+                color="secondary"
-                  flat
+                dense
-                  icon="mdi-dots-horizontal-circle-outline"
+                icon="mdi-checkbox-multiple-marked-outline"
-                  color="secondary"
+                label="เลือกทั้งหมด"
-                  for="#cancel"
+                :disable="isLoadingAll || allRows.length === 0"
-                  dense
+                @click="selectAllRows()"
-                  round
+              /> -->
+              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
+                :disable="selected.length === 0 || isLoadingAll"
+                :color="selected.length === 0 ? 'grey' : 'info'"
+                dense
+                icon="mdi-shuffle-variant"
+                :label="`เปลี่ยนรอบการลงเวลา${
+                  selected.length > 0 ? ` (${selected.length})` : ''
+                }`"
+                @click="handleSelectMultiple()"
+              />
+            </div>
+          </div>
+
+          <d-table
+            ref="table"
+            :columns="dataStore.columns"
+            :rows="allRows"
+            row-key="profileId"
+            flat
+            bordered
+            dense
+            virtual-scroll
+            table-style="max-height: 58vh"
+            class="custom-header-table"
+            :visible-columns="dataStore.visibleColumns"
+            hide-pagination
+            v-model:pagination="pagination"
+            selection="multiple"
+            v-model:selected="selected"
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width>
+                  <q-checkbox
+                    keep-color
+                    color="primary"
+                    dense
+                    :disable="isLoadingAll"
+                    v-model="props.selected"
+                  />
+                </q-th>
+                <q-th auto-width />
+                <q-th
+                  v-for="col in props.cols"
+                  :key="col.name"
+                  :props="props"
+                  style="color: #000000; font-weight: 500"
                 >
-                  <q-menu>
+                  <span class="text-weight-medium">{{ col.label }}</span>
-                    <q-list>
+                </q-th>
-                      <q-item
+              </q-tr>
-                        v-if="checkPermission($route)?.attrIsUpdate"
+            </template>
-                        clickable
+            <template v-slot:body="props">
-                        v-close-popup
+              <q-tr :props="props">
-                        @click="Openmodal('edit', props.row)"
+                <q-td class="text-center">
-                      >
+                  <q-checkbox
-                        <q-item-section style="min-width: 0px" avatar>
+                    keep-color
-                          <q-icon
+                    color="primary"
-                            color="primary"
+                    dense
-                            name="mdi-shuffle-variant"
+                    :disable="isLoadingAll"
-                            size="xs"
+                    v-model="props.selected"
-                          />
+                  />
-                        </q-item-section>
+                </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-section>
-                          <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
+                              <q-item-label>เปลี่ยนรอบการลงเวลา</q-item-label>
-                        </q-item-section>
+                            </q-item-section>
-                      </q-item>
+                          </q-item>
-                      <q-item
+                          <q-item
-                        v-if="checkPermission($route)?.attrIsUpdate"
+                            v-if="checkPermission($route)?.attrIsUpdate"
-                        clickable
+                            clickable
-                        v-close-popup
+                            v-close-popup
-                        @click="OpenmodalFix(props.row)"
+                            @click="OpenmodalFix(props.row)"
-                      >
+                          >
-                        <q-item-section style="min-width: 0px" avatar>
+                            <q-item-section style="min-width: 0px" avatar>
-                          <q-icon color="edit" name="edit" size="xs" />
+                              <q-icon color="edit" name="edit" size="xs" />
-                        </q-item-section>
+                            </q-item-section>
 
-                        <q-item-section>
+                            <q-item-section>
-                          <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
+                              <q-item-label>แก้ไขปฏิทินวันทำงาน</q-item-label>
-                        </q-item-section>
+                            </q-item-section>
-                      </q-item>
+                          </q-item>
-                      <q-item
+                          <q-item
-                        clickable
+                            clickable
-                        v-close-popup
+                            v-close-popup
-                        @click="Openmodal('history', props.row)"
+                            @click="Openmodal('history', props.row)"
-                      >
+                          >
-                        <q-item-section style="min-width: 0px" avatar>
+                            <q-item-section style="min-width: 0px" avatar>
-                          <q-icon
+                              <q-icon
-                            color="deep-purple"
+                                color="deep-purple"
-                            name="mdi-history"
+                                name="mdi-history"
-                            size="xs"
+                                size="xs"
-                          />
+                              />
-                        </q-item-section>
+                            </q-item-section>
-                        <q-item-section>
+                            <q-item-section>
-                          <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
+                              <q-item-label>ประวัติการเปลี่ยนรอบ</q-item-label>
-                        </q-item-section>
+                            </q-item-section>
-                      </q-item>
+                          </q-item>
-                    </q-list>
+                        </q-list>
-                  </q-menu>
+                      </q-menu>
-                </q-btn>
+                    </q-btn>
-              </div>
+                  </div>
-            </q-td>
+                </q-td>
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                <q-td v-for="col in props.cols" :key="col.name" :props="props">
-              <div>
+                  <div>
-                {{ col.value ?? "-" }}
+                    {{ col.value ?? "-" }}
-              </div>
+                  </div>
-            </q-td>
+                </q-td>
-          </q-tr>
+              </q-tr>
-        </template>
+            </template>
-        <template v-slot:pagination="scope">
+          </d-table>
-          ทั้งหมด {{ dataStore.totalListMain }} รายการ
+          <div class="text-caption text-grey-7 q-mt-sm">
-          <q-pagination
+            ทั้งหมด {{ allRows.length }} รายการ
-            v-model="formData.page"
+          </div>
-            active-color="primary"
+        </div>
-            color="dark"
+      </q-card-section>
-            :max="Number(dataStore.maxPageMain)"
+    </q-card-section>
-            size="sm"
-            boundary-links
-            direction-links
-            :max-pages="5"
-            @update:model-value="dataStore.fetchDataForCardId(formData)"
-          ></q-pagination>
-        </template>
-      </d-table>
-    </div>
   </q-card>
 
   <!-- popup เปลี่ยนรอบการปฏิบัติงาน ,ประวัติการเปลี่ยนรอบการปฏิบัติงาน  -->
@@ -328,6 +562,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 +621,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>

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 {
-import type { DataSpecialTime } from "@/modules/09_leave/interface/index/Main";
+  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="{ year }">
-          <template #year-overlay-value="{ value }">{{
+            {{ year + 543 }}
-            parseInt(value + 543)
+          </template>
-          }}</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 />
+      <q-space v-if="!$q.screen.xs && !$q.screen.sm" />
-      <div class="col-xs-12 col-sm-3 col-md-2">
+      <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

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"
+                v-if="
-                @click="getReport()"
+                  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

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",

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({
+const props = defineProps<{
-  rows: {
+  rows?: any[];
-    type: Array,
+  columns?: QTableColumn[];
-    default: [],
+  visibleColumns?: string[];
-  },
+  fetchData?: () => void;
-  columns: {
+}>();
-    type: Array,
-    default: [],
-  },
-  visibleColumns: {
-    type: Array,
-    default: [],
-  },
-  fetchData: Function,
-});
 
 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

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,

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";

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,

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>

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"; //เรื่องร้องเรียน

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>

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

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.evaluationMain() + `/del-director/${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'">

src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardMeet.vue

@@ -27,6 +27,7 @@ const {
   dialogConfirm,
   date2Thai,
   success,
+  dialogRemove,
 } = mixin;
 
 /** props*/
@@ -208,6 +209,23 @@ async function getList() {
     });
 }
 
+function handleDelete(meetingId: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    try {
+      await http.delete(
+        config.API.evaluationMain() + `/del-meeting/${id.value}/${meetingId}`
+      );
+      await props.fetchData();
+      await success($q, "ลบสำเร็จ");
+    } catch (error) {
+      messageError($q, error);
+    } finally {
+      hideLoader();
+    }
+  });
+}
+
 watch(
   () => props.data,
   () => {
@@ -265,6 +283,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 +291,19 @@ watch(
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
+            <q-td auto-width>
+              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
+                flat
+                round
+                dense
+                icon="delete"
+                color="red"
+                @click="handleDelete(props.row.id)"
+              >
+                <q-tooltip>ลบ</q-tooltip>
+              </q-btn>
+            </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <div v-if="col.name == 'no'">
                 {{ props.rowIndex + 1 }}

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

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,

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,

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);

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",