Merge branch 'develop' into dev

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

src/modules/05_leave/components/DialogDetail.vue

@@ -6,7 +6,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveStore } from "@/modules/05_leave/store";
-import { useDataStore } from "@/stores/data";
+import genReport from "@/plugins/genreport";
 
 /** import type*/
 import type {
@@ -16,8 +16,6 @@ import type {
   FromCancelDetail,
 } from "@/modules/05_leave/interface/response/leave";
 
-import DialogHeader from "@/components/DialogHeader.vue";
-import Workflow from "@/components/Workflow/Main.vue";
 import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
 import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
 import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue";
@@ -33,7 +31,6 @@ import FormCancel from "@/modules/05_leave/components/formDetail/formCancel.vue"
 
 const $q = useQuasar();
 const dataStore = useLeaveStore();
-const mainStore = useDataStore();
 const { convertStatud } = dataStore;
 const mixin = useCounterMixin();
 const {
@@ -206,7 +203,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 +252,7 @@ async function fetchDataDetail(id: string) {
       formData.studyDaySubject = data.studyDaySubject ?? "-";
       formData.studyDayDegreeLevel = data.studyDayDegreeLevel ?? "-";
       formData.studyDayUniversityName = data.studyDayUniversityName ?? "-";
-      formData.studyDayTrainingSubject =
+      formData.studyDayTrainingSubject = data.studyDayTrainingSubject ?? "-";
-        data.studyDayTrainingSubject ?? "-" ?? "-";
       formData.studyDayTrainingName = data.studyDayTrainingName ?? "-";
       formData.studyDayCountry = data.studyDayCountry ?? "-";
       formData.studyDayScholarship = data.studyDayScholarship ?? "-";
@@ -383,7 +379,7 @@ async function onClickSave() {
         onSubmit();
       },
       "ยืนยันการบันทึกข้อมูล",
-      "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?"
+      "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?",
     );
   } else {
   }
@@ -412,6 +408,28 @@ async function onSubmit() {
     });
 }
 
