From ff6671d5230598337c694b9feedd9679234bbeac Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 4 Jun 2026 12:58:07 +0700
Subject: [PATCH] =?UTF-8?q?fixed:=20=E0=B9=80=E0=B8=9B=E0=B8=B4=E0=B8=94?=
 =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=AA=E0=B8=B2=E0=B8=A1=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=96=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B9=84?=
 =?UTF-8?q?=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/02_resign/ResignByid.vue | 11 +++++++----
 .../components/03_resignEmp/ResignByid.vue            |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 4d4dac874..48cd50147 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -771,10 +771,13 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
-          !checkRoutePermisson &&
-            isStaff &&
-            status === 'WAITTING' &&
-            checkPermission($route)?.attrIsUpdate
+            (!checkRoutePermisson &&
+              isStaff &&
+              status === 'WAITTING' &&
+              checkPermission($route)?.attrIsUpdate) ||
+            (!checkRoutePermisson &&
+              ((isStaff && group === '1.1' && approveStep === 'st1') ||
+                (isOfficer && group !== '1.1' && approveStep === 'st3')))
           "
         >
           <q-btn
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index fddf3cf66..c10cda62c 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -801,10 +801,11 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
-          !checkRoutePermisson &&
-            isStaff &&
-            status === 'WAITTING' &&
-            checkPermission($route)?.attrIsUpdate
+            (!checkRoutePermisson &&
+              isStaff &&
+              status === 'WAITTING' &&
+              checkPermission($route)?.attrIsUpdate) ||
+            (!checkRoutePermisson && isStaff && approveStep === 'st1')
           "
         >
           <q-btn