แก้ไข loader

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

@@ -582,7 +582,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";
@@ -609,10 +609,10 @@ const props = defineProps({
 const $q = useQuasar();
 const store = useProfileDataStore();
 const { profileData, changeProfileColumns } = store;
-const dataStore = useDataStore();
-const { loaderPage } = dataStore;
+
 const mixin = useCounterMixin();
-const { success, dateToISO, date2Thai, messageError } = mixin;
+const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader } =
+  mixin;
 const route = useRoute();
 const id = ref<string>("");
 const levelId = ref<string>();
@@ -1047,7 +1047,7 @@ onMounted(async () => {
 });
 
 const fetchLevel = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.educationLevel)
     .then((res) => {
@@ -1063,12 +1063,12 @@ const fetchLevel = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
 const fetchPositionPath = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.positionPath)
     .then((res) => {
@@ -1085,7 +1085,7 @@ const fetchPositionPath = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };
 
@@ -1113,7 +1113,7 @@ const filterSelector = (val: any, update: Function, refData: string) => {
 
 const fetchData = async () => {
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .get(config.API.profileEduId(profileId.value))
       .then((res) => {
@@ -1150,7 +1150,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        loaderPage(false);
+        hideLoader();
       });
   }
 };
@@ -1258,7 +1258,7 @@ const saveData = async () => {
   //     (r: any) => r.id == isEducation.value
   //   );
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .post(config.API.profileEduId(profileId.value), {
         id: id.value,
@@ -1308,7 +1308,7 @@ const editData = async () => {
   //   const filterPositionPath = OpsFilter.value.positionPathOptions.filter(
   //     (r: any) => r.id == isEducation.value
   //   );
-  loaderPage(true);
+  showLoader();
   await http
     .put(config.API.profileEduId(id.value), {
       id: id.value,
@@ -1359,7 +1359,7 @@ const clickDelete = async () => {
     persistent: true,
   })
     .onOk(async () => {
-      loaderPage(true);
+      showLoader();
       await http
         .delete(config.API.profileEduId(id.value))
         .then((res) => {
@@ -1493,7 +1493,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileEduHisId(row.id))
     .then((res) => {
@@ -1530,7 +1530,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };