From ab24770899c0a099fa412ae40193486efc524f18 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 15 Sep 2023 14:34:31 +0700
Subject: [PATCH] =?UTF-8?q?report=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AA=E0=B8=B3=E0=B8=AB=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=99=E0=B8=AD=E0=B8=82=E0=B8=AD=E0=B8=9E=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B2=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=8D=E0=B8=88=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=9E=E0=B8=A3=E0=B8=A3=E0=B8=94=E0=B8=B4=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../07_insignia/components/2_Manage/Tab1.vue  | 401 ++++++++++++++----
 .../components/2_Manage/downloadFile.vue      |  96 +++++
 .../components/2_Manage/listManage.vue        |   3 +
 .../components/report/ReportView.vue          |   4 +-
 src/modules/07_insignia/store.ts              |   4 +
 5 files changed, 431 insertions(+), 77 deletions(-)
 create mode 100644 src/modules/07_insignia/components/2_Manage/downloadFile.vue

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;
+};
 </script>
 
 <template>
   <div class="col-12 row q-pa-md">
     <div class="row col-12">
       <div class="row col-12 q-col-gutter-sm">
-        <q-select v-if="roleDataStore.adminRole" v-model="organization" label="หน่วยงาน" dense emit-value map-options
-          :options="organizationOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-          :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 150px"
-          @update:model-value="changtypeOc" />
-        <q-select v-model="DataStore.typeinsignia" label="ปรเภทเครื่องราชฯ ที่ยืนขอ" dense emit-value map-options
-          :options="DataStore.typeinsigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-          :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 180px"
+        <q-select
+          v-if="roleDataStore.adminRole"
+          v-model="organization"
+          label="หน่วยงาน"
+          dense
+          emit-value
+          map-options
+          :options="organizationOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 150px"
+          @update:model-value="changtypeOc"
+        />
+        <q-select
+          v-model="DataStore.typeinsignia"
+          label="ปรเภทเครื่องราชฯ ที่ยืนขอ"
+          dense
+          emit-value
+          map-options
+          :options="DataStore.typeinsigniaOptions"
+          option-value="id"
+          option-label="name"
+          lazy-rules
+          hide-bottom-space
+          :readonly="false"
+          :borderless="false"
+          :outlined="true"
+          :hide-dropdown-icon="false"
+          style="min-width: 180px"
           @update:model-value="
             DataStore.searchDataTable(
               DataStore.typeinsignia,
               DataStore.employeeClass
             )
-            " />
+          "
+        />
         <div>
-          <q-select v-model="DataStore.employeeClass" dense outlined lazy-rules hide-bottom-space :label="`${'สถานภาพ'}`"
-            emit-value map-options option-label="name" :options="DataStore.employeeClassOps" option-value="id"
-            :readonly="false" :borderless="false" style="min-width: 150px" @update:model-value="
+          <q-select
+            v-model="DataStore.employeeClass"
+            dense
+            outlined
+            lazy-rules
+            hide-bottom-space
+            :label="`${'สถานภาพ'}`"
+            emit-value
+            map-options
+            option-label="name"
+            :options="DataStore.employeeClassOps"
+            option-value="id"
+            :readonly="false"
+            :borderless="false"
+            style="min-width: 150px"
+            @update:model-value="
               DataStore.searchDataTable(
                 DataStore.typeinsignia,
                 DataStore.employeeClass
               )
-              " />
+            "
+          />
         </div>
         <div>
-          <q-btn size="md" icon="mdi-download" flat round color="primary" @click="downloadFileexcel">
+          <q-btn
+            size="md"
+            icon="mdi-download"
+            flat
+            round
+            color="primary"
+            @click="downloadFileexcel"
+          >
             <!-- @click="downloadReport('pdf')" -->
             <q-tooltip>ดาวน์โหลด</q-tooltip>
             <!-- <q-menu>
