From 5920adfb8843fbd1d89ac788e6fddd451c86f591 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Jan 2025 09:14:48 +0700
Subject: [PATCH] fix

---
 src/modules/03_retire/views/addRetire.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 30e535c..c5ee0bc 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -219,13 +219,17 @@ onMounted(async () => {
             style="padding-bottom: 0px"
           >
             <div class="q-pl-sm text-grey-7" v-if="dataDetail.cancelReason">
-              เหตุผลการขอยกเลิก:
+              เหตุผลการขอยกเลิก :
               <spen class="text-red">{{ dataDetail.cancelReason }}</spen>
             </div>
 
             <q-space />
             <q-btn
-              v-if="dataDetail.statusMain !== 'CANCEL' && checkCancleLeave"
+              v-if="
+                dataDetail.statusMain !== 'CANCEL' &&
+                dataDetail.statusMain !== 'DONECANCEL' &&
+                checkCancleLeave
+              "
               unelevated
               color="orange"
               label="ยกเลิกการลาออก"
@@ -235,7 +239,8 @@ onMounted(async () => {
 
             <q-btn
               v-else-if="
-                dataDetail.statusMain === 'CANCEL' &&
+                (dataDetail.statusMain === 'CANCEL' ||
+                  dataDetail.statusMain === 'DONECANCEL') &&
                 dataStore.officerType == 'OFFICER'
               "
               unelevated