Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

src/modules/04_registryPerson/store.ts

@@ -9,6 +9,7 @@ import type {
 import type { FormFilter } from "@/modules/04_registryPerson/interface/request/Main";
 
 export const useRegistryNewDataStore = defineStore("registryNew", () => {
+  const routerName = ref<any>()
   const searchTypeOption = ref<DataOption[]>([
     { id: "fullName", name: "ชื่อ-นามสกุล" },
     { id: "citizenId", name: "เลขประจำตัวประชาชน" },
@@ -163,5 +164,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     retireTypeEmpOps,
     citizenId,
     displayOrderOps,
+    routerName
   };
 });

src/modules/04_registryPerson/views/listView.vue

@@ -345,11 +345,14 @@ function clearSelect(t: string) {
  */
 async function fetchTree() {
   const data = await fetchStructureTree(route.meta.Key as string);
+  if (store.routerName !== route.name) {
+    store.formFilter.node = null;
+    store.formFilter.nodeId = null;
+    store.routerName = route.name ? route.name : "";
+  }
   if (data) {
     isLoad.value = true;
     node.value = data;
-    store.formFilter.node = nodeData.node;
-    store.formFilter.nodeId = nodeData.nodeId;
   }
 }