From c62c745f5e557279ccf207d4f01a9849f83fbde6 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Mon, 9 Oct 2023 13:06:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=84=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=94=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=A1=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../03_recruiting/components/Career.vue       |  9 +++---
 .../03_recruiting/components/TableCan.vue     |  4 +++
 .../components/TableCandidate.vue             | 28 +++++++++----------
 .../views/02_qualify/PeriodAdd.vue            |  4 +--
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue
index 97aeb80c3..bb7ff708e 100644
--- a/src/modules/03_recruiting/components/Career.vue
+++ b/src/modules/03_recruiting/components/Career.vue
@@ -12,6 +12,7 @@
       :add="clickAdd"
       :edit="clickEdit"
       :addData="false"
+      :bottom="true"
       :editData="status == 'checkRegister' || status == 'payment'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
@@ -550,13 +551,13 @@ const fetchData = async () => {
             yearDiff = yearDiff + d.yearDiff;
             monthDiff = monthDiff + d.monthDiff;
             dayDiff = dayDiff + d.dayDiff;
-            if (dayDiff > 30) {
-              dayDiff = dayDiff % 30;
+            if (dayDiff >= 30) {
               monthDiff = monthDiff + parseInt((dayDiff / 30).toString());
+              dayDiff = dayDiff % 30;
             }
-            if (monthDiff > 12) {
-              monthDiff = monthDiff % 12;
+            if (monthDiff >= 12) {
               yearDiff = yearDiff + parseInt((monthDiff / 12).toString());
+              monthDiff = monthDiff % 12;
             }
             total.value = `${yearDiff > 0 ? yearDiff + " ปี " : ""}${
               monthDiff > 0 ? monthDiff + " เดือน " : ""
diff --git a/src/modules/03_recruiting/components/TableCan.vue b/src/modules/03_recruiting/components/TableCan.vue
index 1ac843d17..097cf69c1 100644
--- a/src/modules/03_recruiting/components/TableCan.vue
+++ b/src/modules/03_recruiting/components/TableCan.vue
@@ -77,6 +77,9 @@
     <template #body="props">
       <slot v-bind="props" name="columns"></slot>
     </template>
+    <template v-slot:bottom v-if="bottom == true">
+      <slot v-bind="props" name="bottom"></slot>
+    </template>
   </q-table>
 </template>
 <script setup lang="ts">
@@ -99,6 +102,7 @@ const props = defineProps({
   inputvisible: Array,
   editvisible: Boolean,
   nameHeader: Boolean,
+  bottom: Boolean,
   addData: {
     type: Boolean,
     defualt: true,
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index f7b49eccf..aa1acbafd 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -36,6 +36,20 @@
             <q-icon name="attach_file" color="blue" />
           </template>
         </q-file>
+        <div>
+          <q-btn
+            size="md"
+            icon="mdi-upload"
+            round
+            flat
+            color="blue"
+            v-if="statusPayment"
+            @click="uploadFile"
+          >
+            <q-tooltip v-if="setSeat == false">อัปโหลดที่นั่งสอบ</q-tooltip>
+            <q-tooltip v-if="setSeat == true">อัปโหลดคะแนนสอบ</q-tooltip>
+          </q-btn>
+        </div>
       </div>
     </q-card>
     <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
@@ -70,20 +84,6 @@
           <q-tooltip>ตรวจสอบข้อมูล</q-tooltip>
         </q-btn>
       </div>
-      <div>
-        <q-btn
-          size="md"
-          icon="mdi-upload"
-          round
-          flat
-          color="blue"
-          v-if="statusPayment"
-          @click="uploadFile"
-        >
-          <q-tooltip v-if="setSeat == false">อัปโหลดที่นั่งสอบ</q-tooltip>
-          <q-tooltip v-if="setSeat == true">อัปโหลดคะแนนสอบ</q-tooltip>
-        </q-btn>
-      </div>
       <div>
         <q-btn icon="mdi-download" round color="green-6" flat>
           <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 8631b84f3..aa6289d3e 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -380,13 +380,13 @@
                         v-model="props.row.code"
                         :rules="[
                           (val) =>
-                            val.length >= 4 ||
+                            val.length >= 3 ||
                             `${'กรุณากรอกรหัสประจำตำแหน่งที่สอบ'}`,
                         ]"
                         :label="`${'รหัสประจำตำแหน่งที่สอบ'}`"
                         @update:modelValue="clickEditRow"
                         hide-bottom-space
-                        mask="####"
+                        mask="###"
                       />
                     </q-td>
                     <q-td key="position" :props="props">