ปรับ fe sprint2

src/modules/03_recruiting/views/02_qualify/manageDetail.vue

@@ -11,7 +11,11 @@
       @click="router.go(-1)"
     />
     {{ name }}
-    {{ `ครั้งที่${round}/${yearly == null ? "" : yearly + 543}` }}
+    {{
+      `ครั้งที่${round == null ? "" : round}/${
+        yearly == null ? "" : yearly + 543
+      }`
+    }}
     <q-space />
     <q-btn
       @click="visible = !visible"
@@ -221,6 +225,9 @@
             >
               {{ statusCandidate(props.row.status) }}
             </div>
+            <div v-else-if="col.name == 'registerDate'" class="table_ellipsis">
+              {{ col.value }}
+            </div>
             <div v-else class="table_ellipsis">
               {{ col.value }}
             </div>
@@ -282,14 +289,7 @@ import { useQuasar } from "quasar";
 
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const {
-  genColor15,
-  dateToISO,
-  date2Thai,
-  messageError,
-  showLoader,
-  hideLoader,
-} = mixin;
+const { genColor15, dateToISO, date2Thai, messageError } = mixin;
 const dataStore = useDataStore();
 const { loaderPage } = dataStore;
 const router = useRouter();
@@ -314,6 +314,7 @@ const initialPagination = ref<Pagination>({
 const visibleColumns = ref<String[]>([
   "no",
   "number",
+  "registerDate",
   "examIdenNumber",
   "seatNumber",
   "resultB",
@@ -451,6 +452,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px;",
     style: "font-size: 14px; ",
   },
+  {
+    name: "registerDate",
+    align: "left",
+    label: "วันเและเวลาที่สมัคร",
+    sortable: true,
+    field: "registerDate",
+    headerStyle: "font-size: 14px; min-width: 200px",
+    style: "font-size: 14px; ",
+  },
   {
     name: "status",
     align: "left",
@@ -472,7 +482,7 @@ watch(status, (count: String, prevCount: String) => {
 });
 
 onMounted(async () => {
-  hideLoader();
+  loaderPage(false);
   await fetchDataCom();
 });
 
@@ -491,7 +501,7 @@ const fetchDataCom = async () => {
 };
 
 const fetchData = async () => {
-  showLoader();
+  loaderPage(true);
   await http
     .get(config.API.candidateOfPeriodExam(status.value, examId.value))
     .then((res) => {
@@ -504,6 +514,7 @@ const fetchData = async () => {
           avatar: r.profileImg != null ? r.profileImg.detail : "",
           citizenId: r.citizenId,
           number: r.number,
+          registerDate: r.registerDate,
           examIdenNumber: r.examIdenNumber,
           seatNumber: r.seatNumber,
           resultC: r.resultC,
@@ -518,12 +529,12 @@ const fetchData = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
 const fetchPeriodExam = async () => {
-  showLoader();
+  loaderPage(true);
   await http
     .get(config.API.periodExamStatus(examId.value))
     .then((res) => {
@@ -538,7 +549,7 @@ const fetchPeriodExam = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
@@ -547,7 +558,7 @@ const fetchPeriodExam = async () => {
  */
 const fetchDataSummary = async () => {
   dataNum.value = [];
-  showLoader();
+  loaderPage(true);
   await http
     .get(config.API.countDashbordPeriodExam(examId.value))
     .then((res) => {
@@ -565,12 +576,12 @@ const fetchDataSummary = async () => {
       dataNum.value = [];
     })
     .finally(() => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
 const downloadFileDashboard = async () => {
-  showLoader();
+  loaderPage(true);
   await http
     .put(
       config.API.periodExamDownloadDashboard(examId.value),
@@ -594,7 +605,7 @@ const downloadFileDashboard = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      loaderPage(false);
     });
 };