diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue index 3d0e9f617..30c53cb21 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab1.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue @@ -11,6 +11,7 @@ import { useRouter } from "vue-router"; import DialogPopupReason from "@/components/Dialogs/PopupReason.vue"; import DialogHeader from "@/components/DialogHeader.vue"; +import btnDownloadFile from "./downloadFile.vue"; const router = useRouter(); const mixin = useCounterMixin(); @@ -569,39 +570,89 @@ const paginationLabel2 = (start: number, end: number, total: number) => { }; const closeModalEdit = () => { - modalEdit.value = false -} + modalEdit.value = false; +}; diff --git a/src/modules/07_insignia/components/2_Manage/downloadFile.vue b/src/modules/07_insignia/components/2_Manage/downloadFile.vue new file mode 100644 index 000000000..54732d227 --- /dev/null +++ b/src/modules/07_insignia/components/2_Manage/downloadFile.vue @@ -0,0 +1,96 @@ + + + + diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue index c3b4e250a..d86a05ecb 100644 --- a/src/modules/07_insignia/components/2_Manage/listManage.vue +++ b/src/modules/07_insignia/components/2_Manage/listManage.vue @@ -55,8 +55,10 @@ const fecthlistRound = async () => { name: e.period_name, })); if (optionRound.value.length !== 0) { + DataStore.optionRound = optionRound.value; const lastValue = optionRound.value[0]; round.value = lastValue.id.toString(); + DataStore.roundId = round.value; roundName.value = lastValue.name; await fecthStat(round.value); await fecthAgency(); @@ -123,6 +125,7 @@ const fecthType = async () => { }; const changround = async () => { + DataStore.roundId = round.value; fecthStat(round.value); var organization = await (DataStore.agency != null ? DataStore.agency diff --git a/src/modules/07_insignia/components/report/ReportView.vue b/src/modules/07_insignia/components/report/ReportView.vue index 3c8f99beb..fef254874 100644 --- a/src/modules/07_insignia/components/report/ReportView.vue +++ b/src/modules/07_insignia/components/report/ReportView.vue @@ -85,7 +85,7 @@ const nextPage = (type: string, title: string) => { - ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา - + --> diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts index 6890179ff..ebd234f03 100644 --- a/src/modules/07_insignia/store.ts +++ b/src/modules/07_insignia/store.ts @@ -6,6 +6,8 @@ const mixin = useCounterMixin(); const { date2Thai } = mixin; export const useInsigniaDataStore = defineStore("insignia", () => { + const roundId = ref("") + const optionRound = ref([]) const isLock = ref(false) const roleUser = ref("") const requestId = ref("") @@ -112,6 +114,8 @@ export const useInsigniaDataStore = defineStore("insignia", () => { } return { + roundId, + optionRound, optionsTypeOc, mainTab, typeOc,