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

@@ -97,7 +97,7 @@
 //            children:data['children']
 //            departmentId:data['children']
 //        };
-//        console.log(JSON.stringify(newData));
+        console.log(JSON.stringify(newData));
 //        return false;
         $.ajax({
             type: 'post',
@@ -107,6 +107,7 @@
             dataType: 'json',
             contentType: "application/json; charset=UTF-8",
             success: function (data) {
+                console.log(data);
                 if (data.msg) {
                     layer.alert(data.msg);
                 } else if (data.code != 0) {
@@ -115,10 +116,10 @@
                     layer.msg('操作成功');
                 }
                 if (data.code) {
-                    setTimeout(function () {
-                        window.parent.reload();
-                        layer_close();
-                    }, 500);
+//                    setTimeout(function () {
+//                        window.parent.reload();
+//                        layer_close();
+//                    }, 500);
                 }
             },
             error: function () {