zhangweicheng 5 年之前
父節點
當前提交
84255e3e8f
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 2 2
      web/building_saas/main/js/models/bills.js
  2. 4 3
      web/building_saas/main/js/views/project_view.js

+ 2 - 2
web/building_saas/main/js/models/bills.js

@@ -741,7 +741,7 @@ var Bills = {
                             project.calcProgram.calcAllNodesAndSave();
                         }else {
                             if(parent){
-                                projectObj.converseCalculateBills([parent]);
+                                projectObj.converseCalculateBills(parent);
                             }else { //删除的是大项费用要重新计算工程造价节点
                                 project.Bills.calcEngineeringCostNode(controller);
                             }
@@ -750,7 +750,7 @@ var Bills = {
                     });
                 }else {
                     if(parent){
-                        projectObj.converseCalculateBills([parent]);
+                        projectObj.converseCalculateBills(parent);
                     }else { //删除的是大项费用要重新计算工程造价节点
                         project.Bills.calcEngineeringCostNode(controller);
                     }

+ 4 - 3
web/building_saas/main/js/views/project_view.js

@@ -1744,8 +1744,8 @@ var projectObj = {
         });
     },
     // 计算node及node的所有父项
-    converseCalculateBills: function (nodes) {
-        projectObj.project.calcProgram.calcNodesAndSave(nodes);
+    converseCalculateBills: function (node) {
+        projectObj.project.calcProgram.calcAndSave(node);
     },
 
     // 获取上次退出时的焦点位置
@@ -2211,10 +2211,11 @@ const throttleDownLevel = _.throttle(() => {
     const mainTreeNodes = controller.getValidNodesWithinSelection();
     const billsNodes = mainTreeNodes.map(node => node.source);
     const orgParent = mainTreeNodes[0].parent;
+    const preNode = mainTreeNodes[0].preSibling;//降级前的前一节点变成降级后新的父节点,要重新计算
     project.Bills.multiDownLevelBills(project.Bills.tree, billsNodes);
     controller.multiDownLevel(mainTreeNodes);
     controller.refreshTreeNode([orgParent, ...mainTreeNodes]);
-    projectObj.converseCalculateBills([orgParent,...billsNodes]);
+    projectObj.converseCalculateBills(preNode);
 }, throttleTime);
 $('#downLevel').click(throttleDownLevel);
 $('#insertRation').click(function () {