@@ -627,45 +678,100 @@ const closeModalEdit = () => {
               </q-list>
             </q-menu> -->
           </q-btn>
-          <q-btn size="12px" flat round color="add" icon="mdi-plus" @click="clickmodalAdd" v-if="(DataStore.isLock == false &&
-            DataStore.requestStatus == 'st5' &&
-            roleDataStore.adminRole) ||
-            checkStatus == true
-            ">
+          <q-btn
+            size="12px"
+            flat
+            round
+            color="add"
+            icon="mdi-plus"
+            @click="clickmodalAdd"
+            v-if="
+              (DataStore.isLock == false &&
+                DataStore.requestStatus == 'st5' &&
+                roleDataStore.adminRole) ||
+              checkStatus == true
+            "
+          >
             <q-tooltip>เพิ่ม</q-tooltip>
           </q-btn>
         </div>
         <q-space />
 
-        <q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
-          debounce="300" placeholder="ค้นหา">
+        <q-input
+          class="col-xs-12 col-sm-3 col-md-2"
+          standout
+          dense
+          v-model="filterKeyword"
+          ref="filterRef"
+          outlined
+          debounce="300"
+          placeholder="ค้นหา"
+        >
           <template v-slot:append>
             <q-icon v-if="filterKeyword == ''" name="search" />
-            <q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
+            <q-icon
+              v-if="filterKeyword !== ''"
+              name="clear"
+              class="cursor-pointer"
+              @click="resetFilter"
+            />
           </template>
         </q-input>
 
-        <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
-          emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
-          class="col-xs-12 col-sm-3 col-md-2" />
+        <q-select
+          v-model="visibleColumns"
+          multiple
+          outlined
+          dense
+          options-dense
+          :display-value="$q.lang.table.columns"
+          emit-value
+          map-options
+          :options="columns"
+          option-value="name"
+          options-cover
+          style="min-width: 150px"
+          class="col-xs-12 col-sm-3 col-md-2"
+        />
       </div>
       <div class="col-12 q-pt-sm">
-        <q-table ref="table" :columns="columns" :rows="DataStore.rows" :filter="filterKeyword" row-key="name" flat
-          bordered :paging="true" dense class="custom-header-table" :visible-columns="visibleColumns"
-          :pagination-label="paginationLabel" v-model:pagination="pagination">
+        <q-table
+          ref="table"
+          :columns="columns"
+          :rows="DataStore.rows"
+          :filter="filterKeyword"
+          row-key="name"
+          flat
+          bordered
+          :paging="true"
+          dense
+          class="custom-header-table"
+          :visible-columns="visibleColumns"
+          :pagination-label="paginationLabel"
+          v-model:pagination="pagination"
+        >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th auto-width v-if="(DataStore.isLock == false &&
-                DataStore.requestStatus == 'st5') ||
-                checkStatus == true
-                " />
+              <q-th></q-th>
+              <q-th
+                auto-width
+                v-if="
+                  (DataStore.isLock == false &&
+                    DataStore.requestStatus == 'st5') ||
+                  checkStatus == true
+                "
+              />
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer" @click.stop="nextPage(props.row.profileId)">
+            <q-tr
+              :props="props"
+              class="cursor-pointer"
+              @click.stop="nextPage(props.row.profileId)"
+            >
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -699,33 +805,88 @@ const closeModalEdit = () => {
               <q-td key="dateSend" :props="props">
                 {{ props.row.dateSend }}
               </q-td>
-              <q-td auto-width v-if="(DataStore.isLock == false &&
-                DataStore.requestStatus == 'st5' &&
-                roleDataStore.adminRole) ||
-                checkStatus == true
-                ">
-                <q-btn v-if="roleDataStore.adminRole ||
-                  (roleDataStore.insignia1Role &&
-                    (requestStatus == 'st1' || requestStatus == 'st4'))
-                  " icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense @click.stop>
+              <q-td
+                auto-width
+                v-if="props.row.insigniaSend == 'เหรียญจักรพรรดิมาลา'"
+              >
+                <btnDownloadFile
+                  :profileId="props.row.profileId"
+                  :round="DataStore.roundId"
+                  :optionRound="DataStore.optionRound"
+                />
+              </q-td>
+              <q-td v-else auto-width></q-td>
+              <q-td
+                auto-width
+                v-if="
+                  (DataStore.isLock == false &&
+                    DataStore.requestStatus == 'st5' &&
+                    roleDataStore.adminRole) ||
+                  checkStatus == true
+                "
+              >
+                <q-btn
+                  v-if="
+                    roleDataStore.adminRole ||
+                    (roleDataStore.insignia1Role &&
+                      (requestStatus == 'st1' || requestStatus == 'st4'))
+                  "
+                  icon="mdi-dots-vertical"
+                  size="12px"
+                  color="grey-7"
+                  flat
+                  round
+                  dense
+                  @click.stop
+                >
                   <q-menu transition-show="jump-down" transition-hide="jump-up">
                     <q-list dense style="min-width: 250px">
