diff --git a/src/api/recruiting/api.disable.ts b/src/api/recruiting/api.disable.ts index cfb00e4a4..6e5428f14 100644 --- a/src/api/recruiting/api.disable.ts +++ b/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}`, - exportDisablePassExamList: (id: string) => `${diable_report}pass/${id}`, + exportDisableCandidateList: (id: string) => + `${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}`, - repoetDownloadDisableExam:(id:string,examId:string)=>`${disableExam}report/exam/${id}/${examId}` + + repoetUploadDisableExam: (id: string) => `${disableExam}result/${id}`, + repoetDownloadDisableExam: (id: string, examId: string) => + `${disableExam}report/exam/${id}/${examId}`, }; diff --git a/src/api/recruiting/api.recruit.ts b/src/api/recruiting/api.recruit.ts index bc2344e66..3a9f220a8 100644 --- a/src/api/recruiting/api.recruit.ts +++ b/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}`, - - - 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}`, + reportRecruit: (type: string) => `${recruit}${type}`, + 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}`, }; diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue index e590de582..10e2a48d1 100644 --- a/src/modules/03_recruiting/views/01_compete/Period.vue +++ b/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", diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue index 70250fcec..46d808300 100644 --- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue +++ b/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 || `${'กรุณาเลือกปีงบประมาณ'}`]" - :label="`${'ปีงบประมาณ'}`" + :rules="[(val:string) => !!val || `${'กรุณาเลือกปี พ.ศ.'}`]" + :label="`${'ปี พ.ศ.'}`" >