Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/report/js/rpt_main.js

@@ -503,8 +503,9 @@ let zTreeOprObj = {
         } else {
             params.needWaterMark = false;
         }
+        const url = (STAGE_ID === -400) ? '/contract/report_api/getReport' : '/tender/report_api/getReport';
         $.bootstrapLoading.start();
-        CommonAjax.postXsrfEx("/tender/report_api/getReport", params, 300000, true, getCookie('csrfToken_j'),
+        CommonAjax.postXsrfEx(url, params, 300000, true, getCookie('csrfToken_j'),
             async function(result){
                 $.bootstrapLoading.end();
                 let pageRst = result.data;

app/router.js

@@ -829,9 +829,11 @@ 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('/report_api/getReport', sessionAuth, 'reportController.getReport');
     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, 'reportController.getMultiReportsEx');
     app.post('/report_api/getMultiReports', sessionAuth, 'reportController.getMultiReportsEx');
     app.post('/tender/report_api/getTestReport', sessionAuth, 'reportController.getTestReport');