From c9c6ba33e6cb6b7b7af26af26258116f660fe0e9 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 9 Apr 2025 16:37:06 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=8A=E0=B9=87=E0=B8=84=20=E0=B8=9C=E0=B8=B9=E0=B9=89?=
 =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=B3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_scholarship/views/detail.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index 898ba70..555e40f 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -271,13 +271,17 @@ function onOpenReturn() {
   dialogReturn.value = true;
 }
 
-function onDownload(type: string) {
+async function onDownload(type: string) {
   showLoader();
-  http
+  await http
     .get(config.API.developmentScholarshipReport + `/${id.value}`)
-    .then((res) => {
+    .then(async (res) => {
       const dataList = res.data.result;
-      genReport(dataList, "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)", type);
+      await genReport(
+        dataList,
+        "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)",
+        type
+      );
     })
     .catch((e) => {
       messageError($q, e);
@@ -470,9 +474,7 @@ function fetchDataDetail(id: string) {
       dataPerson.positionSide = data.posExecutive ? data.posExecutive : "-";
       dataPerson.org = data.org ? data.org : "-";
 
-      dataGuarantor.citizenId = data.guarantorCitizenId
-        ? data.guarantorCitizenId
-        : "-";
+      dataGuarantor.citizenId = data.guarantorCitizenId;
       dataGuarantor.name = `${data.guarantorPrefix}${data.guarantorFirstName} ${data.guarantorLastName}`;
       dataGuarantor.position = data.position ? data.position : "-";
       dataGuarantor.type = data.posTypeguarantorName
@@ -1072,7 +1074,8 @@ onMounted(async () => {
                   </template>
                 </datepicker>
               </div>
-              <div class="col-12">
+
+              <div class="col-12" v-if="dataGuarantor.citizenId">
                 <q-card bordered tyle="border: 1px solid #d6dee1">
                   <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
                     ข้อมูลผู้ค้ำประกัน

From 72807671b491fba26937ff3553f44a060b9a7402 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 9 Apr 2025 17:18:44 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=20popup?=
 =?UTF-8?q?=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_evaluate/components/PopupPosition.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/06_evaluate/components/PopupPosition.vue b/src/modules/06_evaluate/components/PopupPosition.vue
index c4a72dd..7a9f9d7 100644
--- a/src/modules/06_evaluate/components/PopupPosition.vue
+++ b/src/modules/06_evaluate/components/PopupPosition.vue
@@ -94,7 +94,7 @@ watch(modal, (v) => {
 <template>
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 40%">
-      <DialogHeader :tittle="`ตำแหน่ง`" :close="onClosePopup" />
+      <DialogHeader :tittle="`ประวัติการรับราชการ`" :close="onClosePopup" />
       <q-separator />
       <q-card-section>
         <div class="row q-col-gutter-sm q-pb-sm">