diff --git a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
index 2fcd3a31c..c56708d53 100644
--- a/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
+++ b/src/modules/09_leave/components/4_specialTime/DialogApprove.vue
@@ -159,7 +159,7 @@ watch(
           <div class="col q-ma-md q-pa-sm bg-white border-custom">
             <q-card bordered class="border-primary text-center">
               <q-card-section class="bg-primary q-pa-sm">
-                <div class="text-white text-bold">เวลาที่กรอก</div>
+                <div class="text-white text-bold">วันที่ยื่นเรื่อง</div>
               </q-card-section>
 
               <q-card-section class="q-pa-sm bg-white text-black">
@@ -216,6 +216,7 @@ watch(
             </div>
           </div>
           <div
+          v-if="formData.checkInEdit"
             class="col q-ma-md q-pa-sm bg-white border-custom text-weight-medium"
           >
             <p style="color: #06884d; font-size: 16px">สถานะช่วงเช้า</p>
@@ -242,6 +243,7 @@ watch(
           </div>
 
           <div
+          v-if="formData.checkOutEdit"
             class="col q-ma-md q-pa-sm bg-white border-custom text-weight-medium"
           >
             <p style="color: #06884d; font-size: 16px">สถานะช่วงบ่าย</p>
diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 9069ff8e8..12059f15b 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -73,8 +73,8 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
           rows.value.push({
             id: e.id,
             fullname: e.fullName,
-            date: date2Thai(new Date(e.checkDate), false, true),
-            dateFix: date2Thai(new Date(e.createdAt)),
+            date: date2Thai(new Date(e.createdAt), false, true),
+            dateFix: date2Thai(new Date(e.checkDate)),
             timeMorning:
               e.startTimeMorning == null
                 ? "-"
@@ -151,9 +151,10 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     }
   };
   const optionStatus = ref<DataOption[]>([
-    { id: "0", name: "ปกติ" },
-    { id: "1", name: "สาย" },
-    { id: "2", name: "ขาดราชการ" },
+    { id: "NORMAL", name: "ปกติ" },
+    { id: "LATE", name: "สาย" },
+    { id: "ABSENT", name: "ขาดราชการ" },
+    { id: "NOT_COMPLETE", name: "ปฏิบัติงานไม่ครบตามกำหนดเวลา" },
   ]);
 
   //   const filterSelector = (val: any, update: Function, refData: string) => {
@@ -203,7 +204,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     {
       name: "date",
       align: "left",
-      label: "วันที่กรอก",
+      label: "วันที่ยื่นเรื่อง",
       sortable: true,
       field: "date",
       headerStyle: "font-size: 14px",