Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -118,8 +118,11 @@
 				return false;
 				return false;
 			}
 			}
             var  targetUrl = 'department/update/' + treeNode.id;
             var  targetUrl = 'department/update/' + treeNode.id;
+            console.log(treeNode);
+
 			var data = {
 			var data = {
-                name:newName
+                name:newName,
+                parentId:treeNode.id
             }
             }
             $.ajax({
             $.ajax({
                 type: 'put',
                 type: 'put',
@@ -160,6 +163,38 @@
 			if (btn) btn.bind("click", function(){
 			if (btn) btn.bind("click", function(){
 				var zTree = $.fn.zTree.getZTreeObj("tree");
 				var zTree = $.fn.zTree.getZTreeObj("tree");
 				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
 				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+
+                var data = {
+                    name:'new node',
+                    parentId:treeNode.id
+                }
+                var targetUrl1 = 'department/add';
+                $.ajax({
+                    type: 'post',
+                    url: apiBaseUrl + targetUrl1,
+                    cache: false,
+                    dataType: 'json',
+                    data: JSON.stringify(data),
+                    contentType: "application/json; charset=UTF-8",
+                    success: function (data) {
+                        if (data.msg) {
+                            layer.alert(data.msg);
+                        } else if (data.code != 0) {
+                            layer.alert('操作失败');
+                        } else {
+                            layer.msg('操作成功');
+                        }
+                        setTimeout(function () {
+                            if(!data.code) {
+                                layer_close();
+                            }
+                        },500);
+                    },
+                    error: function () {
+                        layer.alert("操作失败")
+                    }
+                })
+
 				return false;
 				return false;
 			});
 			});
 		};
 		};