From 467fa1aa2eb7f0285137ed7556d3be768e6a09c3 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Mon, 4 Sep 2023 11:38:43 +0700
Subject: [PATCH] =?UTF-8?q?report/probation/16,17=20=E0=B9=80=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=20/no?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reports/api.report.ts                                 | 4 ++--
 .../components/probation/FormEvaluation/Template2.vue         | 2 +-
 .../components/probation/FormEvaluation/Template2Format2.vue  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts
index 940e15765..b7c32d839 100644
--- a/src/api/reports/api.report.ts
+++ b/src/api/reports/api.report.ts
@@ -29,8 +29,8 @@ export default {
     reportAssign:(type:string, id:string) => `${reportProbation}/13/${type}/${id}`,
     reportEvaluateRecord1:(type:string, id:string) => `${reportProbation}/14/${type}/${id}`,
     reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`,
-    reportEvaluate:(type:string, id:string) => `${reportProbation}/16/${type}/${id}`,
-    reportEvaluateChairman:(type:string, id:string) => `${reportProbation}/17/${type}/${id}`,
+    reportEvaluate:(type:string, id:string,no:number) => `${reportProbation}/16/${type}/${id}/${no}`,
+    reportEvaluateChairman:(type:string, id:string,no:number) => `${reportProbation}/17/${type}/${id}/${no}`,
     reportEvaluateResult:(type:string, id:string) => `${reportProbation}/18/${type}/${id}`,
     reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`,
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index 23ff1d94b..e068a83b8 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
@@ -76,7 +76,7 @@ const FileDownload = async (type: string) => {
   let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value);
   showLoader();
   await http
-    .get(config.API.reportEvaluate(type, numTab.id), {
+    .get(config.API.reportEvaluate(type, numTab.id,numTab.no), {
       responseType: "blob",
     })
     .then(async (res) => {
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
index 2ebee1e93..c7c4609a1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
@@ -72,7 +72,7 @@ const FileDownload = async (type: string) => {
   let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value);
   showLoader();
   await http
-    .get(config.API.reportEvaluateChairman(type, numTab.id), {
+    .get(config.API.reportEvaluateChairman(type, numTab.id,numTab.no), {
       responseType: "blob",
     })
     .then(async (res) => {