ประวัติฝึกอบรม/ดูงานลูกจ้าง

src/modules/15_development/components/BasicInfo.vue

@@ -43,9 +43,9 @@ const node = ref<any>([]);
 const filter = ref<string>("");
 const expanded = ref<any>([]);
 
-async function fetchData(id: string) {
+function fetchData(id: string) {
   showLoader();
-  await http
+  http
     .get(config.API.developmentMainTab("tab1", id))
     .then(async (res) => {
       const data = res.data.result;
@@ -60,8 +60,8 @@ async function fetchData(id: string) {
         if (nodeTree) {
           expanded.value = [];
           const parts = nodeTree?.orgName.split("/");
-          for (let i = 0; i < parts.length; i++) {
-            const arrangedParts = parts[i - 1];
+          for (let i = 1; i < parts.length; i++) {
+            const arrangedParts = parts[i];
             expanded.value.push(arrangedParts);
           }
           updateSelected(nodeTree);
@@ -137,17 +137,19 @@ function updateSelected(data: any) {
   formData.orgRevisionId = data.orgRevisionId;
 }
 
-function searchAndReplace(orgTreeData: any, treeId: string | null) {
-  for (let orgTree of orgTreeData) {
-    if (orgTree.orgTreeId === treeId) {
-      return orgTree;
-    }
-    let foundOrg: any = searchAndReplace(orgTree.children, treeId);
-    if (foundOrg) {
-      return foundOrg;
+async function searchAndReplace(orgTreeData: any, treeId: string | null) {
+  if (orgTreeData) {
+    for (let orgTree of orgTreeData) {
+      if (orgTree.orgTreeId === treeId) {
+        return orgTree;
+      }
+      let foundOrg: any = await searchAndReplace(orgTree.children, treeId);
+      if (foundOrg) {
+        return foundOrg;
+      }
     }
+    return false;
   }
-  return null;
 }
 
 onMounted(async () => {