From 71ef13e1f2b79fa0a5fd1135439cdfa4731ea151 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 29 Aug 2024 14:26:25 +0700
Subject: [PATCH] fixing register filter

---
 src/modules/04_registryPerson/store.ts       | 2 +-
 src/modules/04_registryPerson/views/list.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 73c15a8fc..44fba1bf2 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -88,6 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     mode,
     formFilter,
     labelOption,
-    nodeData
+    nodeData,
   };
 });
diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index d1456cc28..5c1ca07d8 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -143,9 +143,9 @@ function fetchDataPerson() {
     queryParams.type = empType.value;
   }
 
-  if (nodeData.node !== null && nodeData.nodeId !== null) {
-    queryParams.node = nodeData.node;
-    queryParams.nodeId = nodeData.nodeId;
+  if (store.nodeData.node !== null && store.nodeData.nodeId !== null) {
+    queryParams.node = store.nodeData.node;
+    queryParams.nodeId = store.nodeData.nodeId;
   }
   http
     .get(
@@ -262,7 +262,8 @@ async function selectType() {
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
       store.formFilter.isShowRetire ||
-      store.formFilter.isProbation
+      store.formFilter.isProbation ||
+      store.nodeData.nodeId != null
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();