Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/reports/controllers/rpt_controller.js

@@ -553,6 +553,7 @@ function getGljSummaryReportPages(user_id, prjIds, rpt_id, pageSize, orientation
             let rptDataUtil = new rptDataExtractor();
             rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
             try {
+                // fsUtil.writeObjToFile(summaryRawDataRst, "D:/GitHome/temp/summaryRawDataRstRawData.jsp");
                 let tplData = rptDataUtil.assembleData(summaryRawDataRst);
                 let printCom = JpcEx.createNew();
                 if (pageSize) rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
@@ -576,7 +577,7 @@ function getGljSummaryReportPages(user_id, prjIds, rpt_id, pageSize, orientation
                     cb('Have errors while on going...', null);
                 }
             } catch (ex) {
-                console.log("报表数据异常： userId " + user_id + ", project id: " + prj_id);
+                // console.log("报表数据异常： userId " + user_id + ", project id: " + prj_id);
                 console.log(ex);
                 cb('Exception occurs while on going...', null);
             }

modules/reports/util/rpt_yanghu_data_util.js

@@ -273,7 +273,8 @@ class Rpt_Data_Extractor {
         }
         //还有汇总的...
         if (rawDataObj.hasOwnProperty(`Construct`) || rawDataObj.hasOwnProperty(`ConstructDetail`) || rawDataObj.hasOwnProperty(`Segment`) || rawDataObj.hasOwnProperty(`SegmentDetail`)
-            || rawDataObj.hasOwnProperty(`SummaryAudit`) || rawDataObj.hasOwnProperty(`SummaryAuditDetail`)) {
+            || rawDataObj.hasOwnProperty(`SummaryAudit`) || rawDataObj.hasOwnProperty(`SummaryAuditDetail`)
+            || rawDataObj.hasOwnProperty(`SummaryGljAudit`) || rawDataObj.hasOwnProperty(`SummaryGljAuditDetail`)) {
             $PROJECT.SUMMARY = {};
             if (rawDataObj.Construct) {
                 setupMainFunc($PROJECT.SUMMARY, `Construct`, rawDataObj.Construct);

web/building_saas/main/js/models/calc_program.js

@@ -1765,6 +1765,7 @@ class CalcProgram {
         else if (treeNode.calcType == treeNodeCalcType.ctNull){
             delete treeNode.data.gljList;
             deleteProperties(treeNode, ['calcBase', 'calcBaseValue', 'tenderCalcBaseValue', 'programID']);
+            deleteUselessFees(treeNode, ['common', 'rationCommon']);
 
             if (treeNode.data.feesIndex && treeNode.data.feesIndex.common){
                 let uf, tf;