重庆2018 A03表 完整通过

modules/pm/facade/pm_facade.js

@@ -14,6 +14,7 @@ module.exports={
     copyExample: copyExample,
     getSummaryInfo: getSummaryInfo,
     getSummaryInfoByTender: getSummaryInfoByTender,
+    getIndexReportData: getIndexReportData,
     getTendersFeeInfo: getTendersFeeInfo,
     getConstructionProject: getConstructionProject,
     getFullPath: getFullPath,
@@ -703,6 +704,12 @@ function getBuildingArea(projFeature){
     return null;
 }
 
+//根据单位工程ID获取经济指标信息
+//@param {Number}prj_id @return {Object}
+async function getIndexReportData(prj_id) {
+    return await project_facade.getIndexReportData(prj_id);
+}
+
 //根据单位工程ID获取汇总信息
 //@param {Number}tenderID {String}summaryType @return {Object}
 async function getSummaryInfoByTender(tenderID, summaryType) {

modules/reports/controllers/rpt_controller.js

@@ -222,12 +222,7 @@ function setupCustomizeCfg(customizeCfg, rptTpl, defProperties) {
         }
     }
 }
-function getEcoFieldsData() {
-    let dummyDataObj = null;
-    let data = fs.readFileSync('D:/Temp/demoFieldData.js', 'utf8', 'r');
-    eval('dummyDataObj = ' + data + ';');
-    return dummyDataObj;
-}
+
 function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, option, outputType, cb) {
     let rptTpl = null;
     rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
@@ -247,7 +242,7 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
                 }
             }
             if (economicRst.length > 0) {
-                promiseArr[2] = getEcoFieldsData();
+                promiseArr[2] = pm_facade.getIndexReportData(prj_id);
             }
             rptTplDataFacade.prepareProjectData(user_id, prj_id, filter, function (err, msg, rawDataObj) {
                 if (!err) {
@@ -306,13 +301,17 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
                         });
                     } else {
                         if (promiseArr[2] !== null) {
-                            //暂时这样测试
-                            rawDataObj.prjData.push({moduleName: 'ProjectCostFields', data: promiseArr[2].ProjectCostFields});
-                            rawDataObj.prjData.push({moduleName: 'ProjectEcoFields', data: promiseArr[2].ProjectEcoFields});
-                            rawDataObj.prjData.push({moduleName: 'ProjectLabMaterialFields', data: promiseArr[2].ProjectLabMaterialFields});
-                            rawDataObj.prjData.push({moduleName: 'ProjectQtyFields', data: promiseArr[2].ProjectQtyFields});
+                            promiseArr[2].then(function (rst) {
+                                let ecoFieldsRst = (rst._doc)?rst._doc:rst;
+                                rawDataObj.prjData.push({moduleName: 'ProjectCostFields', data: ecoFieldsRst.ProjectCostFields});
+                                rawDataObj.prjData.push({moduleName: 'ProjectEcoFields', data: ecoFieldsRst.ProjectEcoFields});
+                                rawDataObj.prjData.push({moduleName: 'ProjectLabMaterialFields', data: ecoFieldsRst.ProjectLabMaterialFields});
+                                rawDataObj.prjData.push({moduleName: 'ProjectQtyFields', data: ecoFieldsRst.ProjectQtyFields});
+                                buildPageData(rawDataObj, rptDataUtil, rptTpl);
+                            });
+                        } else {
+                            buildPageData(rawDataObj, rptDataUtil, rptTpl);
                         }
-                        buildPageData(rawDataObj, rptDataUtil, rptTpl);
                     }
                     /*/
                     let tplData = rptDataUtil.assembleData(rawDataObj);