Merge branch 'develop' into dev

src/modules/06_retirement/components/03_resignEmp/ResignReject.vue

@@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
 import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
 import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow";
+import { checkPermission } from "@/utils/permissions";
 
 import type { QTableProps } from "quasar";
 import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
@@ -507,7 +508,12 @@ onMounted(async () => {
           ผลการพิจารณาของผู้บังคับบัญชา
         </div>
         <q-btn
-          v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
+          v-if="
+            !checkRoutePermisson &&
+            isStaff &&
+            approveStep === 'st1' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           flat
           round
           icon="add"
@@ -554,7 +560,8 @@ onMounted(async () => {
                       dataDetail.statusMain === 'CANCELING' &&
                       props.row.approveStatus == 'PENDING' &&
                       props.row.comment == '' &&
-                      approveStep === 'st2'
+                      approveStep === 'st2' &&
+                      checkPermission($route)?.attrIsUpdate
                     "
                   >
                     <q-btn
@@ -613,7 +620,12 @@ onMounted(async () => {
         </div>
         <q-btn
           q-btn
-          v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
+          v-if="
+            !checkRoutePermisson &&
+            isStaff &&
+            approveStep === 'st1' &&
+            checkPermission($route)?.attrIsUpdate
+          "
           flat
           round
           icon="add"
@@ -634,7 +646,8 @@ onMounted(async () => {
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == keycloakId &&
             rowsApprover.approvers[0]?.approveStatus == 'PENDING' &&
-            approveStep === 'st3'
+            approveStep === 'st3' &&
+            checkPermission($route)?.attrIsUpdate
           "
         >
           <q-btn
@@ -708,7 +721,12 @@ onMounted(async () => {
     <q-card
       bordered
       class="row col-12 text-dark q-mt-sm q-pa-sm"
-      v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
+      v-if="
+        !checkRoutePermisson &&
+        isStaff &&
+        approveStep === 'st1' &&
+        checkPermission($route)?.attrIsUpdate
+      "
     >
       <q-btn
         @click="onSend"
@@ -744,7 +762,8 @@ onMounted(async () => {
               !checkRoutePermisson &&
               (dataDetail.status === 'APPROVE' ||
                 dataDetail.status === 'REJECT') &&
-              isStaff
+              isStaff &&
+              checkPermission($route)?.attrIsUpdate
             "
           >
             <div class="q-gutter-sm" v-if="!edit">