Merge branch 'tree' into dev

src/components/JwTree/nodeWrap.vue

@@ -100,36 +100,38 @@ export default {
           this.$EventBus.$emit('handelClickJWNode',data)
           data.forEach(item=>{
             item.zkFlag = !item.childCount>0
+            item.children = null
           })
           arr.forEach((element, index) => {
-        if (index === idx) {
-          if (element.children) {
-            console.log('element存在的话',element);
-            element.zkFlag = true;
-            element.children = null;
+          if (index === idx) {
+            if (element.children) {
+              console.log(item);
+              element.zkFlag = false;
+              element.children = null;
+            } else {
+              element.zkFlag = true;
+              element.children = data;
+            }
           } else {
+            element.children = null;
             element.zkFlag = false;
-            console.log('element不存在的话',element);
-            element.children = data;
           }
-        } else {
-          element.children = null;
-        }
-      });
+        });
         }
       }else{
         arr.forEach((element, index) => {
         if (index === idx) {
-        console.log(element.zkFlag);
           if (element.children) {
-            element.zkFlag = true;
+            element.zkFlag = false;
+            element._children = element.children
             element.children = null;
           } else {
+            element.zkFlag = true;
             element.children = element._children;
           }
         } else {
-          element.zkFlag = false;
           element.children = null;
+          element.zkFlag = false;
         }
       });
       }

src/views/dataBoard/organizational/jwTree/index.vue

@@ -100,9 +100,9 @@ export default {
           this.hideChildrenData(item.children);
         }
         if (item.children && item.children.length > 0 && item.laneLevel >= 2) {
-          item.zkFlag = true
-          item.children = item.children;
-          this.hideChildrenData(item.children);
+          item._children = item.children;
+          item.children = null;
+          this.hideChildrenData(item._children);
         }
       });
       this.nodeConfig = newData[0];