From b07ed6e4c79bc3f6a32b774ac62bab4e38cea7bd Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 26 Mar 2024 11:08:26 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=20filter=20=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registryNew/views/list.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue
index 20d9f8f98..c7c5e647d 100644
--- a/src/modules/04_registryNew/views/list.vue
+++ b/src/modules/04_registryNew/views/list.vue
@@ -112,7 +112,7 @@ function fetchYearOption() {
 async function fetchDataPerson(search: boolean = false) {
   showLoader();
 
-  let queryParams = {
+  let queryParams:any = {
     page: formFilter.page,
     pageSize: formFilter.pageSize,
   };
@@ -121,9 +121,17 @@ async function fetchDataPerson(search: boolean = false) {
     queryParams = Object.assign({}, queryParams, {
       searchField: searchType.value,
       searchKeyword: formFilter.keyword,
+      posLevel: labelOption.posLevel,
+      posType: labelOption.posType,
     });
-  }
+    if (formFilter.isProbation) {
+      queryParams.isProbation = formFilter.isProbation;
+    }
 
+    if (formFilter.isShowRetire) {
+      queryParams.isRetire = formFilter.isShowRetire;
+    }
+  }
   http
     .get(config.API.registryNew, { params: queryParams })
     .then((res) => {