From 8db24538e0bc218c317a797d2588a46bb9666e34 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 20 Feb 2025 13:33:26 +0700
Subject: [PATCH] =?UTF-8?q?filter=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/requestEdit/Page01_Detail.vue  | 10 +++----
 src/modules/04_registryPerson/store.ts        |  1 +
 .../04_registryPerson/views/listView.vue      | 12 +++------
 .../07_insignia/views/06_ReportMain.vue       | 26 ++++++++++++-------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
index 36ffd9a6a..8751cfbf6 100644
--- a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, reactive, computed, readonly } from "vue";
+import { onMounted, ref, reactive, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useRouter, useRoute } from "vue-router";
@@ -80,8 +80,8 @@ async function fetchDataRequest() {
         typeEmp.value == "employee" ? "-employee" : ""
       ) + `${requestId.value}`
     )
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       dataRequest.value = data;
 
       formData.status = data.status;
@@ -93,7 +93,7 @@ async function fetchDataRequest() {
         isReadOnly.value = false;
       }
 
-      onDownloadFile(requestId.value);
+      await onDownloadFile(requestId.value);
     })
     .catch((err) => {
       messageError($q, err);
@@ -161,7 +161,7 @@ const fileDownloadName = ref<string>("");
  * function หาชื่อไฟล์
  * @param id รายการยื่นคำร้องขอแก้ไขข้อมูล
  */
-function onDownloadFile(id: string) {
+async function onDownloadFile(id: string) {
   http
     .get(
       config.API.file(
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 0ded7ece6..8e69cc5dc 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -83,6 +83,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     retireYear: "",
     node: "เลือกหน่วยงาน",
     retireType: "ทั้งหมด",
+    sortName: "ลำดับการแสดงผล",
   });
 
   function convertTypeRetired(val: string) {
diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index beb426486..40b5cba2f 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -237,6 +237,7 @@ function selectType() {
   if (store.formFilter.type != empType.value) {
     store.labelOption.posType = "ทั้งหมด";
     store.labelOption.posLevel = "ทั้งหมด";
+    store.labelOption.sortName = "ลำดับการแสดงผล";
     store.formFilter.type = empType.value;
     store.formFilter.dateAppoint = "";
     store.labelOption.node =
@@ -299,6 +300,7 @@ function selectRetireType(item: DataOption) {
 }
 
 function selectDisplayOrderType(item: DataOption) {
+  store.labelOption.sortName = item.name;
   store.formFilter.page = 1;
   store.formFilter.dateAppoint = item.id;
   fetchDataPerson();
@@ -755,15 +757,7 @@ onMounted(async () => {
               class="q-px-sm"
             >
               <template v-slot:label>
-                {{
-                  `ลำดับการแสดผล ${
-                    store.formFilter.dateAppoint
-                      ? store.formFilter.dateAppoint === "ASC"
-                        ? "เก่า-ล่าสุด"
-                        : "ล่าสุด-เก่า"
-                      : ""
-                  }`
-                }}
+                {{ store.labelOption.sortName }}
               </template>
               <q-list>
                 <q-item
diff --git a/src/modules/07_insignia/views/06_ReportMain.vue b/src/modules/07_insignia/views/06_ReportMain.vue
index 5f090531a..77deca558 100644
--- a/src/modules/07_insignia/views/06_ReportMain.vue
+++ b/src/modules/07_insignia/views/06_ReportMain.vue
@@ -196,6 +196,8 @@ async function onUpdateFilter() {
   ) {
     isLoadPDF.value = true;
     pdfSrc.value = undefined;
+    numOfPages.value = 1;
+    detailReport.value = null;
 
     await http
       .post(
@@ -222,6 +224,8 @@ async function onUpdateFilter() {
   } else if (roundId2.value && nodeId.value) {
     isLoadPDF.value = true;
     pdfSrc.value = undefined;
+    numOfPages.value = 1;
+    detailReport.value = null;
 
     await http
       .post(
@@ -236,7 +240,6 @@ async function onUpdateFilter() {
       .then(async (res) => {
         const data = await res.data.result;
         detailReport.value = data;
-
         await fetchDocumentTemplate(data, "xlsx");
       })
       .catch(async (e) => {
@@ -294,12 +297,14 @@ function downloadReport(type: string, download: "docx" | "" | "xlsx" = "") {
   const fileName =
     optionReport.value.find((e) => e.id === typeReport.value.id)?.name || "";
 
-  if (type === "xlsx" && download === "") {
-    genReportXLSX(detailReport.value, fileName, type);
-  } else if (type === "pdf" && download === "xlsx") {
-    genReportXLSX(detailReport.value, fileName, "pdf");
-  } else {
-    genReport(detailReport.value, fileName, type);
+  if (detailReport.value) {
+    if (type === "xlsx" && download === "") {
+      genReportXLSX(detailReport.value, fileName, type);
+    } else if (type === "pdf" && download === "xlsx") {
+      genReportXLSX(detailReport.value, fileName, "pdf");
+    } else {
+      genReport(detailReport.value, fileName, type);
+    }
   }
 }
 
@@ -333,6 +338,7 @@ onMounted(async () => {
           </q-select>
 
           <q-space />
+
           <q-btn
             flat
             round
@@ -350,9 +356,9 @@ onMounted(async () => {
                   @click="
                     downloadReport(
                       'pdf',
-                      typeReport.val != 'report1' ||
-                        typeReport.val != 'report2' ||
-                        typeReport.val != 'report3'
+                      !['report1', 'report2', 'report3'].includes(
+                        typeReport.val
+                      )
                         ? 'xlsx'
                         : 'docx'
                     )