Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

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

src/modules/07_insignia/components/2_Manage/listManage.vue

@@ -40,6 +40,7 @@ const modalPopupBackToEdit = ref<boolean>(false); //model แก้ไข
 onMounted(async () => {
   tab.value = DataStore.mainTab;
   await fecthlistRound();
+  DataStore.dataInsigniaType.length === 0 && (await fecthInsignia());
 });
 
 //เรียกรอบการเสนอขอพระราชทานเครื่อง
@@ -123,6 +124,18 @@ const fecthType = async () => {
       messageError($q, err);
     });
 };
+// เรียกประเภทเครื่องราช
+const fecthInsignia = async () => {
+  await http
+    .get(config.API.insignia)
+    .then((res) => {
+      let data = res.data.result;
+      DataStore.fetchInsigniaType(data);
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+};
 
 //เลือกรอบการแสดง
 const changround = async () => {

src/modules/07_insignia/store.ts

@@ -37,6 +37,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
     { id: '44', title: 'บัญชีแสดงจำนวนชั้นตราเครื่องราชฯ' }
   ])
   const mainTab = ref<string | undefined>("pending");
+  const dataInsigniaType = ref<any>([])
   // เรียกราชชื่อการเสนอขอ
   const fetchData = async (data: any) => {
     if (data !== null) {
@@ -124,6 +125,10 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
       rows.value = listinsignia.value;
     }
   };
+  // ประเภทเครื่องราช
+  function fetchInsigniaType(data: any) {
+    dataInsigniaType.value = data
+  }
 
   // ประเภทลูกจ้าง
   const profileType = (val: string) => {
@@ -167,11 +172,13 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
     employeeClass,
     employeeClassOps,
     fetchDataInsignia,
+    fetchInsigniaType,
     isLock,
     requestId,
     roleUser,
     requestStatus,
     optionReport,
-    convertStatus
+    convertStatus,
+    dataInsigniaType,
   };
 });