From b1f7d9ece75692fd1a39841166645c0155360cde Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 31 May 2024 14:50:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B8=E0=B8=99=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2=3D>=20?=
 =?UTF-8?q?=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/scholarship/DetailView.vue     | 39 ++++++++++---------
 .../interface/response/Scholarship.ts         |  1 +
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index fbdd3f0f8..a21c5f3a0 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -172,6 +172,7 @@ function fetchDataDetail(id: string) {
     .then((res) => {
       const data: DataSholarship = res.data.result;
       console.log(data);
+      formBody.profileId = data.profileId;
       formBody.rank = data.rank;
       formBody.prefix = data.prefix;
       formBody.firstName = data.firstName;
@@ -382,7 +383,7 @@ function onClickUpdateStatus(type: string) {
 
 /**
  * update date
- * @param startDate วันที่เริ่ม 
+ * @param startDate วันที่เริ่ม
  * @param endDate วันที่สิ้นสุด
  * @param toDo true/false
  */
@@ -483,25 +484,25 @@ async function checkFileBackReceived(id: string) {
 function downloadFileBackReceived() {
   showLoader();
   if (scholarshipId.value !== null && fileBackReceived.value !== null) {
-  http
-    .get(
-      config.API.fileByFile(
-        "ระบบพัฒนาบุคคล",
-        "ฟอร์มรายงานตัวกลับเข้ารับราชการ",
-        scholarshipId.value,
-        fileBackReceived.value
+    http
+      .get(
+        config.API.fileByFile(
+          "ระบบพัฒนาบุคคล",
+          "ฟอร์มรายงานตัวกลับเข้ารับราชการ",
+          scholarshipId.value,
+          fileBackReceived.value
+        )
       )
-    )
-    .then((res) => {
-      const data = res.data.downloadUrl;
-      window.open(data, "_blank");
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      hideLoader();
-    });
+      .then((res) => {
+        const data = res.data.downloadUrl;
+        window.open(data, "_blank");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(async () => {
+        hideLoader();
+      });
   }
 }
 
diff --git a/src/modules/15_development/interface/response/Scholarship.ts b/src/modules/15_development/interface/response/Scholarship.ts
index 16b58f81f..1d3215ff8 100644
--- a/src/modules/15_development/interface/response/Scholarship.ts
+++ b/src/modules/15_development/interface/response/Scholarship.ts
@@ -9,6 +9,7 @@ interface ListSholarship {
 }
 
 interface DataSholarship {
+  profileId: string
   rank: string; //ยศ
   prefix: string; //คำนำหน้าชื่อ
   firstName: string; //ชื่อ