feat: TASK #5580 调整

app/controller/report_controller.js

@@ -1464,9 +1464,10 @@ module.exports = app => {
                 // const bglObj = { status: stage_status };
                 // bglObj.BUSINESS_ID = ctx.params.id;
 
-                const project_id = ctx.subProject.id;
+                const project_id = ctx.subProject.project_id;
+                // const project_id = ctx.subProject.id;
                 // const { treeNodes, custCfg, commonArrs } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract, project_id);
-                const { treeNodes, custCfg, commonArrs, allTreeItems, allIndivTreeItems } = await this._createNodes(ctx, source_type, project_id);
+                const { treeNodes, custCfg, commonArrs, allTreeItems, allIndivTreeItems } = await this._createNodes(ctx, sourceTypeConst.sourceType.cost_ledger, project_id);
                 // const custTreeFolders = await this._getCustFolder(ctx, this.ctx.session.sessionUser.accountId, tenderId);
                 const custTreeFolders = [];
                 const rpt_tpl_items = { customize: [], common: [] };
@@ -1527,7 +1528,7 @@ module.exports = app => {
                     project_id,
                     tender_id: tenderId,
                     budget_id: -1,
-                    sp_id: -1,
+                    sp_id: ctx.subProject.id,
                     tender_name: '',
                     detail_id: -1,
                     stg_id: show_stage_id,
@@ -1796,8 +1797,8 @@ module.exports = app => {
                 case -802: // 成本分析
                     const costAudit = await ctx.service.costStageAudit.getAuditors(params.cost_stage_id, params.stage_times);
                     costAudit.forEach(audit => {
-                        stgAudit.push({ aid: audit.create_user_id, status: audit.audit_status, opinion: '', end_time: audit.audit_end_time, order: audit.stage_order });
-                        stageFlow.push({ aid: audit.create_user_id, audit_type: audit.stage_type, status: audit.audit_status, order: audit.stage_order });
+                        stgAudit.push({ aid: audit.audit_id, status: audit.audit_status, opinion: '', end_time: audit.audit_time, order: audit.audit_order });
+                        stageFlow.push({ aid: audit.audit_id, audit_type: audit.stage_type, status: audit.audit_status, order: audit.audit_order });
                     });
                     break;
                 // case -801: // 财务账面

app/public/report/js/rpt_main.js

@@ -534,9 +534,10 @@ let zTreeOprObj = {
             params.phase_pay_id = BUSINESS_ID;
         }
         if ([-800, -801, -802, -803].includes(STAGE_ID)) {
-            url =  `/sp/${PROJECT_ID}/cost/tender/${TENDER_ID}/report_api/getReport`;
+            url =  `/sp/${SP_ID}/cost/tender/${TENDER_ID}/report_api/getReport`;
             params.tid = params.tender_id;
-            params.id = PROJECT_ID;
+            // params.id = PROJECT_ID;
+            params.id = SP_ID;
             params.cost_stage_id = BGL_OBJ.BUSINESS_ID;
         }
         $.bootstrapLoading.start();
@@ -1315,9 +1316,9 @@ let rptControlObj = {
                     url =  `/tender/${params.tid}/phase/report_api/getMultiReports`;
                 }
                 if ([-800, -801, -802, -803].includes(STAGE_ID)) {
-                    url =  `/sp/${PROJECT_ID}/cost/tender/${TENDER_ID}/report_api/getMultiReportsEx`;
+                    url =  `/sp/${SP_ID}/cost/tender/${TENDER_ID}/report_api/getMultiReportsEx`;
                     params.tid = params.tender_id;
-                    params.id = PROJECT_ID;
+                    params.id = SP_ID;
                     params.cost_stage_id = BGL_OBJ.BUSINESS_ID;
                 }
                 CommonAjax.postXsrfEx(url, params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),

app/public/report/js/rpt_print.js

@@ -24,7 +24,7 @@ let rptPrintHelper = {
             }
             if ([-800, -801, -802, -803].includes(STAGE_ID)) {
                 params.tid = params.tender_id;
-                params.id = PROJECT_ID;
+                params.id = SP_ID;
                 params.cost_stage_id = BGL_OBJ.BUSINESS_ID;
             }
             let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);

app/router.js

@@ -1071,7 +1071,8 @@ module.exports = app => {
     app.post('/tender/report_api/getMultiReports', sessionAuth, subProjectCheck, 'reportController.getMultiReportsEx');
     app.post('/contract/report_api/getMultiReports', sessionAuth, subProjectCheck, 'reportController.getMultiReportsEx');
     app.post('/tender/:id/phase/report_api/getMultiReports', sessionAuth, tenderCheck, subProjectCheck, 'reportController.getMultiReportsEx');
-    // app.post('/contract/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
+    // /sp/${PROJECT_ID}/cost/tender/${TENDER_ID}/report_api/getMultiReportsEx
+    app.post('/sp/:id/cost/tender/:tid/report_api/getMultiReportsEx', sessionAuth, subProjectCheck, tenderCheck, 'reportController.getMultiReportsEx');
     app.post('/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
     app.post('/tender/report_api/getTestReport', sessionAuth, 'reportController.getTestReport');