From 22d1fbed58da7fce9a5839e54a95d87348f3150b Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 10 Sep 2025 12:04:53 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=AB=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/recruiting/api.disable.ts                 |  2 +-
 .../03_recruiting/views/01_compete/DetailEx.vue   |  6 +++---
 .../03_recruiting/views/01_compete/Period.vue     |  1 +
 .../views/02_qualify/DisableDetailEx.vue          | 15 ++++++---------
 .../views/02_qualify/DisablePeriod.vue            | 11 ++++++-----
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/api/recruiting/api.disable.ts b/src/api/recruiting/api.disable.ts
index d4b5215f6..cfb00e4a4 100644
--- a/src/api/recruiting/api.disable.ts
+++ b/src/api/recruiting/api.disable.ts
@@ -39,5 +39,5 @@ export default {
     `${disableExam}placement/${examId}`,
   
   repoetUploadDisableExam:(id:string)=>`${disableExam}result/${id}`,
-  repoetDownloadDisableExam:(id:string)=>`${disableExam}report/exam/${id}`
+  repoetDownloadDisableExam:(id:string,examId:string)=>`${disableExam}report/exam/${id}/${examId}`
 };
diff --git a/src/modules/03_recruiting/views/01_compete/DetailEx.vue b/src/modules/03_recruiting/views/01_compete/DetailEx.vue
index eaf1e7b4f..a917c63b6 100644
--- a/src/modules/03_recruiting/views/01_compete/DetailEx.vue
+++ b/src/modules/03_recruiting/views/01_compete/DetailEx.vue
@@ -104,7 +104,7 @@ async function downloadScore() {
     .get(config.API.examReport(importId.value, examId.value))
     .then(async (res) => {
       const data = res.data.result;
-      await genReport(data, `ผลคะแนน_${examId.value}.pdf`,'pdf');
+      await genReport(data, `ผลคะแนน_${examId.value}`, "pdf");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
@@ -332,10 +332,10 @@ onMounted(async () => {
                 ภาคความรู้ความสามารถที่ใช้เฉพาะตำแหน่ง (ภาค ข)
               </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreAFull ? scoreAFull:'-' }}
+                {{ scoreAFull ? scoreAFull : "-" }}
               </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreA ? scoreA:'-' }}
+                {{ scoreA ? scoreA : "-" }}
               </div>
               <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
 
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 189039415..4a5c400aa 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -231,6 +231,7 @@ async function clickPassExam(id: string) {
     .get(config.API.exportPassExamList(id))
     .then(async (res) => {
       const data = res.data.result;
+      data.reportName = `CandidateList`;
       await genReport(data, "รายชื่อผู้สอบแข่งขันได้", "pdf");
     })
     .catch(async (e) => {
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
index 6df0eeee9..dd7d242c2 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
@@ -8,6 +8,8 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 
+import genReport from "@/plugins/genreport";
+
 const $q = useQuasar();
 
 const router = useRouter();
@@ -96,15 +98,10 @@ async function fetchData() {
 async function downloadScore() {
   showLoader();
   await http
-    .get(config.API.downloadDisableScoreReport(importId.value, examId.value), {
-      responseType: "blob",
-    })
-    .then((res) => {
-      var a = document.createElement("a");
-      a.href = URL.createObjectURL(res.data);
-      a.download = `ผลคะแนน_${examId.value}.pdf`;
-      // start download
-      a.click();
+    .get(config.API.repoetDownloadDisableExam(importId.value, examId.value))
+    .then(async (res) => {
+      const data = res.data.result;
+      await genReport(data, `ผลคะแนน_${examId.value}`, "pdf");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index 53368c744..003788647 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -60,6 +60,7 @@ const textTittleScore = ref<string>("");
 const textTittleCandidate = ref<string>("");
 const textTittleResult = ref<string>("");
 const initialPagination = ref<Pagination>({
+  page: 1,
   rowsPerPage: 0,
   sortBy: "year",
 });
@@ -186,9 +187,10 @@ const visibleColumnsHistory = ref<String[]>([
 async function clickPassExam(id: string) {
   showLoader();
   await http
-    .get(config.API.repoetDownloadDisableExam(id))
+    .get(config.API.exportDisablePassExamList(id))
     .then(async (res) => {
       const data = res.data.result;
+      data.reportName = `CandidateList`;
       await genReport(data, "รายชื่อผู้สอบแข่งขันได้", "pdf");
     })
     .catch(async (e) => {
@@ -668,7 +670,8 @@ onMounted(async () => {
                   round
                   @click.stop.prevent="clickResult(props.row.id)"
                   v-if="
-                    (props.row.score == null || props.row.score.resultCount == 0) &&
+                    (props.row.score == null ||
+                      props.row.score.resultCount == 0) &&
                     checkPermission($route)?.attrIsUpdate
                   "
                 >
@@ -702,9 +705,7 @@ onMounted(async () => {
                     @click.stop.prevent="clickPassExam(props.row.id)"
                     icon="mdi-clipboard-arrow-down"
                   >
-                    <q-tooltip
-                      >ดาวน์โหลดรายชื่อผู้สอบแข่งขันได้</q-tooltip
-                    >
+                    <q-tooltip>ดาวน์โหลดรายชื่อผู้สอบแข่งขันได้</q-tooltip>
                   </q-btn>
                 </div>
               </div>