From db1698c3f37958db2383bbff282e406db092a115 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 15 Nov 2024 15:54:51 +0700
Subject: [PATCH] =?UTF-8?q?fix=20status=20=E0=B8=A2=E0=B8=81=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B4=E0=B8=81=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

---
 .../components/resign/ResignReject.vue        |  7 +++++--
 .../components/resignEMP/ResignReject.vue     | 21 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/ResignReject.vue b/src/modules/06_retirement/components/resign/ResignReject.vue
index 64d5f8fa6..89ad75460 100644
--- a/src/modules/06_retirement/components/resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/resign/ResignReject.vue
@@ -67,6 +67,7 @@ const dataDetail = ref<any>({
   status: "",
   statustext: "",
   fullname: "",
+  statusMain: "",
 });
 
 const workflowRef = ref<any>(null);
@@ -380,7 +381,8 @@ onMounted(async () => {
           class="q-gutter-x-sm"
           v-if="
             workflowRef?.permission.isUpdate &&
-            dataDetail.commanderReject === null
+            dataDetail.commanderReject === null &&
+            dataDetail.statusMain === 'WAITTING'
           "
         >
           <q-btn
@@ -453,7 +455,8 @@ onMounted(async () => {
           class="q-gutter-x-sm"
           v-if="
             workflowRef?.permission.isUpdate &&
-            dataDetail.oligarchReject === null
+            dataDetail.oligarchReject === null &&
+            dataDetail.statusMain === 'WAITTING'
           "
         >
           <q-btn
diff --git a/src/modules/06_retirement/components/resignEMP/ResignReject.vue b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
index b801948af..d427f4e86 100644
--- a/src/modules/06_retirement/components/resignEMP/ResignReject.vue
+++ b/src/modules/06_retirement/components/resignEMP/ResignReject.vue
@@ -67,6 +67,7 @@ const dataDetail = ref<any>({
   status: "",
   statustext: "",
   fullname: "",
+  statusMain: "",
 });
 
 const workflowRef = ref<any>(null);
@@ -396,7 +397,11 @@ onMounted(async () => {
         <q-space />
         <div
           class="q-gutter-x-sm"
-          v-if="isDirector && dataDetail.commanderReject === null"
+          v-if="
+            isDirector &&
+            dataDetail.commanderReject === null &&
+            dataDetail.statusMain === 'WAITTING'
+          "
         >
           <q-btn
             outline
@@ -466,7 +471,11 @@ onMounted(async () => {
 
         <div
           class="q-gutter-x-sm"
-          v-if="isDirector && dataDetail.oligarchReject === null"
+          v-if="
+            isDirector &&
+            dataDetail.oligarchReject === null &&
+            dataDetail.statusMain === 'WAITTING'
+          "
         >
           <q-btn
             outline
@@ -540,7 +549,13 @@ onMounted(async () => {
           </div>
           <q-space />
           <!-- && workflowRef?.permission.isUpdate -->
-          <div v-if="!checkRoutePermisson && isStaff">
+          <div
+            v-if="
+              !checkRoutePermisson &&
+              isStaff &&
+              dataDetail.statusMain === 'WAITTING'
+            "
+          >
             <div class="q-gutter-sm" v-if="!edit">
               <q-btn
                 outline