ทะเบียนประวัติ ==> ข้อมูลครอบครัว

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

@@ -25,6 +25,7 @@ const route = useRoute();
 const store = useProfileDataStore();
 const { filterSelector } = store;
 const {
+  date2Thai,
   dialogConfirm,
   showLoader,
   hideLoader,
@@ -47,6 +48,8 @@ const visibleColumns = ref<String[]>([
   "job",
   "isLive",
   "lastNameOld",
+  "lastUpdateFullName",
+  "lastUpdatedAt",
 ]);
 const columns = ref<QTableProps["columns"]>([
   {
@@ -114,6 +117,25 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format: (val) => (val ? "มีชีวิต" : "ถึงแก่กรรม"),
   },
+  {
+    name: "lastUpdateFullName",
+    align: "left",
+    label: "ผู้ดำเนินการ",
+    sortable: true,
+    field: "lastUpdateFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "lastUpdatedAt",
+    align: "left",
+    label: "วันที่แก้ไข",
+    sortable: true,
+    field: "lastUpdatedAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => date2Thai(val),
+  },
 ]);
 const rows = ref<any[]>([]);
 
@@ -173,13 +195,12 @@ const fromData = reactive({
  * function fetch ข้อมูลบิดา
  */
 async function fetchDataFather() {
-  showLoader();
   await http
     .get(
       config.API.profileFamily(empType.value, "father") + `/${profileId.value}`
     )
-    .then((res) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
 
       if (data) {
         fatherData.isLive = data.fatherLive;
@@ -192,9 +213,6 @@ async function fetchDataFather() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -202,13 +220,12 @@ async function fetchDataFather() {
  * function fetch ข้อมูลมารดา
  */
 async function fetchDataMother() {
-  showLoader();
   await http
     .get(
       config.API.profileFamily(empType.value, "mother") + `/${profileId.value}`
     )
-    .then((res) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       if (data) {
         motherData.isLive = data.motherLive;
         motherData.citizenId = data.motherCitizenId;
@@ -220,9 +237,6 @@ async function fetchDataMother() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -230,13 +244,12 @@ async function fetchDataMother() {
  * function fetch ข้อมูลคู่สมรส
  */
 async function fetchDataCouple() {
-  showLoader();
   await http
     .get(
       config.API.profileFamily(empType.value, "couple") + `/${profileId.value}`
     )
-    .then((res) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       if (data) {
         coupleData.isLive = data.coupleLive;
         coupleData.citizenId = data.coupleCitizenId;
@@ -250,9 +263,6 @@ async function fetchDataCouple() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -260,21 +270,17 @@ async function fetchDataCouple() {
  * function fetch ข้อมูลบุตร
  */
 async function fetchDataChildren() {
-  showLoader();
   await http
     .get(
       config.API.profileFamily(empType.value, "children") +
         `/${profileId.value}`
     )
-    .then((res) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       childData.value = data;
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -339,6 +345,7 @@ function closeDialog() {
   fromData.job = "";
   fromData.lastNameOld = "";
   fromData.statusMarital = "";
+  rows.value = [];
 }
 
 /**
@@ -412,7 +419,6 @@ function onOpenDialogHistory(type: string, id: string = "") {
  * function fetch ข้อมูลความสัมพันธ์
  */
 function fetchDataRelationship() {
-  // showLoader();
   http
     .get(config.API.orgRelationship)
     .then((res) => {
@@ -424,11 +430,6 @@ function fetchDataRelationship() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      // setTimeout(() => {
-      //   hideLoader();
-      // }, 2000);
     });
 }
 
@@ -450,13 +451,13 @@ function filterSelectorRelation(val: any, update: Function) {
  * @param id
  * @param type
  */
-function fetchHistory(id: string, type: string) {
+async function fetchHistory(id: string, type: string) {
-  hideLoader();
+  showLoader();
-  http
+  await http
     .get(config.API.profileFamilyHistory(id, empType.value, type))
-    .then((res) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
-      rows.value = data.map((e: any) => ({
+      rows.value = await data.map((e: any) => ({
         citizenId: e[`${type}CitizenId`],
         prefix: e[`${type}Prefix`],
         firstName: e[`${type}FirstName`],
@@ -464,6 +465,8 @@ function fetchHistory(id: string, type: string) {
         job: e[`${type}Career`],
         isLive: e[`${type}Live`],
         lastNameOld: type === "couple" ? e.coupleLastNameOld : undefined,
+        lastUpdateFullName: e.lastUpdateFullName,
+        lastUpdatedAt: e.lastUpdatedAt,
       }));
     })
     .catch((err) => {
@@ -482,9 +485,13 @@ onMounted(async () => {
     fetchDataCouple(),
     fetchDataChildren(),
     fetchDataRelationship(),
-  ]).then(() => {
+  ])
-    hideLoader();
+    .then(() => {
-  });
+      hideLoader();
+    })
+    .catch(() => {
+      hideLoader();
+    });
 });
 </script>