+/**
+ * ฟังก์ชันดาวน์โหลดไฟล์
+ * @param id รหัสการลา
+ * @param fileName ชื่อไฟล์
+ * @param type ประเภทไฟล์
+ */
+async function onClickDownloadFile(id: string, fileName: string, type: string) {
+  showLoader();
+  await http
+    .get(config.API.leaveReport(id))
+    .then(async (res) => {
+      const data = res.data.result;
+      await genReport(data, fileName, type);
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
 /**** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาแล้วเปิด modal */
 watch(
   () => props.modal,
@@ -425,7 +443,7 @@ watch(
         ? props.leaveId && fetchDataCancelDetail(props.leaveId)
         : props.leaveId && fetchDataDetail(props.leaveId);
     }
-  }
+  },
 );
 </script>
 
@@ -435,10 +453,62 @@ watch(
       v-if="props.leaveStatus != 'DELETE'"
       style="width: 900px; max-width: 80vw"
     >
-      <DialogHeader
+      <q-toolbar>
-        :tittle="`${titleMain} ${titleName}`"
+        <q-toolbar-title class="text-subtitle2 text-bold">
-        :close="props.onClickClose"
+          {{ ` ${titleMain} ${titleName}` }}
+          <q-btn class="q-mr-sm" icon="mdi-download" round color="primary" flat>
+            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
+            <q-menu>
+              <q-list style="min-width: 100px">
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="
+                    onClickDownloadFile(
+                      formData.id,
+                      formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName,
+                      'docx',
+                    )
+                  "
+                >
+                  <q-item-section avatar>
+                    <q-icon color="blue" name="mdi-file-word" />
+                  </q-item-section>
+                  <q-item-section>ไฟล์ .DOCX</q-item-section>
+                </q-item>
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="
+                    onClickDownloadFile(
+                      formData.id,
+                      formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName,
+                      'pdf',
+                    )
+                  "
+                >
+                  <q-item-section avatar>
+                    <q-icon color="red" name="mdi-file-pdf" />
+                  </q-item-section>
+                  <q-item-section>ไฟล์ .pdf</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+        </q-toolbar-title>
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="props.onClickClose?.()"
+          style="color: #ff8080; background-color: #ffdede"
         />
+      </q-toolbar>
 
       <q-separator />
       <q-card-section v-if="isLoading">
@@ -581,10 +651,62 @@ watch(
     </q-card>
 
     <q-card v-if="props.leaveStatus === 'DELETE'" style="min-width: 40vw">
-      <DialogHeader
+      <q-toolbar>
-        :tittle="`${titleMainCancle} ${titleName}`"
+        <q-toolbar-title class="text-subtitle2 text-bold">
-        :close="props.onClickClose"
+          {{ ` ${titleMainCancle} ${titleName}` }}
+          <q-btn class="q-mr-sm" icon="mdi-download" round color="primary" flat>
+            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
+            <q-menu>
+              <q-list style="min-width: 100px">
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="
+                    onClickDownloadFile(
+                      formData.id,
+                      formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName,
+                      'docx',
+                    )
+                  "
+                >
+                  <q-item-section avatar>
+                    <q-icon color="blue" name="mdi-file-word" />
+                  </q-item-section>
+                  <q-item-section>ไฟล์ .DOCX</q-item-section>
+                </q-item>
+                <q-item
+                  clickable
+                  v-close-popup
+                  @click="
+                    onClickDownloadFile(
+                      formData.id,
+                      formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName,
+                      'pdf',
+                    )
+                  "
+                >
+                  <q-item-section avatar>
+                    <q-icon color="red" name="mdi-file-pdf" />
+                  </q-item-section>
+                  <q-item-section>ไฟล์ .pdf</q-item-section>
+                </q-item>
+              </q-list>
+            </q-menu>
+          </q-btn>
+        </q-toolbar-title>
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="props.onClickClose?.()"
+          style="color: #ff8080; background-color: #ffdede"
         />
+      </q-toolbar>
 
       <q-separator />
       <q-card-section v-if="isLoading">

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 */

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>
 

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>

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>

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 store = useLeaveStore();
-const { converstType } = store
+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>

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>

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>

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>

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 store = useLeaveStore();
-const { converstType } = store
+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>

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 store = useLeaveStore();
-const { converstType } = store
+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>

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>

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>

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>

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>

src/modules/05_leave/interface/index/main.ts

@@ -43,6 +43,7 @@ interface LeaveItem {
   all: number;
   use: number;
   remain: number;
+  leaveCountApproveCount: number;
 }
 
 interface MainList {

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,

src/modules/05_leave/views/Main.vue

@@ -141,12 +141,14 @@ async function fetchStatsTable() {
             value:
               el.leaveLimit > 0
                 ? Math.round(
-                    (Number(el.leaveCountApprove) / Number(el.leaveLimit)) * 100
+                    (Number(el.leaveCountApprove) / Number(el.leaveLimit)) *
+                      100,
                   )
                 : 0,
             all: Number(el.leaveLimit),
             use: el.leaveCountApprove,
             remain: Number(el.leaveLimit) - Number(el.leaveCountApprove),
+            leaveCountApproveCount: el.leaveCountApproveCount,
           }));
       });
       stat.forEach((item) => itemPie.value.push(...item));
