Browse Source

项目管理界面使用调价后的

vian 5 years ago
parent
commit
bdd9e1ed7b
1 changed files with 6 additions and 1 deletions
  1. 6 1
      modules/pm/facade/pm_facade.js

+ 6 - 1
modules/pm/facade/pm_facade.js

@@ -856,7 +856,11 @@ function getTotalFee(bills, feeName) {
     }
     for(let fee of bills.fees){
         if(isDef(fee.fieldName) && fee.fieldName === feeName){
-            return isDef(fee.totalFee) ? fee.totalFee : 0;
+            return isDef(fee.tenderTotalFee)
+                ? fee.tenderTotalFee
+                : isDef(fee.totalFee)
+                    ? fee.totalFee
+                    : 0;
         }
     }
     return 0;
@@ -1076,6 +1080,7 @@ async function getSummaryInfo(projectIDs, feeFields = null, engineeringCostField
     let engineerings = await projectModel.find({ParentID: {$in : projectIDs}, projType: projectType.engineering, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]});
     let tenders = [];
     let engIDs = [];
+    
     for(let eng of engineerings){
         engIDs.push(eng.ID);
         IDMapping[eng.ID] = {rate: 0, buildingArea: '', perCost: ''};