-                      <q-item clickable v-close-popup @click.stop="clickmodalEdit(props.row)">
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click.stop="clickmodalEdit(props.row)"
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-tooltip>
                           <q-icon color="primary" size="xs" name="mdi-pencil" />
                         </q-item-section>
-                        <q-item-section>แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section>
+                        <q-item-section
+                          >แก้ไขเครื่องราชฯ ที่ยื่นขอ</q-item-section
+                        >
                       </q-item>
-                      <q-item clickable v-close-popup @click.stop="clickReject(props.row.id)">
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click.stop="clickReject(props.row.id)"
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>ไม่ยื่นขอ</q-tooltip>
-                          <q-icon color="blue" size="xs" name="mdi-alert-circle-outline" />
+                          <q-icon
+                            color="blue"
+                            size="xs"
+                            name="mdi-alert-circle-outline"
+                          />
                         </q-item-section>
                         <q-item-section>ไม่ยื่นขอ</q-item-section>
                       </q-item>
-                      <q-item clickable v-close-popup @click.stop="clickDelete(props.row.id)">
-                        <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                      <q-item
+                        clickable
+                        v-close-popup
+                        @click.stop="clickDelete(props.row.id)"
+                      >
+                        <q-item-section
+                          style="min-width: 0px"
+                          avatar
+                          class="q-py-sm"
+                        >
                           <q-tooltip>ลบออก</q-tooltip>
                           <q-icon color="red" size="xs" name="mdi-delete" />
                         </q-item-section>
