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

public/web/gljUtil.js

@@ -221,7 +221,7 @@ let gljUtil = {
             }
         }
         let coe = 1;
-        if(projectGLJ && projectGLJ.is_adjust_price == 1){
+        if(projectGLJ && projectGLJ.is_adjust_price == 0){
           coe = ration.quantityCoe&&this.isNotEmpty(ration.quantityCoe[coeField])?ration.quantityCoe[coeField]:1;
           coe = parseFloat(coe);
         }else{

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);
                     }

web/building_saas/main/js/models/project_glj.js

@@ -332,7 +332,7 @@ ProjectGLJ.prototype.updateCalcMaterials = async function(projectGLJs,value) {//
     for(let dm of dataMaps){
       let glj = dm.glj;
       glj.unit_price[updateField] = value;
-      if(dm.data.ext) gljUtil.setProperty(glj.unit_price,);
+      if(dm.data.ext) gljUtil.setProperty(glj.unit_price,dm.data.ext);
       if(updateField == 'calcMaterial' && value ==0){///标记为0即删除材料计算标记，要删除其下挂的原价计算，运费计算，定额计算,消耗量重新计算
         calcQ = true;
         let connect_key = gljUtil.getIndex(glj);

web/building_saas/main/js/views/project_view.js

@@ -1744,8 +1744,8 @@ var projectObj = {
         });
     },
     // 计算node及node的所有父项
-    converseCalculateBills: function (node) {
-        projectObj.project.calcProgram.calcAndSave(node);
+    converseCalculateBills: function (nodes) {
+        projectObj.project.calcProgram.calcNodesAndSave(nodes);
     },
 
     // 获取上次退出时的焦点位置
@@ -2214,7 +2214,7 @@ const throttleDownLevel = _.throttle(() => {
     project.Bills.multiDownLevelBills(project.Bills.tree, billsNodes);
     controller.multiDownLevel(mainTreeNodes);
     controller.refreshTreeNode([orgParent, ...mainTreeNodes]);
-    projectObj.converseCalculateBills(orgParent);
+    projectObj.converseCalculateBills([orgParent,...billsNodes]);
 }, throttleTime);
 $('#downLevel').click(throttleDownLevel);
 $('#insertRation').click(function () {