Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/user

2025-09-09 15:08:20 +07:00
parent a208bbad9c 4f4f11ca84
commit 938278a7a2
7 changed files with 373 additions and 57 deletions
@@ -27,13 +27,17 @@ if (!hasAccess) {
 }

 // Define permission-based computed properties
-const canRead = hasReadAccess(roleAccess)
+const canRead = true // hasReadAccess(roleAccess)
 </script>

 <template>
  <div>
    <div v-if="canRead">
+<<<<<<< HEAD
+      <ContentEquipmentList />
+=======
      <ContentMaterialList />
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
    </div>
    <Error v-else :status-code="403" />
  </div>