From 86a6de45be4b626114b5de43f04521b3daa2623c Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 6 Nov 2024 10:11:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=20profileID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/FormAssign.vue       | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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