calcFlag

web/building_saas/main/js/models/calc_program.js

@@ -1629,7 +1629,6 @@ class CalcProgram {
         me.setUpdateDataToNode(treeNode);                                       // 先更新要计算的节点信息
         if(!treeNode.temData) treeNode.temData = _.cloneDeep(treeNode.data);    // 有可能会有多次计算，只有第一次才保存原始数据，用来对于更新。
 
-
         let nQ = calcTools.uiNodeQty(treeNode);
         let nTQ = calcTools.uiNodeTenderQty(treeNode);
         treeNode.calcType = calcTools.getCalcType(treeNode);
@@ -1687,7 +1686,7 @@ class CalcProgram {
                     btf = sum_rtf;
                     bttf = sum_rttf;
 
-                    if (projectObj.project.property.valuationType != 'bill') {  // 招投标项目, 还要反算
+                    if (calcTools.isBillProject()) {  // 招投标项目, 还要反算
                         buf = buf.toDecimal(decimalObj.bills.unitPrice);
                         btuf = btuf.toDecimal(decimalObj.bills.unitPrice);
                         btf = (buf * nQ).toDecimal(decimalObj.bills.totalPrice);
@@ -1766,14 +1765,14 @@ class CalcProgram {
                 calcTools.checkFeeField(treeNode, ftObj);
 
                 // 数量、金额时，同步定额建安费
-                if (treeNode.data.calcFlag == treeNodeCalcFlag.customUnitPrice || treeNode.data.calcFlag == treeNodeCalcFlag.customTotalPrice){
+                // if (treeNode.data.calcFlag == treeNodeCalcFlag.customUnitPrice || treeNode.data.calcFlag == treeNodeCalcFlag.customTotalPrice){
                     let ftObj2 = {
                         fieldName: 'rationCommon',
                         unitFee: uf,
                         totalFee: tf
                     };
                     calcTools.checkFeeField(treeNode, ftObj2);
-                };
+                // };
             }
 
             treeNode.data.calcTemplate = {"calcItems": []};
@@ -1962,6 +1961,7 @@ class CalcProgram {
     };
     setUpdateDataToNode(node){//将updateData里面的值设到node.data上，计算结点时才能拿到最新的值
         if(!_.isEmpty(node.updateData)){
+            node.changed = true;
             for(let key in node.updateData){
                 node.data[key] = node.updateData[key];
             }

web/building_saas/main/js/models/ration.js

@@ -606,6 +606,8 @@ var Ration = {
                     }else {
                         project.projectGLJ.loadData(function () {
                             syncNodeOper(data);
+                            if (newNode.parent.data.calcFlag)        // 删除定额时不用改Flag，反正添加定额时已经改好了。
+                                newNode.parent.updateData.calcFlag = null;
                             project.calcProgram.calcAndSave(newNode,function () {
                                 if(project.Bills.isFBFX(newNode)) { //判断是否属于分部分项工程 ，是的话才需要做计取安装费计算
                                     installationFeeObj.calcInstallationFee();
@@ -685,11 +687,15 @@ var Ration = {
                     newSource = data.ration;
                     newNode.source = newSource;
                     newNode.data = newSource;
-                })
+                });
                 ProjectController.syncDisplayNewNode(sheetController, newNode);
                 if(callback){
                     callback(newNode);
-                }
+                };
+                if (newNode.parent.data.calcFlag) {        // 删除定额时不用改Flag，反正添加定额时已经改好了。
+                    newNode.parent.updateData.calcFlag = null;
+                    project.calcProgram.calcAndSave(newNode.parent);
+                };
                 $.bootstrapLoading.end();
                 return newNode;
             }

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

@@ -1991,7 +1991,7 @@ $("body").on("click",  function(e) {
     }
 });
 
-$('#insert').click(function () {
+/*$('#insert').click(function () {
     var controller = projectObj.mainController, project = projectObj.project;
     var selected = controller.tree.selected;
 
@@ -2000,7 +2000,7 @@ $('#insert').click(function () {
     } else if (selected.sourceType === project.Ration.getSourceType()) {
         ProjectController.addRation(project, controller, selected.data.type);
     };
-});
+});*/
 
 $('#delete').click(function () {
     let project = projectObj.project;