app/controller/report_controller.js

@@ -1130,6 +1130,8 @@ module.exports = app => {
                 // const tenderId = ctx.params.tid || -1; // 标段级别有
                 const tenderId = ctx.contractOptions.tid || -1;
                 const bglObj = {};
+                // const bglObj = { status: stage_status };
+                bglObj.BUSINESS_ID = ctx.params.id;
                 // const tender = ctx.tender;
                 const stage = ctx.stage;
                 const stage_order = -1;

app/public/report/js/rpt_main.js

@@ -510,7 +510,10 @@ let zTreeOprObj = {
             params.needWaterMark = false;
         }
         let url = '/tender/report_api/getReport';
-        if (STAGE_ID === -600) url =  '/contract/report_api/getReport';
+        if (STAGE_ID === -600) {
+            params.sp_id = BUSINESS_ID;
+            url =  '/contract/report_api/getReport';
+        }
         if (STAGE_ID === -150) {
             url =  '/safe_calc/report_api/getReport';
             params.tid = params.tender_id;
@@ -1037,7 +1040,12 @@ let rptControlObj = {
                     params.needWaterMark = false;
                 }
                 params.outputType = 'Excel';
-                CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),
+                let url = '/tender/report_api/getMultiReports';
+                if (STAGE_ID === -600) {
+                    params.sp_id = BUSINESS_ID;
+                    url =  '/contract/report_api/getMultiReports';
+                }
+                CommonAjax.postXsrfEx(url, params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),
                     function(result){
                         $.bootstrapLoading.end();
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
@@ -1220,7 +1228,13 @@ let rptControlObj = {
                     params.needWaterMark = false;
                 }
                 params.outputType = 'PDF';
-                CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),
+                let url = '/tender/report_api/getMultiReports';
+                // if (STAGE_ID === -600) url =  '/contract/report_api/getMultiReports';
+                if (STAGE_ID === -600) {
+                    params.sp_id = BUSINESS_ID;
+                    url =  '/contract/report_api/getMultiReports';
+                }
+                CommonAjax.postXsrfEx(url, params, WAIT_TIME_EXPORT, true, getCookie('csrfToken_j'),
                     async function(result){
                         // closeWaitingView();
                         $.bootstrapLoading.end();

app/public/report/js/rpt_preview_common.js

@@ -54,7 +54,9 @@ async function printPageLoading() {
         let isTextSignature = parseInt(sessionStorage.isTextSignature);
         current_stage_id = parseInt(sessionStorage.current_stage_id);
         let scaleFactor = 1;
-        CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken_j'),
+        let url = '/tender/report_api/getMultiReports';
+        if (current_stage_id === -600) url =  '/contract/report_api/getMultiReports';
+        CommonAjax.postXsrfEx(url, params, 60000, true, getCookie('csrfToken_j'),
             async function(result){
                 const signatureRelArr = [];
                 STAGE_AUDIT = result.stageAudit || [];

app/public/report/js/rpt_print.js

@@ -15,6 +15,9 @@ let rptPrintHelper = {
                 params.tid = params.tender_id;
                 params.safe_stage_id = BGL_OBJ.BUSINESS_ID;
             }
+            if (STAGE_ID === -600) {
+                params.sp_id = BUSINESS_ID;
+            }
             let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
             if (chkNodes.length > 0) {
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向

app/router.js

@@ -925,7 +925,9 @@ module.exports = app => {
     app.get('/printReport/:size', sessionAuth, 'reportController.showPrintPage');
     app.get('/individualReport/:size', sessionAuth, 'reportController.showIndividualPage');
     app.post('/tender/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
-    app.post('/contract/report_api/getReport', sessionAuth, 'reportController.getReport');
+    app.post('/contract/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
+    // app.post('/sp/contract/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
+    // /sp/:id
     // app.post('/safe_calc/report_api/getReport', sessionAuth, subProjectCheck, tenderCheck, tenderPermissionCheck, safeStageCheck, 'reportController.getReport');
     app.post('/safe_calc/report_api/getReport', sessionAuth, subProjectCheck, 'reportController.getReport');
     app.post('/report_api/getReport', sessionAuth, 'reportController.getReport');
@@ -937,6 +939,7 @@ module.exports = app => {
     app.post('/report_api/getPreviewReport', sessionAuth, 'reportController.getPreviewReport');
     app.post('/tender/report_api/getDirectReport', sessionAuth, 'reportController.createExcelFilesFromDirectData');
     app.post('/tender/report_api/getMultiReports', sessionAuth, subProjectCheck, 'reportController.getMultiReportsEx');
+    app.post('/contract/report_api/getMultiReports', sessionAuth, subProjectCheck, 'reportController.getMultiReportsEx');
     // app.post('/contract/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
     app.post('/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
     app.post('/tender/report_api/getTestReport', sessionAuth, 'reportController.getTestReport');

app/service/report.js

@@ -425,6 +425,7 @@ module.exports = app => {
                         case 'mem_schedule_stage':
                             runnableRst.push(service.scheduleStage.getReportData(params.tender_id));
                             runnableKey.push(filter);
+                            break;
                         case 'mem_schedule':
                             runnableRst.push(service.schedule.getDataByCondition({ tid: params.tender_id }));
                             runnableKey.push(filter);
@@ -619,73 +620,73 @@ module.exports = app => {
                     //     rst[filter] = await service.rptGatherMemory.getMaterialBillsGl(params.tender_id, params.material_order, memFieldKeys[filter]);
                     //     break;
                     case 'mem_spss_gather_info_tender':
-                        rst[filter] =  await spssSource.getGatherStageInfoTender();
+                        rst[filter] = await spssSource.getGatherStageInfoTender();
                         break;
                     case 'mem_spss_gather_info':
-                        rst[filter] =  await spssSource.getGatherStageInfo();
+                        rst[filter] = await spssSource.getGatherStageInfo();
                         break;
                     case 'mem_spss_gather_ledger_tender':
-                        rst[filter] =  await spssSource.getGatherLedgerTender();
+                        rst[filter] = await spssSource.getGatherLedgerTender();
                         break;
                     case 'mem_spss_gather_ledger_bills':
-                        rst[filter] =  await spssSource.getGatherLedgerBills();
+                        rst[filter] = await spssSource.getGatherLedgerBills();
                         break;
                     case 'mem_spss_gather_ledger_pos':
-                        rst[filter] =  await spssSource.getGatherLedgerPos();
+                        rst[filter] = await spssSource.getGatherLedgerPos();
                         break;
                     case 'mem_spss_gather_stage_tender':
-                        rst[filter] =  await spssSource.getGatherStageTender();
+                        rst[filter] = await spssSource.getGatherStageTender();
                         break;
                     case 'mem_spss_gather_stage_bills':
-                        rst[filter] =  await spssSource.getGatherStageBills();
+                        rst[filter] = await spssSource.getGatherStageBills();
                         break;
                     case 'mem_spss_gather_stage_pos':
-                        rst[filter] =  await spssSource.getGatherStagePos();
+                        rst[filter] = await spssSource.getGatherStagePos();
                         break;
                     case 'mem_spss_gather_stage_extra_tender':
-                        rst[filter] =  await spssSource.getGatherStageExtraTender();
+                        rst[filter] = await spssSource.getGatherStageExtraTender();
                         break;
                     case 'mem_spss_gather_stage_jgcl':
-                        rst[filter] =  await spssSource.getGatherStageJgcl();
+                        rst[filter] = await spssSource.getGatherStageJgcl();
                         break;
                     case 'mem_spss_gather_stage_yjcl':
-                        rst[filter] =  await spssSource.getGatherStageYjcl();
+                        rst[filter] = await spssSource.getGatherStageYjcl();
                         break;
                     case 'mem_spss_gather_stage_bonus':
-                        rst[filter] =  await spssSource.getGatherStageBonus();
+                        rst[filter] = await spssSource.getGatherStageBonus();
                         break;
                     case 'mem_spss_gather_stage_other':
-                        rst[filter] =  await spssSource.getGatherStageOther();
+                        rst[filter] = await spssSource.getGatherStageOther();
                         break;
                     case 'mem_spss_gather_stage_safe_prod':
-                        rst[filter] =  await spssSource.getGatherStageSafeProd();
+                        rst[filter] = await spssSource.getGatherStageSafeProd();
                         break;
                     case 'mem_spss_gather_stage_temp_land':
-                        rst[filter] =  await spssSource.getGatherStageTempLand();
+                        rst[filter] = await spssSource.getGatherStageTempLand();
                         break;
                     case 'mem_spss_gather_stage_pay_tender':
-                        rst[filter] =  await spssSource.getGatherStagePayTender();
+                        rst[filter] = await spssSource.getGatherStagePayTender();
                         break;
                     case 'mem_spss_gather_stage_pay':
-                        rst[filter] =  await spssSource.getGatherStagePay();
+                        rst[filter] = await spssSource.getGatherStagePay();
                         break;
                     case 'mem_spss_compare_ledger_tender':
-                        rst[filter] =  await spssSource.getCompareLedgerTender();
+                        rst[filter] = await spssSource.getCompareLedgerTender();
                         break;
                     case 'mem_spss_compare_ledger_bills':
-                        rst[filter] =  await spssSource.getCompareLedgerBills();
+                        rst[filter] = await spssSource.getCompareLedgerBills();
                         break;
                     case 'mem_spss_compare_ledger_pos':
-                        rst[filter] =  await spssSource.getCompareLedgerPos();
+                        rst[filter] = await spssSource.getCompareLedgerPos();
                         break;
                     case 'mem_spss_compare_stage_tender':
-                        rst[filter] =  await spssSource.getCompareStageTender();
+                        rst[filter] = await spssSource.getCompareStageTender();
                         break;
                     case 'mem_spss_compare_stage_bills':
-                        rst[filter] =  await spssSource.getCompareStageBills();
+                        rst[filter] = await spssSource.getCompareStageBills();
                         break;
                     case 'mem_spss_compare_stage_pos':
-                        rst[filter] =  await spssSource.getCompareStagePos();
+                        rst[filter] = await spssSource.getCompareStagePos();
                         break;
                     default:
                         break;
@@ -791,7 +792,7 @@ module.exports = app => {
         // params = { tender_id: int }
         async contract(params, sourceFilters, memFieldKeys, customDefine, customSelect) {
             const RptContract = require('../lib/rm/contract');
-            const rptContract= new RptContract(this.ctx);
+            const rptContract = new RptContract(this.ctx);
 
             return rptContract.getReportData(params, sourceFilters, memFieldKeys, customDefine, customSelect);
         }