From 118156a1f08184028f303bc884fb74984ea09b38 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 29 Sep 2023 09:49:43 +0700
Subject: [PATCH] =?UTF-8?q?download=20file=20=E0=B8=88=E0=B8=B1=E0=B8=94?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=82=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../07_insignia/components/2_Manage/Tab1.vue  | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 6f042f192..af9bac3ae 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -409,10 +409,17 @@ const downloadFile = (response: any, filename: string) => {
 };
 // เรียก file รายชื่อข้าราชการสามัญฯ
 const downloadFileexcel = async () => {
+  const findInsigniaId = DataStore.dataInsigniaType.find(
+    (e: any) => e.name == DataStore.typeinsignia
+  );
+
   showLoader();
   await http
-    .get(config.API.insigniaDowanload(DataStore.requestId), {
+    .put(config.API.insigniaDowanload(DataStore.requestId), {
       responseType: "blob",
+      profileType:
+        DataStore.employeeClass == "all" ? null : DataStore.employeeClass,
+      InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id,
     })
     .then(async (res) => {
       await downloadFile(
@@ -656,33 +663,29 @@ const clickShowWarn = (
 const filterSelector = (val: any, update: Function, name: any) => {
   update(() => {
     const needle = val.toLowerCase();
-    if (name === 'typeinsigniaOptions') {
-      DataStore.typeinsignia = ''
-        typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'employeeClassOps'){
-      DataStore.employeeClass = ''
-        employeeClassOps.value = DataStore.employeeClassOps.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    }
-    else if(name === 'filterOrganizationOP'){
+    if (name === "typeinsigniaOptions") {
+      DataStore.typeinsignia = "";
+      typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "employeeClassOps") {
+      DataStore.employeeClass = "";
+      employeeClassOps.value = DataStore.employeeClassOps.filter(
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
+    } else if (name === "filterOrganizationOP") {
       filterOrganizationOP.value = organizationOptions.value.filter(
-          (v: any) => v.name.toLowerCase().indexOf(needle) > -1
-        );
+        (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+      );
     }
-
-    }
-  )
-}
+  });
+};
 
 const clearInsigniaFilters = (name: string) => {
   if (name === "typeinsigniaOptions") {
     DataStore.typeinsignia = "all";
     typeinsigniaOptions.value = DataStore.typeinsigniaOptions;
-  } else if (name === 'employeeClassOps') {
+  } else if (name === "employeeClassOps") {
     DataStore.employeeClass = "all";
     employeeClassOps.value = DataStore.employeeClassOps;
   }
@@ -694,7 +697,7 @@ const clearInsigniaFilters = (name: string) => {
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
         <q-select
-        class="col-4"
+          class="col-4"
           v-if="roleDataStore.adminRole"
           v-model="organization"
           label="หน่วยงาน"
@@ -718,7 +721,7 @@ const clearInsigniaFilters = (name: string) => {
                       ) "
         />
         <q-select
-        class="col-1"
+          class="col-1"
           v-model="DataStore.typeinsignia"
           label="ประเภทเครื่องราชฯ ที่ยืนขอ"
           dense
@@ -761,7 +764,7 @@ const clearInsigniaFilters = (name: string) => {
         </q-select>
         <div>
           <q-select
-          class="col-2"
+            class="col-2"
             v-model="DataStore.employeeClass"
             dense
             outlined