|
@@ -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: ''};
|