From a1820982896e309d7114bd511100f1f7714425a0 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 13 Jun 2024 11:47:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84=E0=B8=A3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/02_qualify/DisablePeriodAdd.vue         | 15 +++++++++------
 .../03_recruiting/views/02_qualify/PeriodAdd.vue  |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
index e506a8f23..f81a44e49 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
@@ -20,7 +20,7 @@
       <q-card-section class="q-pa-md">
         <div class="col-xs-12 col-sm-8"></div>
         <div class="col-12 row items-center q-col-gutter-x-sm">
-          <div class="col-xs-12 col-sm-8">
+          <div class="col-xs-12 col-sm-6">
             <q-input
               outlined
               v-model="name"
@@ -61,7 +61,6 @@
               <template #trigger>
                 <q-input
                   dense
-                  
                   outlined
                   :model-value="yearly + 543"
                   :rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
@@ -79,7 +78,7 @@
               </template>
             </datepicker>
           </div>
-          <div class="col-xs-12 col-sm-4 col-md-2" v-if="announcementExam">
+          <div class="col-xs-12 col-sm-4 col-md-1" v-if="announcementExam">
             <q-input
               outlined
               v-model="fee"
@@ -113,7 +112,6 @@
                 <q-input
                   outlined
                   dense
-                  class="full-width datepicker q-mb-md"
                   :model-value="dateExam != null ? date2Thai(dateExam) : null"
                   :label="`${'วันที่สอบ'}`"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สอบ'}`]"
@@ -206,7 +204,10 @@
               </template>
             </datepicker>
           </div>
-          <div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
+          <div
+            class="col-xs-12 col-sm-3 col-md-3"
+            v-if="announcementExam && fee != 0"
+          >
             <datepicker
               menu-class-name="modalfix"
               v-model="datePayment"
@@ -228,7 +229,9 @@
                   outlined
                   dense
                   class="full-width datepicker q-mb-md"
-                  :model-value="dateThaiRange(datePayment)"
+                  :model-value="
+                    datePayment != null ? dateThaiRange(datePayment) : null
+                  "
                   :label="`${'วันที่ชำระเงิน'}`"
                   :rules="[(val) => !!val || `${'กรุณาเลือกวันที่ชำระเงิน'}`]"
                 >
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 10945c281..f317d94fc 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -378,12 +378,12 @@
                         lazy-rules
                         v-model="props.row.code"
                         :rules="[
-                          (val) =>
-                            val.length >= 3 ||
-                            `${'กรุณากรอกรหัสประจำตำแหน่งที่สอบ'}`,
+                            (val:string) => !!val || `${'กรุณากรอกรหัสประจำตำแหน่งที่สอบ'}`,
+                            (val:any) =>
+                                val.length >= 3 ||
+                                `${'กรุณากรอกรหัสประจำตำแหน่งที่สอบ'}`,
                         ]"
                         :label="`${'รหัสประจำตำแหน่งที่สอบ'}`"
-                        @update:modelValue="clickEditRow"
                         hide-bottom-space
                         mask="###"
                       />