From 90d6421a9ef68240f76998655d0ae0ff5429a61f Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 26 Dec 2024 10:46:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B8=E0=B9=88=E0=B8=A1=20=E0=B8=94=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A7=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8=20=E0=B9=81=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=20=E0=B8=A2?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=A2=20=E0=B9=82=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/05_placement/views/09_reportMain.vue             | 5 ++++-
 .../11_discipline/components/9_DisciplineReport/Main.vue     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/05_placement/views/09_reportMain.vue b/src/modules/05_placement/views/09_reportMain.vue
index 7ebb04d46..4004a450c 100644
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@@ -14,6 +14,7 @@ import type { DataStructureTree } from "@/interface/main";
 import type { DataTypeReport } from "@/modules/05_placement/interface/index/Main";
 
 import LoadView from "@/components/LoadView.vue";
+import genReportXLSX from "@/plugins/genreportxlsx";
 
 /** use*/
 const $q = useQuasar();
@@ -29,6 +30,7 @@ const {
 } = useCounterMixin();
 
 /** Filter*/
+const detailReport = ref<any>();
 const reportType = ref<DataTypeReport>();
 const optionReport = ref<DataTypeReport[]>([
   {
@@ -113,6 +115,7 @@ function fetchDataReport() {
     })
     .then(async (res) => {
       const data = await res.data.result;
+      detailReport.value = data;
       await fetchDocumentTemplate(data);
     })
     .catch((err) => {
@@ -192,7 +195,6 @@ onMounted(() => {
           >
           </q-select>
 
-          
           <q-space />
           <q-btn
             :loading="isLoadPDF"
@@ -201,6 +203,7 @@ onMounted(() => {
             color="primary"
             icon="download"
             :disable="!reportType || !nodeId"
+            @click="genReportXLSX(detailReport, `${year}_${reportType?.name}`)"
           >
           </q-btn>
         </div>
diff --git a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
index 006ce806e..6e5b08400 100644
--- a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
+++ b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
@@ -270,7 +270,7 @@ onMounted(async () => {
           <q-btn
             flat
             round
-            :disable="!nodeId || !employeeClass || !posType || !posLevel"
+            :disable="!nodeId || !employeeClass"
             color="primary"
             icon="download"
             v-if="checkPermission($route)?.attrIsGet"