From c622df5b580282a10129e391ad1a47cea58edd3d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 28 Jun 2024 23:47:18 +0700
Subject: [PATCH] fixing

---
 .../components/PersonalList/Table.vue         |  5 +++-
 .../components/probation/FormAssign.vue       |  1 -
 .../components/probation/ProbationDetail.vue  | 24 ++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index f3d48cf59..c39128e8f 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -339,6 +339,7 @@ async function getTable() {
             posLevelCandidateName: data.posLevelCandidateName,
             posmasterId: data.posmasterId,
             statusNameCheck: convertContainStatus(data.statusId),
+            deferment: data.deferment,
 
             statusName:
               data.statusId == "CONTAIN"
@@ -883,7 +884,9 @@ onMounted(async () => {
 
             <template v-else-if="col.name === 'statusName'">
               <div class="text-weight-medium">
-                {{ props.row.statusName }}
+                {{
+                  props.row.statusName == "เตรียม" ? "-" : props.row.statusName
+                }}
               </div>
             </template>
           </q-td>
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 69f07140b..adc2cba5d 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -838,7 +838,6 @@ async function saveData(id: string) {
  */
 async function DataSave(id: string) {
   const data = putData(id);
-  console.log("data==>", data);
   await http
     .post(config.API.saveFinish(id), data)
     .then(() => {
diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue
index 4fad830da..1d800bb3b 100644
--- a/src/modules/05_placement/components/probation/ProbationDetail.vue
+++ b/src/modules/05_placement/components/probation/ProbationDetail.vue
@@ -245,16 +245,22 @@ function updatemodalPersonal(modal: boolean) {
 
 async function fetchProfilePhoto() {
   await http
-    .get(
-      config.API.fileByFile(
-        "ทะเบียนประวัติ",
-        "โปรไฟล์",
-        personalId.value,
-        `profile-${personalId.value}`
-      )
-    )
+    .get(config.API.orgCheckAvatar(personalId.value))
     .then(async (res) => {
-      avatarProfile.value = res.data.downloadUrl;
+      if (res.data.result.avatarName) {
+        await http
+          .get(
+            config.API.fileByFile(
+              "ทะเบียนประวัติ",
+              "โปรไฟล์",
+              personalId.value,
+              res.data.result.avatarName
+            )
+          )
+          .then(async (res) => {
+            avatarProfile.value = res.data.downloadUrl;
+          });
+      }
     });
 }