diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts index 940e15765..b7c32d839 100644 --- a/src/api/reports/api.report.ts +++ b/src/api/reports/api.report.ts @@ -29,8 +29,8 @@ export default { reportAssign:(type:string, id:string) => `${reportProbation}/13/${type}/${id}`, reportEvaluateRecord1:(type:string, id:string) => `${reportProbation}/14/${type}/${id}`, reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`, - reportEvaluate:(type:string, id:string) => `${reportProbation}/16/${type}/${id}`, - reportEvaluateChairman:(type:string, id:string) => `${reportProbation}/17/${type}/${id}`, + reportEvaluate:(type:string, id:string,no:number) => `${reportProbation}/16/${type}/${id}/${no}`, + reportEvaluateChairman:(type:string, id:string,no:number) => `${reportProbation}/17/${type}/${id}/${no}`, reportEvaluateResult:(type:string, id:string) => `${reportProbation}/18/${type}/${id}`, reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`, diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue index 23ff1d94b..e068a83b8 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2.vue @@ -76,7 +76,7 @@ const FileDownload = async (type: string) => { let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value); showLoader(); await http - .get(config.API.reportEvaluate(type, numTab.id), { + .get(config.API.reportEvaluate(type, numTab.id,numTab.no), { responseType: "blob", }) .then(async (res) => { diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue index 2ebee1e93..c7c4609a1 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue @@ -72,7 +72,7 @@ const FileDownload = async (type: string) => { let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value); showLoader(); await http - .get(config.API.reportEvaluateChairman(type, numTab.id), { + .get(config.API.reportEvaluateChairman(type, numTab.id,numTab.no), { responseType: "blob", }) .then(async (res) => {