Browse Source

定额建安费(不含定额设备购置费)算法变更

vian 5 years ago
parent
commit
1a2eac6ac0
1 changed files with 4 additions and 3 deletions
  1. 4 3
      web/building_saas/main/js/models/calc_base.js

+ 4 - 3
web/building_saas/main/js/models/calc_base.js

@@ -725,12 +725,13 @@ let baseFigureTemplate = {
             return projectObj.project.calcProgram.getTotalFee([oneToSeven], deductNodes, fullFeeField).toDecimal(decimalObj.bills.totalPrice);
         },
         // {定额建安费(不含定额设备购置费)} 汇总各大项费用清单的“定额建安费”
+        // {定额建安费(不含定额设备购置费)} 汇总非设备类型的定额的定额建安费
         'DEJAFBHDESBGZF': function (tender) {
             const feeField = 'rationCommon';
             const subFeeField = tender ? 'tenderTotalFee' : 'totalFee';
-            const roots = projectObj.project.mainTree.roots;
-            const summaryFee = roots.reduce((total, node) => {
-                const fee = cbTools.getFee(node.data, feeField, subFeeField);
+            const rations = projectObj.project.Ration.datas.filter(ration => !(ration.type === rationType.gljRation && ration.subType === gljType.EQUIPMENT));
+            const summaryFee = rations.reduce((total, ration) => {
+                const fee = cbTools.getFee(ration, feeField, subFeeField);
                 return total += fee;
             }, 0);
             return summaryFee.toDecimal(decimalObj.bills.totalPrice);