From 8d4813b79e3c9d76e15c9b6fbabdc482d3ed1036 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 21 Sep 2023 16:22:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20fiter=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0?=
 =?UTF-8?q?=E0=B8=97=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/07_insignia/components/2_Manage/Tab1.vue      | 1 +
 .../07_insignia/components/2_Manage/downloadFile.vue      | 7 +++++--
 src/modules/07_insignia/storeResult.ts                    | 2 +-
 src/modules/07_insignia/views/ResultPage.vue              | 8 +++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 17b215ea9..2c1c66a72 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -830,6 +830,7 @@ const closeModalEdit = () => {
                   </q-menu>
                 </q-btn>
               </q-td>
+              <q-td v-else auto-width></q-td>
               <q-td
                 auto-width
                 v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
diff --git a/src/modules/07_insignia/components/2_Manage/downloadFile.vue b/src/modules/07_insignia/components/2_Manage/downloadFile.vue
index 02bc9a282..7778ebd9b 100644
--- a/src/modules/07_insignia/components/2_Manage/downloadFile.vue
+++ b/src/modules/07_insignia/components/2_Manage/downloadFile.vue
@@ -37,7 +37,10 @@ const downloadDocument = async (type: string) => {
       })
       .then(async (res) => {
         if (download) {
-          downloadFile(res, `ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.${type}`);
+          downloadFile(
+            res,
+            `ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.${type}`
+          );
         }
       })
       .catch((e) => {
@@ -91,4 +94,4 @@ const downloadFile = (response: any, filename: string) => {
       </q-list>
     </q-menu>
   </q-btn>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index 65f2574d4..5113d8288 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -27,7 +27,7 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
     insigniaOp.value = [{ name: "ทั้งหมด", id: "" }]
     insigniaOp2.value = []
     data.forEach((e: any) => {
-      insigniaOp.value.push({ name: e.name, id: e.id })
+      insigniaOp.value.push({ name: e.name, id: e.id, insigniaType: e.insigniaType.id })
     });
     data.forEach((e: any) => {
       insigniaOp2.value.push({ name: e.name, id: e.id })
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index 0bef186be..19d87db6a 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -34,6 +34,7 @@ const profileType = ref<string>("");
 const fileResult = ref<any>(null);
 const fileinvoice = ref<any>(null);
 const loadView = ref<boolean>(false);
+const insigniaTypeOption = ref<any>([]);
 
 onMounted(async () => {
   await fecthRound();
@@ -264,6 +265,11 @@ const columns = ref<QTableProps["columns"]>([
 watch(tab, () => {
   if (tab.value !== "doc") {
     fecthlistInsignia();
+    console.log(DataStore.insigniaOp);
+
+    insigniaTypeOption.value = DataStore.insigniaOp.filter(
+      (e: any) => e.insigniaType == tab.value || e.name == "ทั้งหมด"
+    );
   }
 });
 watch(modal, () => {
@@ -555,7 +561,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 emit-value
                 map-options
                 option-label="name"
-                :options="DataStore.insigniaOp"
+                :options="insigniaTypeOption"
                 option-value="id"
                 :readonly="false"
                 :borderless="false"