Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-mgt into dev

* 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-mgt:
Merge branch 'develop' into dev
2026-06-04 12:58:27 +07:00 · 2026-06-04 12:58:19 +07:00 · 2026-06-04 12:58:07 +07:00
2 changed files with 12 additions and 8 deletions
--- 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
--- 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
Author	SHA1	Message	Date
waruneeauy	0d897fb583	Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-mgt into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 3m23s Details * 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-mgt:	2026-06-04 12:58:27 +07:00
waruneeauy	07cad34910	Merge branch 'develop' into dev * develop: fixed: เปิดให้สามารถแก้ไขข้อมูลขอลาออกได้ feat: add delete is OWNER feat(leave): add delete	2026-06-04 12:58:19 +07:00
waruneeauy	ff6671d523	fixed: เปิดให้สามารถแก้ไขข้อมูลขอลาออกได้	2026-06-04 12:58:07 +07:00