แก้ไข บัค

src/modules/01_metadata/components/person/Education.vue

@@ -206,7 +206,7 @@ const mixin = useCounterMixin();
 const { success, dateText, messageError, showLoader, hideLoader } = mixin;
 const store = useManageDataStore();
 const { manageData, changeManageColumns, getEducation, dataEducation } = store;
-const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
+const rows = ref<RequestItemsHistoryObject[]>(dataEducation.data); //list data table
 const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
 const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
 const tittleHistory = ref<string>("ประวัติแก้ไขระดับการศึกษา"); //

src/modules/01_metadata/components/person/Gender.vue

@@ -206,7 +206,7 @@ const mixin = useCounterMixin();
 const { success, dateText, messageError, showLoader, hideLoader } = mixin;
 const store = useManageDataStore();
 const { manageData, changeManageColumns, getGender, dataGender } = store;
-const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
+const rows = ref<RequestItemsHistoryObject[]>(dataGender.data); //list data table
 const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
 const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
 const tittleHistory = ref<string>("ประวัติแก้ไขเพศ"); //

src/modules/01_metadata/components/person/Province.vue

@@ -218,7 +218,7 @@ const mixin = useCounterMixin();
 const { success, dateText, messageError, showLoader, hideLoader } = mixin;
 const store = useManageDataStore();
 const { manageData, changeManageColumns, getProvince, dataProvince } = store;
-const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
+const rows = ref<RequestItemsHistoryObject[]>(dataProvince.data); //list data table
 const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
 const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
 const tittleHistory = ref<string>("ประวัติแก้ไขจังหวัด"); //

src/modules/01_metadata/components/person/Relationship.vue

@@ -207,7 +207,7 @@ const { success, dateText, messageError, showLoader, hideLoader } = mixin;
 const store = useManageDataStore();
 const { manageData, changeManageColumns, getRelationship, dataRelationship } =
   store;
-const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
+const rows = ref<RequestItemsHistoryObject[]>(dataRelationship.data); //list data table
 const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
 const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
 const tittleHistory = ref<string>("ประวัติแก้ไขสถานภาพ"); //

src/modules/01_metadata/components/person/Religion.vue

@@ -206,7 +206,7 @@ const mixin = useCounterMixin();
 const { success, dateText, messageError, showLoader, hideLoader } = mixin;
 const store = useManageDataStore();
 const { manageData, changeManageColumns, getReligion, dataReligion } = store;
-const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
+const rows = ref<RequestItemsHistoryObject[]>(dataReligion.data); //list data table
 const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
 const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
 const tittleHistory = ref<string>("ประวัติแก้ไขศาสนา"); //

src/modules/01_metadata/store.ts

@@ -4,7 +4,7 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
-import type { RequestItemsHistoryObject } from "@/modules/01_metadata/interface/request/person/Prefix";
+import type { RequestItemsHistoryObject as RequestItemsPrefix } from "@/modules/01_metadata/interface/request/person/Prefix";
 import type { RequestItemsHistoryObject as RequestItemsBlood } from "@/modules/01_metadata/interface/request/person/Blood";
 import type { RequestItemsHistoryObject as RequestItemsGender } from "@/modules/01_metadata/interface/request/person/Gender";
 import type { RequestItemsHistoryObject as RequestItemsReligion } from "@/modules/01_metadata/interface/request/person/Religion";
