From 701b90d89a9a5c067b2c46f967aa7602d9b33651 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Wed, 2 Jul 2025 15:53:20 +0700
Subject: [PATCH] refactor: enhance role-based access checks in TreeComponent
 and MainPage components

---
 src/components/TreeComponent.vue            |  8 ++++++-
 src/pages/01_branch-management/MainPage.vue | 24 +++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/components/TreeComponent.vue b/src/components/TreeComponent.vue
index ee5130ba..58dd3f5e 100644
--- a/src/components/TreeComponent.vue
+++ b/src/components/TreeComponent.vue
@@ -123,7 +123,13 @@ defineEmits<{
               v-if="
                 node.isHeadOffice &&
                 typeTree === 'branch' &&
-                isRoleInclude(['head_of_admin', 'admin', 'system'])
+                isRoleInclude([
+                  'system',
+                  'head_of_admin',
+                  'admin',
+                  'executive',
+                  'accountant',
+                ])
               "
               :id="`create-sub-branch-btn-${node.name}`"
               @click.stop="$emit('create', node)"
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index cc4cae06..e056b6d4 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -10,7 +10,7 @@ import type { QTableProps, QTableSlots } from 'quasar';
 import { resetScrollBar } from 'src/stores/utils';
 import useBranchStore from 'stores/branch';
 import useFlowStore from 'stores/flow';
-import { isRoleInclude } from 'stores/utils';
+import { isRoleInclude, canAccess } from 'stores/utils';
 import {
   BranchWithChildren,
   BranchCreate,
@@ -1050,7 +1050,7 @@ watch(currentHq, () => {
                     {{ $t('branch.allBranch') }}
                   </div>
                   <q-btn
-                    v-if="isRoleInclude(['head_of_admin', 'admin', 'system'])"
+                    v-if="isRoleInclude(['system'])"
                     round
                     flat
                     size="md"
@@ -1561,6 +1561,16 @@ watch(currentHq, () => {
                         </q-td>
                         <q-td>
                           <KebabAction
+                            v-if="
+                              isRoleInclude([
+                                'system',
+                                'head_of_admin',
+                                'admin',
+                                'executive',
+                                'accountant',
+                              ]) ||
+                              (canAccess('branch') && currentHq.id)
+                            "
                             :status="props.row.status"
                             :idName="props.row.name"
                             @view="
@@ -1702,6 +1712,16 @@ watch(currentHq, () => {
                         >
                           <template v-slot:action>
                             <KebabAction
+                              v-if="
+                                isRoleInclude([
+                                  'system',
+                                  'head_of_admin',
+                                  'admin',
+                                  'executive',
+                                  'accountant',
+                                ]) ||
+                                (canAccess('branch') && currentHq.id)
+                              "
                               :status="props.row.status"
                               :idName="props.row.name"
                               @view="