diff --git a/src/modules/02_users/router.ts b/src/modules/02_users/router.ts index 14dd6f56..ee8b6812 100644 --- a/src/modules/02_users/router.ts +++ b/src/modules/02_users/router.ts @@ -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], diff --git a/src/modules/02_users/views/detailRoleView.vue b/src/modules/02_users/views/detailRoleView.vue index 626323c6..62a501ca 100644 --- a/src/modules/02_users/views/detailRoleView.vue +++ b/src/modules/02_users/views/detailRoleView.vue @@ -1,12 +1,25 @@ +<<<<<<<< HEAD:src/modules/02_users/views/detailRoleView.vue diff --git a/src/modules/02_users/views/permissionDetail.vue b/src/modules/02_users/views/permissionDetail.vue new file mode 100644 index 00000000..62a501ca --- /dev/null +++ b/src/modules/02_users/views/permissionDetail.vue @@ -0,0 +1,1262 @@ +<<<<<<<< HEAD:src/modules/02_users/views/detailRoleView.vue + + +