统计的格式化问题(没有处理到离散指标的统计)

modules/reports/rpt_component/helper/jpc_helper_field.js

@@ -19,7 +19,9 @@ let JpcFieldHelper = {
             for (let tab_field of ref_tab_fields) {
                 if (tab_field[JV.PROP_FIELD_ID] === sum_tab_field[JV.PROP_FIELD_ID]) {
                     rst = true;
-                    sum_tab_field[JV.PROP_FORMAT] = tab_field[JV.PROP_FORMAT];
+                    if (tab_field[JV.PROP_FORMAT]) {
+                        sum_tab_field[JV.PROP_FORMAT] = tab_field[JV.PROP_FORMAT];
+                    }
                     break;
                 }
             }

modules/reports/rpt_component/jpc_flow_tab.js

@@ -986,10 +986,8 @@ JpcFlowTabSrv.prototype.createNew = function(){
                 let tab_fields = me.page_sum_tab_fields;
                 for (let i = 0; i < tab_fields.length; i++) {
                     if (!JpcFieldHelper.resetSumFormat(ref_tab_fields, tab_fields[i])) {
-                        if (!JpcFieldHelper.resetSumFormat(ref_tab_fields_ex, tab_fields[i])) {
-                            let map_data_field = JE.F(tab_fields[i][JV.PROP_FIELD_ID], $CURRENT_RPT);
-                            tab_fields[i][JV.PROP_FORMAT] = map_data_field[JV.PROP_FORMAT];
-                        }
+                        JpcFieldHelper.resetSumFormat(ref_tab_fields_ex, tab_fields[i]);
+                        //如果都找不到，说明是离散的指标，那么就得靠tab_fields[i]本身的Format来处理格式了
                     }
                     let cellItem = JpcCommonOutputHelper.createCommonOutput(tab_fields[i], me.pageSumValLst[page - 1][i], controls);
                     cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_fields[i][JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, me.multiCols, 0, true, false);

test/unit/reports/test_rpt_test_template.js

@@ -32,8 +32,8 @@ let demoPrjId = - 1;
 // let demoRptId = 361; //封1
 // let demoRptId = 279; //表04
 // let demoRptId = 261; //封3
-// let demoRptId = 418; //09
-let demoRptId = 386; //04
+let demoRptId = 400; //09
+// let demoRptId = 386; //04
 // let demoRptId = 389; //10
 // let demoRptId = 280; //11-1 暂列金
 // let demoRptId = 2260; //测试基本信息