hrms-bangkok/hrms-admin
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-admin into develop

Browse source 
# Conflicts:
#	src/modules/02_users/router.ts
#	src/modules/02_users/views/detailRoleView.vue
#	src/modules/02_users/views/permissionDetail.vue
#	src/modules/02_users/views/roleDetail.vue
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-05-31 16:44:29 +07:00
commit 581cd7a7de
3 changed files with 1427 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/02_users/router.ts
View file

@ -3,10 +3,12 @@ const PageManagementRole = () =>
import("@/modules/02_users/views/managementRoleUser.vue");
const ListsPageRole = () => import("@/modules/02_users/views/listsRole.vue");
const RoleDetail = () => import("@/modules/02_users/views/detailRoleView.vue");
// const RoleDetail = () => import("@/modules/02_users/views/detailRoleView.vue");
const PermissionPsge = () =>
import("@/modules/02_users/views/permissionsView.vue");
const ListsPage2Role = () =>
import("@/modules/02_users/views/permissionDetail.vue");
export default [
{
@ -49,7 +51,7 @@ export default [
{
path: "/roles/:id",
name: "manageRolesId",
component: RoleDetail,
component: ListsPage2Role,
meta: {
Auth: true,
Key: [7],