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

Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m34s
Details

Browse source 
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  search tree report by dna
  rollback search search report
This commit is contained in:
Warunee Tamkoo 2026-01-11 21:44:35 +07:00
commit a0c023fc0f
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/05_placement/views/09_reportMain.vue
View file

@ -94,7 +94,7 @@ function onUpdateYear(val: number) {
function onSelectedNode(data: any) {
org.value = data.orgName;
nodeId.value = data.orgTreeId;
nodeId.value = data.orgTreeDnaId;
nodeLevel.value = data.orgLevel;
orgTreeDnaId.value = data.orgTreeDnaId;
expandedModal.value = false;
@ -297,7 +297,7 @@ onMounted(() => {
<q-tree
dense
:nodes="node"
node-key="orgTreeId"
node-key="orgTreeDnaId"
label-key="labelName"
v-model:expanded="expanded"
:filter="filterTree.trim()"
@ -308,7 +308,7 @@ onMounted(() => {
<template v-slot:default-header="prop">
<q-item
@click.stop="onSelectedNode(prop.node)"
:active="nodeId === prop.node.orgTreeId"
:active="nodeId === prop.node.orgTreeDnaId"
clickable
active-class="my-list-link text-primary text-weight-medium"
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"

11
src/modules/09_leave/views/06_ReportMain.vue
View file

@ -133,7 +133,7 @@ async function fetchDataTree() {
*/
function onSelectedNode(data: any) {
org.value = data.orgName;
nodeId.value = data.orgTreeId;
nodeId.value = data.orgTreeDnaId;
nodeLevel.value = data.orgLevel;
expandedModal.value = false;
orgTreeDnaId.value = data.orgTreeDnaId;
@ -626,7 +626,7 @@ onMounted(() => {
<q-tree
dense
:nodes="node"
node-key="orgTreeId"
node-key="orgTreeDnaId"
label-key="labelName"
v-model:expanded="expanded"
:filter="filterTree.trim()"
@ -637,7 +637,7 @@ onMounted(() => {
<template v-slot:default-header="prop">
<q-item
@click.stop="onSelectedNode(prop.node)"
:active="nodeId === prop.node.orgTreeId"
:active="nodeId === prop.node.orgTreeDnaId"
clickable
active-class="my-list-link text-primary text-weight-medium"
class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
@ -847,7 +847,10 @@ onMounted(() => {
</template>
</datepicker>
</div>
<div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'">
<div
class="col-12"
v-if="yearType == 'MONTH' || leaveType == 'MONTH'"
>
<datepicker
v-model="dateMonth"
:locale="'th'"