diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts index 081de5a04..56033ced6 100644 --- a/src/api/05_placement/api.probation.ts +++ b/src/api/05_placement/api.probation.ts @@ -5,16 +5,23 @@ const calculate = `${env.API_PROBATION_URI}/calculate`; const finish = `${env.API_PROBATION_URI}/assign`; export default { - competencyOptions: () => `${dataOptions}/competency`, - competencyGroupOptions: () => `${dataOptions}/competency-group`, - knowledgeOptions: () => `${dataOptions}/knowledge`, - skillOptions: () => `${dataOptions}/skill`, - lawOptions: () => `${dataOptions}/law`, + competencyOptions: (personalId: string) => + `${dataOptions}/competency?personal_id=${personalId}`, + competencyGroupOptions: (personalId: string) => + `${dataOptions}/competency-group?personal_id=${personalId}`, + knowledgeOptions: (personalId: string) => + `${dataOptions}/knowledge?personal_id=${personalId}`, + skillOptions: (personalId: string) => + `${dataOptions}/skill?personal_id=${personalId}`, + lawOptions: (personalId: string) => + `${dataOptions}/law?personal_id=${personalId}`, probationPersonalList: () => `${personal}/list`, - personal: (personalId:string) => `${personal}?personal_id=${personalId}`, - newAssign: (personalId:string) => `${dataOptions}/new-assign?personal_id=${personalId}`, + personal: (personalId: string) => `${personal}?personal_id=${personalId}`, + newAssign: (personalId: string) => + `${dataOptions}/new-assign?personal_id=${personalId}`, calculateDate: () => `${calculate}/assign-finish`, - saveFinish: (personalId:string) => `${finish}/probation-assign?personal_id=${personalId}`, + saveFinish: (personalId: string) => + `${finish}/probation-assign?personal_id=${personalId}`, personalAdd: () => `${personal}/add`, // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}` }; diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index a3511744f..daa51c5e6 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -1557,10 +1557,10 @@ const OPgroup = ref< }> >([]); const clearDateExam = () => { - date_start.value = null; + date_start.value = undefined; }; const clearDateExam2 = () => { - date_finish.value = null; + date_finish.value = undefined; }; const isDatePicker2Readonly = computed(() => { return date_start.value === null; @@ -1699,8 +1699,8 @@ const getAssignNew = async (id: string) => { position.value = data.person.OrganizationOrganization }); }; -const getcompetency = async () => { - await http.get(config.API.competencyOptions()).then((res: any) => { +const getcompetency = async (id: string) => { + await http.get(config.API.competencyOptions(id)).then((res: any) => { const data = res.data.data; OPmain.value = data; main.value = data[0]; @@ -1710,8 +1710,8 @@ const getcompetency = async () => { main5.value = data[4]; }); }; -const getCompetencyGroup = async () => { - await http.get(config.API.competencyGroupOptions()).then((res: any) => { +const getCompetencyGroup = async (id: string) => { + await http.get(config.API.competencyGroupOptions(id)).then((res: any) => { const data = res.data.data; OPgroup.value = data; group.value = data[0]; @@ -1719,13 +1719,13 @@ const getCompetencyGroup = async () => { group3.value = data[2]; }); }; -const getKnowledge = async () => { - await http.get(config.API.knowledgeOptions()).then((res: any) => { +const getKnowledge = async (id: string) => { + await http.get(config.API.knowledgeOptions(id)).then((res: any) => { OPknowledge.value = res.data.data; }); }; -const getSkill = async () => { - await http.get(config.API.skillOptions()).then((res: any) => { +const getSkill = async (id: string) => { + await http.get(config.API.skillOptions(id)).then((res: any) => { const skillData = res.data.data; OPcomputer.value = [skillData.computer]; OPenglish.value = [skillData.english]; @@ -1737,8 +1737,8 @@ const getSkill = async () => { skill4.value = skillData.resourse; }); }; -const getLaw = async () => { - await http.get(config.API.lawOptions()).then((res: any) => { +const getLaw = async (id: string) => { + await http.get(config.API.lawOptions(id)).then((res: any) => { checkRule.value = res.data.data; }); }; @@ -1936,11 +1936,11 @@ const OPresourse = ref< >([]); onMounted(async () => { - await getLaw(); - await getcompetency(); - await getCompetencyGroup(); - await getSkill(); - await getKnowledge(); + await getLaw(personalId); + await getcompetency(personalId); + await getCompetencyGroup(personalId); + await getSkill(personalId); + await getKnowledge(personalId); await getAssignNew(personalId); }); watch(