fix: solve conflict

This commit is contained in:
riefive
2025-09-08 14:40:28 +07:00
23 changed files with 348 additions and 28 deletions

No files matched your search

@@ -1,9 +1,9 @@
<script setup lang="ts">
definePageMeta({
roles: ['sys', 'doc'],
})
</script>
<template>
<div>detail satusehat</div>
</template>
<script setup lang="ts">
definePageMeta({
roles: ['sys', 'doc'],
})
</script>
<template>
<div>detail satusehat</div>
</template>
@@ -1,9 +1,9 @@
<script setup lang="ts">
definePageMeta({
roles: ['sys', 'doc'],
})
</script>
<template>
<div>edit satusehat</div>
</template>
<script setup lang="ts">
definePageMeta({
roles: ['sys', 'doc'],
})
</script>
<template>
<div>edit satusehat</div>
</template>
@@ -34,7 +34,7 @@ const canRead = true
<template>
<div>
<div v-if="canRead">
<FlowDivisionList />
<ContentDivisionList />
</div>
<Error v-else :status-code="403" />
</div>
@@ -34,7 +34,7 @@ const canRead = true
<template>
<div>
<div v-if="canRead">
<FlowInstallationList />
<ContentInstallationList />
</div>
<Error v-else :status-code="403" />
</div>
+1 -1
View File
@@ -34,7 +34,7 @@ const canRead = true
<template>
<div>
<div v-if="canRead">
<FlowUnitList />
<ContentUnitList />
</div>
<Error v-else :status-code="403" />
</div>
@@ -0,0 +1,41 @@
<script setup lang="ts">
import type { PagePermission } from '~/models/role'
import Error from '~/components/pub/base/error/error.vue'
import { PAGE_PERMISSIONS } from '~/lib/page-permission'
definePageMeta({
middleware: ['rbac'],
roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
title: 'Tambah User',
contentFrame: 'cf-full-width',
})
const route = useRoute()
useHead({
title: () => route.meta.title as string,
})
const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
const { checkRole, hasCreateAccess } = useRBAC()
// Check if user has access to this page
const hasAccess = checkRole(roleAccess)
if (!hasAccess) {
throw createError({
statusCode: 403,
statusMessage: 'Access denied',
})
}
// Define permission-based computed properties
const canCreate = hasCreateAccess(roleAccess)
</script>
<template>
<div v-if="canCreate">
<ContentDeviceEntry />
</div>
<Error v-else :status-code="403" />
</template>
@@ -0,0 +1,41 @@
<script setup lang="ts">
import type { PagePermission } from '~/models/role'
import Error from '~/components/pub/base/error/error.vue'
import { PAGE_PERMISSIONS } from '~/lib/page-permission'
definePageMeta({
middleware: ['rbac'],
roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
title: 'Tambah User',
contentFrame: 'cf-full-width',
})
const route = useRoute()
useHead({
title: () => route.meta.title as string,
})
const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
const { checkRole, hasCreateAccess } = useRBAC()
// Check if user has access to this page
const hasAccess = checkRole(roleAccess)
if (!hasAccess) {
throw createError({
statusCode: 403,
statusMessage: 'Access denied',
})
}
// Define permission-based computed properties
const canCreate = hasCreateAccess(roleAccess)
</script>
<template>
<div v-if="canCreate">
<ContentMaterialEntry />
</div>
<Error v-else :status-code="403" />
</template>
@@ -33,7 +33,11 @@ const canRead = true // hasReadAccess(roleAccess)
<template>
<div>
<div v-if="canRead">
<<<<<<< HEAD
<ContentEquipmentList />
=======
<ContentMaterialList />
>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
</div>
<Error v-else :status-code="403" />
</div>
@@ -33,7 +33,11 @@ const canRead = true // hasReadAccess(roleAccess)
<template>
<div>
<div v-if="canRead">
<<<<<<< HEAD:app/pages/(features)/tools-equipment-src/tools/index.vue
<ContentToolsList />
=======
<ContentDeviceList />
>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/pages/(features)/tools-equipment-src/device/index.vue
</div>
<Error v-else :status-code="403" />
</div>