บรรจุ => ปรับ รายการช่วยราชการ,รายการส่งตัวกลับ

src/modules/05_placement/components/Repatriate/RepatriatebyId.vue

@@ -12,7 +12,7 @@ import config from "@/app.config";
 
 import type { QForm } from "quasar";
 import type { ResponseData } from "@/modules/05_placement/interface/response/officer";
-import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 
 const modalPersonal = ref<boolean>(false);
 const personalId = ref<string>("");
@@ -67,10 +67,10 @@ const getData = async () => {
       prefix.value = data.prefix;
       firstName.value = data.firstName;
       lastName.value = data.lastName;
-      avatar.value = data.avatar ?? "";
-      position.value = data.position;
+
+      position.value = data.position ?? "-";
       posNo.value = data.posNo;
-      positionLevel.value = data.positionLevel;
+      positionLevel.value = `${data.posTypeName}(${data.posLevelName})`;
       createdAt.value = data.createdAt;
       organization.value = data.organization;
       reason.value = data.reason;
@@ -82,6 +82,7 @@ const getData = async () => {
       positionNumberOld.value = data.positionNumberOld;
       organizationPositionOld.value = data.organizationPositionOld;
       dateRepatriation.value = data.dateRepatriation;
+      fetchProfile(data.profileId);
     })
     .catch((e) => {
       messageError($q, e);
@@ -91,6 +92,27 @@ const getData = async () => {
     });
 };
 
+function fetchProfile(id: string) {
+  showLoader();
+  http
+    .get(
+      config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `profile-${id}`)
+    )
+    .then(async (res) => {
+      avatar.value = res.data.downloadUrl;
+    })
+    .catch((e) => {
+      if (e.response.data.message === "ไม่พบไฟล์ในระบบ") {
+        avatar.value = "";
+      } else {
+        messageError($q, e);
+      }
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
 const getClass = (val: boolean) => {
   return {
     "full-width inputgreen cursor-pointer": val,
@@ -200,15 +222,15 @@ onMounted(async () => {
           <div class="col-12 q-pl-md">
             <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
             <div class="col-12 text-detail">
-              {{ positionTypeOld }}
+              {{ position }}
             </div>
           </div>
         </div>
         <div class="col-xs-6 col-sm-3 row items-center">
           <div class="col-12">
-            <div class="col-12 text-top">ระดับ</div>
+            <div class="col-12 text-top">ประเภทตำแหน่ง</div>
             <div class="col-12 text-detail">
-              {{ positionLevelOld }}
+              {{ positionLevel }}
             </div>
           </div>
         </div>
@@ -216,7 +238,7 @@ onMounted(async () => {
           <div class="col-12">
             <div class="col-12 text-top">สังกัด</div>
             <div class="col-12 text-detail">
-              {{ organizationPositionOld }}
+              {{ organization }}
             </div>
           </div>
         </div>