TASK #5043 补漏(多表)

app/controller/report_controller.js

@@ -1289,11 +1289,13 @@ module.exports = app => {
 
             let stgAudit = null,
                 stageFlow = null,
-                stageList = [];
+                stageList = [],
+                ledger = [];
             if (params.stage_id > 0) {
                 stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
                 stageList = await ctx.service.stage.getValidStagesShort(params.tender_id);
                 stageFlow = await ctx.service.stageAudit.getAuditGroupByListWithOwner(params.stage_id, params.stage_times);
+                ledger = await ctx.service.ledger.getDataOnlyByNodeId(params.tender_id);
             } else if ([-100, -200].includes(params.stage_id)) {
                 stgAudit = await ctx.service.paymentDetailAudit.getAuditors(params.detail_id);
                 stageFlow = await ctx.service.paymentDetailAudit.getAuditorsWithOwner(params.detail_id);
@@ -1321,7 +1323,7 @@ module.exports = app => {
                 }
             }
             // console.log(pageRstArr);
-            ctx.body = { data: pageRstArr, signatureRelInfo: roleRel, stageAudit: stgAudit, stageFlow, waterMarkStr };
+            ctx.body = { data: pageRstArr, signatureRelInfo: roleRel, stageAudit: stgAudit, stageFlow, waterMarkStr, ledger };
             ctx.status = 201;
         }
 

app/public/report/js/rpt_main.js

@@ -508,8 +508,8 @@ let zTreeOprObj = {
                 if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
                 STAGE_AUDIT = result.stageAudit || [];
                 STAGE_AUDIT_ORG = result.stageAuditOrg || [];
-                STAGE_FLOW = result.stageFlow;
-                LEDGER_LIST = result.ledger;
+                STAGE_FLOW = result.stageFlow || [];
+                LEDGER_LIST = result.ledger || [];
                 //stageAuditOrg
                 if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
                     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
@@ -1021,6 +1021,7 @@ let rptControlObj = {
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
                         STAGE_AUDIT = result.stageAudit || [];
                         STAGE_FLOW = result.stageFlow || [];
+                        LEDGER_LIST = result.ledger || [];
                         let pageSize = rptControlObj.getCurrentPageSize();
                         let pageDataArr = result.data;
                         let signatureRelInfo = result.signatureRelInfo;
@@ -1192,6 +1193,7 @@ let rptControlObj = {
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
                         STAGE_AUDIT = result.stageAudit || [];
                         STAGE_FLOW = result.stageFlow || [];
+                        LEDGER_LIST = result.ledger || [];
                         let pageSize = rptControlObj.getCurrentPageSize();
                         let pageDataArr = result.data;
                         let signatureRelInfo = result.signatureRelInfo;