From af1f13ed3be4ab3cddd7d38dd38cb581c930447d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 19 Mar 2025 17:52:36 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20label=20=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A5=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=81=E0=B8=A3=E0=B8=93?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_SpecialTime/DialogApprove.vue          | 21 +++++++++++++++----
 .../09_leave/stores/SpecialTimeStore.ts       | 13 +++++++-----
 .../09_leave/views/04_SpecialTimeMain.vue     |  4 ----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
index 9203da9ce..11bac7607 100644
--- a/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
+++ b/src/modules/09_leave/components/04_SpecialTime/DialogApprove.vue
@@ -135,7 +135,10 @@ watch(
         <DialogHeader
           :tittle="
             props.editCheck === 'PENDING'
-              ? 'อนุมัติคำขอ'
+              ? props.detailData?.checkInStatus != null ||
+                props.detailData?.checkOutStatus != null
+                ? 'อนุมัติคำขอแก้ไข'
+                : 'อนุมัติคำขอลงเวลากรณีพิเศษ'
               : props.detailData
               ? `REJECT ${props.detailData.round}`
               : ''
@@ -155,7 +158,6 @@ watch(
               </q-card-section>
             </q-card>
           </div>
-
           <div
             class="col q-ma-md q-pa-sm bg-white border-custom text-weight-medium"
           >
@@ -180,7 +182,12 @@ watch(
                   readonly
                   :model-value="props.dateFix"
                   hide-bottom-space
-                  :label="`${'วันที่ขอแก้ไข'}`"
+                  :label="`${
+                    props.detailData?.checkInStatus != null ||
+                    props.detailData?.checkOutStatus != null
+                      ? 'วันที่ขอแก้ไข'
+                      : 'วันที่ขอลงเวลากรณีพิเศษ'
+                  }`"
                 >
                   <template v-slot:prepend>
                     <q-icon name="event" class="cursor-pointer text-primary">
@@ -189,7 +196,13 @@ watch(
                 </q-input>
               </template>
             </datepicker>
-            <div class="column">
+            <div
+              v-if="
+                props.detailData?.checkInStatus != null ||
+                props.detailData?.checkOutStatus != null
+              "
+              class="column"
+            >
               <q-checkbox
                 disabled
                 :model-value="formData.checkInEdit"
diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 8cbf32e99..b7f89301d 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -224,13 +224,16 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
 
   // convertSatatus
   function convertStatus(val: string) {
-    switch (val) {
-      case "normal":
+    const value = val ? val.toUpperCase() : null;
+    switch (value) {
+      case "NORMAL":
         return "ปกติ";
-      case "late":
+      case "LATE":
         return "สาย";
-      case "absent":
+      case "ABSENT":
         return "ขาดราชการ";
+      default:
+        value;
     }
   }
 
@@ -254,7 +257,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     pageSize,
     month,
     filter,
-    convertStatus
+    convertStatus,
     // changeMonth,
   };
 });
diff --git a/src/modules/09_leave/views/04_SpecialTimeMain.vue b/src/modules/09_leave/views/04_SpecialTimeMain.vue
index 689b3c4bc..9d92b79e8 100644
--- a/src/modules/09_leave/views/04_SpecialTimeMain.vue
+++ b/src/modules/09_leave/views/04_SpecialTimeMain.vue
@@ -246,8 +246,6 @@ watch(
  * ฟังชั้นเรียกดูข้อมูล
  */
 async function fetchData() {
-  console.log(pagination.value.page);
-
   showLoader();
   await http
     .get(
@@ -392,7 +390,6 @@ onMounted(async () => {
         class="col-xs-12 col-sm-3 col-md-2"
       />
     </div>
-
     <div class="col-12">
       <d-table
         :columns="columns"
@@ -430,7 +427,6 @@ onMounted(async () => {
                 @click="unapprove(props.row.fullname, props.row.id)"
                 >ไม่อนุมัติ</q-btn
               >
-
               <q-btn
                 v-if="
                   props.row.status == 'PENDING' &&