Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-02-20 14:15:09 +07:00
commit 5c0a5d3138
2 changed files with 4 additions and 2 deletions

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>

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);
}
/**