From 5211555eae87b0b76b53a5273e083ac2354be036 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 29 May 2025 14:27:15 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_retire/store.ts            | 9 +++++----
 src/modules/03_retire/views/addRetire.vue | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/03_retire/store.ts b/src/modules/03_retire/store.ts
index 3c48e6f..e322d20 100644
--- a/src/modules/03_retire/store.ts
+++ b/src/modules/03_retire/store.ts
@@ -18,11 +18,13 @@ export const useRestDataStore = defineStore("Rest", () => {
       case "DONE":
         return "ออกคำสั่งเสร็จสิ้น";
       case "DONECANCEL":
-        return "ยกเลิกการลาออก";
+        return "ยกเลิกการลาออกสำเร็จ";
       case "CANCEL":
-        return "ยกเลิกการลาออก";
+        return "ยกเลิกการลาออกสำเร็จ";
       case "DONEREJECT":
         return "ออกคำสั่งยกเลิกลาออกเสร็จแล้ว";
+      case "CANCELING":
+        return "กำลังดำเนิดการยกเลิกการ";
       default:
         return "-";
     }
@@ -39,9 +41,8 @@ export const useRestDataStore = defineStore("Rest", () => {
     }
   }
 
-  
   return {
     statusText,
-    convertStatusText
+    convertStatusText,
   };
 });
diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index d1b164e..2dfe2ff 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -303,6 +303,7 @@ onMounted(async () => {
               v-if="
                 dataDetail.statusMain !== 'CANCEL' &&
                 dataDetail.statusMain !== 'DONECANCEL' &&
+                dataDetail.statusMain !== 'CANCELING' &&
                 checkCancleLeave
               "
               unelevated