@@ -254,7 +256,7 @@ onMounted(async () => {
                     </q-knob>
                   </div>
                   <div class="col-12 text-center text-weight-medium">
-                    ลาพักผ่อน
+                    {{ item.text }}
                   </div>
                 </div>
                 <div class="row gt-xs"><q-separator vertical /></div>
@@ -262,17 +264,19 @@ onMounted(async () => {
                   <div class="col-12 row text-dark text-body2 items-center">
                     <div class="col-12 row q-pa-xs q-px-md row">
                       <span class="text-grey-7 col-6">ได้รับ</span>
-                      <span class="text-weight-bold">{{ item.all }}</span>
+                      <span class="text-weight-bold">{{ item.all }} วัน</span>
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 row q-pa-xs q-px-md">
                       <span class="text-grey-7 col-6">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }}</span>
+                      <span class="text-weight-bold">{{ item.use }} วัน </span>
                     </div>
                     <div class="col-12"><q-separator /></div>
                     <div class="col-12 row q-pa-xs q-px-md">
                       <span class="text-grey-7 col-6">คงเหลือ</span>
-                      <span class="text-weight-bold">{{ item.remain }}</span>
+                      <span class="text-weight-bold"
+                        >{{ item.remain }} วัน</span
+                      >
                     </div>
                   </div>
                 </div>
@@ -294,11 +298,11 @@ onMounted(async () => {
                     flat
                     class="shadow-0 col-12 fit row items-center q-px-lg"
                   >
-                    <div class="text-subtitle2 col-4">ลาป่วย</div>
+                    <div class="text-subtitle2 col-4">{{ item.text }}</div>
                     <div class="text-subtitle2 col-8">
                       <span class="text-grey-7 q-pr-md">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }}</span>
+                      <span class="text-weight-bold">{{ item.use }} วัน </span>
-                      <!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
+                      ({{ item.leaveCountApproveCount }} ครั้ง)
                     </div>
                   </q-card>
                 </div>
@@ -317,11 +321,11 @@ onMounted(async () => {
                     flat
                     class="shadow-0 col-12 fit row items-center q-px-lg"
                   >
-                    <div class="text-subtitle2 col-4">ลากิจส่วนตัว</div>
+                    <div class="text-subtitle2 col-4">{{ item.text }}</div>
                     <div class="text-subtitle2 col-8">
                       <span class="text-grey-7 q-pr-md">ใช้ไป</span>
-                      <span class="text-weight-bold">{{ item.use }}</span>
+                      <span class="text-weight-bold">{{ item.use }} วัน </span>
-                      <!-- <span class="text-grey-7 q-pl-md">ลา</span> -->
+                      ({{ item.leaveCountApproveCount }} ครั้ง)
                     </div>
                   </q-card>
                 </div>

src/modules/08_KPI/views/form.vue

@@ -9,6 +9,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/08_KPI/store";
+import avatar from "@/assets/avatar_user.jpg";
 
 import type { FormProfile } from "@/modules/08_KPI/interface/request/index";
 import type {
@@ -107,11 +108,13 @@ async function getAvatar(id: string) {
     .then(async (res) => {
       const data = await res.data.result;
       if (data.avatarName) {
-        await fetchProfile(id, data.avatarName);
+        fetchProfile(id, data.avatarName);
       }
     })
     .catch((e) => {
       messageError($q, e);
+      imgProfile.value = avatar;
+      store.dataEvaluation.avartar = avatar;
     })
     .finally(() => {
       isLoadAvatar.value = false;
@@ -119,12 +122,16 @@ async function getAvatar(id: string) {
 }
 
 /** ดึงข้อมูล เพื่อเก็บรูปโปรไฟล์ */
-async function fetchProfile(id: string, avatarName: string) {
+function fetchProfile(id: string, avatarName: string) {
-  await http
+  http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
-    .then(async (res) => {
+    .then((res) => {
       store.dataEvaluation.avartar = res.data.downloadUrl;
       imgProfile.value = res.data.downloadUrl;
+    })
+    .catch(() => {
+      imgProfile.value = avatar;
+      store.dataEvaluation.avartar = avatar;
     });
 }
 
@@ -208,7 +215,7 @@ async function getOrgOp() {
           name: `${i.prefix}${i.firstName} ${i.lastName}`,
         }))
         .find(
-          (i: EvaOptionType) => i.id == store.dataEvaluation.commanderHighId
+          (i: EvaOptionType) => i.id == store.dataEvaluation.commanderHighId,
         );
       isLoadCommander.value = false;
     })
@@ -225,21 +232,21 @@ function filterOption(val: string, update: Function, refData: string) {
     case "evaluatorIdOp":
       update(() => {
         evaluatorIdOp.value = evaluatorIdMainOp.value.filter(
-          (v: DataOptions) => v.name.indexOf(val) > -1
+          (v: DataOptions) => v.name.indexOf(val) > -1,
         );
       });
       break;
     case "commanderIdOp":
       update(() => {
         commanderIdOp.value = commanderIdMainOp.value.filter(
-          (v: DataOptions) => v.name.indexOf(val) > -1
+          (v: DataOptions) => v.name.indexOf(val) > -1,
         );
       });
       break;
     case "commanderHighOp":
       update(() => {
         commanderHighOp.value = commanderHighMainOp.value.filter(
-          (v: DataOptions) => v.name.indexOf(val) > -1
+          (v: DataOptions) => v.name.indexOf(val) > -1,
         );
       });
       break;
@@ -278,7 +285,7 @@ function sendToEvaluatore() {
       }
     },
     "ยืนยันการส่งข้อตกลงให้ผู้ประเมินอนุมัติ",
-    "ต้องการยืนยันส่งข้อตกลงนี้ให้ผู้ประเมินอนุมัติใช่หรือไม่?"
+    "ต้องการยืนยันส่งข้อตกลงนี้ให้ผู้ประเมินอนุมัติใช่หรือไม่?",
   );
 }
 
@@ -308,7 +315,7 @@ function sendToEvaluateEvaluatore() {
       }
     },
     "ยืนยันการส่งให้ผู้ประเมินรายงานผลสำเร็จของงาน",
-    "ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?"
+    "ต้องการยืนยันส่งให้ผู้ประเมินรายงานผลสำเร็จของงานใช่หรือไม่?",
   );
 }
 
@@ -338,7 +345,7 @@ function requireEdit() {
       }
     },
     "ยืนยันการขอแก้ไขข้อตกลง",
-    "ต้องการยืนยันการขอแก้ไขข้อตกลงนี้ใช่หรือไม่?"
+    "ต้องการยืนยันการขอแก้ไขข้อตกลงนี้ใช่หรือไม่?",
   );
 }
 