@@ -43,12 +43,12 @@ const { success, messageError, showLoader, hideLoader } = mixin;
 
 export const useManageDataStore = defineStore("manage", () => {
   const dataPrefix = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsPrefix[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftPrefix = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsPrefix[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
@@ -63,75 +63,75 @@ export const useManageDataStore = defineStore("manage", () => {
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const dataGender = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsGender[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftGender = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsGender[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const dataReligion = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsReligion[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftReligion = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsReligion[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const dataRelationship = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsRelationship[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftRelationship = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsRelationship[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const dataEducation = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsEducation[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftEducation = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsEducation[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const dataProvince = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsProvince[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
   const draftProvince = ref<{
-    data: RequestItemsHistoryObject[];
-    idversion: string;
-    version: string;
-  }>({ data: [], idversion: "", version: "published" }); //list data table
-  const dataDistrict = ref<{
-    data: RequestItemsHistoryObject[];
-    idversion: string;
-    version: string;
-  }>({ data: [], idversion: "", version: "published" }); //list data table
-  const draftDistrict = ref<{
-    data: RequestItemsHistoryObject[];
-    idversion: string;
-    version: string;
-  }>({ data: [], idversion: "", version: "published" }); //list data table
-  const dataSubDistrict = ref<{
-    data: RequestItemsHistoryObject[];
-    idversion: string;
-    version: string;
-  }>({ data: [], idversion: "", version: "published" }); //list data table
-  const draftSubDistrict = ref<{
-    data: RequestItemsHistoryObject[];
+    data: RequestItemsProvince[];
     idversion: string;
     version: string;
   }>({ data: [], idversion: "", version: "published" }); //list data table
+  //   const dataDistrict = ref<{
+  //     data: RequestItemsBlood[];
+  //     idversion: string;
+  //     version: string;
+  //   }>({ data: [], idversion: "", version: "published" }); //list data table
+  //   const draftDistrict = ref<{
+  //     data: RequestItemsBlood[];
+  //     idversion: string;
+  //     version: string;
+  //   }>({ data: [], idversion: "", version: "published" }); //list data table
+  //   const dataSubDistrict = ref<{
+  //     data: RequestItemsHistoryObject[];
+  //     idversion: string;
+  //     version: string;
+  //   }>({ data: [], idversion: "", version: "published" }); //list data table
+  //   const draftSubDistrict = ref<{
+  //     data: RequestItemsHistoryObject[];
+  //     idversion: string;
+  //     version: string;
+  //   }>({ data: [], idversion: "", version: "published" }); //list data table
 
   const dataInsignia = ref<InsigniaResponse[]>([]); //list data table
   const draftInsignia = ref<InsigniaResponse[]>([]); //list data table
@@ -419,6 +419,32 @@ export const useManageDataStore = defineStore("manage", () => {
     }
   }
 
+  const getPrefix = async (
+    selector: boolean = false,
+    newFetch: boolean = false
+  ) => {
+    if (dataPrefix.value.data.length === 0) {
+      await fetchPrefix(true, selector);
+      return draftPrefix.value;
+    } else {
+      if (newFetch) {
+        await fetchPrefix(true, selector);
+        return draftPrefix.value;
+      } else {
+        // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า
+        if (
+          JSON.stringify(dataPrefix.value.data) ==
+          JSON.stringify(draftPrefix.value.data)
+        ) {
+          return draftPrefix.value;
+        } else {
+          await fetchPrefix(false, selector);
+          return draftPrefix.value;
+        }
+      }
+    }
+  };
+
   const getBlood = async (
     selector: boolean = false,
     newFetch: boolean = false
@@ -620,233 +646,6 @@ export const useManageDataStore = defineStore("manage", () => {
   //     }
   //   };
 
-  const getPrefix = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-<<<<<<< HEAD
-    if (dataPrefix.value.data.length === 0) {
-      await fetchPrefix(true, selector);
-      return draftPrefix.value;
-=======
-    let apiPrefix = "";
-    if (selector) {
-      apiPrefix = config.API.prefix;
-    } else {
-      apiPrefix = config.API.listPrefixHistory;
-    }
-    if (
-      dataPrefix.value.length === 0 ||
-      (dataPrefix.value.length !== 0 && newFetch)
-    ) {
-      let data = await fetchData(true, apiPrefix);
-      dataPrefix.value = data;
-      draftPrefix.value = data;
-      return {
-        data: draftPrefix.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
->>>>>>> e1a25d437df67812ecdc71d4ae29f9b555910106
-    } else {
-      return {
-        data: draftPrefix.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    }
-  };
-
-  const getBlood = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataBlood.value.length === 0) {
-      await fetchBlood(true, selector);
-      return {
-        data: draftBlood.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-        await fetchBlood(true, selector);
-        return {
-          data: draftBlood.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftBlood.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      }
-    }
-  };
-
-  const getGender = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataGender.value.length === 0) {
-      await fetchGender(true, selector);
-      return {
-        data: draftGender.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-        await fetchGender(true, selector);
-        return {
-          data: draftGender.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftGender.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      }
-    }
-  };
-
-  const getReligion = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataReligion.value.length === 0) {
-      await fetchReligion(true, selector);
-      return {
-        data: draftReligion.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-        await fetchReligion(true, selector);
-        return {
-          data: draftReligion.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftReligion.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      }
-    }
-  };
-
-  const getRelationship = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataRelationship.value.length === 0) {
-      await fetchRelationship(true, selector);
-      return {
-        data: draftRelationship.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-        await fetchRelationship(true, selector);
-        return {
-          data: draftRelationship.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftRelationship.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      }
-    }
-  };
-
-  const getEducation = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataEducation.value.length === 0) {
-      await fetchEducation(true, selector);
-      return {
-        data: draftEducation.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-        await fetchEducation(true, selector);
-        return {
-          data: draftEducation.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftEducation.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      }
-    }
-  };
-
-  const getProvince = async (
-    selector: boolean = false,
-    newFetch: boolean = false
-  ) => {
-    if (dataProvince.value.length === 0) {
-      await fetchProvince(true, selector);
-      return {
-        data: draftProvince.value,
-        version: storeVersion.value,
-        idversion: storeIdVersion.value,
-      };
-    } else {
-      if (newFetch) {
-<<<<<<< HEAD
-        await fetchPrefix(true, selector);
-        return draftPrefix.value;
-      } else {
-        // เทียบ กรณี fetch data selector ไม่เหมือนกัน หรือ กรณี ดราฟ ดาต้า
-        if (
-          JSON.stringify(dataPrefix.value.data) ==
-          JSON.stringify(draftPrefix.value.data)
-        ) {
-          return draftPrefix.value;
-        } else {
-          await fetchPrefix(false, selector);
-          return draftPrefix.value;
-        }
-=======
-        await fetchProvince(true, selector);
-        return {
-          data: draftProvince.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
-      } else {
-        return {
-          data: draftProvince.value,
-          version: storeVersion.value,
-          idversion: storeIdVersion.value,
-        };
->>>>>>> e1a25d437df67812ecdc71d4ae29f9b555910106
-      }
-    }
-  };
-
   const getInsigniaType = async (
     selector: boolean = false,
     newFetch: boolean = false
@@ -1135,17 +934,29 @@ export const useManageDataStore = defineStore("manage", () => {
         };
       }
     }
+  };
+
+  const fetchPrefix = async (loader: boolean, selector: boolean) => {
+    let apiPrefix = "";
+    if (loader) {
+      showLoader();
+    }
+    if (selector) {
+      apiPrefix = config.API.prefix;
+    } else {
+      apiPrefix = config.API.listPrefixHistory;
+    }
     await http
       .get(apiPrefix)
       .then((res) => {
         const data = res.data.result;
-        let rows: RequestItemsHistoryObject[] = [];
+        let rows: RequestItemsPrefix[] = [];
         let version: string = "";
         let id: string = "";
         if (selector) {
           version = "";
           id = "";
-          data.map((e: RequestItemsHistoryObject) => {
+          data.map((e: RequestItemsPrefix) => {
             rows.push({
               ...e,
             });
@@ -1153,8 +964,7 @@ export const useManageDataStore = defineStore("manage", () => {
         } else {
           version = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
           id = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: RequestItemsHistoryObject) => {
+          data.items.map((e: RequestItemsPrefix) => {
             rows.push({
               ...e,
             });
@@ -1906,422 +1716,6 @@ export const useManageDataStore = defineStore("manage", () => {
     }
   };
 
-  const fetchData = async (loader: boolean, api: string): Promise<any> => {
-    let apiPrefix = "";
-    if (loader) {
-      showLoader();
-    }
-    let rows: any = [];
-    await http
-      .get(api)
-      .then((res) => {
-        const data = res.data.result;
-        if (api) {
-          data.map((e: any) => {
-            rows.push({
-              ...e,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: any) => {
-            rows.push({
-              ...e,
-            });
-          });
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-    return rows;
-  };
-
-  const fetchBlood = async (loader: boolean, selector: boolean) => {
-    let apiBlood = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiBlood = config.API.bloodGroup;
-    } else {
-      apiBlood = config.API.listBloodGroupHistory;
-    }
-    await http
-      .get(apiBlood)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: bloodResponse[] = [];
-        if (selector) {
-          data.map((e: bloodResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: bloodResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftBlood.value = rows;
-        if (loader) {
-          dataBlood.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
-  const fetchGender = async (loader: boolean, selector: boolean) => {
-    let apiGender = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiGender = config.API.gender;
-    } else {
-      apiGender = config.API.listGenderHistory;
-    }
-    await http
-      .get(apiGender)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: genderResponse[] = [];
-        if (selector) {
-          data.map((e: genderResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: genderResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftGender.value = rows;
-        if (loader) {
-          dataGender.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
-  const fetchReligion = async (loader: boolean, selector: boolean) => {
-    let apiReligion = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiReligion = config.API.religion;
-    } else {
-      apiReligion = config.API.listReligionHistory;
-    }
-    await http
-      .get(apiReligion)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: religionResponse[] = [];
-        if (selector) {
-          data.map((e: religionResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: religionResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftReligion.value = rows;
-        if (loader) {
-          dataReligion.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
-  const fetchRelationship = async (loader: boolean, selector: boolean) => {
-    let apiRelationship = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiRelationship = config.API.relationship;
-    } else {
-      apiRelationship = config.API.listRelationshipHistory;
-    }
-    await http
-      .get(apiRelationship)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: relationshipResponse[] = [];
-        if (selector) {
-          data.map((e: relationshipResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: relationshipResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftRelationship.value = rows;
-        if (loader) {
-          dataRelationship.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
-  const fetchEducation = async (loader: boolean, selector: boolean) => {
-    let apiEducation = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiEducation = config.API.educationLevel;
-    } else {
-      apiEducation = config.API.listEducationLevelHistory;
-    }
-    await http
-      .get(apiEducation)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: educationResponse[] = [];
-        if (selector) {
-          data.map((e: educationResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: educationResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftEducation.value = rows;
-        if (loader) {
-          dataEducation.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
-  const fetchProvince = async (loader: boolean, selector: boolean) => {
-    let apiProvince = "";
-    if (loader) {
-      showLoader();
-    }
-    if (selector) {
-      apiProvince = config.API.province;
-    } else {
-      apiProvince = config.API.listProvinceHistory;
-    }
-    await http
-      .get(apiProvince)
-      .then((res) => {
-        const data = res.data.result;
-        let rows: provinceResponse[] = [];
-        if (selector) {
-          data.map((e: provinceResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        } else {
-          storeVersion.value = data.version; //ตัวแปรที่บอกว่าข้อมูลเผยแพร่ไปหรือยัง published=เผยแพร่แล้ว draft=ยังไม่เผยแพร่
-          storeIdVersion.value = data.id; //เลข id ใน mongodb
-
-          data.items.map((e: provinceResponse) => {
-            rows.push({
-              id: e.id,
-              name: e.name,
-              createdAt: e.createdAt,
-              lastUpdatedAt: e.lastUpdatedAt,
-              lastUpdateFullName: e.lastUpdateFullName,
-              isActive: e.isActive,
-              createdFullName: e.createdFullName,
-              createdUserId: e.createdUserId,
-              lastUpdateUserId: e.lastUpdateUserId,
-            });
-          });
-        }
-
-        draftProvince.value = rows;
-        if (loader) {
-          dataProvince.value = rows;
-        }
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(() => {
-        if (loader) {
-          hideLoader();
-        }
-      });
-  };
-
   const fetchInsignia = async (loader: boolean, selector: boolean) => {
     let apiInsignia = "";
     if (loader) {