From 8269eb8e3c95f09332c1bb655ea3e327cb7ba310 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Thu, 28 Mar 2024 14:22:43 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B9=89=E0=B8=94+=E0=B9=81=E0=B8=81?=
 =?UTF-8?q?=E0=B9=89=E0=B8=9A=E0=B8=B1=E0=B8=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/PersonalInformation/04_Family.vue  | 23 ++++---------------
 .../PersonalInformation/05_Education.vue      |  4 ++--
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
index 797cdfcfe..700d0ac85 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
@@ -21,6 +21,7 @@ const {
 } = mixin;
 
 const store = useProfileDataStore();
+const { fetchPerson, filterSelector } = store;
 const route = useRoute();
 const id = ref<string>(route.params.id.toString());
 const dialog = ref<boolean>(false);
@@ -121,7 +122,6 @@ async function fetchHistoryData(id: string) {
   await http
     .get(config.API.profileNewFamilyHisByFamilyId(id))
     .then(async (res) => {
-      console.log(res.data.result);
       historyRows.value = res.data.result;
     })
     .catch((err) => {
@@ -243,23 +243,8 @@ onMounted(async () => {
   ) {
     await fetchPerson();
   }
-  prefixFilter.value = store.Ops.prefixOps;
   await fetchData(id.value);
 });
-
-function filterSelector(val: string, update: Function, refData: string) {
-  switch (refData) {
-    case "prefixOps":
-      update(() => {
-        store.Ops.prefixOps = prefixFilter.value.filter(
-          (v: any) => v.name.indexOf(val) > -1
-        );
-      });
-      break;
-    default:
-      break;
-  }
-}
 </script>
 
 <template>
@@ -800,9 +785,9 @@ function filterSelector(val: string, update: Function, refData: string) {
                   :options="store.Ops.prefixOps"
                   option-label="name"
                   option-value="name"
-                  @filter="(inputValue:string,
-                      doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps'
-                      ) "
+                  @filter="(inputValue: any,
+              doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
+              )"
                 />
               </div>
               <div class="col">
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index ec28c3f79..948d4a3d4 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -215,7 +215,7 @@ const educationOptionFilter = ref([
   { label: "ไม่ใช่", value: false },
 ]);
 
-const educationLevelOption = ref([]);
+const educationLevelOption = ref<any>([]);
 const educationLevelOptionFilter = ref([]);
 
 const historyDialog = ref<boolean>(false);
@@ -1044,7 +1044,7 @@ onMounted(async () => {
                 bg-color="white"
                 v-model="educationData.isEducation"
                 :options="educationOption"
-                option-value="label"
+                option-value="value"
                 option-label="label"
                 input-debounce="0"
                 use-input