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 = () => {
+
{
})
.then(async (res) => {
if (download) {
- downloadFile(res, `ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.${type}`);
+ downloadFile(
+ res,
+ `ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา.${type}`
+ );
}
})
.catch((e) => {
@@ -91,4 +94,4 @@ const downloadFile = (response: any, filename: string) => {
-
\ No newline at end of file
+
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("");
const fileResult = ref(null);
const fileinvoice = ref(null);
const loadView = ref(false);
+const insigniaTypeOption = ref([]);
onMounted(async () => {
await fecthRound();
@@ -264,6 +265,11 @@ const columns = ref([
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"