浏览代码

数据预处理,交叉汇总数据,处理合同支付、签约清单

MaiXinRong 5 年之前
父节点
当前提交
42f58b9395
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 4 2
      app/lib/rpt_data_analysis.js
  2. 1 1
      builder_report_index_define.js

+ 4 - 2
app/lib/rpt_data_analysis.js

@@ -1011,7 +1011,7 @@ const gatherSelectConverse = {
     defaultSetting: {
         table: ['mem_gather_stage_bills'],
     },
-    _stageBills: function (helper, data, count) {
+    _commonConverse: function (helper, data, count) {
         const result = [];
         const reg = new RegExp('^t_[0-9]+_');
         for (let i = 0; i < count; i++) {
@@ -1043,7 +1043,9 @@ const gatherSelectConverse = {
         for (const t of options.table) {
             switch (t) {
                 case 'mem_gather_stage_bills':
-                    data[t] = this._stageBills(ctx.helper, data[t], count);
+                case 'mem_gather_stage_pay':
+                case 'mem_gather_deal_bills':
+                    data[t] = this._commonConverse(ctx.helper, data[t], count);
                     break;
             }
         }

+ 1 - 1
builder_report_index_define.js

@@ -824,7 +824,7 @@ const gather_deal_bills = {
     remark: '',
     id: 39,
     key: 'mem_gather_deal_bills',
-    prefix: '汇总-期-合同支付',
+    prefix: '汇总-签约清单',
     cols: [
         { name: '编号', field: 'code', type: dataType.str },
         { name: '名称', field: 'name', type: dataType.str },