Merge branch 'develop' into devTee

src/components/Dialogs/PopupPersonalNew.vue

@@ -142,7 +142,7 @@ async function fetchProfileGov(id: string) {
       goverment.positionType = data.posType !== "" ? data.posType : "-";
       goverment.positionLevel = data.posLevel !== "" ? data.posLevel : "-";
       goverment.positionExecutive =
-        data.posExecutive !== "" ? data.posExecutive : "-";
+        data.posExecutive !== null ? data.posExecutive : "-";
       goverment.positionExecutiveSide =
         data.positionExecutiveField !== "" ? data.positionExecutiveField : "-";
     })
@@ -172,9 +172,12 @@ watch(
   async () => {
     modal.value = props.modal ? props.modal : false;
     if (modal.value) {
-      props.id && (fetchInformation(props.id), fetchProfileGov(props.id));
-      (fileName.value = `profile-${props.id}`),
+      if (props.id) {
+        fetchInformation(props.id);
+        fetchProfileGov(props.id);
+        fileName.value = `profile-${props.id}`;
         fetchProfile(props.id as string);
+      }
     }
   }
 );
@@ -214,11 +217,6 @@ async function fetchProfile(id: string) {
           style="color: red; background-color: #ffdede"
         />
       </q-toolbar>
-      <!-- <q-card-section>
-        <div class="text-bold text-h6 text-center">ข้อมูลทะเบียนประวัติ</div>
-        <q-space />
-
-      </q-card-section> -->
 
       <q-card-section class="col q-pt-none bg-grey-12">
         <div class="q-gutter-md">