From f216ef85f1cf0fa13b34af1893d5dcd89f976cc4 Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Tue, 3 Oct 2023 10:16:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../01_exam/components/Form/Document.vue      |  4 +-
 .../01_exam/components/Form/Information.vue   | 56 +++++++++----------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/modules/01_exam/components/Form/Document.vue b/src/modules/01_exam/components/Form/Document.vue
index c5a36a7..d95cd33 100644
--- a/src/modules/01_exam/components/Form/Document.vue
+++ b/src/modules/01_exam/components/Form/Document.vue
@@ -4,8 +4,8 @@
     v-model:edit="edit"
     :header="
       $q.screen.gt.xs
-        ? 'Upload รูปถ่าย (รูปถ่ายหน้าตรง ชุดสุภาพ ไม่สวมหมวก/แว่นตาดำ และไม่มีลวดลายใด ๆ บนรูปถ่าย)'
-        : 'Upload'
+        ? 'อัปโหลดเอกสาร (ถ้ามี)'
+        : 'อัปโหลดเอกสาร'
     "
     icon="mdi-file-document"
     :addData="true"
diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue
index ab957e2..045f130 100644
--- a/src/modules/01_exam/components/Form/Information.vue
+++ b/src/modules/01_exam/components/Form/Information.vue
@@ -10,7 +10,27 @@
   />
   <q-form ref="myform" class="col-12 row q-col-gutter-x-sm justify-center q-col-gutter-sm">
     <div class="row col-xs-12 col-sm-12 col-md-9 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
-      <div class="col-xs-12 col-sm-3 col-md-3">
+      <div class="col-xs-12 col-sm-3 col-md-4">
+        <q-input
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          type="tel"
+          mask="#############"
+          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
+          lazy-rules
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          v-model="defaultInformation.cardid"
+          maxlength="13"
+          :rules="[
+            (val) => val.length == 13 || `${'กรุณากรอก เลขประจำตัวประชาชน'}`,
+            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกเลขประจำตัวประชาชนให้ถูกต้อง'}`
+          ]"
+          label="เลขบัตรประจำตัวประชาชน"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-2">
         <q-select
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
@@ -54,14 +74,14 @@
           :label="`${'นามสกุล'}`"
         />
       </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
+      <div class="col-xs-12 col-sm-3 col-md-3"><!-- :borderless="!false" -->
         <q-input
           :class="getClass(false)"
-          :outlined="false"
+          outlined
           dense
           lazy-rules
           :readonly="!false"
-          :borderless="!false"
+          
           v-model="defaultInformation.nationality"
           :rules="[(val) => !!val || `${'กรุณากรอก สัญชาติ'}`]"
           :label="`${'สัญชาติ'}`"
@@ -141,8 +161,7 @@
           dense
           lazy-rules
           readonly
-          borderless
-          :style="!(status == 'register' || status == 'rejectRegister') ? '' : 'padding:0 12px;'"
+          outlined
           :model-value="
             defaultInformation.birthDate == null ? null : calAge(defaultInformation.birthDate)
           "
@@ -169,26 +188,6 @@
           ]"
         />
       </div>
-      <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-input
-          :class="getClass(status == 'register' || status == 'rejectRegister')"
-          :outlined="status == 'register' || status == 'rejectRegister'"
-          dense
-          type="tel"
-          mask="#############"
-          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
-          lazy-rules
-          :readonly="!(status == 'register' || status == 'rejectRegister')"
-          :borderless="!(status == 'register' || status == 'rejectRegister')"
-          v-model="defaultInformation.cardid"
-          maxlength="13"
-          :rules="[
-            (val) => val.length == 13 || `${'กรุณากรอก เลขประจำตัวประชาชน'}`,
-            (val) => /^[0-9]*$/.test(val) || `${'กรุณากรอกเลขประจำตัวประชาชนให้ถูกต้อง'}`
-          ]"
-          label="เลขบัตรประจำตัวประชาชน"
-        />
-      </div>
       <!-- <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
           :outlined="status == 'register' || status == 'rejectRegister'"
@@ -209,14 +208,13 @@
           :label="`${'โทรศัพท์มือถือ'}`"
         />
       </div> -->
-      <div class="col-xs-12 col-sm-3 col-md-3 q-pb-md">
+      <div class="col-xs-12 col-sm-3 col-md-3 q-pb-md"><!-- style="padding: 0 12px" -->
         <q-input
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           dense
           lazy-rules
           readonly
-          borderless
-          style="padding: 0 12px"
+          outlined
           v-model="defaultInformation.email"
           label="E-mail address"
         />