Merge branch 'oat_dev' into develop

src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue

@@ -36,32 +36,29 @@ const index = ref<number>(1);
 const fatherData = reactive({
   isHaveInfo: 1,
   isLive: 0,
-  citizenId: "123123213",
+  citizenId: "",
-  prefix: "นาย",
+  prefix: "",
-  optionPrefix: ["นาย", "จ่าสิบเอก"],
+  firstName: "",
-  firstName: "ณัฐพัฐ",
+  lastName: "",
-  lastName: "ดิษยบุตร",
+  job: "",
-  job: "ตำรวจ",
 });
 const motherData = reactive({
   isHaveInfo: 1,
   isLive: 0,
-  citizenId: "222222222",
+  citizenId: "",
-  prefix: "นาง",
+  prefix: "",
-  optionPrefix: ["นาง", "นางสาว"],
+  firstName: "",
-  firstName: "นางอริญกัญญา",
+  lastName: "",
-  lastName: "ดิษยบุตร",
+  job: "",
-  job: "พยาบาล",
 });
 const spouseData = reactive({
   isHave: 1,
   isLive: 0,
-  citizenId: "44444444",
+  citizenId: "",
-  prefix: "นาย",
+  prefix: "",
-  optionPrefix: ["นาย", "นาง", "นางสาว"],
+  firstName: "",
-  firstName: "กัญจาพล",
+  lastName: "",
-  lastName: "ดิอุรุกษา",
+  job: "",
-  job: "ค้าขาย",
 });
 
 const rows = ref<any>([]);
@@ -294,25 +291,25 @@ onMounted(async () => {
             <div>เลขบัตรประจำตัวประชาชน</div>
           </div>
           <div class="col">
-            {{ fatherData.citizenId }}
+            {{ fatherData.citizenId ? fatherData.citizenId : "-" }}
           </div>
         </div>
         <div class="row items-center">
           <div class="col-2">คำนำหน้าชื่อ</div>
           <div class="col-2">
-            {{ fatherData.prefix }}
+            {{ fatherData.prefix ? fatherData.prefix : "-" }}
           </div>
           <div class="col-1">ชื่อ</div>
           <div class="col-2">
-            {{ fatherData.firstName }}
+            {{ fatherData.firstName ? fatherData.firstName : "-" }}
           </div>
           <div class="col-1">นามสกุล</div>
           <div class="col-2">
-            {{ fatherData.lastName }}
+            {{ fatherData.lastName ? fatherData.lastName : "-" }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
-            {{ fatherData.job }}
+            {{ fatherData.job ? fatherData.job : "-" }}
           </div>
         </div>
         <div class="row items-center">
@@ -336,25 +333,25 @@ onMounted(async () => {
             <div>เลขบัตรประจำตัวประชาชน</div>
           </div>
           <div class="col">
-            {{ motherData.citizenId }}
+            {{ motherData.citizenId ? motherData.citizenId : "-" }}
           </div>
         </div>
         <div class="row items-center">
           <div class="col-2">คำนำหน้าชื่อ</div>
           <div class="col-2">
-            {{ motherData.prefix }}
+            {{ motherData.prefix ? motherData.prefix : "-" }}
           </div>
           <div class="col-1">ชื่อ</div>
           <div class="col-2">
-            {{ motherData.firstName }}
+            {{ motherData.firstName ? motherData.firstName : "-" }}
           </div>
           <div class="col-1">นามสกุล</div>
           <div class="col-2">
-            {{ motherData.lastName }}
+            {{ motherData.lastName ? motherData.lastName : "-" }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
-            {{ motherData.job }}
+            {{ motherData.job ? motherData.job : "-" }}
           </div>
         </div>
         <div class="row items-center">
@@ -378,25 +375,25 @@ onMounted(async () => {
             <div>เลขบัตรประจำตัวประชาชน</div>
           </div>
           <div class="col">
-            {{ spouseData.citizenId }}
+            {{ spouseData.citizenId ? spouseData.citizenId : "-" }}
           </div>
         </div>
         <div class="row items-center">
           <div class="col-2">คำนำหน้าชื่อ</div>
           <div class="col-2">
-            {{ spouseData.prefix }}
+            {{ spouseData.prefix ? spouseData.prefix : "-" }}
           </div>
           <div class="col-1">ชื่อ</div>
           <div class="col-2">
-            {{ spouseData.firstName }}
+            {{ spouseData.firstName ? spouseData.firstName : "-" }}
           </div>
           <div class="col-1">นามสกุล</div>
           <div class="col-2">
-            {{ spouseData.lastName }}
+            {{ spouseData.lastName ? spouseData.lastName : "-" }}
           </div>
           <div class="col-1">อาชีพ</div>
           <div class="col">
-            {{ spouseData.job }}
+            {{ spouseData.job ? spouseData.job : "-" }}
           </div>
         </div>
         <div class="row items-center">
@@ -1041,7 +1038,8 @@ onMounted(async () => {
         />
       </q-card-section>
       <q-separator color="grey-4" />
-      <div class="q-pa-md scroll" style="max-height: 70vh">
+      <div v-if="historyRows.length === 0" class="q-pa-md">ไม่พบข้อมูล</div>
+      <div v-else class="q-pa-md scroll" style="max-height: 70vh">
         <div>
           <div class="row text-right">
             <div class="col-12">