hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ทดลองงาน - ส่ง personal id เพิ่มในส่วนข้อมูลฟอร์มมอบหมายงาน

Browse source
This commit is contained in:
Warunee Tamkoo 2023-08-09 21:35:25 +07:00
parent 940dd882bc
commit 9cad6dce3d
2 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/api/05_placement/api.probation.ts
View file

@ -5,16 +5,23 @@ const calculate = `${env.API_PROBATION_URI}/calculate`;
const finish = `${env.API_PROBATION_URI}/assign`; const finish = `${env.API_PROBATION_URI}/assign`;
export default { export default {
competencyOptions: () => `${dataOptions}/competency`, competencyOptions: (personalId: string) =>
competencyGroupOptions: () => `${dataOptions}/competency-group`, `${dataOptions}/competency?personal_id=${personalId}`,
knowledgeOptions: () => `${dataOptions}/knowledge`, competencyGroupOptions: (personalId: string) =>
skillOptions: () => `${dataOptions}/skill`, `${dataOptions}/competency-group?personal_id=${personalId}`,
lawOptions: () => `${dataOptions}/law`, 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`, probationPersonalList: () => `${personal}/list`,
personal: (personalId:string) => `${personal}?personal_id=${personalId}`, personal: (personalId: string) => `${personal}?personal_id=${personalId}`,
newAssign: (personalId:string) => `${dataOptions}/new-assign?personal_id=${personalId}`, newAssign: (personalId: string) =>
`${dataOptions}/new-assign?personal_id=${personalId}`,
calculateDate: () => `${calculate}/assign-finish`, 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`, personalAdd: () => `${personal}/add`,
// clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}` // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}`
}; };

34
src/modules/05_placement/components/probation/FormAssign.vue
View file

@ -1557,10 +1557,10 @@ const OPgroup = ref<
}> }>
>([]); >([]);
const clearDateExam = () => { const clearDateExam = () => {
date_start.value = null; date_start.value = undefined;
}; };
const clearDateExam2 = () => { const clearDateExam2 = () => {
date_finish.value = null; date_finish.value = undefined;
}; };
const isDatePicker2Readonly = computed(() => { const isDatePicker2Readonly = computed(() => {
return date_start.value === null; return date_start.value === null;
@ -1699,8 +1699,8 @@ const getAssignNew = async (id: string) => {
position.value = data.person.OrganizationOrganization position.value = data.person.OrganizationOrganization
}); });
}; };
const getcompetency = async () => { const getcompetency = async (id: string) => {
await http.get(config.API.competencyOptions()).then((res: any) => { await http.get(config.API.competencyOptions(id)).then((res: any) => {
const data = res.data.data; const data = res.data.data;
OPmain.value = data; OPmain.value = data;
main.value = data[0]; main.value = data[0];
@ -1710,8 +1710,8 @@ const getcompetency = async () => {
main5.value = data[4]; main5.value = data[4];
}); });
}; };
const getCompetencyGroup = async () => { const getCompetencyGroup = async (id: string) => {
await http.get(config.API.competencyGroupOptions()).then((res: any) => { await http.get(config.API.competencyGroupOptions(id)).then((res: any) => {
const data = res.data.data; const data = res.data.data;
OPgroup.value = data; OPgroup.value = data;
group.value = data[0]; group.value = data[0];
@ -1719,13 +1719,13 @@ const getCompetencyGroup = async () => {
group3.value = data[2]; group3.value = data[2];
}); });
}; };
const getKnowledge = async () => { const getKnowledge = async (id: string) => {
await http.get(config.API.knowledgeOptions()).then((res: any) => { await http.get(config.API.knowledgeOptions(id)).then((res: any) => {
OPknowledge.value = res.data.data; OPknowledge.value = res.data.data;
}); });
}; };
const getSkill = async () => { const getSkill = async (id: string) => {
await http.get(config.API.skillOptions()).then((res: any) => { await http.get(config.API.skillOptions(id)).then((res: any) => {
const skillData = res.data.data; const skillData = res.data.data;
OPcomputer.value = [skillData.computer]; OPcomputer.value = [skillData.computer];
OPenglish.value = [skillData.english]; OPenglish.value = [skillData.english];
@ -1737,8 +1737,8 @@ const getSkill = async () => {
skill4.value = skillData.resourse; skill4.value = skillData.resourse;
}); });
}; };
const getLaw = async () => { const getLaw = async (id: string) => {
await http.get(config.API.lawOptions()).then((res: any) => { await http.get(config.API.lawOptions(id)).then((res: any) => {
checkRule.value = res.data.data; checkRule.value = res.data.data;
}); });
}; };
@ -1936,11 +1936,11 @@ const OPresourse = ref<
>([]); >([]);
onMounted(async () => { onMounted(async () => {
await getLaw(); await getLaw(personalId);
await getcompetency(); await getcompetency(personalId);
await getCompetencyGroup(); await getCompetencyGroup(personalId);
await getSkill(); await getSkill(personalId);
await getKnowledge(); await getKnowledge(personalId);
await getAssignNew(personalId); await getAssignNew(personalId);
}); });
watch( watch(