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

# 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

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],

View file

@ -1,12 +1,25 @@
<<<<<<<< HEAD:src/modules/02_users/views/detailRoleView.vue
<script setup>
========
<script setup lang="ts">
>>>>>>>> fc575094eec541671db6fffe19e04350fdb0ff54:src/modules/02_users/views/permissionDetail.vue
import { reactive, ref } from "vue";
import { useRouter } from "vue-router";
import type { FormRole } from "@/modules/02_users/interface/request/Main";
const router = useRouter();
const formData = reactive<FormRole>({
role: "",
description: "",
});
<<<<<<<< HEAD:src/modules/02_users/views/detailRoleView.vue
const columns = ref([]);
========
const columns = ref<any>([]);
>>>>>>>> fc575094eec541671db6fffe19e04350fdb0ff54:src/modules/02_users/views/permissionDetail.vue
const systemLists = ref([
const systemLists = ref<any>([
{
key: "SYS_METADATA_KPI",
name: "ข้อมูลการประเมิน",
@ -1050,6 +1063,8 @@ const systemLists = ref([
],
},
]);
function onSubmit() {}
</script>
<template>
@ -1067,106 +1082,141 @@ const systemLists = ref([
ดการสทธบทบาท
</div>
<q-card flast bordered class="">
<div class="col-12">
<q-table
flat
bordered
:rows="systemLists"
:columns="columns"
separator="cell"
:pagination="{
page: 1,
rowsPerPage: 100,
}"
hide-bottom
>
<template v-slot:header>
<q-tr>
<q-th rowspan="2" colspan="3" style="font-size: 1rem"
>รายการระบบ</q-th
<q-form greedy @submit.prevent @validation-success="onSubmit">
<q-card flast bordered class="">
<div class="col-12">
<q-card>
<q-card-section>
<div class="row q-col-gutter-md">
<div class="col-4">
<q-input
v-model="formData.role"
outlined
dense
:rules="[(val:string) => !!val || `${'กรุณากรอกชื่อบทบาท'}`,]"
lazy-rules
hide-bottom-space
class="inputgreen"
label="ชื่อบทบาท"
/>
</div>
<div class="col-8">
<q-input
v-model="formData.description"
outlined
dense
:rules="[(val:string) => !!val || `${'กรุณากรอกคำอิบาย'}`,]"
lazy-rules
hide-bottom-space
class="inputgreen"
label="คำอิบาย"
type="textarea"
/>
</div>
</div>
</q-card-section>
</q-card>
</div>
<div class="col-12">
<q-table
flat
bordered
:rows="systemLists"
:columns="columns"
separator="cell"
:pagination="{
page: 1,
rowsPerPage: 100,
}"
hide-bottom
>
<template v-slot:header>
<q-tr>
<q-th rowspan="2" colspan="3" style="font-size: 1rem"
>รายการระบบ</q-th
>
<q-th colspan="2" style="font-size: 1rem"
>ทธการเขาถงขอม</q-th
>
<q-th colspan="5" style="text-align: center; font-size: 1rem"
>ทธการใชงาน</q-th
>
</q-tr>
<q-tr>
<q-th
>OWNER<br />
เจาของระบบ</q-th
>
<q-th>OFFICER <br />(การเจาหนาท)</q-th>
<q-th>CREATE <br />(ทธในการสรางขอม)</q-th>
<q-th>LIST<br />(ทธในการดรายการขอม)</q-th>
<q-th>GET<br />(ทธในการดรายละเอยดขอม)</q-th>
<q-th>UPDATE<br />(ทธในการแกไขขอม)</q-th>
<q-th>DELETE<br />(ทธในการลบขอม)</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr>
<q-td auto-width colspan="3">
<q-checkbox v-model="props.row.selected" />
<strong>{{ props.row.name }}</strong>
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.owner" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.officer" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.create" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.list" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.get" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.update" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.delete" />
</q-td>
</q-tr>
<q-tr
v-if="props.row.selected && props.row.children"
v-for="(item, index) in props.row.children"
:key="index"
>
<q-th colspan="2" style="font-size: 1rem"
>ทธการเขาถงขอม</q-th
>
<q-th colspan="5" style="text-align: center; font-size: 1rem"
>ทธการใชงาน</q-th
>
</q-tr>
<q-tr>
<q-th
>OWNER<br />
เจาของระบบ</q-th
>
<q-th>OFFICER <br />(การเจาหนาท)</q-th>
<q-th>CREATE <br />(ทธในการสรางขอม)</q-th>
<q-th>LIST<br />(ทธในการดรายการขอม)</q-th>
<q-th>GET<br />(ทธในการดรายละเอยดขอม)</q-th>
<q-th>UPDATE<br />(ทธในการแกไขขอม)</q-th>
<q-th>DELETE<br />(ทธในการลบขอม)</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr>
<q-td auto-width colspan="3">
<q-checkbox v-model="props.row.selected" />
<strong>{{ props.row.name }}</strong>
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.owner" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.officer" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.create" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.list" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.get" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.update" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="props.row.delete" />
</q-td>
</q-tr>
<q-tr
v-if="props.row.selected && props.row.children"
v-for="(item, index) in props.row.children"
:key="index"
>
<q-td></q-td>
<q-td auto-width colspan="2">
<q-checkbox v-model="item.selected" />
{{ item.name }}
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.owner" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.officer" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.create" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.list" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.get" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.update" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.delete" />
</q-td>
</q-tr>
<!-- <q-tr
<q-td></q-td>
<q-td auto-width colspan="2">
<q-checkbox v-model="item.selected" />
{{ item.name }}
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.owner" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.officer" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.create" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.list" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.get" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.update" />
</q-td>
<q-td style="text-align: center">
<q-checkbox v-model="item.delete" />
</q-td>
</q-tr>
<!-- <q-tr
v-if="item.children"
v-for="(item3, index) in item.children"
:key="index"
@ -1198,8 +1248,15 @@ const systemLists = ref([
<q-checkbox v-model="item3.delete" />
</q-td>
</q-tr> -->
</template>
</q-table>
</div>
</q-card>
</template>
</q-table>
</div>
<!-- <q-card-actions align="right">
<q-btn label="บันทึก" color="secondary" type="submit"
><q-tooltip>นทกขอม</q-tooltip></q-btn
>
</q-card-actions> -->
</q-card>
</q-form>
</template>

File diff suppressed because it is too large Load diff