no message

src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue

@@ -158,6 +158,7 @@ const motherData = reactive<FormPerson>({
   prefix: "",
   firstName: "",
   lastName: "",
+  lastNameOld: "",
   job: "",
 });
 const coupleData = reactive<FormPerson>({
@@ -236,6 +237,7 @@ async function fetchDataMother() {
         motherData.firstName = data.motherFirstName;
         motherData.lastName = data.motherLastName;
         motherData.job = data.motherCareer;
+        motherData.lastNameOld = data.motherLastNameOld;
       }
     })
     .catch((err) => {
@@ -307,6 +309,7 @@ function onSubmit(type: string) {
       [`${type}Live`]: fromData.isLive === 1 ? true : false,
       relationship: type === "couple" ? fromData.statusMarital : undefined,
       coupleLastNameOld: type === "couple" ? fromData.lastNameOld : undefined,
+      motherLastNameOld: type === "mother" ? fromData.lastNameOld : undefined,
     };
 
     const url =
@@ -385,6 +388,7 @@ function onOpenDialogForm(
     fromData.prefix = motherData.prefix;
     fromData.firstName = motherData.firstName;
     fromData.lastName = motherData.lastName;
+    fromData.lastNameOld = motherData.lastNameOld as string;
     fromData.job = motherData.job;
   } else if (type === "couple") {
     titleForm.value = "คู่สมรส";
@@ -629,16 +633,16 @@ onMounted(async () => {
                 : "-"
             }}
           </div>
-          <div class="col-1 text-grey-6 text-weight-medium">อาชีพ</div>
+          <div class="col-1 text-grey-6 text-weight-medium">นามสกุลเดิม</div>
           <div class="col">
-            {{ motherData.job ? motherData.job : "-" }}
+            {{ motherData.lastNameOld ? motherData.lastNameOld : "-" }}
           </div>
         </div>
         <div class="row items-start">
           <div class="col-2 text-grey-6 text-weight-medium">
             สถานภาพการมีชีวิต
           </div>
-          <div class="col-10">
+          <div class="col-6">
             {{
               motherData.isLive === true
                 ? "มีชีวิตอยู่"
@@ -647,6 +651,10 @@ onMounted(async () => {
                 : "-"
             }}
           </div>
+          <div class="col-1 text-grey-6 text-weight-medium">อาชีพ</div>
+          <div class="col">
+            {{ motherData.job ? motherData.job : "-" }}
+          </div>
         </div>
       </q-card>
     </div>
@@ -723,22 +731,16 @@ onMounted(async () => {
                   : "-"
               }}
             </div>
-            <div class="col-1 text-grey-6 text-weight-medium">อาชีพ</div>
+            <div class="col-1 text-grey-6 text-weight-medium">นามสกุลเดิม</div>
             <div class="col">
-              {{ coupleData.job ?? "-" }}
-            </div>
-          </div>
-          <div class="row items-start" v-if="coupleData.lastNameOld">
-            <div class="col-2 text-grey-6 text-weight-medium">นามสกุลเดิม</div>
-            <div class="col">
-              {{ coupleData.lastNameOld }}
+              {{ coupleData.lastNameOld ? coupleData.lastNameOld : "-" }}
             </div>
           </div>
           <div class="row items-start">
             <div class="col-2 text-grey-6 text-weight-medium">
               สถานภาพการมีชีวิต
             </div>
-            <div class="col">
+            <div class="col-6">
               {{
                 coupleData.isLive === true
                   ? "มีชีวิตอยู่"
@@ -747,6 +749,10 @@ onMounted(async () => {
                   : "-"
               }}
             </div>
+            <div class="col-1 text-grey-6 text-weight-medium">อาชีพ</div>
+            <div class="col">
+              {{ coupleData.job ?? "-" }}
+            </div>
           </div>
         </div>
       </q-card>
@@ -977,7 +983,10 @@ onMounted(async () => {
                   label="นามสกุล"
                 />
               </div>
-              <div class="col" v-if="typeForm === 'couple'">
+              <div
+                class="col"
+                v-if="typeForm === 'couple' || typeForm == 'mother'"
+              >
                 <q-input
                   outlined
                   dense
@@ -1092,7 +1101,6 @@ onMounted(async () => {
                 : columns?.filter((e) => e.name !== 'lastNameOld')
             "
             option-value="name"
-            
             style="min-width: 140px"
           />
         </div>

src/modules/05_placement/components/probation/MainProbation.vue

@@ -659,7 +659,7 @@ onMounted(async () => {
                   }}
                 </div>
 
-                <div v-else>
+                <div v-else class="table_ellipsis">
                   {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>