diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue index e27d51208..a70e216e6 100644 --- a/src/modules/13_salary/views/04_salaryLists.vue +++ b/src/modules/13_salary/views/04_salaryLists.vue @@ -121,12 +121,11 @@ async function getRound() { roundFilter.value = "ไม่มีข้อมูล"; snapFilter.value = "ไม่มีข้อมูล"; agencyFilter.value = "ไม่มีข้อมูล"; + hideLoader(); } }) .catch((e) => { messageError($q, e); - }) - .finally(() => { hideLoader(); }); } @@ -274,11 +273,13 @@ async function fetchSalalyPeriod( periodLatest.value = data; isLoad.value = true; } + + if (data.group1id) { + hideLoader(); + } }) .catch((err) => { messageError($q, err); - }) - .finally(() => { hideLoader(); }); } diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue index e494b93b3..afa13d3c1 100644 --- a/src/modules/13_salary/views/05_salaryListsEmployee.vue +++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue @@ -120,12 +120,11 @@ async function getRound() { roundFilter.value = "ไม่มีข้อมูล"; snapFilter.value = "ไม่มีข้อมูล"; agencyFilter.value = "ไม่มีข้อมูล"; + hideLoader(); } }) .catch((e) => { messageError($q, e); - }) - .finally(() => { hideLoader(); }); } @@ -248,7 +247,7 @@ async function fetchSalalyPeriod( const body = { rootId: rootId, salaryPeriodId: periodId, - snapshot: snap, + snapshot: snap, }; await http @@ -258,12 +257,12 @@ async function fetchSalalyPeriod( data && store.fetchPeriodLatest(data, store.tabGroup); periodLatest.value = data; isLoad.value = data.group1id ? true : false; + if (data.group1id) { + hideLoader(); + } }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); } }