Merge branch 'nice_dev' into develop

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 == 'เหรียญจักรพรรดิมาลา'"

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>
+</template>

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

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"