From 6bbf5b5716685f5febd04d1cb98d3c5ccc86d967 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 12 Sep 2023 11:11:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=20=20api=20=E0=B8=94=E0=B8=B2=E0=B8=A7?=
 =?UTF-8?q?=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94=E0=B9=84=E0=B8=9F=E0=B8=A5?=
 =?UTF-8?q?=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts
index b7c32d839..9021a1739 100644
--- a/src/api/reports/api.report.ts
+++ b/src/api/reports/api.report.ts
@@ -28,11 +28,11 @@ 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,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}`,
+    // 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}`,
+    reportEvaluateResult:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`,
+    // reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`,
 
     //filetransfer
     reportTransferFile:(no:number,type:string,id:string) => `${reportTransfer}/${no}/${type}/${id}`,
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index cca4a51d7..e0a9fb74e 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -48,7 +48,7 @@ onMounted(() => {
   fecthAssign(assignId.value);
   fecthResult(assignId.value);
 });
-
+const ID = ref<string>('')
 const date_start = ref<Date>(new Date());
 const date_finish = ref<Date>();
 const develop = ref<number>();
@@ -92,7 +92,7 @@ const fecthResult = async (id: string) => {
     .then(async (res: any) => {
       if (res.data.data != null) {
         const data = await res.data.data.evaluate;
-
+        ID.value = data.id
         // fullname.value = res.data.data.profile.name;
         date_start.value = data.date_start;
         date_finish.value = data.date_finish;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
index 8e52fb016..23ff1d94b 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.assign_id,numTab.no), {
+    .get(config.API.reportEvaluate(type, numTab.id), {
       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 c7c4609a1..2ebee1e93 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,numTab.no), {
+    .get(config.API.reportEvaluateChairman(type, numTab.id), {
       responseType: "blob",
     })
     .then(async (res) => {