From 299a5e0a865bbbd0d8bd49a4fbd80e9d1cca9779 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Tue, 26 Mar 2024 14:23:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B9=82=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryNew/views/detailView.vue        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue
index 0e6316417..39cf1c172 100644
--- a/src/modules/04_registryNew/views/detailView.vue
+++ b/src/modules/04_registryNew/views/detailView.vue
@@ -11,6 +11,7 @@ import type { DataPerson } from "@/modules/04_registryNew/interface/response/Mai
 import avatar from "@/assets/avatar_user.jpg";
 import TabMain from "@/modules/04_registryNew/components/detail/TabMain.vue";
 import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
+import { ResponseObject } from "../interface/response/Profile";
 const mixin = useCounterMixin();
 const $q = useQuasar();
 const router = useRouter();
@@ -26,7 +27,7 @@ const {
 } = mixin;
 
 const profileId = ref<string>(route.params.id.toString());
-const formDetail = ref<any>();
+const formDetail = ref<ResponseObject>();
 const itemsMenu = ref<DataOption[]>([
   {
     id: "1",
@@ -217,7 +218,10 @@ onMounted(async () => {
           <div class="col-sm-3 col-md-2"></div>
           <div class="col">
             <div class="col-12 text-primary">
-              <h2 class="title q-ma-none q-pa-none">
+              <h2
+                class="title q-ma-none q-pa-none"
+                v-if="formDetail && formDetail.firstName && formDetail.lastName"
+              >
                 {{
                   `${formDetail?.prefix}${formDetail?.firstName}  ${formDetail?.lastName}`
                 }}
@@ -249,19 +253,23 @@ onMounted(async () => {
           <div class="col-2">
             <div class="col-sm-3 col-md-3">
               <div class="col text-grey-6">ตำแหน่งในสายงาน</div>
-              <div class="col">{{ formDetail?.position }}</div>
+              <div class="col">{{ formDetail?.position || "-" }}</div>
             </div>
           </div>
           <div class="col-2">
             <div class="col-sm-3 col-md-3">
               <div class="col text-grey-6">ประเภทตำแหน่ง</div>
-              <div class="col">{{ formDetail?.posType.posTypeName }}</div>
+              <div class="col">
+                {{ formDetail?.posType?.posTypeName || "-" }}
+              </div>
             </div>
           </div>
           <div class="col-2">
             <div class="col-sm-3 col-md-3">
               <div class="col text-grey-6">ระดับตำแหน่ง</div>
-              <div class="col">{{ formDetail?.posLevel.posLevelName }}</div>
+              <div class="col">
+                {{ formDetail?.posLevel?.posLevelName || "-" }}
+              </div>
             </div>
           </div>
         </div>