diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 7adf079fe..d01dbf801 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -64,17 +64,22 @@ const resetFilter = () => { onMounted(() => { fecthlistRecevice(); }); +const listRecevice = ref([]); const fecthlistRecevice = async () => { showLoader(); await http .get(config.API.receiveData()) .then((res) => { let response = res.data.result; + listRecevice.value = response; console.log(response); rows.value = response.map((e: any) => ({ personalId: e.id, citizenId: e.citizenId, fullname: e.firstname + " " + e.lastname, + organizationName: "sssss", + orgName: "xxaxa", + organizationShortName: "ssss", positionNumber: e.positionNumber, positionPath: e.positionPath, birthday: date2Thai(e.dateOfBirth), @@ -207,7 +212,7 @@ const openModalTree = (id: string) => { personalId.value = id; console.log(personalId.value); - personal.value = []; + personal.value = listRecevice.value.filter((e) => e.id === id); modalTree.value = true; }; diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue index fab7859b7..89208163a 100644 --- a/src/modules/05_placement/components/Receive/receiveModal.vue +++ b/src/modules/05_placement/components/Receive/receiveModal.vue @@ -169,7 +169,7 @@ const saveAppoint = async () => { positionId: dataForm.positionId, positionLevelId: dataForm.positionLevelId, positionLineId: dataForm.positionLineId, - positionPathSideId: null, + positionPathSideId: dataForm.positionPathSideId, positionTypeId: dataForm.positionTypeId, // salaryAmount: dataForm.salaryAmount, // mouthSalaryAmount: dataForm.mouthSalaryAmount, @@ -377,6 +377,8 @@ const expanded = ref([]); watch(props, () => { expanded.value = []; const dataPersonal = props.personal; + console.log(props.personal); + if (dataPersonal) { dataPersonal.map((data: any) => { personal.value = data; @@ -385,15 +387,15 @@ watch(props, () => { } // console.log("draft===>", personal.value.draft); - if (personal.value && personal.value.draft === false) { + if (personal.value) { // const findData = dataRespone.value.find(findByPerson); let findData: any = null; dataRespone.value.map((x: any) => { findData = findByPerson(x); - console.log(findData); + // console.log(findData); if (findData != null) { - console.log("findData===>", findData); + // console.log("findData===>", findData); selectedPosition(findData); for (let i = 3; i <= findData.keyId.length; i += 2) { expanded.value.push(findData.keyId.slice(0, i));