From 3fd7a8b9640b6b7b08c35c45110508b97446a571 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 30 May 2023 14:40:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B2=E0=B8=8A=E0=B8=B5=E0=B8=9E?=
 =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=9A=E0=B8=B1=E0=B8=87=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B9=83=E0=B8=AA=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamCard.vue      |  2 +-
 src/modules/01_exam/components/Form/Document.vue |  9 ++++++++-
 .../01_exam/components/Form/Information.vue      |  7 +++----
 .../01_exam/components/Form/Occupation.vue       | 16 +++++-----------
 src/stores/mixin.ts                              |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/modules/01_exam/components/ExamCard.vue b/src/modules/01_exam/components/ExamCard.vue
index a67eed4..85e7620 100644
--- a/src/modules/01_exam/components/ExamCard.vue
+++ b/src/modules/01_exam/components/ExamCard.vue
@@ -69,7 +69,7 @@
           <div class="col-xs-6 col-sm-7 q-pr-xs">
             {{ number }}
           </div>
-          <div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีสอบคัดเลือก</div>
+          <div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีคัดเลือก</div>
           <div class="col-xs-6 col-sm-7 q-pr-xs">
             {{ score_expired == null ? '' : date2Thai(score_expired) }}
           </div>
diff --git a/src/modules/01_exam/components/Form/Document.vue b/src/modules/01_exam/components/Form/Document.vue
index d136213..f949061 100644
--- a/src/modules/01_exam/components/Form/Document.vue
+++ b/src/modules/01_exam/components/Form/Document.vue
@@ -13,9 +13,9 @@
     :editData="status == 'register' || status == 'rejectRegister' || status == 'done'"
     :save="uploadData"
   />
-
   <div v-if="edit" class="row justify-center row col-12">
     <q-input
+      v-if="file.length > 0"
       class="q-mt-sm col-12 q-pb-xs"
       :outlined="edit"
       dense
@@ -39,6 +39,7 @@
       bordered
       label="[ไฟล์ขนาดไม่เกิน 10MB]"
       @added="fileAdd"
+      @removed="fileDelete"
     >
       <template v-slot:header="scope">
         <div class="row no-wrap items-center q-pa-sm q-gutter-xs">
@@ -173,8 +174,14 @@ const fileAdd = async (val: any) => {
   file.value = val
 }
 
+const fileDelete = async (val: any) => {
+  name.value = ''
+  file.value = []
+}
+
 const getData = async () => {
   name.value = ''
+  file.value = []
   uploader.value.reset()
   loaderPage(true)
   await http
diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue
index 05c10a2..a725ccb 100644
--- a/src/modules/01_exam/components/Form/Information.vue
+++ b/src/modules/01_exam/components/Form/Information.vue
@@ -269,12 +269,11 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultInformation.tel"
-          :rules="[
-            (val) => !!val || `${'กรุณากรอก โทรศัพท์'}`,
-            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกข้อมูลโทรศัพท์ให้ถูกต้อง'}`
-          ]"
           :label="`${'โทรศัพท์'}`"
         />
+        <!-- :rules="[
+            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกข้อมูลโทรศัพท์ให้ถูกต้อง'}`
+          ]" -->
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
diff --git a/src/modules/01_exam/components/Form/Occupation.vue b/src/modules/01_exam/components/Form/Occupation.vue
index 0f5bb37..34d9889 100644
--- a/src/modules/01_exam/components/Form/Occupation.vue
+++ b/src/modules/01_exam/components/Form/Occupation.vue
@@ -21,7 +21,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.official"
-          :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
           :disable="
             defaultOccupation.status !== 'official' ||
             !(status == 'register' || status == 'rejectRegister')
@@ -51,7 +50,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.personnel"
-          :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
           :disable="
             defaultOccupation.status !== 'personnel' ||
             !(status == 'register' || status == 'rejectRegister')
@@ -81,7 +79,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.officialsOther"
-          :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
           :disable="
             defaultOccupation.status !== 'officialsOther' ||
             !(status == 'register' || status == 'rejectRegister')
@@ -111,7 +108,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.employee"
-          :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
           :disable="
             defaultOccupation.status !== 'employee' ||
             !(status == 'register' || status == 'rejectRegister')
@@ -152,7 +148,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.other"
-          :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
           :disable="
             defaultOccupation.status !== 'other' ||
             !(status == 'register' || status == 'rejectRegister')
@@ -214,14 +209,14 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.email"
-          :rules="[
-            (val) =>
-              /^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/.test(val) ||
-              'E-mail address ไม่ถูกต้อง'
-          ]"
           :label="`${'E-mail address'}`"
           hide-bottom-space
         />
+        <!-- :rules="[
+            (val) =>
+              /^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/.test(val) ||
+              'E-mail address ไม่ถูกต้อง'
+          ]" -->
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
@@ -237,7 +232,6 @@
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultOccupation.tel"
-          :rules="[(val) => /^[0-9]*$/.test(val) || 'กรุณากรอก โทรศัพท์ให้ถูกต้อง']"
           :label="`${'โทรศัพท์'}`"
           hide-bottom-space
         />
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 932021f..c6cb335 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -452,7 +452,7 @@ export const useCounterMixin = defineStore('mixin', () => {
       case 'checkPoint':
         return 'รอเจ้าหน้าที่สรุปคะแนนสอบ'
       case 'done':
-        return 'สอบคัดเลือกสำเร็จ'
+        return 'คัดเลือกสำเร็จ'
       case 'waiver':
         return 'สละสิทธิ์สอบ'
       default: