From 346e31999faa0add7cc184778f525498fc550e4a Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 13 Oct 2023 17:33:15 +0700
Subject: [PATCH] no message

---
 src/components/Table.vue                      |  7 ++++---
 .../01_exam/components/Form/Career.vue        | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/Table.vue b/src/components/Table.vue
index 0f1f610..b81e171 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -71,13 +71,13 @@
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>
-        <q-th auto-width v-if="editBtn == true" />
+        <q-th auto-width v-if="boss == true" />
       </q-tr>
     </template>
     <template #body="props">
       <slot v-bind="props" name="columns"></slot>
     </template>
-    <template v-slot:bottom v-if="bottom ==  true">
+    <template v-slot:bottom v-if="bottom == true">
       <slot v-bind="props" name="bottom"></slot>
     </template>
   </q-table>
@@ -94,7 +94,8 @@ const props = defineProps({
   inputvisible: Array,
   editvisible: Boolean,
   nameHeader: Boolean,
-  bottom:Boolean,
+  bottom: Boolean,
+  boss: Boolean,
   addData: {
     type: Boolean,
     defualt: true
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue
index 8c8e9a3..41db96f 100644
--- a/src/modules/01_exam/components/Form/Career.vue
+++ b/src/modules/01_exam/components/Form/Career.vue
@@ -13,6 +13,7 @@
       :edit="clickEdit"
       :addData="false"
       :bottom="true"
+      :editBtn="false"
       :editData="status == 'register' || status == 'rejectRegister'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
@@ -33,7 +34,7 @@
               {{ col.value }}
             </div>
           </q-td>
-          <q-td auto-width v-if="edit === true">
+          <q-td auto-width v-if="status == 'startDate' || status == 'endDate'">
             <q-btn
               color="red"
               flat
@@ -456,6 +457,14 @@ const calDate = async () => {
     }
     dayDiff += daysInMonth[_startDate.getMonth()]
   }
+  if (dayDiff >= 30) {
+    monthDiff = monthDiff + 1
+    dayDiff = 0
+    if (monthDiff >= 12) {
+      yearDiff = yearDiff + 1
+      monthDiff = 0
+    }
+  }
   rangeDate.value = `${yearDiff > 0 ? yearDiff + ' ปี ' : ''}${
     monthDiff > 0 ? monthDiff + ' เดือน ' : ''
   }${dayDiff > 0 ? dayDiff + ' วัน ' : ''}`
@@ -490,6 +499,14 @@ const calDateSplit = async (startDate: Date, endDate: Date) => {
     }
     dayDiff += daysInMonth[_startDate.getMonth()]
   }
+  if (dayDiff >= 30) {
+    monthDiff = monthDiff + 1
+    dayDiff = 0
+    if (monthDiff >= 12) {
+      yearDiff = yearDiff + 1
+      monthDiff = 0
+    }
+  }
   var obj = {
     yearDiff: yearDiff,
     monthDiff: monthDiff,