no message

src/modules/05_placement/components/Main.vue

@@ -100,10 +100,6 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 // ข้อมูลตาราง (จำลอง)
 const rows = ref<QTableProps["rows"]>([]);
-// const yearValue = ref<number>(0); // เพิ่มตัวแปรในโมดูล
-
-// let OriginalData = ref<FormPlacementMainData[]>([]);
-// let UpdataData = ref<FormPlacementMainData[]>([]);
 const searchYear = ref();
 const yearOptions = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
 
@@ -126,14 +122,11 @@ onMounted(async () => {
 const fetchPlacementData = async (val: number) => {
   showLoader();
   rows.value = [];
-  http
+  await http
     .get(config.API.MainDetail(val))
     .then(async (res) => {
       dataPlacement.value = res.data.result;
       DataStore.DataMainOrig = dataPlacement.value;
-      console.log(DataStore.DataMainOrig);
-
-      // rows.value = DataStore.DataMainOrig;
       const dataArr: any = [];
       await DataStore.DataMainOrig.map((e: any) => {
         dataArr.push({
@@ -149,27 +142,25 @@ const fetchPlacementData = async (val: number) => {
           numberOfCandidates: e.numberOfCandidates,
         });
       });
-
       rows.value = dataArr;
-
       examTypeFilter();
       examTimeFilter();
       expiredAccountFilter();
     })
     .catch((e) => {
-      console.log(e);
+      messageError($q, e);
     })
     .finally(() => {
       filterKeyword.value = "";
-      examTime.value = "all"
-      examType.value = "all"
-      expiredAccount.value = false
+      examTime.value = "all";
+      examType.value = "all";
+      expiredAccount.value = false;
       hideLoader();
     });
 };
 
 const fetchYearOptions = async () => {
-  http
+  await http
     .get(config.API.yearOptions())
     .then((res) => {
       const response = res.data.result;
@@ -179,7 +170,6 @@ const fetchYearOptions = async () => {
       }, "");
       searchYear.value = maxNumber;
       DataStore.DataMainYearSet(searchYear.value);
-      // DataStore.DataMainYear = yearOptions.value;
       fetchPlacementData(searchYear.value);
     })
     .catch((e) => {
@@ -187,7 +177,6 @@ const fetchYearOptions = async () => {
     });
 };
 const filterYear = () => {
-  // console.log("searchYear", searchYear.value);
   fetchPlacementData(searchYear.value);
 };
 
@@ -210,7 +199,6 @@ const examTimeOP = reactive<DataOption1[]>([{ id: "all", name: "ทั้งห
 const addedExamTimeValues: Set<number> = new Set();
 
 const examTimeFilter = async () => {
-  // examTimeOP.push({ id: "all", name: "ทั้งหมด" });
   for (const data of dataPlacement.value) {
     const examOrder = data.examOrder;
     if (examOrder !== null && !addedExamTimeValues.has(examOrder)) {
@@ -274,12 +262,8 @@ const searchFilterTable = async () => {
 //----------------|บัญชีหมดอายุ|-----------------------------//
 const expiredAccount = ref<boolean>(false);
 const expiredAccountFilter = async () => {
-  // const currentDate = new Date();
   const updatedRows = dataPlacement.value.map((data: any) => {
-    // let expirationDate = new Date(data.accountExpirationDate);
-    // let isExpired = currentDate > expirationDate;
     let isExpired = data.isExpired == expiredAccount;
-
     return { ...data, isExpired };
   });
   await DataStore.DataMain(updatedRows);
@@ -427,7 +411,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
             <q-pagination
               v-model="pagination.page"
               active-color="primary"
-							color="dark"
+              color="dark"
               :max="scope.pagesNumber"
               :max-pages="5"
               size="sm"