TASK #5479

app/controller/report_controller.js

@@ -664,15 +664,6 @@ module.exports = app => {
                 const stage_times = -1;
                 const stage_status = -1;
 
-                // const paymentDetailList = await ctx.service.paymentDetail.getDetail(paymentDetail_id);
-                // if (paymentDetailList && paymentDetailList.length > 0) {
-                //     const payment = paymentDetailList[0];
-                //     stage_status = payment.status;
-                //     stage_order = payment.order;
-                //     sorder = stage_order;
-                //     stage_times = payment.times;
-                //     stageList.push({ id: stage_id, user_id: payment.uid, status: payment.status });
-                // }
                 for (const prjAcc of prjAccList) {
                     prjAcc.account_group = prjAcc.company;
                 }
@@ -684,8 +675,10 @@ module.exports = app => {
 
                 // 获取所有项目参与者
                 const { accountList, newAccountGroup, advance } = await this._getInvolveAcc(ctx, tenderId);
-                // let sp_id = -1;
-                // if (this.ctx.subProject) sp_id = this.ctx.subProject.id;
+
+                const safeStage = ctx.safeStage;
+                const bglObj = {};
+                bglObj.BUSINESS_ID = safeStage.id;
 
                 const renderData = {
                     accountGroup: newAccountGroup,
@@ -744,7 +737,7 @@ module.exports = app => {
                     OSS_PATH: ctx.app.config.fujianOssPath,
                     viewPmData: PermissionCheck.viewPmData(this.ctx.session.sessionUser.permission),
                     source_type: 40,
-                    bglObj: 'null',
+                    bglObj: JSON.stringify(bglObj),
                     changes: 'null',
                     otherChangeList: 'null',
                     otherHintName: '',

app/lib/rm/safe_stage.js

@@ -30,9 +30,6 @@ class rptMemChange extends RptMemBase {
     }
 
     async doBeforeLoadReport(params) {
-        // console.log(`this.ctx.safeStage.tid: ${this.ctx.safeStage.tid}`);
-        console.log(`params.safe_stage_id1: ${params.safe_stage_id}`);
-        // console.log(`params.safe_stage_id1: ${this.ctx.safeStage.id}`);
         await this.doCheckSafeStage(params.safe_stage_id);
         await this.doCheckTender(this.ctx.safeStage.tid);
     }

app/public/report/js/rpt_main.js

@@ -514,6 +514,7 @@ let zTreeOprObj = {
         if (STAGE_ID === -150) {
             url =  '/safe_calc/report_api/getReport';
             params.tid = params.tender_id;
+            params.safe_stage_id = BGL_OBJ.BUSINESS_ID;
         }
         $.bootstrapLoading.start();
         CommonAjax.postXsrfEx(url, params, 300000, true, getCookie('csrfToken_j'),

app/router.js

@@ -898,7 +898,7 @@ module.exports = app => {
     app.post('/tender/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
     app.post('/contract/report_api/getReport', sessionAuth, 'reportController.getReport');
     // app.post('/safe_calc/report_api/getReport', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, safeStageCheck, 'reportController.getReport');
-    app.post('/safe_calc/report_api/getReport', sessionAuth, subProjectCheck, tenderCheck, 'reportController.getReport');
+    app.post('/safe_calc/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
     app.post('/report_api/getReport', sessionAuth, 'reportController.getReport');
     app.post('/report_api/getReportTemplate', sessionAuth, 'reportController.getReportTemplate');
     app.post('/report_api/updateReportTemplate', sessionAuth, 'reportController.updateReportTemplate');