基数计算调整。

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

@@ -409,9 +409,10 @@ let calcTools = {
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
                     }
                 }
-                // result = result + (gljQ * mdSum).toDecimal(decimalObj.process);
-                result = result + (gljQ * mdSum).toDecimal(decimalObj.ration.unitPrice);
-                result = (result).toDecimal(decimalObj.ration.unitPrice);
+                if (typeof isCQ2018 != 'undefined')
+                    result = (result + (gljQ * mdSum).toDecimal(decimalObj.process)).toDecimal(decimalObj.process)
+                else
+                    result = (result + (gljQ * mdSum).toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
             }
         }
         result = (result).toDecimal(decimalObj.ration.unitPrice);
@@ -884,13 +885,14 @@ let calcTools = {
                 let gljQ;
                 if (isTender){
                     calcTools.calcGLJTenderQty(node, glj);
-                    gljQ = glj.tenderQuantity;
+                    gljQ = glj.tenderQuantity.toDecimal(decimalObj.glj.quantity);
                 }
                 else
-                    gljQ = glj.quantity;
+                    gljQ = glj.quantity.toDecimal(decimalObj.glj.quantity);
 
-                rst = rst + (gljQ * calcTools.uiNodeQty(node)).toDecimal(decimalObj.process);
-                rst = rst.toDecimal(decimalObj.process);
+                // rst = rst + (gljQ * calcTools.uiNodeQty(node)).toDecimal(decimalObj.process);
+                // rst = rst.toDecimal(decimalObj.process);
+                rst = (rst + gljQ).toDecimal(decimalObj.process);
             }
         };
         return rst.toDecimal(decimalObj.glj.quantity);

web/over_write/js/chongqing_2018.js

@@ -127,9 +127,9 @@ function overwriteRationCalcBases (taxType){
             rationCalcBases['安拆费及场外运输费'] = function (node, isTender) {
                 return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.DISMANTLING_FREIGHT_FEE, isTender);
             };
-            rationCalcBases['燃料动力费'] = function (node, isTender) {
+/*            rationCalcBases['燃料动力费'] = function (node, isTender) {
                 return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.FUEL_POWER_FEE, isTender);
-            };
+            };*/
             rationCalcBases['定额仪器仪表费'] = function (node, isTender) {
                 return calcTools.rationBaseFee(node, [gljType.INSTRUMENT], priceTypes.ptBasePrice, isTender);
             };