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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m49s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-05 15:56:32 +07:00
commit 0d1dea5289
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/Dialogs/DialogOrgSelect.vue
View file

@ -318,9 +318,7 @@ async function getDataTable(id: string, level: number = 0) {
messageError($q, err); messageError($q, err);
}) })
.finally(() => { .finally(() => {
setTimeout(() => { hideLoader();
hideLoader();
}, 1000);
}); });
} }
@ -403,15 +401,15 @@ async function fetchPosFind(level: number, id: string) {
}; };
await http await http
.post(config.API.orgPosFind, body) .post(config.API.orgPosFind, body)
.then((res) => { .then(async (res) => {
const data = res.data.result; const data = res.data.result;
expanded.value = data; expanded.value = data;
nodeId.value = id; nodeId.value = id;
positionId.value = props?.dataRows?.posmasterId; positionId.value = props?.dataRows?.posmasterId;
seletcId.value = props?.dataRows?.positionId; seletcId.value = props?.dataRows?.positionId;
datePos.value = props?.dataRows?.reportingDate; datePos.value = props?.dataRows?.reportingDate;
await getDataTable(nodeId.value, level);
getDataTable(nodeId.value, level); await onClickSelectPos(positionId.value);
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
@ -427,11 +425,6 @@ watch(
if (props?.dataRows?.node !== null && props?.dataRows?.nodeId !== null) { if (props?.dataRows?.node !== null && props?.dataRows?.nodeId !== null) {
await fetchPosFind(props?.dataRows?.node, props?.dataRows?.nodeId); await fetchPosFind(props?.dataRows?.node, props?.dataRows?.nodeId);
if (positionId.value) {
setTimeout(async () => {
await onClickSelectPos(positionId.value);
}, 200);
}
} else { } else {
expanded.value = []; expanded.value = [];
} }
@ -534,6 +527,7 @@ onMounted(async () => {
await fetchTree(); await fetchTree();
}); });
</script> </script>
<template> <template>
<q-dialog v-model="modal" persistent full-width> <q-dialog v-model="modal" persistent full-width>
<q-card class="no-scroll"> <q-card class="no-scroll">
@ -929,6 +923,7 @@ onMounted(async () => {
</q-card> </q-card>
</q-dialog> </q-dialog>
</template> </template>
<style scoped> <style scoped>
.my-list-link { .my-list-link {
color: rgb(118, 168, 222); color: rgb(118, 168, 222);