汇总表调整 + 小数补零

modules/reports/rpt_component/helper/jpc_helper_cross_tab.js

@@ -232,6 +232,7 @@ function getMaxTabCntPerPage(rptTpl, tabNodeName, tabMeasurePropName, measureFor
         }
         rst = Math.floor(measureForCal / maxFieldMeasure);
     }
+    if (rst <= 0) rst = 1;
     return rst;
 };
 

modules/reports/rpt_component/helper/jpc_helper_field.js

@@ -1,4 +1,5 @@
 let JV = require('../jpc_value_define');
+let strUtil = require("../../../../public/stringUtil");
 
 let JpcFieldHelper = {
     getValue: function(dataField, valueIdx) {
@@ -45,6 +46,10 @@ let JpcFieldHelper = {
             }
             map_field[JV.PROP_FORMAT] = tab_field[JV.PROP_FORMAT]; //这里顺手把format也赋给map_field,后期统计用得着
             rst = true;
+        } else if (tab_field[JV.PROP_FORMAT] && tab_field[JV.PROP_FORMAT].indexOf("#") >= 0 && (customizeCfg && customizeCfg.fillZero)) {
+            tab_field[JV.PROP_FORMAT] = strUtil.replaceAll(tab_field[JV.PROP_FORMAT], '#', '0');
+            map_field[JV.PROP_FORMAT] = tab_field[JV.PROP_FORMAT];
+            rst = true;
         }
         return rst;
     },

test/unit/reports/test_summary_multi_prjs.js

@@ -14,9 +14,9 @@ let dbm = require("../../../config/db/db_manager");
 let rpt_cfg = require('./rpt_cfg');
 dbm.connect(process.env.NODE_ENV);
 
-let demoPrjs = [2552]; //
+let demoPrjs = [548,561]; //
 // let demoRptId = 68; //01-2
-let demoRptId = 72; //01-1
+let demoRptId = 79; //01-1
 // let demoRptId = 73; //02-2
 let pagesize = "A4";
 // let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
@@ -53,7 +53,7 @@ test('测试 - 测试清单汇总: ', function (t) {
         rptTplFacade.getRptTemplate(demoRptId).then(function(rptTpl) {
             try {
                 let dt = new Date();
-                // fsUtil.writeObjToFile(summaryRst, "D:/GitHome/YangHuCost/tmp/多清单汇总表(01_2)原始数据.jsp");
+                fsUtil.writeObjToFile(summaryRst, "D:/GitHome/YangHuCost/tmp/多清单汇总表(01_1)原始数据.jsp");
                 let rptDataUtil = new rptDataExtractor();
                 rptDataUtil.initialize(rptTpl._doc);
                 let tplData = rptDataUtil.assembleData(summaryRst);