Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionOperation

modules/reports/controllers/rpt_tpl_controller.js

@@ -259,7 +259,7 @@ let mExport = {
         const _addNodeByPath = function(path, node, topNodeItems) {
             let rst = false;
             let tmpParentItems = topNodeItems;
-            if (path === null || path === '') {
+            if (path === null || path === '' || path.node_path.length === 0) {
                 topNodeItems.push(node);
                 rst = true;
             } else {
@@ -311,7 +311,7 @@ let mExport = {
                     } else if (pathArray[idx].operation_type === 'add') {
                         _addNodeByPath(pathArray[idx], nodeArray[idx], topNodeItems);
                     } else if (pathArray[idx].operation_type === 'delete') {
-                        _deleteNodeByPath(pathArray[idx], nodeArray[idx, topNodeItems]);
+                        _deleteNodeByPath(pathArray[idx], nodeArray[idx], topNodeItems);
                     } else {
                         // out of control
                     }

web/maintain/report/js/rpt_tpl_main.js

@@ -146,7 +146,7 @@ let zTreeOprObj = {
     },
     getNodePath: function(node, includeCurrentNode) {
         const rst = [];
-        if (includeCurrentNode) {
+        if (includeCurrentNode && node.level >= 1) {
             rst.push(node.name);
         }
         let parentNode = node.getParentNode();
@@ -256,6 +256,8 @@ let zTreeOprObj = {
                     rawNode.nodeType = RT.NodeType.NODE;
                     rawNode.name = "新增子节点" + (new Date()).getTime();
                     rawNode.ID = newNodeID;
+                    rawNode.isParent = true;
+                    rawNode.items = [];
                     let newNodes = [], isSilent = false;
                     newNodes.push(rawNode);
                     if (me.treeObj) {
@@ -753,13 +755,25 @@ let zTreeOprObj = {
                     }
                 });
             } else {
-                me.updateTreeRootNode(rawNode, true, function(rst){
+                // me.updateTreeRootNode(rawNode, true, function(rst){
+                //     if (!(rst)) {
+                //         alert("删除请求失败！");
+                //     }
+                // });
+                let pathArr = [];
+                let nodeArr = [];
+                let path = {operation_type: 'delete', node_path: []};
+                path.node_path = me.getNodePath(treeNode, true);
+                pathArr.push(path);
+                nodeArr.push('');
+                me.partialUpdateTreeNode(topPNode, pathArr, nodeArr, true, function (rst) {
                     if (!(rst)) {
-                        alert("删除请求失败！");
+                        alert("删除模板失败！");
                     }
-                });
+                }, null);
             }
             me.refreshNodes();
+            //*/
         }
     },
     beforeEditName: function (treeId, treeNode) {