Pārlūkot izejas kodu

造价计算,量价的单价、合价会丢失。
量价没有定额价,费用汇总的“价差”是负数。

chenshilong 4 gadi atpakaļ
vecāks
revīzija
cbc16f16db

+ 3 - 5
web/building_saas/main/js/models/calc_program.js

@@ -2009,9 +2009,7 @@ class CalcProgram {
           let u = treeNode.data.marketUnitFee ? treeNode.data.marketUnitFee : 0;
           let t = (u * nQ).toDecimal(decimalObj.ration.totalPrice);
           if (treeNode.data.marketTotalFee != t){
-            treeNode.data.marketTotalFee = t;
-            treeNode.changed = true;
-
+              treeNode.data.marketTotalFee = t;
               let obj = {};
               obj.fieldName = 'common';
               obj.unitFee = u;
@@ -2019,10 +2017,10 @@ class CalcProgram {
               obj.tenderUnitFee = obj.unitFee;
               obj.tenderTotalFee = obj.totalFee;
               calcTools.checkFeeField(treeNode, obj);
-
               me.deleteUselessFees(treeNode, budgetFields);
-              return;
+              treeNode.changed = true;
           }
+          return;
         };
       };
 

+ 1 - 1
web/building_saas/main/js/models/ration_glj.js

@@ -69,7 +69,7 @@ let ration_glj = {
               let glj = JSON.parse(JSON.stringify(ration));
               glj.type = glj.subType;
               glj.totalQuantity = parseFloatPlus(ration.quantity);
-              glj.markertPrice = glj.marketUnitFee;
+              glj.marketPrice = glj.marketUnitFee;
               glj.basePrice = glj.marketUnitFee;
               glj.adjustPrice = glj.marketUnitFee;
               result.push(glj);