2 changed files with 8 additions and 12 deletions
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@ -771,13 +771,10 @@ onMounted(async () => {
        <q-space />
        <div
          v-if="
-            (!checkRoutePermisson &&
-              isStaff &&
-              status === 'WAITTING' &&
-              checkPermission($route)?.attrIsUpdate) ||
-            (!checkRoutePermisson &&
-              ((isStaff && group === '1.1' && approveStep === 'st1') ||
-                (isOfficer && group !== '1.1' && approveStep === 'st3')))
+          !checkRoutePermisson &&
+            isStaff &&
+            status === 'WAITTING' &&
+            checkPermission($route)?.attrIsUpdate
          "
        >
          <q-btn
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@ -801,11 +801,10 @@ onMounted(async () => {
        <q-space />
        <div
          v-if="
-            (!checkRoutePermisson &&
-              isStaff &&
-              status === 'WAITTING' &&
-              checkPermission($route)?.attrIsUpdate) ||
-            (!checkRoutePermisson && isStaff && approveStep === 'st1')
+          !checkRoutePermisson &&
+            isStaff &&
+            status === 'WAITTING' &&
+            checkPermission($route)?.attrIsUpdate
          "
        >
          <q-btn