-
คำนำหน้านาม
+
+ คำนำหน้านาม
+
{{ prefix }}
- ชื่อ-นามสกุล
+
+ ชื่อ-นามสกุล
+
{{ fullname }}
@@ -55,17 +59,23 @@
{{ position_name }}
- สถานศึกษา
+
+ สถานศึกษา
+
{{ university }}
- วุฒิการศึกษา
+
+ วุฒิการศึกษา
+
{{ degree }}
- สาขาวิชาเอก
+
+ สาขาวิชาเอก
+
{{ major }}
@@ -118,7 +128,11 @@
>ดาวน์โหลดผลคะแนน
-
- ("");
const number = ref("");
const score_expired = ref("");
const mixin = useCounterMixin();
-const { messageError } = mixin;
+const { messageError, showLoader, hideLoader } = mixin;
const examID = ref("62150001");
const prefix = ref("นาย");
const fullname = ref("เกียรติศักดิ์ บัณฑิต");
@@ -253,7 +281,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getExamDetail(importId.value, examId.value))
.then((res) => {
@@ -290,12 +318,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadScore = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.downloadScoreReport(importId.value, examId.value), {
responseType: "blob",
@@ -311,12 +339,12 @@ const downloadScore = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadCertificate = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.downloadExamReport(importId.value, examId.value, 2), {
responseType: "blob",
@@ -332,7 +360,7 @@ const downloadCertificate = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 8b5a2528e..933d99932 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -316,7 +316,10 @@
-
ประเภท
- คะแนนเต็ม
+
+ ประเภท
+
+
+ คะแนนเต็ม
+
คะแนนที่ได้
-
+
ภาค ก
@@ -181,10 +201,16 @@
คะแนน
- ผลการสอบ
-
+
-
+ ผลการสอบ
+
+
{{ examResultinscore }}
@@ -194,7 +220,9 @@
{{ number }}
วันหมดอายุบัญชีสอบแข่งขัน
+
+ วันหมดอายุบัญชีสอบแข่งขัน
+
{{ score_expired }}
@@ -241,7 +269,7 @@ const examCount = ref
@@ -379,7 +382,7 @@ const name = ref("");
const year = ref(new Date().getFullYear() + 543);
const order = ref(1);
const mixin = useCounterMixin();
-const { success, dateToISO, dateText } = mixin;
+const { success, dateToISO, dateText, showLoader, hideLoader } = mixin;
const files = ref(null);
const files_score = ref(null);
const files_candidate = ref(null);
@@ -551,7 +554,7 @@ const visibleColumnsHistory = ref([
]);
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
@@ -564,7 +567,7 @@ const textDate = (value: Date) => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getCandidates)
.then((res) => {
@@ -586,7 +589,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -620,7 +623,7 @@ const clickEditPeriod = (id: string) => {
const clickHistory = async (id: string) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getImportHistory(id))
.then((res) => {
@@ -649,7 +652,7 @@ const clickHistory = async (id: string) => {
statusCode.value = e.response.data.status;
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -664,7 +667,7 @@ const clickDelete = (id: string) => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.deleteCandidates(id))
.then((res) => {
@@ -675,7 +678,7 @@ const clickDelete = (id: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
})
.onCancel(() => {})
@@ -704,7 +707,7 @@ const clickCloseCandidate = async () => {
const checkSaveCandidate = async () => {
const fd = new FormData();
fd.append("attachment", files_candidate.value[0]);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.uploadCandidates(selected_row_id.value), fd)
.then((res) => {
@@ -717,14 +720,14 @@ const checkSaveCandidate = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const checkSaveScore = async () => {
const fd = new FormData();
fd.append("attachment", files_score.value[0]);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.saveScores(selected_row_id.value), fd)
.then((res) => {
@@ -737,7 +740,7 @@ const checkSaveScore = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -747,7 +750,7 @@ const checkSave = async () => {
fd.append("year", year.value.toString());
fd.append("order", order.value.toString());
fd.append("name", name.value);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.saveCandidates, fd)
.then((res) => {
@@ -759,7 +762,7 @@ const checkSave = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
index 65fa88c12..ec4009d6b 100644
--- a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
@@ -25,7 +25,10 @@
label="ชื่อรอบการสอบแข่งขัน/ชื่อประกาศ"
dense
lazy-rules
- :rules="[(val) => !!val || `${'กรุณากรอกชื่อรอบการสอบแข่งขัน/ชื่อประกาศ'}`]"
+ :rules="[
+ (val) =>
+ !!val || `${'กรุณากรอกชื่อรอบการสอบแข่งขัน/ชื่อประกาศ'}`,
+ ]"
>
@@ -83,7 +86,9 @@
dense
lazy-rules
input-class="text-right"
- :rules="[(val) => val >= 0 || `${'กรุณากรอกค่าธรรมเนียมให้ถูกต้อง'}`]"
+ :rules="[
+ (val) => val >= 0 || `${'กรุณากรอกค่าธรรมเนียมให้ถูกต้อง'}`,
+ ]"
>
@@ -295,7 +300,9 @@
@removed="fileRemoveImg"
>
-
+
ลบไฟล์ที่อัปโหลด
-
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
@@ -360,7 +370,11 @@
v-if="fileImgs.length != 0"
>
-
+
{{ file.fileName }}
@@ -421,7 +435,9 @@
@removed="fileRemoveDoc"
>
-
+
ลบไฟล์ที่อัปโหลด
-
+
ดาวน์โหลดเอกสารรับรอง
@@ -138,12 +152,18 @@
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
@@ -486,7 +505,11 @@
v-if="fileDocs.length != 0"
>
-
+
{{ file.fileName }}
@@ -534,7 +557,9 @@
- ("");
@@ -733,7 +766,7 @@ watch(organizationName, (count: DataOption, prevCount: DataOption) => {
});
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
if (route.params.id != undefined) {
edit.value = true;
id.value = route.params.id.toString();
@@ -748,7 +781,7 @@ const clickBack = () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getPeriodById(id.value))
.then((res) => {
@@ -785,7 +818,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -797,7 +830,9 @@ const fileUploadDoc = async (files: any) => {
const fileRemoveDoc = async (files: any) => {
files.forEach((file: any) => {
- const index = fileDocDataUpload.value.findIndex((x: any) => x.__key == file.__key);
+ const index = fileDocDataUpload.value.findIndex(
+ (x: any) => x.__key == file.__key
+ );
if (index > -1) {
fileDocDataUpload.value.splice(index, 1);
}
@@ -810,7 +845,7 @@ const uploadDocData = async () => {
fileDocDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodRecruitDoc(id.value), formData)
.then((res) => {})
@@ -818,7 +853,7 @@ const uploadDocData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
success($q, "บันทึกข้อมูลสำเร็จ");
clickBack();
});
@@ -834,7 +869,7 @@ const uploadImgData = async () => {
fileImgDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodRecruitImg(id.value), formData)
.then((res) => {})
@@ -842,7 +877,7 @@ const uploadImgData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
}
};
@@ -855,7 +890,9 @@ const fileUploadImg = async (files: any) => {
const fileRemoveImg = async (files: any) => {
files.forEach((file: any) => {
- const index = fileImgDataUpload.value.findIndex((x: any) => x.__key == file.__key);
+ const index = fileImgDataUpload.value.findIndex(
+ (x: any) => x.__key == file.__key
+ );
if (index > -1) {
fileImgDataUpload.value.splice(index, 1);
}
@@ -906,7 +943,7 @@ const sendData = () => {
};
const deleteDocData = async (docId: string) => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.periodDeleteDoc(docId))
.then(async () => {
@@ -916,12 +953,12 @@ const deleteDocData = async (docId: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const deleteImgData = async (docId: string) => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.periodDeleteImg(docId))
.then(async () => {
@@ -931,12 +968,12 @@ const deleteImgData = async (docId: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const addData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.savePeriod, sendData())
.then(async (res) => {
@@ -949,12 +986,12 @@ const addData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const editData = async (id: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.editPeriod(id), sendData())
.then(async () => {
@@ -965,7 +1002,7 @@ const editData = async (id: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
index 66d0f4751..4439ed10f 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
@@ -129,7 +129,7 @@ const pass = ref(0);
const notpass = ref(0);
const importId = ref(route.params.id as string); // Period Import Id
const mixin = useCounterMixin();
-const { messageError } = mixin;
+const { messageError, showLoader, hideLoader } = mixin;
const filter = ref(""); //search data table
const visibleColumns = ref([
"examID",
@@ -317,12 +317,12 @@ const clickDetail = (examID: string) => {
};
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
const downloadExam = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.exportDisableExam(importId.value), {
responseType: "blob",
@@ -338,12 +338,12 @@ const downloadExam = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadPassExam = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.exportDisablePassExam(importId.value), {
responseType: "blob",
@@ -359,12 +359,12 @@ const downloadPassExam = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadPassResultExam = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.exportDisablePassResultExam(importId.value), {
responseType: "blob",
@@ -380,12 +380,12 @@ const downloadPassResultExam = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.getDisableExamResultById(importId.value), {
examAttribute: "",
@@ -416,7 +416,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
index 402f654b5..12046592e 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
@@ -26,12 +26,16 @@
{{ profile_id }}
- รายละเอียด
+
+ รายละเอียด
+
คำนำหน้านาม
+
+ คำนำหน้านาม
+
{{ prefix }}
- ชื่อ-นามสกุล
+
+ ชื่อ-นามสกุล
+
{{ fullname }}
@@ -55,17 +59,23 @@
{{ position_name }}
สถานศึกษา
+
+ สถานศึกษา
+
{{ university }}
- วุฒิการศึกษา
+
+ วุฒิการศึกษา
+
{{ degree }}
- สาขาวิชาเอก
+
+ สาขาวิชาเอก
+
{{ major }}
@@ -118,7 +128,11 @@
>ดาวน์โหลดผลคะแนน
-
-
ประเภท
- คะแนนเต็ม
+
+ ประเภท
+
+
+ คะแนนเต็ม
+
คะแนนที่ได้
-
+
ภาค ก
@@ -181,10 +201,16 @@
คะแนน
- ผลการสอบ
-
+ ();
const profile_id = ref("");
@@ -263,7 +289,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getDisableExamDetail(importId.value, examId.value))
.then((res) => {
@@ -303,12 +329,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadScore = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.downloadDisableScoreReport(importId.value, examId.value), {
responseType: "blob",
@@ -324,16 +350,19 @@ const downloadScore = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadCertificate = async () => {
- loaderPage(true);
+ showLoader();
await http
- .get(config.API.downloadDisableExamReport(importId.value, examId.value, 2), {
- responseType: "blob",
- })
+ .get(
+ config.API.downloadDisableExamReport(importId.value, examId.value, 2),
+ {
+ responseType: "blob",
+ }
+ )
.then((res) => {
var a = document.createElement("a");
a.href = URL.createObjectURL(res.data);
@@ -345,7 +374,7 @@ const downloadCertificate = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index 61a595875..14b8aa02d 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -382,7 +382,7 @@ const name = ref("");
const year = ref(new Date().getFullYear() + 543);
const round = ref(1);
const mixin = useCounterMixin();
-const { success, dateText, messageError } = mixin;
+const { success, dateText, messageError, showLoader, hideLoader } = mixin;
const files = ref(null);
const files_score = ref(null);
const files_candidate = ref(null);
@@ -549,7 +549,7 @@ const visibleColumnsHistory = ref([
]);
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
@@ -570,7 +570,7 @@ const textDate = (value: Date) => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getDisableCandidates)
.then((res) => {
@@ -592,7 +592,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -618,7 +618,7 @@ const clickEditPeriod = (id: string) => {
const clickHistory = async (id: string) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getDisableImportHistory(id))
.then((res) => {
@@ -644,7 +644,7 @@ const clickHistory = async (id: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -659,7 +659,7 @@ const clickDelete = (id: string) => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.deleteDisableCandidates(id))
.then((res) => {
@@ -670,7 +670,7 @@ const clickDelete = (id: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
})
.onCancel(() => {})
@@ -699,7 +699,7 @@ const clickCloseCandidate = async () => {
const checkSaveCandidate = async () => {
const fd = new FormData();
fd.append("attachment", files_candidate.value[0]);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.uploadDisableCandidates(selected_row_id.value), fd)
.then((res) => {
@@ -712,14 +712,14 @@ const checkSaveCandidate = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const checkSaveScore = async () => {
const fd = new FormData();
fd.append("attachment", files_score.value[0]);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.saveDisableScores(selected_row_id.value), fd)
.then((res) => {
@@ -732,7 +732,7 @@ const checkSaveScore = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -742,7 +742,7 @@ const checkSave = async () => {
fd.append("year", year.value.toString());
fd.append("round", round.value.toString());
fd.append("name", name.value);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.saveDisableCandidates, fd)
.then((res) => {
@@ -754,7 +754,7 @@ const checkSave = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
index e3526cb0f..2a95833ff 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
@@ -671,7 +671,15 @@ const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
const route = useRoute();
-const { date2Thai, success, dateToISO, notifyError, messageError } = mixin;
+const {
+ date2Thai,
+ success,
+ dateToISO,
+ notifyError,
+ messageError,
+ showLoader,
+ hideLoader,
+} = mixin;
const myForm = ref(null); //form data input
const name = ref("");
const note = ref("");
@@ -719,7 +727,7 @@ onMounted(async () => {
if (route.params.id != undefined) {
edit.value = true;
id.value = route.params.id.toString();
- loaderPage(false);
+ hideLoader();
await fetchData();
} else {
edit.value = false;
@@ -731,7 +739,7 @@ const clickBack = () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.getDisablePeriodById(id.value))
.then((res) => {
@@ -764,7 +772,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -808,7 +816,7 @@ const sendData = () => {
};
const addData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.saveDisablePeriod, sendData())
.then(async (res) => {
@@ -823,12 +831,12 @@ const addData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const editData = async (id: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.editDisablePeriod(id), sendData())
.then(async () => {
@@ -841,7 +849,7 @@ const editData = async (id: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -868,7 +876,7 @@ const uploadImgData = async () => {
fileImgDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodExamImg(id.value), formData)
.then((res) => {})
@@ -876,7 +884,7 @@ const uploadImgData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
}
};
@@ -885,7 +893,7 @@ const deleteDocData = async (docId: string) => {
const params = {
documentId: docId,
};
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.periodExamDoc(id.value.toString()), {
params,
@@ -898,7 +906,7 @@ const deleteDocData = async (docId: string) => {
})
.finally(async () => {
await fetchData();
- loaderPage(false);
+ hideLoader();
});
};
@@ -929,7 +937,7 @@ const uploadDocData = async () => {
fileDocDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodExamDoc(id.value), formData)
.then((res) => {})
@@ -937,7 +945,7 @@ const uploadDocData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
} else {
clickBack();
diff --git a/src/modules/03_recruiting/views/02_qualify/ExamForm.vue b/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
index 1f8ee5efa..f5a02f5bc 100644
--- a/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
+++ b/src/modules/03_recruiting/views/02_qualify/ExamForm.vue
@@ -145,7 +145,7 @@ const { loaderPage } = dataStore;
const router = useRouter();
const $q = useQuasar();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { success, dateToISO, messageError } = mixin;
+const { success, dateToISO, messageError, showLoader, hideLoader } = mixin;
const route = useRoute();
const examId = ref(route.params.examId.toString());
const candidateId = ref(route.params.candidateId.toString());
@@ -163,7 +163,7 @@ onMounted(async () => {
});
const fetchStatus = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.candidateId(candidateId.value))
.then((res) => {
@@ -174,12 +174,12 @@ const fetchStatus = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const confirm = async (status: boolean, reason: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.candidateCheckRegister(candidateId.value), {
status: status,
@@ -190,14 +190,14 @@ const confirm = async (status: boolean, reason: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
success($q, "ตรวจสอบข้อมูลสำเร็จ");
router.push(`/qualify/manage/${examId.value}`);
});
};
const reject = async (reason: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.candidateRejectRegister(candidateId.value), {
reason: reason,
@@ -207,7 +207,7 @@ const reject = async (reason: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
success($q, "ตรวจสอบข้อมูลสำเร็จ");
router.push(`/qualify/manage/${examId.value}`);
});
@@ -253,7 +253,7 @@ const clickSave = async () => {
type.value = defaultOccupation.value.employee;
if (defaultOccupation.value.status == "other")
type.value = defaultOccupation.value.other;
- loaderPage(true);
+ showLoader();
await http
.post(config.API.candidateId(candidateId.value), {
prefixId: defaultInformation.value.prefixId,
@@ -329,7 +329,7 @@ const clickSave = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
}
});
diff --git a/src/modules/03_recruiting/views/02_qualify/Manage.vue b/src/modules/03_recruiting/views/02_qualify/Manage.vue
index ad5a4af3a..c3556e0b1 100644
--- a/src/modules/03_recruiting/views/02_qualify/Manage.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Manage.vue
@@ -65,7 +65,7 @@ const dataStore = useDataStore();
const { loaderPage } = dataStore;
const router = useRouter();
const mixin = useCounterMixin();
-const { date2Thai, messageError } = mixin;
+const { date2Thai, messageError, showLoader, hideLoader } = mixin;
const rows = ref([]);
const initialPagination = ref({
rowsPerPage: 0,
@@ -163,12 +163,12 @@ const columns = ref([
]);
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.periodExamType("exam"))
.then((res) => {
@@ -219,7 +219,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/Payment.vue b/src/modules/03_recruiting/views/02_qualify/Payment.vue
index 3891cea5f..36d87d3d0 100644
--- a/src/modules/03_recruiting/views/02_qualify/Payment.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Payment.vue
@@ -288,7 +288,7 @@ const fee = ref();
const $q = useQuasar();
const router = useRouter();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { success, messageError } = mixin;
+const { success, messageError, showLoader, hideLoader } = mixin;
const route = useRoute();
const examId = ref(route.params.examId.toString());
const candidateId = ref(route.params.candidateId.toString());
@@ -308,13 +308,13 @@ const props = defineProps({
});
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchPaymentExam();
await fetchData();
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.candidatePayment(candidateId.value))
.then((res) => {
@@ -325,12 +325,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchPaymentExam = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.periodExamPayment(examId.value))
.then((res) => {
@@ -342,12 +342,12 @@ const fetchPaymentExam = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const confirm = async (status: boolean, reason: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.candidateCheckPayment(candidateId.value), {
status: status,
@@ -358,7 +358,7 @@ const confirm = async (status: boolean, reason: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
success($q, "ตรวจสอบข้อมูลชำระเงินสำเร็จ");
router.push(`/qualify/manage/${examId.value}`);
});
diff --git a/src/modules/03_recruiting/views/02_qualify/Period.vue b/src/modules/03_recruiting/views/02_qualify/Period.vue
index df5427647..231628f0e 100644
--- a/src/modules/03_recruiting/views/02_qualify/Period.vue
+++ b/src/modules/03_recruiting/views/02_qualify/Period.vue
@@ -102,7 +102,14 @@ const { loaderPage } = dataStore;
const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
-const { date2Thai, success, typeCategoryExam, messageError } = mixin;
+const {
+ date2Thai,
+ success,
+ typeCategoryExam,
+ messageError,
+ showLoader,
+ hideLoader,
+} = mixin;
const filter = ref(""); //search data table
const initialPagination = ref({
rowsPerPage: 0,
@@ -223,12 +230,12 @@ const columns = ref([
]);
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.periodExamType("all"))
.then((res) => {
@@ -305,7 +312,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -335,7 +342,7 @@ const clickAdd = () => {
};
const deleteData = async (id: string) => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.periodExamId(id))
.then((res) => {
@@ -345,7 +352,7 @@ const deleteData = async (id: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
await fetchData();
});
};
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 63b045828..93ad90eb0 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -976,7 +976,8 @@ const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
const route = useRoute();
-const { date2Thai, success, dateToISO, messageError } = mixin;
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+ mixin;
const myForm = ref(null); //form data input
const name = ref("");
const note = ref("");
@@ -1099,7 +1100,7 @@ watch(organizationName, (count: DataOption, prevCount: DataOption) => {
});
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
if (route.params.id != undefined) {
edit.value = true;
id.value = route.params.id.toString();
@@ -1122,7 +1123,7 @@ const clickBack = () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.periodExamId(id.value))
.then((res) => {
@@ -1196,7 +1197,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1204,7 +1205,7 @@ const fetchData = async () => {
* get รายการ รหัสหน่วยงาน
*/
const fetchOrganizationShortName = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.organizationShortName)
.then((res) => {
@@ -1222,7 +1223,7 @@ const fetchOrganizationShortName = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1230,7 +1231,7 @@ const fetchOrganizationShortName = async () => {
* get รายการ หน่วยงาน
*/
const fetchOrganizationOrganization = async (val: string) => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.organization)
.then((res) => {
@@ -1248,7 +1249,7 @@ const fetchOrganizationOrganization = async (val: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1256,7 +1257,7 @@ const fetchOrganizationOrganization = async (val: string) => {
* get รายการ ตำแหน่งในสายงาน
*/
const fetchPositionPath = async (val: string) => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.positionPath)
.then((res) => {
@@ -1274,7 +1275,7 @@ const fetchPositionPath = async (val: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1355,7 +1356,7 @@ const sendData = () => {
};
const addData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.periodExam, sendData())
.then(async (res) => {
@@ -1370,12 +1371,12 @@ const addData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const editData = async (id: string) => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodExamId(id), sendData())
.then(async (res) => {
@@ -1388,7 +1389,7 @@ const editData = async (id: string) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1415,13 +1416,13 @@ const uploadDocData = async () => {
fileDocDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodExamDoc(id.value), formData)
.then((res) => {})
.catch((e) => {})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
} else {
clickBack();
@@ -1451,13 +1452,13 @@ const uploadImgData = async () => {
fileImgDataUpload.value.forEach((file: any) => {
formData.append("", file);
});
- loaderPage(true);
+ showLoader();
await http
.put(config.API.periodExamImg(id.value), formData)
.then((res) => {})
.catch((e) => {})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
}
};
@@ -1466,7 +1467,7 @@ const deleteDocData = async (docId: string) => {
const params = {
documentId: docId,
};
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.periodExamDoc(id.value.toString()), {
params,
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 82e855411..7a10f573a 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -282,7 +282,14 @@ import { useQuasar } from "quasar";
const $q = useQuasar();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { genColor15, dateToISO, date2Thai, messageError } = mixin;
+const {
+ genColor15,
+ dateToISO,
+ date2Thai,
+ messageError,
+ showLoader,
+ hideLoader,
+} = mixin;
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const router = useRouter();
@@ -465,7 +472,7 @@ watch(status, (count: String, prevCount: String) => {
});
onMounted(async () => {
- loaderPage(false);
+ hideLoader();
await fetchDataCom();
});
@@ -484,7 +491,7 @@ const fetchDataCom = async () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.candidateOfPeriodExam(status.value, examId.value))
.then((res) => {
@@ -511,12 +518,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchPeriodExam = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.periodExamStatus(examId.value))
.then((res) => {
@@ -531,7 +538,7 @@ const fetchPeriodExam = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -540,7 +547,7 @@ const fetchPeriodExam = async () => {
*/
const fetchDataSummary = async () => {
dataNum.value = [];
- loaderPage(true);
+ showLoader();
await http
.get(config.API.countDashbordPeriodExam(examId.value))
.then((res) => {
@@ -558,12 +565,12 @@ const fetchDataSummary = async () => {
dataNum.value = [];
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const downloadFileDashboard = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(
config.API.periodExamDownloadDashboard(examId.value),
@@ -587,7 +594,7 @@ const downloadFileDashboard = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue
index 8f372fe5e..f51d61031 100644
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@@ -578,7 +578,7 @@ const $q = useQuasar();
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
const store = useDataStore();
const { loaderPage } = store;
-const { date2Thai, messageError } = mixin;
+const { date2Thai, messageError, showLoader, hideLoader } = mixin;
const previous = ref(false);
const next = ref(false);
const addDialog = ref(false);
@@ -870,7 +870,7 @@ const saveEdit = async () => {
};
const saveDataAgency = async (data: DataLink[]) => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.cmsAgency, data)
.then((res) => {})
@@ -883,7 +883,7 @@ const saveDataAgency = async (data: DataLink[]) => {
};
const saveDataGoverment = async (data: DataLink[]) => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.cmsGoverment, data)
@@ -897,7 +897,7 @@ const saveDataGoverment = async (data: DataLink[]) => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.cms)
.then((res) => {
@@ -952,12 +952,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const takeLogo = async () => {
- loaderPage(true);
+ showLoader();
const formData = new FormData();
formData.append("FileData", imageFileLogo.value);
await http
@@ -974,7 +974,7 @@ const takeLogo = async () => {
};
const takeBanner = async () => {
- loaderPage(true);
+ showLoader();
const formData = new FormData();
formData.append("FileData", imageFile.value);
await http
@@ -999,7 +999,7 @@ const sendDataDetail = async () => {
description: web.value.descripstion,
shortName: web.value.by,
};
- loaderPage(true);
+ showLoader();
await http
.post(config.API.cmsDeatail, data)
.then((res) => {})
@@ -1026,7 +1026,7 @@ const sendDataAbout = async () => {
zipCode: address.value.code,
telephone: address.value.tel,
};
- loaderPage(true);
+ showLoader();
await http
.post(config.API.cmsAbout, data)
.then((res) => {})
@@ -1042,7 +1042,7 @@ const sendDataAbout = async () => {
};
const fetchProvince = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.province)
.then((res) => {
@@ -1057,13 +1057,13 @@ const fetchProvince = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchDistrict = async (id: string | null) => {
if (id !== null) {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.listDistrict(id))
.then((res) => {
@@ -1078,14 +1078,14 @@ const fetchDistrict = async (id: string | null) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
}
};
const fetchSubDistrict = async (id: string | null) => {
if (id !== null) {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.listSubDistrict(id))
.then((res) => {
@@ -1104,7 +1104,7 @@ const fetchSubDistrict = async (id: string | null) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
}
};
diff --git a/src/modules/04_registry/components/Assessment.vue b/src/modules/04_registry/components/Assessment.vue
index 7825ba62f..76eb3dbaa 100644
--- a/src/modules/04_registry/components/Assessment.vue
+++ b/src/modules/04_registry/components/Assessment.vue
@@ -216,7 +216,8 @@ 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("");
const name = ref();
@@ -352,7 +353,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileAssessmentId(profileId.value))
.then((res) => {
@@ -373,7 +374,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -459,7 +460,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileAssessmentId(profileId.value), {
id: id.value,
@@ -483,7 +484,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileAssessmentId(id.value), {
id: id.value,
@@ -515,7 +516,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileAssessmentId(id.value))
.then((res) => {
@@ -622,7 +623,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) => {
@@ -643,7 +644,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Coin.vue b/src/modules/04_registry/components/Coin.vue
index 84089f940..3964f40f4 100644
--- a/src/modules/04_registry/components/Coin.vue
+++ b/src/modules/04_registry/components/Coin.vue
@@ -224,7 +224,8 @@ 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("");
const issuer = ref();
@@ -360,7 +361,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileHonorId(profileId.value))
.then((res) => {
@@ -381,7 +382,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -467,7 +468,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileHonorId(profileId.value), {
id: id.value,
@@ -491,7 +492,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileHonorId(id.value), {
id: id.value,
@@ -523,7 +524,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileHonorId(id.value))
.then((res) => {
@@ -633,7 +634,7 @@ const clickHistory = async (row: RequestItemsObject) => {
? "ประวัติแก้ไขประกาศลูกจ้างดีเด่น"
: "ประวัติแก้ไขประกาศเกียรติคุณ";
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileHonorHisId(row.id))
.then((res) => {
@@ -654,7 +655,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Discipline.vue b/src/modules/04_registry/components/Discipline.vue
index f4f0e8fd2..162d8a796 100644
--- a/src/modules/04_registry/components/Discipline.vue
+++ b/src/modules/04_registry/components/Discipline.vue
@@ -293,7 +293,8 @@ 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("");
const level = ref();
@@ -545,7 +546,7 @@ const filterSelector = (val: string, update: Function, refData: string) => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileDisId(profileId.value))
.then((res) => {
@@ -568,7 +569,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -656,7 +657,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileDisId(profileId.value), {
id: id.value,
@@ -682,7 +683,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileDisId(id.value), {
id: id.value,
@@ -716,7 +717,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileDisId(id.value))
.then((res) => {
@@ -826,7 +827,7 @@ const clickEditRow = () => {
*/
const clickHistory = async (row: RequestItemsObject) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileDisHisId(row.id))
.then((res) => {
@@ -849,7 +850,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Document.vue b/src/modules/04_registry/components/Document.vue
index 059cec010..52761629a 100644
--- a/src/modules/04_registry/components/Document.vue
+++ b/src/modules/04_registry/components/Document.vue
@@ -161,7 +161,7 @@ const { loaderPage } = dataStore;
const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const route = useRoute();
-const { success, messageError } = mixin;
+const { success, messageError, showLoader, hideLoader } = mixin;
const profileId = ref(route.params.id.toString());
const edit = ref(false);
const uploader = ref();
@@ -174,7 +174,7 @@ onMounted(async () => {
});
const getData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profilePaperId(profileId.value))
.then((res) => {
@@ -185,12 +185,12 @@ const getData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const deleteData = async (id: string) => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profilePaperId(id))
.then((res) => {
@@ -212,7 +212,7 @@ const uploadData = async () => {
});
const formData = new FormData();
formData.append("", newFile);
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profilePaperId(profileId.value), formData)
.then((res) => {
diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index c73e11aa6..298b4a090 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -466,7 +466,8 @@ 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("");
const levelId = ref();
@@ -896,7 +897,7 @@ onMounted(async () => {
});
const fetchLevel = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.educationLevel)
.then((res) => {
@@ -912,12 +913,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) => {
@@ -933,7 +934,7 @@ const fetchPositionPath = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -960,7 +961,7 @@ const filterSelector = (val: any, update: Function, refData: string) => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileEduId(profileId.value))
.then((res) => {
@@ -994,7 +995,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -1097,7 +1098,7 @@ const saveData = async () => {
// const filterPositionPath = OpsFilter.value.positionPathOptions.filter(
// (r: any) => r.id == positionPathId.value
// );
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileEduId(profileId.value), {
id: id.value,
@@ -1139,7 +1140,7 @@ const editData = async () => {
// const filterPositionPath = OpsFilter.value.positionPathOptions.filter(
// (r: any) => r.id == positionPathId.value
// );
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileEduId(id.value), {
id: id.value,
@@ -1183,7 +1184,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileEduId(id.value))
.then((res) => {
@@ -1311,7 +1312,7 @@ const clickEditRow = () => {
*/
const clickHistory = async (row: RequestItemsObject) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileEduHisId(row.id))
.then((res) => {
@@ -1345,7 +1346,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Information/Address.vue b/src/modules/04_registry/components/Information/Address.vue
index f1e10afba..d0a9279aa 100644
--- a/src/modules/04_registry/components/Information/Address.vue
+++ b/src/modules/04_registry/components/Information/Address.vue
@@ -323,7 +323,7 @@ const $q = useQuasar();
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const mixin = useCounterMixin();
-const { date2Thai, success, messageError } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
const edit = ref(false);
const addressData = ref(defaultAddress);
const myform = ref();
@@ -561,7 +561,7 @@ const filterSelector = (val: any, update: Function, refData: string) => {
*/
const clickHistory = async () => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileAdrsHisId(route.params.id.toString()))
.then((res) => {
@@ -589,7 +589,7 @@ const clickHistory = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -610,7 +610,7 @@ const getNewData = async () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileAdrsId(route.params.id.toString()))
.then((res) => {
@@ -629,7 +629,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -661,7 +661,7 @@ const editData = async () => {
createdAt: new Date(),
createdFullName: "-",
};
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileAdrsId(route.params.id.toString()), body)
.then((res) => {
@@ -731,7 +731,7 @@ const selectSubDistrict = (e: string | null, name: string) => {
};
const fetchProvince = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.province)
.then((res) => {
@@ -747,13 +747,13 @@ const fetchProvince = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchDistrict = async (id: string | null, position: string) => {
if (id != null) {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.listDistrict(id))
.then((res) => {
@@ -774,14 +774,14 @@ const fetchDistrict = async (id: string | null, position: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
}
};
const fetchSubDistrict = async (id: string | null, position: string) => {
if (id != null) {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.listSubDistrict(id))
.then((res) => {
@@ -806,7 +806,7 @@ const fetchSubDistrict = async (id: string | null, position: string) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
}
};
diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue
index 721bf17c0..081ce63f5 100644
--- a/src/modules/04_registry/components/Information/Certicate.vue
+++ b/src/modules/04_registry/components/Information/Certicate.vue
@@ -293,7 +293,8 @@ 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("");
const certificateNo = ref();
@@ -484,7 +485,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileCertId(profileId.value))
.then((res) => {
@@ -507,7 +508,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -595,7 +596,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileCertId(profileId.value), {
id: id.value,
@@ -621,7 +622,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileCertId(id.value), {
id: id.value,
@@ -655,7 +656,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileCertId(id.value))
.then((res) => {
@@ -769,7 +770,7 @@ const clickHistory = async (row: RequestItemsObject) => {
? "ประวัติแก้ไขใบอนุญาตของลูกจ้าง"
: "ประวัติแก้ไขใบอนุญาตประกอบอาชีพ";
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileCertHisId(row.id))
.then((res) => {
@@ -792,7 +793,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Information/Family.vue b/src/modules/04_registry/components/Information/Family.vue
index b80ff9ede..f896a6308 100644
--- a/src/modules/04_registry/components/Information/Family.vue
+++ b/src/modules/04_registry/components/Information/Family.vue
@@ -792,7 +792,7 @@ const $q = useQuasar();
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const mixin = useCounterMixin();
-const { date2Thai, success, messageError } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
const edit = ref(false);
const fix = ref(true);
const myform = ref(null);
@@ -857,7 +857,7 @@ const refreshData = async () => {
};
const fetchPrefix = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.prefix)
.then((res) => {
@@ -873,7 +873,7 @@ const fetchPrefix = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -901,7 +901,7 @@ const deleteChildren = (items: childrenFamily) => {
const fetchHistory = async () => {
familyDataHistory.value = [];
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileFamiHisId(route.params.id.toString()))
.then((res) => {
@@ -933,7 +933,7 @@ const fetchHistory = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
if (familyDataHistory.value.length == 0) {
// modalError(
// $q,
@@ -955,7 +955,7 @@ const fetchHistory = async () => {
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileFamiId(route.params.id.toString()))
.then((res) => {
@@ -1000,12 +1000,12 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
const editData = async () => {
- loaderPage(true);
+ showLoader();
const body: ResponseObject = {
couple: familyData.value.same == "1",
couplePrefixId: familyData.value.prefixIdC,
diff --git a/src/modules/04_registry/components/Information/Government.vue b/src/modules/04_registry/components/Information/Government.vue
index 816a85236..4882760ab 100644
--- a/src/modules/04_registry/components/Information/Government.vue
+++ b/src/modules/04_registry/components/Information/Government.vue
@@ -319,7 +319,8 @@ const $q = useQuasar();
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError } = mixin;
+const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
+ mixin;
const profileStore = useProfileDataStore();
const { birthDate, retireText } = storeToRefs(profileStore);
const edit = ref(false);
@@ -540,7 +541,7 @@ watch(retireText, async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileGovId(route.params.id.toString()))
.then((res) => {
@@ -564,7 +565,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -574,7 +575,7 @@ const refreshData = async () => {
};
const editData = async () => {
- loaderPage(true);
+ showLoader();
const body: ResponseObject = {
oc: govermentData.value.ocId,
business: govermentData.value.businessId,
@@ -623,7 +624,7 @@ const handleDate = async (modelData: Date) => {
};
const fetchCalAgeGov = async (date: Date) => {
- loaderPage(true);
+ showLoader();
const body = {
dateAppoint: date,
};
@@ -637,7 +638,7 @@ const fetchCalAgeGov = async (date: Date) => {
messageError($q, e);
})
.finally(async () => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -646,7 +647,7 @@ const fetchCalAgeGov = async (date: Date) => {
*/
const clickHistory = async () => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileGovHisId(route.params.id.toString()))
.then((res) => {
@@ -677,7 +678,7 @@ const clickHistory = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Information/Information.vue b/src/modules/04_registry/components/Information/Information.vue
index a5f177cd3..abd82f41d 100644
--- a/src/modules/04_registry/components/Information/Information.vue
+++ b/src/modules/04_registry/components/Information/Information.vue
@@ -417,7 +417,15 @@ const emit = defineEmits(["update:statusEdit"]);
const route = useRoute();
const $q = useQuasar();
const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, modalError } = mixin;
+const {
+ date2Thai,
+ success,
+ dateToISO,
+ messageError,
+ modalError,
+ showLoader,
+ hideLoader,
+} = mixin;
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const profileStore = useProfileDataStore();
@@ -674,7 +682,7 @@ const onCancel = async () => {
* get รายการ ข้อมูลเกี่ยวกับบุคคล
*/
const fetchPerson = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.person)
.then((res) => {
@@ -731,7 +739,7 @@ const fetchPerson = async () => {
})
.catch((e: any) => {})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -740,7 +748,7 @@ const fetchPerson = async () => {
*/
const clickHistory = async () => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileInforHisId(route.params.id.toString()))
.then((res) => {
@@ -781,7 +789,7 @@ const clickHistory = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -851,7 +859,7 @@ const calRetire = async (birth: Date) => {
const body = {
birthDate: dateToISO(birth),
};
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileCalRetire, body)
.then((res: any) => {
@@ -867,12 +875,12 @@ const calRetire = async (birth: Date) => {
changeRetireText(date2Thai(retire));
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileInforId(route.params.id.toString()))
.then(async (res: any) => {
@@ -904,7 +912,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -933,7 +941,7 @@ const editData = async () => {
profileType: informaData.value.profileType,
createdFullName: "-",
};
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileInforId(route.params.id.toString()), body)
.then((res) => {
diff --git a/src/modules/04_registry/components/Information/layout.vue b/src/modules/04_registry/components/Information/layout.vue
index 63f73ebce..971238b44 100644
--- a/src/modules/04_registry/components/Information/layout.vue
+++ b/src/modules/04_registry/components/Information/layout.vue
@@ -19,7 +19,8 @@ import Address from "@/modules/04_registry/components/Information/Address.vue";
import Family from "@/modules/04_registry/components/Information/Family.vue";
import Certicate from "@/modules/04_registry/components/Information/Certicate.vue";
// import NotifyError from "@/components/NotifyError.vue";
-import { useDataStore } from "@/stores/data";
+
+import { useCounterMixin } from "@/stores/mixin";
const props = defineProps({
statusEdit: {
@@ -33,8 +34,8 @@ const props = defineProps({
});
const emit = defineEmits(["update:statusEdit"]);
-const dataStore = useDataStore();
-const { loaderPage } = dataStore;
+const mixin = useCounterMixin();
+const { showLoader, hideLoader } = mixin;
const statusEdit = ref(false);
const modalNoEdit = ref(false);
const modalNoEditTittle = ref("ไม่สามารถไม่สามารถแก้ไขข้อมูลได้?");
@@ -49,7 +50,7 @@ watch(props, (count: any, prevCount: any) => {
});
onMounted(() => {
- loaderPage(false);
+ hideLoader();
});
const notiNoEdit = () => {
diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index 641800865..8d07317d8 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -420,7 +420,8 @@ 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("");
const insigniaId = ref("");
@@ -790,7 +791,7 @@ const filterSelector = (val: any, update: Function, refData: string) => {
};
const fetchInsignia = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.insignia)
.then((res) => {
@@ -811,12 +812,12 @@ const fetchInsignia = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileInsignId(profileId.value))
.then((res) => {
@@ -846,7 +847,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -940,7 +941,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileInsignId(profileId.value), {
id: id.value,
@@ -972,7 +973,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileInsignId(id.value), {
id: id.value,
@@ -1012,7 +1013,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileInsignId(id.value))
.then((res) => {
@@ -1134,7 +1135,7 @@ const clickEditRow = () => {
*/
const clickHistory = async (row: RequestItemsObject) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileInsignHisId(row.id))
.then((res) => {
@@ -1164,7 +1165,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Leave.vue b/src/modules/04_registry/components/Leave.vue
index 7bebbce50..f96e0b44a 100644
--- a/src/modules/04_registry/components/Leave.vue
+++ b/src/modules/04_registry/components/Leave.vue
@@ -383,7 +383,7 @@ const { profileData, changeProfileColumns } = store;
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const mixin = useCounterMixin();
-const { date2Thai, success, messageError } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
const route = useRoute();
const id = ref("");
const year = ref(0);
@@ -748,7 +748,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileLeaveId(profileId.value))
.then((res) => {
@@ -778,7 +778,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -873,7 +873,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileLeaveId(profileId.value), {
id: id.value,
@@ -906,7 +906,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileLeaveId(id.value), {
id: id.value,
@@ -947,7 +947,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileLeaveId(id.value))
.then((res) => {
@@ -1072,7 +1072,7 @@ const clickEditRow = () => {
*/
const clickHistory = async (row: RequestItemsObject) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileLeaveHisId(row.id))
.then((res) => {
@@ -1102,7 +1102,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Other.vue b/src/modules/04_registry/components/Other.vue
index 9dd6f1094..17a1291a9 100644
--- a/src/modules/04_registry/components/Other.vue
+++ b/src/modules/04_registry/components/Other.vue
@@ -194,7 +194,7 @@ const { profileData, changeProfileColumns } = store;
const dataStore = useDataStore();
const { loaderPage } = dataStore;
const mixin = useCounterMixin();
-const { date2Thai, success, messageError } = mixin;
+const { date2Thai, success, messageError, showLoader, hideLoader } = mixin;
const route = useRoute();
const id = ref("");
const date = ref(new Date());
@@ -302,7 +302,7 @@ onMounted(async () => {
});
const fetchData = async () => {
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileOtherId(profileId.value))
.then((res) => {
@@ -322,7 +322,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
@@ -407,7 +407,7 @@ const clickSave = async () => {
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
- loaderPage(true);
+ showLoader();
await http
.post(config.API.profileOtherId(profileId.value), {
id: id.value,
@@ -430,7 +430,7 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
- loaderPage(true);
+ showLoader();
await http
.put(config.API.profileOtherId(id.value), {
id: id.value,
@@ -461,7 +461,7 @@ const clickDelete = async () => {
persistent: true,
})
.onOk(async () => {
- loaderPage(true);
+ showLoader();
await http
.delete(config.API.profileOtherId(id.value))
.then((res) => {
@@ -565,7 +565,7 @@ const clickEditRow = () => {
*/
const clickHistory = async (row: RequestItemsObject) => {
modalHistory.value = true;
- loaderPage(true);
+ showLoader();
await http
.get(config.API.profileOtherHisId(row.id))
.then((res) => {
@@ -585,7 +585,7 @@ const clickHistory = async (row: RequestItemsObject) => {
messageError($q, e);
})
.finally(() => {
- loaderPage(false);
+ hideLoader();
});
};
diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue
index c0436758b..c7db0dca4 100644
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@@ -2,7 +2,10 @@
+ ผลการสอบ
+
+
{{ examResultinscore }}
@@ -222,7 +248,7 @@ const dataStore = useDataStore();
const router = useRouter();
const route = useRoute();
const mixin = useCounterMixin();
-const { messageError } = mixin;
+const { messageError, showLoader, hideLoader } = mixin;
const { loaderPage } = dataStore;
const date = ref
-
-
+
-
+
@@ -118,9 +133,13 @@
flat
:color="reasonStatus ? 'primary' : 'pink-5'"
@click="clickRetire()"
- :icon="reasonStatus ? 'mdi-home-import-outline' : 'mdi-home-export-outline'"
+ :icon="
+ reasonStatus ? 'mdi-home-import-outline' : 'mdi-home-export-outline'
+ "
>
- {{ reasonStatus ? "กลับเข้าราชการ" : "ออกราชการ" }}
+ {{
+ reasonStatus ? "กลับเข้าราชการ" : "ออกราชการ"
+ }}
@@ -131,7 +150,9 @@
ก.พ.7/ก.ก.1
- ประวัติแบบย่อ
+ ประวัติแบบย่อ
@@ -233,9 +254,18 @@
อัปโหลดรูปภาพ
-
-
{{ fullname }}{{ leaveReason }}
+
+ {{ fullname }}{{ leaveReason }}
+
{{ position }}
+
-
+