@@ -411,7 +418,7 @@ async function goToSummary() {
                       store.excusiveIndicator2ScoreVal +
                       store.competencyScoreVal
                     ).toFixed(2),
-                  }
+                  },
             )
             .then((res) => {});
 
@@ -427,7 +434,7 @@ async function goToSummary() {
         });
     },
     "ยืนยันการส่งไปสรุปผลการประเมิน",
-    "ต้องการยืนยันส่งไปสรุปผลการประเมินใช่หรือไม่?"
+    "ต้องการยืนยันส่งไปสรุปผลการประเมินใช่หรือไม่?",
   );
 }
 
@@ -517,7 +524,7 @@ async function downloadReport() {
           store.dataEvaluation.prefix +
           store.dataEvaluation.firstName +
           " " +
-          store.dataEvaluation.lastName
+          store.dataEvaluation.lastName,
       );
     })
     .catch((e) => {
@@ -556,7 +563,7 @@ async function clickUpload(file: any) {
           const foundKey: string | undefined = Object.keys(res.data).find(
             (key) =>
               res.data[key]?.fileName !== undefined &&
-              res.data[key]?.fileName !== ""
+              res.data[key]?.fileName !== "",
           );
           foundKey &&
             uploadFileDoc(res.data[foundKey]?.uploadUrl, fileUpload.value);
@@ -566,7 +573,7 @@ async function clickUpload(file: any) {
         });
     },
     "ยืนยันการอัปโหลดไฟล์",
-    "ต้องการยืนยันการอัปโหลดไฟล์นี้หรือไม่ ?"
+    "ต้องการยืนยันการอัปโหลดไฟล์นี้หรือไม่ ?",
   );
 }
 
@@ -623,7 +630,7 @@ function deleteFile(fileName: string) {
     showLoader();
     http
       .delete(
-        config.API.file("แบบกำหนดข้อตกลง", "KPI", id.value) + `/${fileName}`
+        config.API.file("แบบกำหนดข้อตกลง", "KPI", id.value) + `/${fileName}`,
       )
       .catch((e) => {
         messageError($q, e);

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;
+      const downloadUrl = res.data.downloadUrl;
-      window.open(data, "_blank");
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: `ประวัติการเปลี่ยนชื่อ-นามสกุล`,
+      });
     })
     .catch((err) => {
       messageError($q, err);

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;
+      const downloadUrl = res.data.downloadUrl;
-      window.open(data.downloadUrl, "_blank");
+      await downloadBlobFile({
+        downloadUrl: downloadUrl,
+        fileName: `เอกสารความสามารถพิเศษ`,
+      });
     })
     .catch((err) => {
       messageError($q, err);

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);
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    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 : [],
   );
 }
 

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);
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    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 : [],
   );
 }
 

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;
+      const downloadUrl = res.data.downloadUrl;
-      window.open(data.downloadUrl, "_blank");
+      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 : [],
   );
 }
 

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);
+    const res = await getPathUploadFlie(fileGroup.value, profileId, id);
-    window.open(data.downloadUrl, "_blank");
+    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 : [],
   );
 }
 

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

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>

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>

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 { useQuasar } from "quasar";
-import { ref, onMounted } from "vue";
+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(async (res) => {
-    .then((res) => {
+      const downloadUrl = res.data.downloadUrl;
-      const data = res.data.downloadUrl;
+      await downloadBlobFile({
-      window.open(data, "_blank");
+        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>

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(async (res) => {
-    .then((res) => {
+      const downloadUrl = res.data.downloadUrl;
-      const data = res.data.downloadUrl;
+      await downloadBlobFile({
-      window.open(data, "_blank");
+        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>

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

src/modules/11_probation/views/mainDetail.vue

@@ -151,6 +151,7 @@ async function getAvatar(id: string) {
     })
     .catch((e) => {
       messageError($q, e);
+      profileImg.value = avatar;
     });
 }
 
@@ -168,14 +169,15 @@ function getList(id: string) {
     });
 }
 
-async function getImg(id: string, pathName: string) {
+function getImg(id: string, pathName: string) {
-  await http
+  http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
     .then((res) => {
       profileImg.value = res.data.downloadUrl;
     })
     .catch((e) => {
-      messageError($q, e);
+      profileImg.value = avatar;
+      // messageError($q, e);
       hideLoader();
     });
 }
@@ -188,7 +190,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 

src/plugins/genreport.ts

@@ -19,7 +19,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 =
@@ -32,13 +32,11 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
 
         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);

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,
@@ -1252,9 +1252,15 @@ export const useCounterMixin = defineStore("mixin", () => {
 
   // กรณีมีเฉพาะ date
   function convertDateToAPI(date: Date | null) {
-    return date
+    if (!date) return null;
-      ? format(utcToZonedTime(date, "Asia/Bangkok"), "yyyy-MM-dd")
+
-      : null;
+    const parsedDate = new Date(date);
+
+    if (parsedDate) {
+      return format(parsedDate, "yyyy-MM-dd");
+    } else {
+      return null;
+    }
   }
 
   // กรณี datetime

src/views/MainLayout.vue

@@ -74,7 +74,7 @@ async function checkUser() {
       await dataStore.getProFileType();
       kpiDataStore.dataProfile = data; // Set dataProfile in kpiDataStore
       if (data.avatarName) {
-        await getImg(data.profileId, data.avatarName);
+        getImg(data.profileId, data.avatarName);
       } else {
         dataStore.profileImg = avatar;
       }
@@ -106,6 +106,9 @@ function getImg(id: string, pathName: string) {
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))
     .then((res) => {
       dataStore.profileImg = res.data.downloadUrl;
+    })
+    .catch(() => {
+      dataStore.profileImg = avatar;
     });
 }
 
@@ -172,13 +175,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 +775,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" />
+  </q-layout>
 </template>
 
 <style>