Merge branch 'develop' into dev

src/api/recruiting/api.disable.ts

@@ -33,11 +33,13 @@ export default {
   exportDisablePassResultExam: (id: string) =>
     `${disableExam}export/pass/${id}`,
 
-  exportDisableCandidateList: (id: string) => `${diable_report}candidate/${id}`,
+  exportDisableCandidateList: (id: string) =>
-  exportDisablePassExamList: (id: string) => `${diable_report}pass/${id}`,
+    `${diable_report}candidate-new/${id}`,
+  exportDisablePassExamList: (id: string) => `${diable_report}pass-new/${id}`,
   periodDisableToPlacement: (examId: string) =>
     `${disableExam}placement/${examId}`,
-  
+
-  repoetUploadDisableExam:(id:string)=>`${disableExam}result/${id}`,
+  repoetUploadDisableExam: (id: string) => `${disableExam}result/${id}`,
-  repoetDownloadDisableExam:(id:string,examId:string)=>`${disableExam}report/exam/${id}/${examId}`
+  repoetDownloadDisableExam: (id: string, examId: string) =>
+    `${disableExam}report/exam/${id}/${examId}`,
 };

src/api/recruiting/api.recruit.ts

@@ -40,14 +40,14 @@ export default {
   exportPassResultExam: (id: string) => `${recruit}export/pass/${id}`,
 
   exportCandidateList: (id: string) => `${recruit_report}candidate/${id}`,
-  exportPassExamList: (id: string) => `${recruit_report}pass/${id}`,
+  exportPassExamList: (id: string) => `${recruit_report}pass-new/${id}`,
   periodRecruitToPlacement: (examId: string) => `${recruit}placement/${examId}`,
 
-  reportRecruit:(type:string)=>`${recruit}${type}`,
+  reportRecruit: (type: string) => `${recruit}${type}`,
-
-
-  exportCandidateListNew: (id: string) => `${recruit_report}candidate-new/${id}`,
-  reportCandidateListNew: (id: string) => `${recruit}report/candidate-new/${id}`,
-  examReport: (id: string,no:string) => `${recruit}report/exam/${id}/${no}`,
 
+  exportCandidateListNew: (id: string) =>
+    `${recruit_report}candidate-new/${id}`,
+  // reportCandidateListNew: (id: string) =>
+  //   `${recruit}report/candidate-new/${id}`, ปรับไปใช้ api ด้านบนแทน
+  examReport: (id: string, no: string) => `${recruit}report/exam/${id}/${no}`,
 };

src/modules/03_recruiting/views/01_compete/Period.vue

@@ -250,7 +250,7 @@ async function clickPassExam(id: string) {
 async function clickCandidateList(id: string) {
   showLoader();
   await http
-    .get(config.API.reportCandidateListNew(id), {
+    .get(config.API.exportCandidateListNew(id), {
       headers: {
         accept:
           "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",

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

@@ -1001,8 +1001,8 @@ onMounted(async () => {
                   outlined
                   :readonly="checkRoutePermisson"
                   :model-value="yearly + 543"
-                  :rules="[(val:string) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณาเลือกปี พ.ศ.'}`]"
-                  :label="`${'ปีงบประมาณ'}`"
+                  :label="`${'ปี พ.ศ.'}`"
                 >
                 </q-input>
               </template>