@@ -738,8 +899,16 @@ const closeModalEdit = () => {
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination v-model="pagination.page" active-color="primary" color="primary" :max="scope.pagesNumber"
-              :max-pages="5" size="sm" boundary-links direction-links></q-pagination>
+            <q-pagination
+              v-model="pagination.page"
+              active-color="primary"
+              color="primary"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
           </template>
         </q-table>
       </div>
@@ -752,25 +921,62 @@ const closeModalEdit = () => {
       <q-toolbar class="q-py-md">
         <q-toolbar-title class="text-h6">เพิ่มรายชื่อ </q-toolbar-title>
 
-        <q-btn icon="close" unelevated round dense @click="modalAdd = false"
-          style="color: #ff8080; background-color: #ffdede" />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="modalAdd = false"
+          style="color: #ff8080; background-color: #ffdede"
+        />
       </q-toolbar>
       <q-separator />
       <div class="q-pa-md">
         <q-toolbar style="padding: 0">
-          <q-select v-model="insigniaType" label="ปรเภทเครื่องราชฯ" dense emit-value map-options
-            :options="insigniaOptions" option-value="id" option-label="name" lazy-rules hide-bottom-space
-            :readonly="false" :borderless="false" :outlined="true" :hide-dropdown-icon="false" style="min-width: 250px" />
+          <q-select
+            v-model="insigniaType"
+            label="ปรเภทเครื่องราชฯ"
+            dense
+            emit-value
+            map-options
+            :options="insigniaOptions"
+            option-value="id"
+            option-label="name"
+            lazy-rules
+            hide-bottom-space
+            :readonly="false"
+            :borderless="false"
+            :outlined="true"
+            :hide-dropdown-icon="false"
+            style="min-width: 250px"
+          />
           <q-space />
-          <q-input borderless outlined dense debounce="300" placeholder="ค้นหา" v-model="filterKeyword2">
+          <q-input
+            borderless
+            outlined
+            dense
+            debounce="300"
+            placeholder="ค้นหา"
+            v-model="filterKeyword2"
+          >
             <!-- style="width: 850px; max-width: auto"? -->
             <template v-slot:append>
               <q-icon name="search" />
             </template>
           </q-input>
         </q-toolbar>
-        <q-table flat bordered dense :rows="rows2" :columns="columns2" :filter="filterKeyword2" row-key="name"
-          class="custom-header-table" :pagination-label="paginationLabel2" v-model:pagination="pagination2">
+        <q-table
+          flat
+          bordered
+          dense
+          :rows="rows2"
+          :columns="columns2"
+          :filter="filterKeyword2"
+          row-key="name"
+          class="custom-header-table"
+          :pagination-label="paginationLabel2"
+          v-model:pagination="pagination2"
+        >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -796,14 +1002,27 @@ const closeModalEdit = () => {
                 {{ props.row.organizationOrganization }}
               </q-td>
               <q-td>
-                <q-btn outline :props="props" label="เพิ่ม" class="text-teal-5" @click="clickAdd(props.row.id)" />
+                <q-btn
+                  outline
+                  :props="props"
+                  label="เพิ่ม"
+                  class="text-teal-5"
+                  @click="clickAdd(props.row.id)"
+                />
                 <q-tooltip>เพิ่ม</q-tooltip>
               </q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination v-model="pagination2.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
-              boundary-links direction-links></q-pagination>
+            <q-pagination
+              v-model="pagination2.page"
+              color="primary"
+              :max="scope.pagesNumber"
+              :max-pages="5"
+              size="sm"
+              boundary-links
+              direction-links
+            ></q-pagination>
           </template>
         </q-table>
       </div>
@@ -814,20 +1033,42 @@ const closeModalEdit = () => {
   <q-dialog v-model="modalEdit" persistent>
     <q-card style="width: 450px; max-width: 80vw">
       <q-form ref="myForm">
-        <DialogHeader tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ" :close="closeModalEdit" />
+        <DialogHeader
+          tittle="แก้ไขเครื่องราชฯ ที่ยื่นขอ"
+          :close="closeModalEdit"
+        />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-py-md">
-
-              <q-select v-model="insignia" label="ชื่อเครื่องราชฯ" dense emit-value map-options :options="insigniaOptions"
-                option-value="id" option-label="name" lazy-rules hide-bottom-space :readonly="false" :borderless="false"
-                :outlined="true" :hide-dropdown-icon="false" style="width: 100%" />
-
+            <q-select
+              v-model="insignia"
+              label="ชื่อเครื่องราชฯ"
+              dense
+              emit-value
+              map-options
+              :options="insigniaOptions"
+              option-value="id"
+              option-label="name"
+              lazy-rules
+              hide-bottom-space
+              :readonly="false"
+              :borderless="false"
+              :outlined="true"
+              :hide-dropdown-icon="false"
+              style="width: 100%"
+            />
           </div>
         </q-card-section>
         <q-separator />
         <q-card-actions align="right">
-          <q-btn dense unelevated label="บันทึก" color="public" @click="clickSave" class="q-px-md">
+          <q-btn
+            dense
+            unelevated
+            label="บันทึก"
+            color="public"
+            @click="clickSave"
+            class="q-px-md"
+          >
             <!-- icon="mdi-content-save-outline" -->
             <q-tooltip>บันทึก</q-tooltip>
           </q-btn>
@@ -836,8 +1077,18 @@ const closeModalEdit = () => {
     </q-card>
   </q-dialog>
 
-  <DialogPopupReason :modal="modelPopupReject" title="เหตุผลไม่ยื่นขอ" label="หมายเหตุ"
-    :click-close="closemodelPopupReject" :savaForm="savaReasonReject" />
-  <DialogPopupReason :modal="modelPopupDelete" title="เหตุผลที่ลบออก" label="หมายเหตุ"
-    :click-close="closemodelPopupDelete" :savaForm="savaReasonDelete" />
+  <DialogPopupReason
+    :modal="modelPopupReject"
+    title="เหตุผลไม่ยื่นขอ"
+    label="หมายเหตุ"
+    :click-close="closemodelPopupReject"
+    :savaForm="savaReasonReject"
+  />
+  <DialogPopupReason
+    :modal="modelPopupDelete"
+    title="เหตุผลที่ลบออก"
+    label="หมายเหตุ"
+    :click-close="closemodelPopupDelete"
+    :savaForm="savaReasonDelete"
+  />
 </template>
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 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { messageError, showLoader, hideLoader } = mixin;
+const props = defineProps({
+  profileId: {
+    type: String,
+  },
+  round: {
+    type: String,
+  },
+  optionRound: {
+    type: Object,
+  },
+});
+
+const titleReport = ref<string>("");
+
+const downloadDocument = async (type: string) => {
+  let round = [];
+  if (props.optionRound) {
+    round = props.optionRound.find((e: any) => e.id === props.round);
+  }
+  titleReport.value = round.name;
+  const download: boolean = true;
+  if (props.profileId) {
+    showLoader();
+    await http
+      .get(config.API.reportInsignia("46", type, props.profileId), {
+        responseType: "blob",
+      })
+      .then(async (res) => {
+        if (download) {
+          downloadFile(res, `${titleReport.value}.${type}`);
+        }
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  }
+};
+const downloadFile = (response: any, filename: string) => {
+  const link = document.createElement("a");
+  var fileName = filename;
+  link.href = window.URL.createObjectURL(new Blob([response.data]));
+  link.setAttribute("download", fileName);
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+};
+</script>
+<template>
+  <q-btn
+    dense
+    size="12px"
+    flat
+    round
+    color="gray"
+    icon="mdi-dots-vertical"
+    @click.stop
+  >
+    <q-menu>
+      <q-list style="min-width: 150px">
+        <q-item clickable v-close-popup @click="downloadDocument('pdf')">
+          <q-item-section avatar
+            ><q-icon color="red" name="mdi-file-pdf"
+          /></q-item-section>
+          <q-item-section>ไฟล์ .PDF</q-item-section>
+        </q-item>
+        <q-item clickable v-close-popup @click="downloadDocument('docx')">
+          <q-item-section avatar
+            ><q-icon color="blue" name="mdi-file-word"
+          /></q-item-section>
+          <q-item-section>ไฟล์ .docx</q-item-section>
+        </q-item>
+        <q-item clickable v-close-popup @click="downloadDocument('xlsx')">
+          <q-item-section avatar
+            ><q-icon color="green" name="mdi-file-excel"
+          /></q-item-section>
+          <q-item-section>ไฟล์ .xlsx</q-item-section>
+        </q-item>
+      </q-list>
+    </q-menu>
+  </q-btn>
+</template>
+
+<style scoped></style>
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) => {
           </q-item-section>
         </q-item>
 
-        <q-item
+        <!-- <q-item
           clickable
           @click="
             nextPage('46', 'ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา')
@@ -99,7 +99,7 @@ const nextPage = (type: string, title: string) => {
           <q-item-section class="text-dark">
             ประวัติสำหรับการเสนอขอพระราชทานเหรียญจักรพรรดิมาลา
           </q-item-section>
-        </q-item>
+        </q-item> -->
       </div>
     </q-card>
   </div>
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<string>("")
+  const optionRound = ref<any>([])
   const isLock = ref<boolean>(false)
   const roleUser = ref<string>("")
   const requestId = ref<string>("")
@@ -112,6 +114,8 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
   }
 
   return {
+    roundId,
+    optionRound,
     optionsTypeOc,
     mainTab,
     typeOc,