แก้ไข loader

src/modules/04_registry/components/Salary.vue

@@ -552,7 +552,7 @@ import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useProfileDataStore } from "@/modules/04_registry/store";
 import { useCounterMixin } from "@/stores/mixin";
-import { useDataStore } from "@/stores/data";
+
 import ProfileTable from "@/modules/04_registry/components/Table.vue";
 import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
 import DialogFooter from "@/modules/04_registry/components/DialogFooter.vue";
@@ -581,10 +581,10 @@ const props = defineProps({
 const $q = useQuasar();
 const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
-const dataStore = useDataStore();
-const { loaderPage } = dataStore;
+
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError } = mixin;
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+  mixin;
 const route = useRoute();
 const id = ref<string>("");
 const date = ref<Date>(new Date());
@@ -1410,7 +1410,7 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
 };
 
 const nodeTree = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileOrganizRoot)
     .then((res: any) => {
@@ -1424,7 +1424,7 @@ const nodeTree = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
@@ -1432,7 +1432,7 @@ const nodeTree = async () => {
  * get รายการ ตำแหน่ง
  */
 const fetchPosition = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.position)
     .then((res) => {
@@ -1509,13 +1509,13 @@ const fetchPosition = async () => {
     })
     .catch((e: any) => {})
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
 const fetchData = async () => {
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .get(config.API.profileSalaryId(profileId.value))
       .then((res) => {
@@ -1558,7 +1558,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        loaderPage(false);
+        hideLoader();
       });
   }
 };
@@ -1569,7 +1569,7 @@ const onSelected = async (id: string) => {
 
 const fetchOrganization = async (id: string) => {
   if (selected.value != "") {
-    loaderPage(true);
+    showLoader();
     await http
       .get(config.API.organizationName(id))
       .then((res) => {
@@ -1580,13 +1580,13 @@ const fetchOrganization = async (id: string) => {
         messageError($q, e);
       })
       .finally(() => {
-        loaderPage(false);
+        hideLoader();
       });
   }
 };
 
 const fetchPositionNumber = async (id: string) => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.getPositionNumberIdByOcId(id))
     .then((res) => {
@@ -1602,7 +1602,7 @@ const fetchPositionNumber = async (id: string) => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
@@ -1767,7 +1767,7 @@ const clickSave = async () => {
  */
 const saveData = async () => {
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .post(config.API.profileSalaryId(profileId.value), {
         date: dateToISO(date.value),
@@ -1804,7 +1804,7 @@ const saveData = async () => {
  * บันทึกแก้ไขข้อมูล
  */
 const editData = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .put(config.API.profileSalaryId(id.value), {
       date: dateToISO(date.value),
@@ -1848,7 +1848,7 @@ const clickDelete = async () => {
     persistent: true,
   })
     .onOk(async () => {
-      loaderPage(true);
+      showLoader();
       await http
         .delete(config.API.profileSalaryId(id.value))
         .then((res) => {
@@ -1992,7 +1992,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileSalaryHisId(row.id))
     .then((res) => {
@@ -2035,7 +2035,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };