Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue

src/modules/04_registryPerson/components/Dialog/DialogUpdate.vue

@@ -111,6 +111,43 @@ async function closeDialog() {
   modal.value = false;
   count.value = 0;
   childData.value = [];
+
+  formInformations.bloodGroup = null;
+  formInformations.relationship = null;
+  formInformations.gender = null;
+  formInformations.religion = null;
+  formInformations.citizenId = "";
+  formInformations.nationality = null;
+  formInformations.ethnicity = null;
+  formInformations.birthDate = null;
+  formInformations.phone = null;
+  formInformations.lastName = "";
+  formInformations.firstName = "";
+  formInformations.prefix = "";
+  formInformations.rank = null;
+
+  fatherData.isLive = 1;
+  fatherData.citizenId = "";
+  fatherData.prefix = "";
+  fatherData.firstName = "";
+  fatherData.lastName = "";
+  fatherData.job = "";
+
+  motherData.isLive = 1;
+  motherData.citizenId = "";
+  motherData.prefix = "";
+  motherData.firstName = "";
+  motherData.lastName = "";
+  motherData.job = "";
+
+  coupleData.isLive = 1;
+  coupleData.citizenId = "";
+  coupleData.prefix = "";
+  coupleData.firstName = "";
+  coupleData.lastName = "";
+  coupleData.job = "";
+  coupleData.lastNameOld = "";
+  coupleData.statusMarital = "";
 }
 
 /** อัพเดตข้อมูลส่วนตัว */
@@ -161,9 +198,13 @@ async function upDateAddress() {
 async function upDateFamily() {
   await saveFather();
   await saveMother();
-  await saveCouple();
-  for (const child of childData.value) {
-    await saveChildren(child);
+  if (coupleData.citizenId !== "") {
+    await saveCouple();
+  }
+  if (childData.value.length !== 0) {
+    for (const child of childData.value) {
+      await saveChildren(child);
+    }
   }
   count.value + 1;
 }