diff --git a/package.json b/package.json
index fc5a6bd..d84d6c4 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "@tato30/vue-pdf": "^1.5.1",
     "@vuepic/vue-datepicker": "^3.6.3",
     "bma-org-chart": "^0.0.7",
+    "exceljs": "^4.4.0",
     "html-to-image": "^1.11.13",
     "keycloak-js": "^20.0.2",
     "moment": "^2.29.4",
diff --git a/src/components/DialogDebug.vue b/src/components/DialogDebug.vue
index d51100e..401d641 100644
--- a/src/components/DialogDebug.vue
+++ b/src/components/DialogDebug.vue
@@ -316,6 +316,9 @@ function onClose() {
               </q-uploader>
             </div>
             <div class="col-12">
+              <div class="text-caption text-grey-7 q-mb-sm">
+                ผู้ดูแลระบบจะติดต่อกลับผ่านทางอีเมลที่ท่านระบุ กรุณาตรวจสอบอีเมลของท่านเป็นระยะ
+              </div>
               <div class="row col-12 q-col-gutter-sm">
                 <div class="col-xs-12 col-md-6 col-lg-6">
                   <q-input
@@ -326,10 +329,11 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                      (val: string) => !!val || 'กรุณากรอกที่อยู่อีเมล',
+                      (val: string) => {
+                        const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+                        return emailPattern.test(val) || 'กรุณากรอกที่อยู่อีเมลในรูปแบบที่ถูกต้อง';
+                      }
                     ]"
                   />
                 </div>
@@ -341,12 +345,6 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
-                    :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
-                    ]"
                   />
                 </div>
               </div>
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 2c05ebd..3333374 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -206,7 +206,7 @@ async function fetchDataDetail(id: string) {
       formData.leaveDateEnd = data.leaveEndDate && date2Thai(data.leaveEndDate);
       formData.leaveCount = calculateDurationYmd(
         data.leaveStartDate,
-        data.leaveEndDate
+        data.leaveEndDate,
       );
       formData.leaveWrote = data.leaveWrote ?? "-";
       formData.leaveAddress = data.leaveAddress ?? "-";
@@ -255,8 +255,7 @@ async function fetchDataDetail(id: string) {
       formData.studyDaySubject = data.studyDaySubject ?? "-";
       formData.studyDayDegreeLevel = data.studyDayDegreeLevel ?? "-";
       formData.studyDayUniversityName = data.studyDayUniversityName ?? "-";
-      formData.studyDayTrainingSubject =
-        data.studyDayTrainingSubject ?? "-" ?? "-";
+      formData.studyDayTrainingSubject = data.studyDayTrainingSubject ?? "-";
       formData.studyDayTrainingName = data.studyDayTrainingName ?? "-";
       formData.studyDayCountry = data.studyDayCountry ?? "-";
       formData.studyDayScholarship = data.studyDayScholarship ?? "-";
@@ -383,7 +382,7 @@ async function onClickSave() {
         onSubmit();
       },
       "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?"
+      "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?",
     );
   } else {
   }
@@ -425,7 +424,7 @@ watch(
         ? props.leaveId && fetchDataCancelDetail(props.leaveId)
         : props.leaveId && fetchDataDetail(props.leaveId);
     }
-  }
+  },
 );
 </script>
 
diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index f1e754e..9b6df27 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -131,11 +131,11 @@ function onValidate() {
     formData.append("leaveRangeEnd", formDataSick.leaveRangeEnd);
     formData.append(
       "leaveStartDate",
-      convertDateToAPI(formDataSick.leaveStartDate) ?? ""
+      convertDateToAPI(formDataSick.leaveStartDate) ?? "",
     );
     formData.append(
       "leaveEndDate",
-      convertDateToAPI(formDataSick.leaveEndDate) ?? ""
+      convertDateToAPI(formDataSick.leaveEndDate) ?? "",
     );
     formData.append("leaveWrote", formDataSick.leaveWrote);
     formData.append("leaveAddress", dataStore.currentAddress);
@@ -202,7 +202,6 @@ function mapPropsToFormData() {
     statusCheck.value = props.data.status;
     leaveId.value = props.data.id;
     formDataSick.leaveDocument = [];
-    console.log(props.data.leaveDocument);
   }
 }
 
@@ -211,7 +210,7 @@ watch(
   () => {
     mapPropsToFormData();
   },
-  { deep: true }
+  { deep: true },
 );
 
 /** Hook */
diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index d80b64b..d5fd5fe 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -293,7 +293,7 @@ function getSearch() {
       />
       <q-input
         v-if="props.model === 'LV-005'"
-        class="col-12 col-sm-4"
+        class="col-md-3 col-sm-6"
         dense
         outlined
         readonly
@@ -302,7 +302,7 @@ function getSearch() {
         label="จำนวนสิทธิ์การลาที่ได้รับ"
       />
       <q-input
-        class="col-12 col-sm-4"
+        class="col-md-3 col-sm-6"
         dense
         outlined
         readonly
@@ -312,7 +312,7 @@ function getSearch() {
       />
       <q-input
         v-if="props.model === 'LV-005'"
-        class="col-12 col-sm-4"
+        class="col-md-3 col-sm-6"
         dense
         outlined
         readonly
@@ -320,6 +320,15 @@ function getSearch() {
         v-model="dataStore.leaveRemain"
         label="จำนวนสิทธิ์การลาคงเหลือ"
       />
+      <q-input
+        class="col-md-3 col-sm-6"
+        dense
+        outlined
+        readonly
+        bg-color="white"
+        v-model="dataStore.leaveWaitingSummary"
+        label="จำนวนวันที่อยู่ระหว่างการพิจารณา"
+      />
     </div>
   </q-card>
 
diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue
index 37aea58..294c302 100644
--- a/src/modules/05_leave/components/ListView.vue
+++ b/src/modules/05_leave/components/ListView.vue
@@ -163,7 +163,7 @@ async function updatePagination(p: number, ps: number, s: string, d: boolean) {
 function convert(val: any) {
   if (leaveType.value) {
     const filtertype = leaveType.value.find(
-      (e: any) => e.id === val.leaveTypeId
+      (e: any) => e.id === val.leaveTypeId,
     );
     const type = filtertype?.code;
     if (type == "LV-006" && val.hajjDayStatus == false) {
@@ -242,7 +242,7 @@ onMounted(async () => {
           :props="props"
           @click="onClickView(props.row.id, props.row.status)"
         >
-          {{ props.row.dateSendLeave }}
+          {{ props.row.status === "DRAFT" ? "-" : props.row.dateSendLeave }}
         </q-td>
 
         <q-td key="status" :props="props">
@@ -419,7 +419,7 @@ onMounted(async () => {
                 <q-item-label v-if="col.name === 'no'">
                   {{ (page - 1) * pageSize + props.rowIndex + 1 }}
                 </q-item-label>
-                <q-item-label v-if="col.name === 'status'">
+                <q-item-label v-else-if="col.name === 'status'">
                   <q-icon
                     v-if="props.row.status == 'DRAFT'"
                     size="10px"
@@ -468,7 +468,12 @@ onMounted(async () => {
 
                   <span class="q-pr-md">{{ props.row.statusConvert }}</span>
                 </q-item-label>
-                <q-item-label v-else>{{ col.value }}</q-item-label>
+                <q-item-label v-else-if="col.name === 'dateSendLeave'">
+                  {{
+                    props.row.status === "DRAFT" ? "-" : props.row.dateSendLeave
+                  }}
+                </q-item-label>
+                <q-item-label v-else>{{ col.value }} </q-item-label>
               </q-item-section>
             </q-item>
           </q-list>
diff --git a/src/modules/05_leave/components/formDetail/01_SickForm.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue
index d186c94..43530d7 100644
--- a/src/modules/05_leave/components/formDetail/01_SickForm.vue
+++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue
@@ -18,7 +18,9 @@ const props = defineProps({
   <div class="q-gutter-md q-pa-sm">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -30,11 +32,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
@@ -87,10 +111,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
index 80ec85d..52d358c 100644
--- a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useLeaveStore } from '@/modules/05_leave/store'
+import { useLeaveStore } from "@/modules/05_leave/store";
 
-const store = useLeaveStore()
-const { converstType } = store
+const store = useLeaveStore();
+const { converstType } = store;
 /**
  * รับ prop จาก component
  */
@@ -17,7 +17,9 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -29,11 +31,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
@@ -82,10 +106,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/05_VacationForm.vue b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
index 1b928aa..024a9ae 100644
--- a/src/modules/05_leave/components/formDetail/05_VacationForm.vue
+++ b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
@@ -18,7 +18,9 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -42,11 +44,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
@@ -91,10 +115,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
index 675f6b4..36540a4 100644
--- a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
@@ -18,7 +18,7 @@ const props = defineProps({
   <div class="q-pa-md q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -98,10 +98,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/07_HajjForm.vue b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
index f20c5db..4569b67 100644
--- a/src/modules/05_leave/components/formDetail/07_HajjForm.vue
+++ b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
@@ -18,7 +18,7 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -77,10 +77,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
index 1579024..4bd127d 100644
--- a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useLeaveStore } from '@/modules/05_leave/store'
+import { useLeaveStore } from "@/modules/05_leave/store";
 
-const store = useLeaveStore()
-const { converstType } = store
+const store = useLeaveStore();
+const { converstType } = store;
 /**
  * รับ prop จาก component
  */
@@ -18,7 +18,9 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -30,11 +32,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
@@ -87,10 +111,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/09_StudyForm.vue b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
index 3a6c7af..e2fbc16 100644
--- a/src/modules/05_leave/components/formDetail/09_StudyForm.vue
+++ b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useLeaveStore } from '@/modules/05_leave/store'
+import { useLeaveStore } from "@/modules/05_leave/store";
 
-const store = useLeaveStore()
-const { converstType } = store
+const store = useLeaveStore();
+const { converstType } = store;
 /**
  * รับ prop จาก component
  */
@@ -18,7 +18,9 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -30,11 +32,33 @@ const props = defineProps({
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>
@@ -111,10 +135,12 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip
+                  >ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip
+                >
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/10_TrainForm.vue b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
index e9ea16d..8e76209 100644
--- a/src/modules/05_leave/components/formDetail/10_TrainForm.vue
+++ b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
@@ -17,7 +17,7 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -132,10 +132,10 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip>
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
index 8e38fae..50bf0ad 100644
--- a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
@@ -17,7 +17,7 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -80,10 +80,10 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip>
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
index 3c6189d..21b1e24 100644
--- a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
@@ -17,7 +17,7 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -145,10 +145,10 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip>
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
index 2398a24..5e28835 100644
--- a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
@@ -17,7 +17,7 @@ const props = defineProps({
   <div class="q-pa-sm q-gutter-md">
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">วันที่ยื่นใบลา</div>
-      <div class="col-xs-12 col-md-6">{{ props.data.dateSendLeave }}</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }}</div>
     </div>
     <div class="row">
       <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
@@ -80,10 +80,10 @@ const props = defineProps({
                 target="_blank"
                 outline
                 color="blue"
-                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`"
                 size="12px"
               >
-                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}</q-tooltip>
               </q-btn>
             </div>
           </div>
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index 169abcc..cb84459 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -33,7 +33,7 @@ export const useLeaveStore = defineStore("Leave", () => {
 
   /**
    * function เรียกข้อมูลรายการลา Table
-   * @param data ข้อมูลรายการลา Table
+   * @param data ข้อมูลรายการลา TableleaveWaitingSummary
    */
   async function fetchListLeave(data: ListLeave[]) {
     let datalist: ListLeaveTable[] = data.map((e: ListLeave) => ({
@@ -66,7 +66,6 @@ export const useLeaveStore = defineStore("Leave", () => {
       isDelete: e.isDelete,
     }));
     rows.value = datalist;
-    console.log(datalist);
   }
 
   //ฟังก์ชั่นแปลง Status
@@ -309,6 +308,7 @@ export const useLeaveStore = defineStore("Leave", () => {
 
   const telephoneNumber = ref<string>("");
   const currentAddress = ref<string>("");
+  const leaveWaitingSummary = ref<number>(0);
 
   //ดึงข้อมูล profile จาก API
   async function fetchProfile() {
@@ -347,6 +347,7 @@ export const useLeaveStore = defineStore("Leave", () => {
             : "-";
         restDayCurrentTotal.value =
           Number(data.leaveLimit) - Number(data.restDayTotalOld);
+        leaveWaitingSummary.value = data.leaveWaitingSummary || 0;
       })
       .catch((e: any) => {
         console.log(e);
@@ -409,6 +410,7 @@ export const useLeaveStore = defineStore("Leave", () => {
     salaryText.value = "";
     leaveLast.value = undefined;
     restDayCurrentTotal.value = 0;
+    leaveWaitingSummary.value = 0;
   }
 
   /** ฟังก์ชันเรียกข้อมูลประเภทการลา */
@@ -480,6 +482,7 @@ export const useLeaveStore = defineStore("Leave", () => {
     currentAddress,
     rangeOptions,
     converstType,
+    leaveWaitingSummary,
 
     fetchLeaveTypeData,
     isLoadingProfile,
diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue
index 0a7a972..165f95a 100644
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@@ -3,6 +3,7 @@ import { ref, onMounted } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -114,7 +115,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
@@ -132,12 +133,15 @@ async function onDownloadFile(id: string, profileId: string) {
         "ประวัติการเปลี่ยนชื่อ-นามสกุล",
         profileId,
         id,
-        "เอกสารหลักฐาน"
-      )
+        "เอกสารหลักฐาน",
+      ),
     )
     .then(async (res) => {
-      const data = res.data.downloadUrl;
-      window.open(data, "_blank");
+      const downloadUrl = res.data.downloadUrl;
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: `ประวัติการเปลี่ยนชื่อ-นามสกุล`,
+      });
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/10_registry/01_Information/06_Ability.vue b/src/modules/10_registry/01_Information/06_Ability.vue
index bc77c5b..ffcb8e0 100644
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@@ -6,6 +6,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 /** import type */
 import type { AbilityRows } from "@/modules/10_registry/interface/index/Main";
@@ -240,7 +241,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
@@ -258,12 +259,15 @@ async function onDownloadFile(id: string, profileId: string) {
         "เอกสารความสามารถพิเศษ",
         profileId,
         id,
-        "เอกสารหลักฐาน"
-      )
+        "เอกสารหลักฐาน",
+      ),
     )
     .then(async (res) => {
-      const data = res.data;
-      window.open(data.downloadUrl, "_blank");
+      const downloadUrl = res.data.downloadUrl;
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: `เอกสารความสามารถพิเศษ`,
+      });
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/10_registry/02_Government/02_Discipline.vue b/src/modules/10_registry/02_Government/02_Discipline.vue
index 7ac9611..2d6b4d0 100644
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { DisciplineDetail } from "@/modules/10_registry/interface/index/Main";
 
@@ -194,8 +195,11 @@ async function getHistory() {
 async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
-    const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
+    await downloadBlobFile({
+      downloadUrl: res.downloadUrl,
+      fileName: `เอกสารวินัย`,
+    });
   } catch (e) {
     messageError($q, e);
   } finally {
@@ -208,7 +212,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
diff --git a/src/modules/10_registry/02_Government/04_Duty.vue b/src/modules/10_registry/02_Government/04_Duty.vue
index 4a6ff94..a64dc34 100644
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { DutyFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -297,8 +298,11 @@ async function getHistory() {
 async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
-    const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
+    await downloadBlobFile({
+      downloadUrl: res.downloadUrl,
+      fileName: `เอกสารปฏิบัติราชการพิเศษ`,
+    });
   } catch (e) {
     messageError($q, e);
   } finally {
@@ -311,7 +315,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
diff --git a/src/modules/10_registry/02_Government/06_Assistance.vue b/src/modules/10_registry/02_Government/06_Assistance.vue
index ac7adc5..69d5184 100644
--- a/src/modules/10_registry/02_Government/06_Assistance.vue
+++ b/src/modules/10_registry/02_Government/06_Assistance.vue
@@ -6,6 +6,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { DutyFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -302,12 +303,15 @@ async function onDownloadFile(id: string, profileId: string) {
         "ช่วยราชการ",
         profileId,
         id,
-        "เอกสารหลักฐาน"
-      )
+        "เอกสารหลักฐาน",
+      ),
     )
     .then(async (res) => {
-      const data = res.data;
-      window.open(data.downloadUrl, "_blank");
+      const downloadUrl = res.data.downloadUrl;
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: `เอกสารช่วยราชการ`,
+      });
     })
     .catch((err) => {
       messageError($q, err);
@@ -322,7 +326,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
diff --git a/src/modules/10_registry/03_Salary/02_Nopaid.vue b/src/modules/10_registry/03_Salary/02_Nopaid.vue
index a74d946..271d3d9 100644
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { NopaidFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -255,7 +256,7 @@ async function getHistory() {
   rowsHistoryData.value = [];
   await http
     .get(
-      config.API.dataUserSalaryNopaidHistoryByType(link.value, idByRow.value)
+      config.API.dataUserSalaryNopaidHistoryByType(link.value, idByRow.value),
     )
     .then((res) => {
       const data = res.data.result;
@@ -278,8 +279,12 @@ async function getHistory() {
 async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
-    const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
+    const downloadUrl = res.downloadUrl;
+    await downloadBlobFile({
+      downloadUrl: downloadUrl,
+      fileName: `บันทึกวันที่ไม่ได้รับ${salaryText.value}ฯ`,
+    });
   } catch (e) {
     messageError($q, e);
   } finally {
@@ -292,7 +297,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
diff --git a/src/modules/10_registry/04_Achievement/01_Certificate.vue b/src/modules/10_registry/04_Achievement/01_Certificate.vue
index 6266c34..5e0b4c7 100644
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { CertificateDetail } from "@/modules/10_registry/interface/index/Main";
 
@@ -253,8 +254,8 @@ async function getHistory() {
       config.API.dataUserCertificateHistoryByType(
         link.value,
         "certificate",
-        idByRow.value
-      )
+        idByRow.value,
+      ),
     )
     .then((res) => {
       const data = res.data.result;
@@ -278,7 +279,10 @@ async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
     const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    await downloadBlobFile({
+      downloadUrl: data.downloadUrl,
+      fileName: `เอกสารใบอนุญาตประกอบวิชาชีพ`,
+    });
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -291,7 +295,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
diff --git a/src/modules/10_registry/04_Achievement/03_Insignia.vue b/src/modules/10_registry/04_Achievement/03_Insignia.vue
index e2dadc0..2acb679 100644
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { InsigniaFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -469,8 +470,8 @@ async function getHistory() {
       config.API.dataUserCertificateHistoryByType(
         link.value,
         "insignia",
-        idByRow.value
-      )
+        idByRow.value,
+      ),
     )
     .then((res) => {
       const data = res.data.result;
@@ -494,7 +495,10 @@ async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
     const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    await downloadBlobFile({
+      downloadUrl: data.downloadUrl,
+      fileName: `เอกสารเครื่องราชอิสริยาภรณ์`,
+    });
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -507,7 +511,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
@@ -647,7 +651,6 @@ onMounted(async () => {
                   dense
                   round
                   size="14px"
-                  class="absolute_button"
                   @click="onHistory(props.row.id)"
                 >
                   <q-tooltip>ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
diff --git a/src/modules/10_registry/04_Achievement/04_Honor.vue b/src/modules/10_registry/04_Achievement/04_Honor.vue
index 6801fd2..a142ad7 100644
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryDataStore } from "@/modules/10_registry/store/Main";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { HonorFormData } from "@/modules/10_registry/interface/index/Main";
 
@@ -278,7 +279,10 @@ async function onDownloadFile(id: string, profileId: string) {
   showLoader();
   try {
     const data = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    await downloadBlobFile({
+      downloadUrl: data.downloadUrl,
+      fileName: `เอกสารประกาศเกียรติคุณ`,
+    });
   } catch (error) {
     messageError($q, error);
   } finally {
@@ -291,7 +295,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
@@ -429,7 +433,6 @@ onMounted(async () => {
                   dense
                   round
                   size="14px"
-                  class="absolute_button"
                   @click="onHistory(props.row.id)"
                 >
                   <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
diff --git a/src/modules/10_registry/05_Other/02_File.vue b/src/modules/10_registry/05_Other/02_File.vue
index 1e9472e..bb9f287 100644
--- a/src/modules/10_registry/05_Other/02_File.vue
+++ b/src/modules/10_registry/05_Other/02_File.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { useCounterMixin } from "@/stores/mixin";
-import { is, useQuasar } from "quasar";
-import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { ref, onMounted, watch } from "vue";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { FileFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -18,14 +19,15 @@ const fileList = ref<FileFormType[]>([]);
 
 /** ฟังก์ชันดึงข้อมูลไฟล์ */
 async function getData() {
+  if (!store.profileId) return;
   isLoading.value = true;
   await http
     .get(
       config.API.fileByFileUser(
         "ระบบทะเบียนประวัติ",
         "เอกสารหลักฐาน",
-        store.profileId
-      )
+        store.profileId,
+      ),
     )
     .then((res) => {
       const data = res.data;
@@ -51,12 +53,15 @@ async function downloadFile(fileName: string) {
         "ระบบทะเบียนประวัติ",
         "เอกสารหลักฐาน",
         store.profileId,
-        fileName
-      )
+        fileName,
+      ),
     )
-    .then((res) => {
-      const data = res.data.downloadUrl;
-      window.open(data, "_blank");
+    .then(async (res) => {
+      const downloadUrl = res.data.downloadUrl;
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: fileName,
+      });
     })
     .catch((e) => {
       messageError($q, e);
@@ -69,6 +74,15 @@ async function downloadFile(fileName: string) {
 onMounted(() => {
   getData();
 });
+
+watch(
+  () => store.profileId,
+  (newVal) => {
+    if (newVal) {
+      getData();
+    }
+  },
+);
 </script>
 
 <template>
diff --git a/src/modules/10_registry/05_Other/03_FileOther.vue b/src/modules/10_registry/05_Other/03_FileOther.vue
index 585997b..585e68c 100644
--- a/src/modules/10_registry/05_Other/03_FileOther.vue
+++ b/src/modules/10_registry/05_Other/03_FileOther.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 import type { FileFormType } from "@/modules/10_registry/interface/index/Main";
 
@@ -18,14 +19,15 @@ const fileList = ref<FileFormType[]>([]);
 
 /** ฟังก์ชันดึงข้อมูลไฟล์ */
 async function getData() {
+  if (!store.citizenId) return;
   isLoading.value = true;
   await http
     .get(
       config.API.fileByFileUser(
         "ระบบทะเบียนประวัติ",
         "เอกสารหลักฐานเพิ่มเติม",
-        store.citizenId
-      )
+        store.citizenId,
+      ),
     )
     .then((res) => {
       const data = res.data;
@@ -51,12 +53,15 @@ async function downloadFile(fileName: string) {
         "ระบบทะเบียนประวัติ",
         "เอกสารหลักฐานเพิ่มเติม",
         store.citizenId,
-        fileName
-      )
+        fileName,
+      ),
     )
-    .then((res) => {
-      const data = res.data.downloadUrl;
-      window.open(data, "_blank");
+    .then(async (res) => {
+      const downloadUrl = res.data.downloadUrl;
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: fileName,
+      });
     })
     .catch((e) => {
       messageError($q, e);
@@ -69,6 +74,15 @@ async function downloadFile(fileName: string) {
 onMounted(() => {
   getData();
 });
+
+watch(
+  () => store.citizenId,
+  (newVal) => {
+    if (newVal) {
+      getData();
+    }
+  },
+);
 </script>
 
 <template>
diff --git a/src/modules/10_registry/components/PositionReview/Table.vue b/src/modules/10_registry/components/PositionReview/Table.vue
index d2b7712..4523be3 100644
--- a/src/modules/10_registry/components/PositionReview/Table.vue
+++ b/src/modules/10_registry/components/PositionReview/Table.vue
@@ -24,6 +24,8 @@ import type { DataPosition } from "@/modules/10_registry/interface/review/Edit";
 // import DialogSort from "@/modules/04_registryPerson/views/edit/components/DialogSort.vue";
 // import CurruncyInput from "@/components/CurruncyInput.vue";
 
+import { exportToExcelPosition } from "@/modules/10_registry/utils/exportPosition";
+
 const dataStore = useDataStore();
 const store = useGovernmentPosDataStore();
 const $q = useQuasar();
@@ -323,20 +325,23 @@ async function fetchData() {
   //   .get(
   //     `${config.API.profileSalaryTemp}/${empType.value}/done/${profileId.value}`,
   //   )
-  http
-    .get(`${config.API.profileSalaryTemp}/${empType.value}/${profileId.value}`)
-    .then((res) => {
-      const data = res.data.result;
-      rowsMain.value = data;
-      rows.value = data;
-      serchDataTable();
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      isLoad.value = false;
-    });
+  try {
+    await http.get(
+      `${config.API.profileSalaryTemp}/${empType.value}/${profileId.value}`,
+    );
+
+    const res = await http.get(
+      `${config.API.profileSalaryTemp}/${empType.value}/done/${profileId.value}`,
+    );
+    const data = res.data.result;
+    rowsMain.value = data;
+    rows.value = data;
+    serchDataTable();
+  } catch (err) {
+    messageError($q, err);
+  } finally {
+    isLoad.value = false;
+  }
 }
 
 /** function ค้นหาข้อมูลรายการในตาราง*/
@@ -442,67 +447,68 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
 
 /** ฟังก์ชันดาวน์โหลดไฟล Excel */
 function exportToExcel() {
-  const newData = rows.value.map((e: DataPosition, index: number) => {
-    return {
-      no: index + 1,
-      commandDateAffect: date2Thai(e.commandDateAffect),
-      positionName: e.positionName,
-      positionType: e.positionType,
-      positionLevel: e.positionLevel
-        ? e.positionLevel
-        : e.positionCee
-        ? e.positionCee
-        : "",
-      positionExecutive: e.positionExecutive,
-      amount: e.amount,
-      mouthSalaryAmount: e.mouthSalaryAmount,
-      positionSalaryAmount: e.positionSalaryAmount,
-      organization: findOrgName({
-        root: e.orgRoot,
-        child1: e.orgChild1,
-        child2: e.orgChild2,
-        child3: e.orgChild3,
-        child4: e.orgChild4,
-      }),
-      posNo:
-        e.posNoAbb && e.posNo
-          ? `${e.posNoAbb} ${e.posNo}`
-          : e.posNo
-          ? e.posNo
-          : "",
-      posNumCodeSit:
-        e.posNumCodeSitAbb && e.posNumCodeSit
-          ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
-          : e.posNumCodeSit
-          ? e.posNumCodeSit
-          : "",
-      commandNo:
-        e.commandNo && e.commandYear
-          ? `${e.commandNo}/${Number(e.commandYear) + 543}`
-          : "",
-      commandDateSign: date2Thai(e.commandDateSign),
-      commandCode: store.convertCommandCodeName(e.commandCode),
-      remark: e.remark,
-    };
-  });
+  exportToExcelPosition(rows.value);
+  // const newData = rows.value.map((e: DataPosition, index: number) => {
+  //   return {
+  //     no: index + 1,
+  //     commandDateAffect: date2Thai(e.commandDateAffect),
+  //     positionName: e.positionName,
+  //     positionType: e.positionType,
+  //     positionLevel: e.positionLevel
+  //       ? e.positionLevel
+  //       : e.positionCee
+  //       ? e.positionCee
+  //       : "",
+  //     positionExecutive: e.positionExecutive,
+  //     amount: e.amount,
+  //     mouthSalaryAmount: e.mouthSalaryAmount,
+  //     positionSalaryAmount: e.positionSalaryAmount,
+  //     organization: findOrgName({
+  //       root: e.orgRoot,
+  //       child1: e.orgChild1,
+  //       child2: e.orgChild2,
+  //       child3: e.orgChild3,
+  //       child4: e.orgChild4,
+  //     }),
+  //     posNo:
+  //       e.posNoAbb && e.posNo
+  //         ? `${e.posNoAbb} ${e.posNo}`
+  //         : e.posNo
+  //         ? e.posNo
+  //         : "",
+  //     posNumCodeSit:
+  //       e.posNumCodeSitAbb && e.posNumCodeSit
+  //         ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
+  //         : e.posNumCodeSit
+  //         ? e.posNumCodeSit
+  //         : "",
+  //     commandNo:
+  //       e.commandNo && e.commandYear
+  //         ? `${e.commandNo}/${Number(e.commandYear) + 543}`
+  //         : "",
+  //     commandDateSign: date2Thai(e.commandDateSign),
+  //     commandCode: store.convertCommandCodeName(e.commandCode),
+  //     remark: e.remark,
+  //   };
+  // });
 
-  const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
-  const worksheet = XLSX.utils.json_to_sheet(newData, {
-    header: visibleColumns.value,
-  });
+  // const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
+  // const worksheet = XLSX.utils.json_to_sheet(newData, {
+  //   header: visibleColumns.value,
+  // });
 
   //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
-  XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
+  // XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
 
   // 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(
-    workbook,
-    worksheet,
-    `รายการประวัติตำแหน่งเงินเดือน`,
-  );
-  XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
+  // XLSX.utils.book_append_sheet(
+  //   workbook,
+  //   worksheet,
+  //   `รายการประวัติตำแหน่งเงินเดือน`,
+  // );
+  // XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
 }
 
 // const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
@@ -880,12 +886,20 @@ async function fetchDataCommandCode() {
 // }
 
 onMounted(async () => {
-  // เพิ่ม delay เล็กน้อยเพื่อรอให้ dataStore fetch ข้อมูล position เสร็จก่อน
-  await new Promise((resolve) => setTimeout(resolve, 800));
   if (dataStore.officerType && dataStore.profileId) {
     await Promise.all([fetchData(), fetchDataCommandCode()]);
   }
 });
+
+watch(
+  () => [dataStore.officerType, dataStore.profileId],
+  async ([officerType, profileId]) => {
+    if (officerType && profileId) {
+      await Promise.all([fetchData(), fetchDataCommandCode()]);
+    }
+  },
+  { immediate: true },
+);
 </script>
 
 <template>
diff --git a/src/modules/10_registry/interface/review/Edit.ts b/src/modules/10_registry/interface/review/Edit.ts
index 04041b2..545dc35 100644
--- a/src/modules/10_registry/interface/review/Edit.ts
+++ b/src/modules/10_registry/interface/review/Edit.ts
@@ -71,6 +71,7 @@ interface DataPosition {
   status: string;
   posNumCodeSitAbb: string;
   posNumCodeSit: string;
+  positionExecutiveField: string;
 }
 
 export type { DataSalaryPos, DataPosition };
diff --git a/src/modules/10_registry/utils/downloadFile.ts b/src/modules/10_registry/utils/downloadFile.ts
new file mode 100644
index 0000000..99c06c5
--- /dev/null
+++ b/src/modules/10_registry/utils/downloadFile.ts
@@ -0,0 +1,60 @@
+export interface DownloadFileOptions {
+  downloadUrl: string;
+  fileName: string;
+}
+
+const isMobile =
+  /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
+    navigator.userAgent,
+  );
+
+export async function downloadBlobFile({
+  downloadUrl,
+  fileName,
+}: DownloadFileOptions): Promise<void> {
+  // Use window.open for desktop, blob download for mobile
+  if (!isMobile) {
+    window.open(downloadUrl, "_blank");
+    return;
+  }
+
+  const response = await fetch(downloadUrl);
+  const blob = await response.blob();
+
+  const contentType: string | null = response.headers.get("Content-Type");
+
+  const extensionMap: Record<string, string> = {
+    "application/pdf": "pdf",
+    "image/jpeg": "jpg",
+    "image/png": "png",
+    "image/gif": "gif",
+    "application/zip": "zip",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document":
+      "docx",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+  };
+
+  let extension = contentType ? extensionMap[contentType] : undefined;
+
+  if (!extension) {
+    const urlWithoutQuery = downloadUrl.split("?")[0];
+    extension = urlWithoutQuery.includes(".")
+      ? urlWithoutQuery.split(".").pop()
+      : "pdf";
+  }
+
+  const blobForDownload = new Blob([blob], {
+    type: "application/octet-stream",
+  });
+  const url = URL.createObjectURL(blobForDownload);
+  const link = document.createElement("a");
+  link.href = url;
+  const downloadFileName = fileName.includes(".") ? fileName : `${fileName}.${extension}`;
+  link.download = downloadFileName;
+  document.body.appendChild(link);
+  link.click();
+  setTimeout(() => {
+    document.body.removeChild(link);
+    URL.revokeObjectURL(url);
+  }, 100);
+}
diff --git a/src/modules/10_registry/utils/exportPosition.ts b/src/modules/10_registry/utils/exportPosition.ts
new file mode 100644
index 0000000..1761408
--- /dev/null
+++ b/src/modules/10_registry/utils/exportPosition.ts
@@ -0,0 +1,157 @@
+import ExcelJS from "exceljs";
+import { useGovernmentPosDataStore } from "@/modules/10_registry/store/Position";
+
+import type { DataPosition } from "@/modules/10_registry/interface/review/Edit";
+
+const store = useGovernmentPosDataStore();
+
+// ฟังก์ชันแปลงวันที่จาก ISO format เป็นรูปแบบ dd/mm/yyyy (เช่น 18/05/2564)
+function formatDateToDDMMYYYY(dateString: string | null | Date): string {
+  if (!dateString) return "";
+
+  const date = new Date(dateString);
+  if (isNaN(date.getTime())) return "";
+
+  const day = String(date.getDate()).padStart(2, "0");
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const year = date.getFullYear() + 543; // แปลงเป็นปีพุทธศักราช
+
+  return `${day}/${month}/${year}`;
+}
+
+export async function exportToExcelPosition(data: DataPosition[]) {
+  const workbook = new ExcelJS.Workbook();
+  const worksheet = workbook.addWorksheet("รายการประวัติตำแหน่งเงินเดือน");
+
+  // --- ส่วนที่ 1: สร้าง Master Data Sheet สำหรับอ้างอิง ID ---
+  // เราจะซ่อนแผ่นงานนี้ไว้ (hidden) เพื่อใช้ทำ Dropdown และ VLOOKUP
+  const masterSheet = workbook.addWorksheet("MasterData", { state: "hidden" });
+  const masterData = store.commandCodeData; // [{id: 1, name: "ย้าย"}, ...]
+
+  masterData.forEach((item, index) => {
+    masterSheet.getCell(`A${index + 1}`).value = item.name;
+    masterSheet.getCell(`B${index + 1}`).value = item.id;
+  });
+
+  // --- ส่วนที่ 2: กำหนด Columns ---
+  worksheet.columns = [
+    { header: "ลำดับ", key: "no", width: 8 },
+    { header: "วันที่คำสั่งมีผล", key: "commandDateAffect", width: 18 },
+    { header: "ตำแหน่งในสายงาน", key: "positionName", width: 25 },
+    { header: "ตำแหน่งประเภท", key: "positionType", width: 18 },
+    { header: "ระดับ", key: "positionLevel", width: 12 },
+    { header: "ระดับซี", key: "positionCee", width: 12 },
+    { header: "สายงาน", key: "positionLine", width: 20 },
+    { header: "ด้าน/สาขา", key: "positionPathSide", width: 15 },
+    { header: "ตำแหน่งทางการบริหาร", key: "positionExecutive", width: 20 },
+    { header: "ด้านทางการบริหาร", key: "positionExecutiveField", width: 20 },
+    { header: "เงินเดือน", key: "amount", width: 15 },
+    { header: "เงินค่าตอบแทนรายเดือน", key: "mouthSalaryAmount", width: 15 },
+    { header: "เงินประจำตำแหน่ง", key: "positionSalaryAmount", width: 15 },
+    { header: "เงินค่าตอบแทนพิเศษ", key: "amountSpecial", width: 15 },
+    { header: "หน่วยงาน", key: "organization", width: 30 },
+    { header: "ส่วนราชการระดับ 1", key: "orgChild1", width: 20 },
+    { header: "ส่วนราชการระดับ 2", key: "orgChild2", width: 20 },
+    { header: "ส่วนราชการระดับ 3", key: "orgChild3", width: 20 },
+    { header: "ส่วนราชการระดับ 4", key: "orgChild4", width: 20 },
+    { header: "ตัวย่อเลขที่ตำแหน่ง", key: "posNoAbb", width: 15 },
+    { header: "เลขที่ตำแหน่ง", key: "posNo", width: 15 },
+    { header: "หน่วยงานที่ออกคำสั่ง", key: "posNumCodeSit", width: 20 },
+    {
+      header: "ตัวย่อหน่วยงานที่ออกคำสั่ง",
+      key: "posNumCodeSitAbb",
+      width: 15,
+    },
+    { header: "เลขที่คำสั่ง", key: "commandNo", width: 15 },
+    { header: "ปีเลขที่คำสั่ง", key: "commandYear", width: 12 },
+    { header: "วันที่ลงนาม", key: "commandDateSign", width: 18 },
+    { header: "ประเภทคำสั่ง", key: "commandCodeName", width: 25 }, // AA
+    { header: "หมายเหตุ", key: "remark", width: 20 },
+    { header: "commandId", key: "commandId", width: 20 }, // AC (ลำดับที่ 29)
+    { header: "commandCode", key: "commandCode", width: 20 }, // AD (ลำดับที่ 30)
+  ];
+
+  // 3. Map ข้อมูล
+  const newData = data.map((e, index) => ({
+    no: index + 1,
+    commandDateAffect: e.commandDateAffect
+      ? formatDateToDDMMYYYY(e.commandDateAffect)
+      : "",
+    positionName: e.positionName,
+    positionType: e.positionType,
+    positionLevel: e.positionLevel,
+    positionCee: e.positionCee,
+    positionLine: e.positionLine || "",
+    positionPathSide: e.positionPathSide || "",
+    positionExecutive: e.positionExecutive,
+    positionExecutiveField: e.positionExecutiveField || "",
+    amount: e.amount || 0,
+    mouthSalaryAmount: e.mouthSalaryAmount || 0,
+    positionSalaryAmount: e.positionSalaryAmount || 0,
+    amountSpecial: e.amountSpecial || 0,
+    organization: e.orgRoot,
+    orgChild1: e.orgChild1,
+    orgChild2: e.orgChild2,
+    orgChild3: e.orgChild3,
+    orgChild4: e.orgChild4,
+    posNoAbb: e.posNoAbb,
+    posNo: e.posNo,
+    posNumCodeSit: e.posNumCodeSit,
+    posNumCodeSitAbb: e.posNumCodeSitAbb,
+    commandNo: e.commandNo,
+    commandYear: e.commandYear ? Number(e.commandYear) + 543 : "",
+    commandDateSign: e.commandDateSign
+      ? formatDateToDDMMYYYY(e.commandDateSign)
+      : "",
+    commandCodeName: store.convertCommandCodeName(e.commandCode),
+    remark: e.remark,
+    commandId: e.commandId || "",
+    commandCode: e.commandCode || "", // ใส่ค่าเริ่มต้นไว้
+  }));
+
+  worksheet.addRows(newData);
+
+  // 4. ตกแต่งสี, Dropdown และ สูตร VLOOKUP
+  newData.forEach((_, index) => {
+    const rowIndex = index + 2;
+
+    // --- ตั้งค่า Format สำหรับเซลล์วันที่ ---
+    // เซลล์ B (commandDateAffect) และ Z (commandDateSign)
+    const dateAffectCell = worksheet.getCell(`B${rowIndex}`);
+    const dateSignCell = worksheet.getCell(`Z${rowIndex}`);
+
+    [dateAffectCell, dateSignCell].forEach((cell) => {
+      cell.numFmt = "dd/mm/yyyy";
+    });
+
+    // --- ทำ Dropdown คอลัมน์ AA ---
+    // อ้างอิงรายการจาก MasterData Sheet จะทำให้ Excel ทำงานได้เสถียรกว่า (กรณีรายการเยอะ)
+    worksheet.getCell(`AA${rowIndex}`).dataValidation = {
+      type: "list",
+      allowBlank: true,
+      formulae: [`MasterData!$A$1:$A$${masterData.length}`],
+    };
+
+    // --- ผูกสูตรให้ commandCode (AD) เปลี่ยนตามการเลือกใน AA ---
+    // AA คือประเภทคำสั่ง, AD คือ commandCode
+    worksheet.getCell(`AD${rowIndex}`).value = {
+      formula: `=IFERROR(VLOOKUP(AA${rowIndex}, MasterData!$A$1:$B$${masterData.length}, 2, FALSE), "")`,
+    };
+  });
+
+  // 5. สไตล์ Header
+  worksheet.getRow(1).font = { bold: true };
+  worksheet.getRow(1).alignment = { vertical: "middle", horizontal: "center" };
+
+  // 6. เขียนไฟล์
+  const buffer = await workbook.xlsx.writeBuffer();
+  const blob = new Blob([buffer], {
+    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  });
+  const url = window.URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = "รายการประวัติตำแหน่งเงินเดือน.xlsx";
+  a.click();
+  window.URL.revokeObjectURL(url);
+}
diff --git a/src/plugins/genreport.ts b/src/plugins/genreport.ts
index 520ec00..19e2856 100644
--- a/src/plugins/genreport.ts
+++ b/src/plugins/genreport.ts
@@ -2,6 +2,7 @@ import axios from "axios";
 import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
+import { downloadBlobFile } from "@/modules/10_registry/utils/downloadFile";
 
 const mixin = useCounterMixin();
 const { showLoader, hideLoader } = mixin;
@@ -19,7 +20,7 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
       },
       responseType: "arraybuffer",
     })
-    .then((res) => {
+    .then(async (res) => {
       const responseData = res.data;
       if (responseData) {
         const mimeType =
@@ -31,18 +32,11 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
         const url = URL.createObjectURL(blob);
 
         const baseName = fileName.trim();
-        const extension = type === "docx" ? "docx" : "pdf";
-
-        const link = document.createElement("a");
-        link.href = url;
-        link.download = `${baseName}.${extension}`;
-        document.body.appendChild(link);
-        link.click();
-
-        setTimeout(() => {
-          document.body.removeChild(link);
-          URL.revokeObjectURL(url);
-        }, 100);
+        // const extension = type === "docx" ? "docx" : "pdf";
+        await downloadBlobFile({
+          downloadUrl: url,
+          fileName: baseName,
+        });
       }
     })
     .catch((err) => {
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 41c7161..02981bb 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -14,7 +14,7 @@ export const useCounterMixin = defineStore("mixin", () => {
   const calAge = (
     srcDate: Date,
     birthCal: Date = new Date(),
-    eng: boolean = false
+    eng: boolean = false,
   ) => {
     const year = eng ? "years" : "ปี";
     const month = eng ? "months" : "เดือน";
@@ -82,7 +82,7 @@ export const useCounterMixin = defineStore("mixin", () => {
   function date2Thai(
     srcDate: Date | null,
     isFullMonth: boolean = false,
-    isTime: boolean = false
+    isTime: boolean = false,
   ) {
     if (srcDate == null || !moment(srcDate).isValid()) return "";
 
@@ -98,7 +98,7 @@ export const useCounterMixin = defineStore("mixin", () => {
   function dateThai(
     srcDate: Date,
     isFullMonth: boolean = true,
-    isTime: boolean = false
+    isTime: boolean = false,
   ) {
     if (srcDate == null) {
       return null;
@@ -490,7 +490,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     color: string | undefined,
     ok?: Function | undefined,
     cancel?: Function | undefined,
-    onlycancel: Boolean = false
+    onlycancel: Boolean = false,
   ) => {
     q.dialog({
       component: CustomComponent,
@@ -529,7 +529,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     title: string,
     message: string,
     ok: Function,
-    cancel?: Function
+    cancel?: Function,
   ) {
     q.dialog({
       title: `<span class="text-red">${title}</span>`,
@@ -559,7 +559,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     title: string,
     message: string,
     ok: Function,
-    cancel?: Function
+    cancel?: Function,
   ) {
     q.dialog({
       title: `<span class="text-primary">${title}</span>`,
@@ -795,7 +795,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     ok?: Function,
     title?: string, // ถ้ามี cancel action ใส่เป็น null
     desc?: string, // ถ้ามี cancel action ใส่เป็น null
-    cancel?: Function
+    cancel?: Function,
   ) => {
     q.dialog({
       component: CustomComponent,
@@ -824,7 +824,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     ok?: Function,
     title?: string, // ถ้ามี cancel action ใส่เป็น null
     desc?: string, // ถ้ามี cancel action ใส่เป็น null
-    cancel?: Function
+    cancel?: Function,
   ) => {
     q.dialog({
       component: CustomComponent,
@@ -851,7 +851,7 @@ export const useCounterMixin = defineStore("mixin", () => {
   const dialogMessageNotify = (
     q: any,
     desc?: string, // ถ้ามี cancel action ใส่เป็น null
-    cancel?: Function
+    cancel?: Function,
   ) => {
     q.dialog({
       component: CustomComponent,
@@ -973,7 +973,7 @@ export const useCounterMixin = defineStore("mixin", () => {
    * @returns ผลการคำนวน ปี เดือน วัน ในรูปแบบ 1 ปี 10 เดือน 5 วัน
    */
   function calculateDurationYmd(startDate: any, endDate: any) {
-     if (!startDate || !endDate) return "";
+    if (!startDate || !endDate) return "";
 
     let start = moment(startDate).startOf("day");
     let end = moment(endDate).startOf("day").add(1, "day");
@@ -1252,9 +1252,15 @@ export const useCounterMixin = defineStore("mixin", () => {
 
   // กรณีมีเฉพาะ date
   function convertDateToAPI(date: Date | null) {
-    return date
-      ? format(utcToZonedTime(date, "Asia/Bangkok"), "yyyy-MM-dd")
-      : null;
+    if (!date) return null;
+
+    const parsedDate = new Date(date);
+
+    if (parsedDate) {
+      return format(parsedDate, "yyyy-MM-dd");
+    } else {
+      return null;
+    }
   }
 
   // กรณี datetime
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index f14d08e..165bf6e 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -172,13 +172,13 @@ const doLogout = () => {
   );
 };
 
-const clickDelete = async (id: string, index: number) => {
+const clickDelete = async (id: string, index: number | string) => {
   dialogRemove($q, async () => {
     // showLoader();
     await http
       .delete(config.API.msgId(id))
       .then(() => {
-        notiList.value.splice(index, 1);
+        notiList.value.splice(Number(index), 1);
         totalInbox.value--;
         totalNoti.value--;
         success($q, "ลบข้อมูลสำเร็จ");
@@ -772,10 +772,10 @@ watch(
     <q-footer class="bg-grey-1 text-dark q-pa-md">
       <FooterContact />
     </q-footer>
-  </q-layout>
 
-  <DialogResetPass v-model="modalResetPass" />
-  <DialogDebug v-model:modal="modalDebug" />
+    <DialogResetPass v-model="modalResetPass" />
+    <DialogDebug v-model:modal="modalDebug" />
+  </q-layout>
 </template>
 
 <style>