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

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-20 13:37:31 +07:00
commit 6fa7bb94e1
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/05_placement/components/PersonalList/CardPosition.vue
View file

@ -267,7 +267,9 @@ const visibleColumns = ref<string[]>([
</div>
<div v-else-if="col.name === 'isPosition'">
<div v-if="col.value">
<q-icon name="done" color="primary" size="24px" />
<q-icon name="done" color="primary" size="24px">
<q-tooltip>ตรงตามตำแหน่ง </q-tooltip>
</q-icon>
</div>
</div>

2
src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
View file

@ -109,9 +109,9 @@ async function fetchDataTree(id: string) {
function updateSelected(data: TreeMain) {
nodeId.value = data.orgTreeId ? data.orgTreeId : "";
nodeLevel.value = data.orgLevel;
fetchDataTable(data.orgTreeId, data.orgLevel);
selectedPos.value = [];
datePos.value = new Date();
fetchDataTable(data.orgTreeId, data.orgLevel);
}
/**