报表，查询设计量明细、计算模板等数据

app/service/report.js

@@ -523,6 +523,14 @@ module.exports = app => {
                             runnableRst.push(service.reportMemory.getPhasePayDetail(params.tender_id, params.stage_id));
                             runnableKey.push(filter);
                             break;
+                        case 'mem_calc_template':
+                            runnableRst.push(service.calcTmpl.getAllDataByCondition({ pid: this.ctx.session.sessionProject.id }));
+                            runnableKey.push(filter);
+                            break;
+                        case 'mem_pos_calc_detail':
+                            runnableRst.push(service.posCalcDetail.getAllDataByCondition({ tid: params.tender_id }));
+                            runnableKey.push(filter);
+                            break;
                         default:
                             break;
                     }

app/service/report_memory.js

@@ -548,6 +548,7 @@ module.exports = app => {
                 const billsData = this.ctx.stage.ledgerHis
                     ? await this.ctx.helper.loadLedgerDataFromOss(this.ctx.stage.ledgerHis.bills_file)
                     : await this.ctx.service.ledger.getData(this.ctx.tender.id);
+                const extraData = await this.ctx.service.ledgerExtra.getData(this.ctx.tender.id, ['is_tp', 'gxby_status', 'gxby_limit', 'gxby_ratio', 'dagl_status', 'dagl_limit', 'dagl_ratio', 'calc_template']);
                 const memoData = this.ctx.stage.ledgerHis ? await this.ctx.service.ledger.getAllDataByCondition({ columns: ['id', 'memo'], where: { tender_id: this.ctx.tender.id } }) : [];
                 if (this._checkFieldsExist(fields, billsFields.stageDgn)) {
                     const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(this.ctx.tender.id);
@@ -577,6 +578,7 @@ module.exports = app => {
                     ? await this.ctx.service.changeAuditList.getBillsSum(this.ctx.tender.id)
                     : [];
                 this.ctx.helper.assignRelaData(billsData, [
+                    { data: extraData, field: ['is_tp', 'gxby_status', 'gxby_limit', 'gxby_ratio', 'dagl_status', 'dagl_limit', 'dagl_ratio', 'calc_template'], prefix: '', relaId: 'id' },
                     { data: memoData, fields: ['memo'], prefix: '', relaId: 'id' },
                     { data: curStage, fields: ['contract_qty', 'contract_tp', 'contract_expr', 'qc_qty', 'qc_tp', 'qc_minus_qty', 'postil'], prefix: '', relaId: 'lid' },
                     { data: preStage, fields: ['contract_qty', 'contract_tp', 'qc_qty', 'qc_tp', 'qc_minus_qty'], prefix: 'pre_', relaId: 'lid' },