调价Bug

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

@@ -1779,7 +1779,7 @@ class CalcProgram {
     };
 
     // 只计算treeNode自身。changedArr: 外部传来的一个数组，专门存储发生变动的节点。
-    innerCalc(treeNode, changedArr, tender){
+    innerCalc(treeNode, changedArr, tenderType){
         let me = this;
         // 仅用作树节点显示的工料机不能参与计算。
         if (treeNode.sourceType === ModuleNames.ration_glj) return;
@@ -2022,7 +2022,7 @@ class CalcProgram {
                     calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.decimal('unitPrice', treeNode));
                     calcItem.totalFee = (calcItem.unitFee * calcTools.uiNodeQty(treeNode)).toDecimal(decimalObj.decimal('totalPrice', treeNode));
 
-                    // if (tender == tenderTypes.ttCalc) {
+                    // if (tenderType == tenderTypes.ttCalc) {
                         let tExpr = analyzer.getCompiledTenderExpr(calcItem.compiledExpr);
                         calcItem.tenderUnitFee = (eval(tExpr) * feeRate * 0.01).toDecimal(decimalObj.decimal('unitPrice', treeNode));
                         calcItem.tenderTotalFee = (calcItem.tenderUnitFee * treeNode.data.tenderQuantity).toDecimal(decimalObj.decimal('totalPrice', treeNode));
@@ -2034,8 +2034,8 @@ class CalcProgram {
                     };
                 };
 
-                if (tender == tenderTypes.ttReverseRation || tender == tenderTypes.ttReverseGLJ)
-                    this.calcTenderReverse(treeNode, tender);
+                if (tenderType == tenderTypes.ttReverseRation || tenderType == tenderTypes.ttReverseGLJ)
+                    this.calcTenderReverse(treeNode, tenderType);
 
                 deleteUselessFees(treeNode, fnArr);
             };

web/building_saas/main/js/views/tender_price_view.js

@@ -470,6 +470,7 @@ $(function () {
         let process = getDecimal('process');
         var newVal = $(this).val();
         process = scMathUtil.roundForObj(newVal,process);
+        if (process == 0) process = 1;    // 清空系数时，强制给1
         let updateData = {type:ModuleNames.project,data:{'ID' : projectObj.project.ID(),'property.tenderSetting.gljPriceTenderCoe':process}};
         me.updateTenderData([updateData],function () {
             me.initPageContent();
@@ -490,14 +491,6 @@ $(function () {
         projectObj.project.calcProgram.doTenderCalc(callback);
     });
 
-    // $('#tenderGLJQuantity').on('click', function () {
-    //     tender_obj.doTenderCalc(tenderTypes.ttReverseGLJ);
-    // });
-    //
-    // $('#tenderRationQuantity').on('click', function () {
-    //     tender_obj.doTenderCalc(tenderTypes.ttReverseRation);
-    // });
-
     $('#cbShowTenderFields').on('click', function () {
         let showFields = $('#cbShowTenderFields').prop("checked");
         projectObj.project.saveProperty('tenderSetting.showTenderFields', showFields);