diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index c63878373..4cbc54495 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -764,7 +764,25 @@ async function getAssign() { isEdit.value = false; const data = res.data.result; fullname.value = data.profile.name; - appointTopic.value = data.assign.appointId; + + appointTopic.value = appointOp.value.find( + (item: AppointTopicMain) => item.id == data.assign.appointId + ); + const dataMap = appointOp.value.find( + (item: AppointTopicMain) => item.id == data.assign.appointId + )?.directors; + const dataPerson = dataMap?.map((dataPerson: AppointTopic) => ({ + ...dataPerson, + name: `${dataPerson.name} (${dataPerson.position}${ + dataPerson.positionLevel && dataPerson.positionType + ? ", " + dataPerson.positionType + ": " + dataPerson.positionLevel + : "" + })`, + })); + reportPersonIdOp.value = dataPerson ?? []; + if (reportPersonIdOp.value.length !== 0) { + reportPersonId.value = data.assign.reportPersonId + } position.value = data.profile.positionName; date_start.value = data.assign.date_start; date_finish.value = data.assign.date_finish; @@ -1213,7 +1231,7 @@ onMounted(async () => { class="col-xs-12 col-sm-6" borderless option-label="name" - option-value="id" + option-value="profileId" v-model="reportPersonId" map-options emit-value