소스 검색

Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

zhangweicheng 4 년 전
부모
커밋
11e7b0a2c0
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      modules/pm/facade/pm_facade.js

+ 3 - 3
modules/pm/facade/pm_facade.js

@@ -1430,7 +1430,7 @@ async function getSummaryInfo(projectIDs, summaryField = defaultSummaryField){
                 }
             }
         }
-        IDMapping[project.ID] = { engineeringCost: summaryMap[project.ID].totalFee || 0, rate: summaryMap[project.ID].rate || 0, buildingArea: grossArea, perCost: ''};
+        IDMapping[project.ID] = { engineeringCost: +summaryMap[project.ID].totalFee || 0, rate: summaryMap[project.ID].rate || 0, buildingArea: grossArea, perCost: ''};
     }
 
     //单项工程
@@ -1440,7 +1440,7 @@ async function getSummaryInfo(projectIDs, summaryField = defaultSummaryField){
     
     for(let eng of engineerings){
         engIDs.push(eng.ID);
-        IDMapping[eng.ID] = {engineeringCost: summaryMap[eng.ID].totalFee || 0, rate: summaryMap[eng.ID].rate || 0, buildingArea: '', perCost: ''};
+        IDMapping[eng.ID] = {engineeringCost: +summaryMap[eng.ID].totalFee || 0, rate: summaryMap[eng.ID].rate || 0, buildingArea: '', perCost: ''};
     }
     //单位工程
     if(engIDs.length > 0){
@@ -1450,7 +1450,7 @@ async function getSummaryInfo(projectIDs, summaryField = defaultSummaryField){
     if(tenders.length > 0){
         for(let tender of tenders){
             tenderIDs.push(tender.ID);
-            IDMapping[tender.ID] = {engineeringCost: summaryMap[tender.ID].totalFee || 0, rate: summaryMap[tender.ID].rate || 0,buildingArea: '', perCost: '', changeMark:tender.changeMark,property:tender.property};
+            IDMapping[tender.ID] = {engineeringCost: +summaryMap[tender.ID].totalFee || 0, rate: summaryMap[tender.ID].rate || 0,buildingArea: '', perCost: '', changeMark:tender.changeMark,property:tender.property};
             let buildingArea = getBuildingArea(tender.property.projectFeature);
             if(buildingArea){
                 IDMapping[tender.ID]['buildingArea'] = buildingArea;