Merge branch 'oat_dev' into develop

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>