From 8725a4f79e93c7a0d8a109779eb9281c71b19867 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 4 Jun 2025 12:05:46 +0700
Subject: [PATCH] =?UTF-8?q?fix=20Status=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B9=80=E0=B8=9E=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=87=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A=E0=B8=B5=E0=B9=81?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9A=E0=B8=97=E0=B9=89=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/02_resign/ResignReject.vue      | 4 ++--
 .../06_retirement/components/03_resignEmp/ResignReject.vue   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index 63295d44f..aca65fb34 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -771,8 +771,8 @@ onMounted(async () => {
           <div
             v-if="
               !checkRoutePermisson &&
-              (dataDetail.statusMain === 'APPROVE' ||
-                dataDetail.statusMain === 'REJECT') &&
+              (dataDetail.status === 'APPROVE' ||
+                dataDetail.status === 'REJECT') &&
               ((isStaff && group === '1.1') || (isOfficer && group !== '1.1'))
             "
           >
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index 921e7526b..cab33a779 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -736,11 +736,12 @@ onMounted(async () => {
           </div>
           <q-space />
           <!-- && workflowRef?.permission.isUpdate -->
+
           <div
             v-if="
               !checkRoutePermisson &&
-              (dataDetail.statusMain === 'APPROVE' ||
-                dataDetail.statusMain === 'REJECT') &&
+              (dataDetail.status === 'APPROVE' ||
+                dataDetail.status === 'REJECT') &&
               isStaff
             "
           >