Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/report/js/rpt_main.js

@@ -489,7 +489,7 @@ let rptControlObj = {
             if (chkNodes.length > 0) {
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向
             }
-            CommonAjax.postXsrfEx("/tender/report_api/createExcelFilesInOneBook", params, 60000, true, getCookie('csrfToken'), function(result){
+            CommonAjax.postXsrfEx("/tender/report_api/createExcelFilesInOneBook", params, 300000, true, getCookie('csrfToken'), function(result){
                     if (result) {
                         let uuIdUrls = [];
                         let uuIdUrl =  "/getFileByUUID/" + result.data[0].uuid + "/" + stringUtil.replaceAll(result.data[0].reportName, "#", "_") + "/xlsx";
@@ -516,7 +516,7 @@ let rptControlObj = {
             if (chkNodes.length > 0) {
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向
             }
-            CommonAjax.postXsrfEx("/tender/report_api/createExcelFiles", params, 60000, true, getCookie('csrfToken'), function(result){
+            CommonAjax.postXsrfEx("/tender/report_api/createExcelFiles", params, 300000, true, getCookie('csrfToken'), function(result){
                     if (result) {
                         let uuIdUrls = [];
                         for (let uuIdObj of result.data) {
@@ -579,7 +579,7 @@ let rptControlObj = {
             if (refRptTplIds.length > 0) {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向
-                CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken'),
+                CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 300000, true, getCookie('csrfToken'),
                     function(result){
                         // closeWaitingView();
                         $.bootstrapLoading.end();

app/public/report/js/rpt_signature.js

@@ -537,10 +537,14 @@ let rptSignatureHelper = {
                     sCell.Value = '同意'; //默认的
                     for (const role_rel of currRoleRelList) {
                         if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
+                            let preDate = '';
                             for (const audit_rel of currAuditList) {
                                 if (role_rel.acc_id === audit_rel.aid) {
-                                    sCell.Value = audit_rel.opinion;
-                                    break;
+                                    if (audit_rel.end_time > preDate && audit_rel.status === 3) {
+                                        sCell.Value = audit_rel.opinion;
+                                        preDate = audit_rel.end_time;
+                                    }
+                                    //不能break，实际会有多个审核意见，以最后一个为准
                                 }
                             }
                             break;