1

app/controller/report_controller.js

@@ -166,7 +166,6 @@ module.exports = app => {
             rptTpl = JSON.parse(rptTpl[0].rpt_content);
             // console.log('get the template!');
             const customSelect = await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, params.stage_id, params.rpt_tpl_id);
-            console.log(customSelect);
             const pageRst = await getAllPagesCommon(ctx, rptTpl, params, JV.PAGING_OPTION_NORMAL, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir, customSelect);
             // console.log(pageRst);
             // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
@@ -539,6 +538,7 @@ async function getAllPagesCommon(ctx, rptTpl, params, option, outputType, baseDi
     const filter = rptDataUtil.getDataRequestFilter();
     // console.log(filter.tables);
     const rawDataObj = await ctx.service.report.getReportData(params, filter.tables, filter.memFieldKeys);
+    await ctx.helper.saveBufferFile(JSON.stringify(rawDataObj,"","\t"), ctx.app.baseDir + '/mem.json');
     // console.log(rawDataObj);
     try {
         const printCom = JpcEx.createNew();

app/service/report.js

@@ -94,11 +94,8 @@ module.exports = app => {
                             break;
                         case 'mem_stage_pay':
                             runnableRst.push(service.reportMemory.getStagePayData(params.tender_id, params.stage_id, memFieldKeys[filter]));
-                            runnableKey.push('mem_stage_pay');
-                        // case 'mem_change_bills':
-                        //     runnableRst.push(service.reportMemory.getChangeBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]));
-                        //     runnableKey.push('mem_change_bills');
-                        //     break;
+                            runnableKey.push(filter);
+                            break;
                         case 'change':
                             runnableRst.push(service.change.getListByStatus(params.tender_id, 3)); // 获取所有审核通过的变更主信息
                             runnableKey.push(filter);

app/service/report_memory.js

@@ -49,15 +49,6 @@ const posFields = (function () {
     return {cur, pre, end, final, stage, stageEnd, bgl};
 })();
 
-const curFields = ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'gather_qty', 'gather_tp', 'postil'];
-const preFields = ['pre_contract_qty', 'pre_contract_tp', 'pre_qc_qty', 'pre_qc_tp', 'pre_gather_qty', 'pre_gather_tp'];
-const endFields = ['end_contract_qty', 'end_contract_tp', 'end_qc_qty', 'end_qc_tp', 'end_gather_qty', 'end_gather_tp'];
-const finalFields = ['final_tp', 'final_ratio'];
-
-const stageFields = curFields.concat(preFields, endFields, finalFields);
-const stageEndFields = preFields.concat(endFields, finalFields);
-const bglFields = ['qc_bgl_code'];
-
 module.exports = app => {
     class ReportMemory extends app.BaseService {
 
@@ -201,30 +192,6 @@ module.exports = app => {
             }
         }
 
-        async getStageImTzNoReturn(tid, sid) {
-            // 备注：单独拎出以下几行代码一个是为了提高效率(跟getStageImTzDataDirectlyByKey方法协作使用)
-            //      二是如果出现并行查询(台账及台账清单)情况下，会出现干扰(已验证过)，导致数据丢失
-            if (!this.stageImData) {
-                this.stageImData = {};
-            }
-            try {
-                await this._generateStageIm(tid, sid);
-            } catch (err) {
-                this.stageImData.main = [];
-                this.stageImData.bills = [];
-            }
-        }
-
-        getStageImTzDataDirectlyByKey(key) {
-            let rst = [];
-            if (key === 'mem_stage_im_tz') {
-                rst = this.stageImData.main;
-            } else {
-                rst = this.stageImData.bills;
-            }
-            return rst;
-        }
-
         async getStageImTzData(tid, sid, fields) {
             await this.ctx.service.tender.checkTender(tid);
             await this.ctx.service.stage.checkStage(sid);

builder_report_index_define.js

@@ -188,11 +188,11 @@ const changeBills = {
 };
 // 期 - 计量单元
 const stage_pos = {
-    name: '期-部位明细(mem_stage_pos)',
+    name: '期-计量单元(mem_stage_pos)',
     remark: '',
     id: 34,
     key: 'stage_pos',
-    prefix: '期-部位明细',
+    prefix: '期-计量单元',
     cols: [
         {name: 'id', field: 'id', type: dataType.str},
         {name: '所属标段id', field: 'tid', type: dataType.int},
@@ -220,11 +220,11 @@ const stage_pos = {
     ],
 };
 const stage_pos_compare = {
-    name: '期-部位明细-全参与人(mem_stage_pos_compare)',
+    name: '期-计量单元-全参与人(mem_stage_pos_compare)',
     remark: '',
     id: 35,
     key: 'stage_pos_compare',
-    prefix: '期-部位明细-全参与人',
+    prefix: '期-计量单元-全参与人',
     cols: [
         {name: 'id', field: 'id', type: dataType.str},
         {name: '所属标段id', field: 'tid', type: dataType.int},