diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue index 29e399185..f5c9653ec 100644 --- a/src/modules/05_placement/components/PersonalList/CardPosition.vue +++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue @@ -189,10 +189,12 @@ const visibleColumns = ref([ onMounted(async () => { if (positionId.value) { - showLoader(); + // showLoader(); setTimeout(async () => { await onClickSelectPos(positionId.value); - await hideLoader(); + // setTimeout(() => { + // hideLoader(); + // }, 2000); }, 1000); } }); diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue index 4b90d70cb..697b92e54 100644 --- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue +++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue @@ -80,9 +80,6 @@ async function fetchOrganizationActive() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); } @@ -105,7 +102,9 @@ async function fetchDataTree(id: string) { messageError($q, err); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 1000); }); } @@ -114,7 +113,7 @@ async function fetchDataTree(id: string) { * @param data ข่อมูล Tree */ function updateSelected(data: TreeMain) { - console.log(props?.dataRow?.nodeId === data.orgTreeId); + // console.log(props?.dataRow?.nodeId === data.orgTreeId); if (props?.dataRow?.nodeId === data.orgTreeId) { positionId.value = props?.dataRow?.posmasterId; seletcId.value = props?.dataRow?.positionId; @@ -136,6 +135,7 @@ function updateSelected(data: TreeMain) { * @param level levelTree */ async function fetchDataTable(id: string, level: number = 0) { + showLoader(); const body = { node: level, nodeId: id, @@ -159,7 +159,11 @@ async function fetchDataTable(id: string, level: number = 0) { .catch((err) => { messageError($q, err); }) - .finally(() => {}); + .finally(() => { + setTimeout(() => { + hideLoader(); + }, 1000); + }); } async function fetchPosFind(level: number, id: string) {