แก้ไข loader

src/components/information/Assessment.vue

@@ -308,7 +308,7 @@ import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useProfileDataStore } from "@/modules/04_registry/store";
-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";
@@ -338,10 +338,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 name = ref<string>();
@@ -598,7 +598,7 @@ onMounted(async () => {
 
 const fetchData = async () => {
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .get(config.API.profileAssessmentId(profileId.value))
       .then((res) => {
@@ -624,7 +624,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        loaderPage(false);
+        hideLoader();
       });
   }
 };
@@ -717,7 +717,7 @@ const clickSave = async () => {
  */
 const saveData = async () => {
   if (profileId.value) {
-    loaderPage(true);
+    showLoader();
     await http
       .post(config.API.profileAssessmentId(profileId.value), {
         id: id.value,
@@ -747,7 +747,7 @@ const saveData = async () => {
  * บันทึกแก้ไขข้อมูล
  */
 const editData = async () => {
-  loaderPage(true);
+  showLoader();
   await http
     .put(config.API.profileAssessmentId(id.value), {
       id: id.value,
@@ -784,7 +784,7 @@ const clickDelete = async () => {
     persistent: true,
   })
     .onOk(async () => {
-      loaderPage(true);
+      showLoader();
       await http
         .delete(config.API.profileAssessmentId(id.value))
         .then((res) => {
@@ -901,7 +901,7 @@ const clickEditRow = () => {
 const clickHistory = async (row: RequestItemsObject) => {
   tittleHistory.value = "ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ";
   modalHistory.value = true;
-  loaderPage(true);
+  showLoader();
   await http
     .get(config.API.profileAssessmentHisId(row.id))
     .then((res) => {
@@ -927,7 +927,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       messageError($q, e);
     })
     .finally(() => {
-      loaderPage(false);
+      hideLoader();
     });
 };