瀏覽代碼

报表章分页问题

TonyKang 4 年之前
父節點
當前提交
f6b6c1170d
共有 2 個文件被更改,包括 15 次插入11 次删除
  1. 14 11
      app/lib/rpt_data_analysis.js
  2. 1 0
      app/reports/rpt_component/jpc_flow_tab.js

+ 14 - 11
app/lib/rpt_data_analysis.js

@@ -1395,19 +1395,22 @@ const stageSelectConverse = {
         const gsDefine = csRela.tplDefine.stage_select;
         if (!gsDefine || !gsDefine.enable || !gsDefine.setting || gsDefine.setting === '') return;
         const gsCustom = csRela.cDefine ? csRela.cDefine.stage_select : null;
-        console.log(gsCustom[0]);
-
-        console.log(data.mem_stage_sum_bills[0]);
-        for (const t of options.table) {
-            switch (t) {
-                case 'mem_stage_sum_bills':
-                case 'mem_stage_sum_pay':
-                case 'mem_union_data':
-                    data[t] = this._commonConverse(ctx.helper, data[t], gsCustom.stages);
-                    break;
+        if (gsCustom) {
+            console.log(gsCustom[0]);
+            console.log(data.mem_stage_sum_bills[0]);
+            for (const t of options.table) {
+                switch (t) {
+                    case 'mem_stage_sum_bills':
+                    case 'mem_stage_sum_pay':
+                    case 'mem_union_data':
+                        data[t] = this._commonConverse(ctx.helper, data[t], gsCustom.stages);
+                        break;
+                }
             }
+            console.log(data.mem_stage_sum_bills[0]);
+        } else {
+            console.log('gsCustom is null!');
         }
-        console.log(data.mem_stage_sum_bills[0]);
     }
 };
 

+ 1 - 0
app/reports/rpt_component/jpc_flow_tab.js

@@ -645,6 +645,7 @@ JpcFlowTabSrv.prototype.createNew = function() {
                 while (true) {
                     if (currentRecAmt > 0) pageStatus[JV.STATUS_SEGMENT_START] = false;
                     if (pageIdx > 0) pageStatus[JV.STATUS_REPORT_START] = false;
+                    private_resetBandArea(); // 这里得预先算maxRowRec(实际数据情况,会有章首页框,在章数据多的情况下,章第二页开始就得补上章首页框不显示遗留下来的row)
                     // 开始判断各种scenarios
                     adHocAutoHeightAmt = 0;
                     if (me.auto_height_fields_idx.length > 0) {