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

fix

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-12-20 11:30:37 +07:00
parent 302b947a2b
commit e4827229f8
3 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/02_users/views/03_permissionsView.vue
View file

@ -234,7 +234,7 @@ const columnsExpand = ref<QTableProps["columns"]>([
const reqMaster = reactive<FilterReqMaster>({
id: null,
type: 0,
isAll: false,
isAll: true,
isBlank: false,
page: 1,
pageSize: 10,
@ -387,6 +387,7 @@ async function fetchDataTable(
* @param data
*/
function updateSelected(data: NodeTree) {
reqMaster.isAll = data.orgTreeId === "" ? true : reqMaster.isAll;
nodeId.value = data.orgTreeId;
fetchDataTable(data.orgTreeId, data.orgRevisionId, data.orgLevel);
}
@ -412,9 +413,9 @@ function onClickAddRole(data: PosMaster) {
function onDeleteRole(id: string) {
dialogRemove(
$q,
() => {
async () => {
showLoader();
http
await http
.post(config.API.managementPermission, {
authRoleId: "",
posMasterId: id,
@ -481,8 +482,8 @@ watch(
() => [reqMaster.isAll, reqMaster.isBlank],
() => {
reqMaster.page = 1;
reqMaster.id &&
fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
}
);
@ -615,7 +616,10 @@ onMounted(() => {
</div>
<!-- TOOLBAR -->
<div class="col-xs-12 col-sm-9 q-pa-md row">
<div
class="col-xs-12 col-sm-9 q-pa-md row scroll"
style="height: 75vh"
>
<div class="col-12">
<q-toolbar style="padding: 0">
<q-space />
@ -633,6 +637,7 @@ onMounted(() => {
<div>
<q-checkbox
:disable="nodeId"
keep-color
v-model="reqMaster.isAll"
label="แสดงตำแหน่งทั้งหมด"

15
src/modules/02_users/views/04_roleOrganization.vue
View file

@ -153,7 +153,7 @@ async function fetchListPerson(newPage: boolean = false) {
const data = await res.data.result;
maxPage.value = Math.ceil(data.total / qureyBody.pageSize); // คำนวนหาจำนวนหน้า
total.value = data.total; // จำนวนรายชื่อคนที่มีสิทธิ์จัดการโครงสร้าง
rows.value = data.data;
// rows.value = data.data;
})
.catch((err) => {
messageError($q, err);
@ -223,9 +223,7 @@ watch(
}
);
/**
* hook ทำงานเมื่อ Components ถูกเรียกใช้งาน
*/
/** hook ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
onMounted(async () => {
await fatchOrg(); // ดึงข้อมูลโครงสร้าง
});
@ -294,16 +292,13 @@ onMounted(async () => {
</div>
</q-card-section>
<q-separator :vertical="$q.screen.gt.sm" />
<q-card-section
class="col-lg-9 col-md-8 col-xs-12 scroll"
style="height: 83vh"
>
<q-card-section class="col-lg-9 col-md-8 col-xs-12" style="height: 85vh">
<q-card bordered style="height: 100%; border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
รายชื่อคนที่มีสิทธิ์จัดการโครงสร้าง
</div>
<div class="col-12"><q-separator /></div>
<q-card-section>
<q-card-section style="height: 92%" class="scroll">
<div class="row col-12 q-col-md">
<q-btn
v-if="orgId"
@ -479,7 +474,7 @@ onMounted(async () => {
<style scoped>
.tree-container {
overflow: auto;
height: 70vh;
height: 76vh;
border: 1px solid #e6e6e7;
border-radius: 10px;
}

14
src/modules/02_users/views/05_responsIbilities.vue
View file

@ -228,7 +228,7 @@ const columnsExpand = ref<QTableProps["columns"]>([
const reqMaster = reactive<FilterReqMaster>({
id: "",
type: 0,
isAll: false,
isAll: true,
isBlank: false,
page: 1,
pageSize: 10,
@ -340,6 +340,7 @@ async function fetchDataTable(
* @param data
*/
function updateSelected(data: NodeTree) {
reqMaster.isAll = data.orgTreeId === "" ? true : reqMaster.isAll;
nodeId.value = data.orgTreeId;
isOfficer.value = data.isOfficer;
fetchDataTable(data.orgTreeId, data.orgRevisionId, data.orgLevel);
@ -411,8 +412,7 @@ watch(
() => [reqMaster.isAll, reqMaster.isBlank],
() => {
reqMaster.page = 1;
reqMaster.id &&
fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
}
);
@ -515,7 +515,10 @@ onMounted(() => {
</div>
<!-- TOOLBAR -->
<div class="col-xs-12 col-sm-9 q-pa-md row">
<div
class="col-xs-12 col-sm-9 q-pa-md row scroll"
style="height: 85vh"
>
<div class="col-12">
<q-toolbar style="padding: 0">
<q-space />
@ -534,6 +537,7 @@ onMounted(() => {
<div>
<q-checkbox
keep-color
:disable="nodeId"
v-model="reqMaster.isAll"
label="แสดงตำแหน่งทั้งหมด"
color="primary"
@ -828,7 +832,7 @@ onMounted(() => {
<style scoped>
.tree-container {
overflow: auto;
height: 75vh;
height: 80vh;
border: 1px solid #e6e6e7;
border-radius: 10px;
}