甲供主材费计算不正确

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

@@ -790,7 +790,7 @@ let calcTools = {
                     Q = Q ? Q : 1;
                     X = tempSGLJ.supply_quantity / Q;
                 };
-                let gljP = isRationPirce ? glj.basePrice : (isTender ? projectGLJ.getTenderMarketPrice(glj) : glj.marketPrice);
+                let gljP = isRationPirce ? glj.basePrice : (isTender ? projectGLJ.getTenderMarketPrice(calcTools.getProjectGLJ(glj)) : glj.marketPrice);
                 sum = (sum + gljP * gljQ * X).toDecimal(decimalObj.process);
             }
             else{   // 当前材料不是甲供材料
@@ -805,7 +805,7 @@ let calcTools = {
                                 if (baseName.includes('甲供') && (c.supply == supplyType.BFJG)){
                                     X = c.supplyX;
                                 };
-                                let cP = isRationPirce ? c.basePrice : (isTender ? projectGLJ.getTenderMarketPrice(c) : c.marketPrice);
+                                let cP = isRationPirce ? c.basePrice : (isTender ? projectGLJ.getTenderMarketPrice(calcTools.getProjectGLJ(c)) : c.marketPrice);
                                 sum = (sum + cP * c.consumption * gljQ * X).toDecimal(decimalObj.process);
                             }
                         }
@@ -1169,10 +1169,10 @@ let rationCalcBases = {
         return calcTools.partASupplyFee(node, '甲供定额基价机械费', isTender);
     },
     '甲供主材费': function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供主材费', isTender);
+        return calcTools.partASupplyFee(node, '甲供主材费', isTender, false);
     },
     '甲供设备费': function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供设备费', isTender);
+        return calcTools.partASupplyFee(node, '甲供设备费', isTender, false);
     },
     '甲定定额基价人工费': function (node, isTender) {
         return calcTools.partASupplyFee(node, '甲定定额基价人工费', isTender);
@@ -1184,10 +1184,10 @@ let rationCalcBases = {
         return calcTools.partASupplyFee(node, '甲定定额基价机械费', isTender);
     },
     '甲定主材费': function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定主材费', isTender);
+        return calcTools.partASupplyFee(node, '甲定主材费', isTender, false);
     },
     '甲定设备费': function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定设备费', isTender);
+        return calcTools.partASupplyFee(node, '甲定设备费', isTender, false);
     },
     '暂估材料费': function (node, isTender) {
         return calcTools.estimateFee(node, true, isTender);

web/over_write/js/chongqing_2018.js

@@ -155,7 +155,7 @@ function overwriteRationCalcBases (taxType){
             return calcTools.partASupplyFee(node, '甲供定额施工机具费', isTender);
         };
         rationCalcBases['甲供主材费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲供主材费', isTender);
+            return calcTools.partASupplyFee(node, '甲供主材费', isTender, false);
         };
         rationCalcBases['甲定定额人工费'] = function (node, isTender) {
             return calcTools.partASupplyFee(node, '甲定定额人工费', isTender);
@@ -167,7 +167,7 @@ function overwriteRationCalcBases (taxType){
             return calcTools.partASupplyFee(node, '甲定定额施工机具费', isTender);
         };
         rationCalcBases['甲定主材费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲定主材费', isTender);
+            return calcTools.partASupplyFee(node, '甲定主材费', isTender, false);
         };
         rationCalcBases['暂估材料费'] = function (node, isTender) {
             return calcTools.estimateFee(node, true, isTender);