From ef92391110a2f200b80d1f11996d78b3760eb53a Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Fri, 19 Apr 2024 12:29:04 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=97=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A9=E0=B8=B2/=E0=B8=9D=E0=B8=B6=E0=B8=81=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_scholarship/views/detail.vue | 40 ++++++++++++---------
 src/modules/09_scholarship/views/main.vue   |  2 ++
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index aec400d..8fea0e5 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -116,6 +116,9 @@ const dataPerson = reactive({
   id: "",
   citizenId: "",
   name: "",
+  prefix: "",
+  firstName: "",
+  lastName: "",
   position: "",
   type: "",
   level: "",
@@ -424,6 +427,9 @@ function fetchDataDetail(id: string) {
 
       dataPerson.citizenId = data.citizenId ? data.citizenId : "-";
       dataPerson.name = `${data.prefix}${data.firstName}  ${data.lastName}`;
+      dataPerson.prefix = data.prefix,
+      dataPerson.firstName = data.firstName,
+      dataPerson.lastName = data.lastName,
       dataPerson.position = data.position ? data.position : "-";
       dataPerson.type = data.posTypeName ? data.posTypeName : "-";
       dataPerson.level = data.posLevelName ? data.posLevelName : "-";
@@ -571,19 +577,19 @@ onMounted(async () => {
               <div class="row q-col-gutter-md">
                 <div class="col-4 text-grey">เลขประจำตัวประชาชน</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.citizenId }}
+                  {{ dataPerson.citizenId ? dataPerson.citizenId:'-' }}
                 </div>
                 <div class="col-4 text-grey">ชื่อ-นามสกุล</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.name }}
+                  {{ dataPerson.firstName ? dataPerson.name:'-' }}
                 </div>
                 <div class="col-4 text-grey">ตำแหน่ง</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.position }}
+                  {{ dataPerson.position ? dataPerson.position:'-' }}
                 </div>
                 <div class="col-4 text-grey">ประเภทตำแหน่ง</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.type }}
+                  {{ dataPerson.type ? dataPerson.type:'-' }}
                 </div>
               </div>
             </div>
@@ -591,15 +597,15 @@ onMounted(async () => {
               <div class="row q-col-gutter-md">
                 <div class="col-4 text-grey">ระดับตำแหน่ง</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.level }}
+                  {{ dataPerson.level ? dataPerson.level:'-' }}
                 </div>
                 <div class="col-4 text-grey">ตำแหน่งทางการบริหาร</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.positionSide }}
+                  {{ dataPerson.positionSide ? dataPerson.positionSide:'-' }}
                 </div>
                 <div class="col-4 text-grey">หน่วยงานที่สังกัด</div>
                 <div class="col-8 text-weight-medium">
-                  {{ dataPerson.org }}
+                  {{ dataPerson.org ? dataPerson.org:'-' }}
                 </div>
               </div>
             </div>
@@ -611,7 +617,7 @@ onMounted(async () => {
           </div>
         </q-card>
 
-        <div class="row q-col-gutter-md q-mt-sm" v-if="isGov">
+        <div class="row q-col-gutter-md q-mt-sm">
           <div class="col-9">
             <q-select
               dense
@@ -1000,7 +1006,7 @@ onMounted(async () => {
                   </template>
                 </datepicker>
               </div>
-              <div class="col-12">
+              <div class="col-12" >
                 <q-card bordered tyle="border: 1px solid #d6dee1">
                   <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
                     ข้อมูลผู้ค้ำประกัน
@@ -1008,25 +1014,25 @@ onMounted(async () => {
                   <div class="col-12"><q-separator /></div>
                   <div
                     class="row col-12 q-col-gutter-md q-pa-md"
-                    v-if="isGuarantor"
+                   
                   >
                     <div class="col">
                       <div class="row q-col-gutter-md">
                         <div class="col-4 text-grey">เลขประจำตัวประชาชน</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.citizenId }}
+                          {{ dataGuarantor.citizenId ? dataGuarantor.citizenId :'-' }}
                         </div>
                         <div class="col-4 text-grey">ชื่อ-นามสกุล</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.name }}
+                          {{ dataGuarantor.firstName ? dataGuarantor.name:'-' }}
                         </div>
                         <div class="col-4 text-grey">ตำแหน่ง</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.position }}
+                          {{ dataGuarantor.position ? dataGuarantor.position:'-' }}
                         </div>
                         <div class="col-4 text-grey">ประเภท</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.type }}
+                          {{ dataGuarantor.type ? dataGuarantor.type :'-' }}
                         </div>
                       </div>
                     </div>
@@ -1034,15 +1040,15 @@ onMounted(async () => {
                       <div class="row q-col-gutter-md">
                         <div class="col-4 text-grey">ระดับตำแหน่ง</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.level }}
+                          {{ dataGuarantor.level ? dataGuarantor.level:'-' }}
                         </div>
                         <div class="col-4 text-grey">ตำแหน่งทางการบริหาร</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.positionSide }}
+                          {{ dataGuarantor.positionSide ? dataGuarantor.positionSide:'-' }}
                         </div>
                         <div class="col-4 text-grey">หน่วยงานที่สังกัด</div>
                         <div class="col-8 text-weight-medium">
-                          {{ dataGuarantor.org }}
+                          {{ dataGuarantor.org ? dataGuarantor.org:'-' }}
                         </div>
                       </div>
                     </div>
diff --git a/src/modules/09_scholarship/views/main.vue b/src/modules/09_scholarship/views/main.vue
index 5bddd3a..5ab249b 100644
--- a/src/modules/09_scholarship/views/main.vue
+++ b/src/modules/09_scholarship/views/main.vue
@@ -137,6 +137,8 @@ function convertType(val: string) {
       return "ฝึกอบรมในประเทศที่ส่งไปพัฒนากับหน่วยวงานภายนอก (หลักสูตรที่มีการไปต่างประเทศ)";
     case "EXECUTIVE":
       return "ฝึกอบรมในประเทศที่ส่งไปพัฒนากับหน่วยวงานภายนอก (หลักสูตรประเภทนักบริหาร)";
+    case "RESEARCH":
+      return "ศึกษา ฝึกอบรม ประชุม ดูงาน และปฏิบัติการวิจัย ณ ต่างประเทศ";
   }
 }