From c1db58e57081b59423b47a8d1d9d39160133c5ea Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 20 May 2024 15:48:03 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5?=
 =?UTF-8?q?=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/viewstep/viewStep1.vue         | 243 +++++++++---------
 1 file changed, 128 insertions(+), 115 deletions(-)

diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
index 7c964a2..c4170ff 100644
--- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
@@ -72,7 +72,7 @@ async function fetchDetail() {
       formDetail.fullName = `${data.firstName}  ${data.lastName}`;
       formDetail.position = data.position;
       formDetail.oc = data.oc;
-      formDetail.salary = formattedNumber(data.salary);
+      formDetail.salary = data.salary ? formattedNumber(data.salary) : "";
       formDetail.positionLevel = data.positionLevel;
       formDetail.posNo = data.posNo;
       formDetail.birthDate = data.birthDate && date2Thai(data.birthDate);
@@ -147,7 +147,7 @@ async function fetchCheckSpec(data: any) {
   formDetail.fullName = data.fullName;
   formDetail.position = data.position;
   formDetail.oc = data.oc;
-  formDetail.salary = formattedNumber(data.salary);
+  formDetail.salary = data.salary ? formattedNumber(data.salary) : "";
   formDetail.positionLevel = data.positionLevel;
   formDetail.posNo = data.posNo;
   formDetail.birthDate = data.birthDate && date2Thai(data.birthDate);
@@ -203,7 +203,11 @@ async function fetchCheckSpec(data: any) {
  * @param x
  */
 function formattedNumber(x: number) {
-  return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  if (x) {
+    return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  } else {
+    return "";
+  }
 }
 
 onMounted(async () => {
@@ -213,9 +217,13 @@ onMounted(async () => {
 </script>
 
 <template>
-  <q-card bordered class="col-12 row shadow-0 q-pa-sm" :style="$q.screen.lt.sm ? '' : 'height: 60vh; overflow: scroll;' ">
+  <q-card
+    bordered
+    class="col-12 row shadow-0 q-pa-sm"
+    :style="$q.screen.lt.sm ? '' : 'height: 60vh; overflow: scroll;'"
+  >
     <div class="row col-12">
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ข้อมูลส่วนตัว</span>
         </div>
@@ -312,122 +320,125 @@ onMounted(async () => {
         </div>
       </q-card>
 
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ประวัติการศึกษา </span>
         </div>
         <div class="col-12"><q-separator /></div>
-        <div class="row col-12 q-pa-sm" v-if="formDetail.educations && formDetail.educations.length > 0">
-            <div
-              class="row q-col-gutter-sm"
-              v-for="(education, index) in formDetail.educations"
-              :key="index"
-            >
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.educationLevel"
-                  label="ระดับศึกษา"
-                />
-              </div>
+        <div
+          class="row col-12 q-pa-sm"
+          v-if="formDetail.educations && formDetail.educations.length > 0"
+        >
+          <div
+            class="row q-col-gutter-sm"
+            v-for="(education, index) in formDetail.educations"
+            :key="index"
+          >
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.educationLevel"
+                label="ระดับศึกษา"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.institute"
-                  label="สถานศึกษา"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.institute"
+                label="สถานศึกษา"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  :model-value="date2Thai(education.startDate)"
-                  readonly
-                  label="ตั้งแต่"
-                >
-                </q-input>
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                :model-value="date2Thai(education.startDate)"
+                readonly
+                label="ตั้งแต่"
+              >
+              </q-input>
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  :model-value="date2Thai(education.endDate)"
-                  readonly
-                  label="ถึง"
-                >
-                </q-input>
-              </div>
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  :model-value="date2Thai(education.finishDate)"
-                  readonly
-                  label="วันที่สำเร็จการศึกษา"
-                >
-                </q-input>
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                :model-value="date2Thai(education.endDate)"
+                readonly
+                label="ถึง"
+              >
+              </q-input>
+            </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                :model-value="date2Thai(education.finishDate)"
+                readonly
+                label="วันที่สำเร็จการศึกษา"
+              >
+              </q-input>
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.isEducation ? 'ใช่' : 'ไม่ใช่'"
-                  label="วุฒิการศึกษาในตําแหน่ง"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.isEducation ? 'ใช่' : 'ไม่ใช่'"
+                label="วุฒิการศึกษาในตําแหน่ง"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.degree"
-                  label="วุฒิการศึกษา"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.degree"
+                label="วุฒิการศึกษา"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.field"
-                  label="สาขาวิชา/ทาง"
-                />
-              </div>
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.fundName"
-                  label="ทุน"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.field"
+                label="สาขาวิชา/ทาง"
+              />
+            </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.fundName"
+                label="ทุน"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-3">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.gpa"
-                  label="เกรดเฉลี่ย"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-3">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.gpa"
+                label="เกรดเฉลี่ย"
+              />
+            </div>
 
-              <div class="col-xs-6 col-sm-4 col-md-6">
-                <q-input
-                  borderless
-                  readonly
-                  :model-value="education.country"
-                  label="ประเทศ"
-                />
-              </div>
+            <div class="col-xs-6 col-sm-4 col-md-6">
+              <q-input
+                borderless
+                readonly
+                :model-value="education.country"
+                label="ประเทศ"
+              />
+            </div>
           </div>
         </div>
         <div v-else class="row col-12 q-pa-md">ไม่มีประวัติการศึกษา</div>
       </q-card>
 
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ใบอนุญาตประกอบวิชาชีพ</span>
         </div>
@@ -439,7 +450,7 @@ onMounted(async () => {
         />
       </q-card>
 
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ประวัติการรับราชการ</span>
         </div>
@@ -448,26 +459,28 @@ onMounted(async () => {
           <TableData :columns="columnSalaries" :row="formDetail.salaries" />
         </div>
       </q-card>
-      
+
       <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ประวัติการฝึกอบรมดูงาน</span>
         </div>
         <div class="col-12"><q-separator /></div>
-        <TableData class="col-12" :columns="columnTraining" :row="formDetail.trainings"/>
+        <TableData
+          class="col-12"
+          :columns="columnTraining"
+          :row="formDetail.trainings"
+        />
       </q-card>
 
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ประสบการณ์ในการปฏิบัติงาน </span>
         </div>
         <div class="col-12"><q-separator /></div>
-        <div class="col-12 q-pa-sm">
-          -
-        </div>
+        <div class="col-12 q-pa-sm">-</div>
       </q-card>
 
-      <q-card class="col-12  cardSp1" bordered>
+      <q-card class="col-12 cardSp1" bordered>
         <div class="text-weight-bold row items-center bg-grey-2 col-12">
           <span class="q-ml-lg q-my-sm">ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)</span>
         </div>
@@ -480,10 +493,10 @@ onMounted(async () => {
   </q-card>
 </template>
 
-<style >
-.cardSp1{
+<style>
+.cardSp1 {
   border: 1px solid #d6dee1;
-  margin-bottom: 10px ;
+  margin-bottom: 10px;
   box-shadow: none !important;
 }
 </style>