Просмотр исходного кода

fix: 安全计量打印、导出EXCEL、PDF问题

Tony Kang 3 недель назад
Родитель
Сommit
060dce47a0

+ 8 - 0
app/public/report/js/rpt_main.js

@@ -1018,6 +1018,10 @@ let rptControlObj = {
             }
             }
             if (refRptTplIds.length > 0) {
             if (refRptTplIds.length > 0) {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
+                if (STAGE_ID === -150) {
+                    params.tid = params.tender_id;
+                    params.safe_stage_id = BGL_OBJ.BUSINESS_ID;
+                }
                 params.option = getExcelOutputOption();
                 params.option = getExcelOutputOption();
                 params.splitArchives = splitArchives;
                 params.splitArchives = splitArchives;
 
 
@@ -1199,6 +1203,10 @@ let rptControlObj = {
             const signatureRelArr = [];
             const signatureRelArr = [];
             if (refRptTplIds.length > 0) {
             if (refRptTplIds.length > 0) {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
+                if (STAGE_ID === -150) {
+                    params.tid = params.tender_id;
+                    params.safe_stage_id = BGL_OBJ.BUSINESS_ID;
+                }
                 params.splitArchives = splitArchives;
                 params.splitArchives = splitArchives;
                 // params.getPicFlag = true; //专门针对草图项,只有此项为true,才需要把草图信息带过来,预览及打印动态加载草图 // 纠结:但这样还是解决不了效率问题,得另外想交互方式
                 // params.getPicFlag = true; //专门针对草图项,只有此项为true,才需要把草图信息带过来,预览及打印动态加载草图 // 纠结:但这样还是解决不了效率问题,得另外想交互方式
                 if (current_stage_id > 0) {
                 if (current_stage_id > 0) {

+ 3 - 3
app/public/report/js/rpt_preview_common.js

@@ -57,7 +57,7 @@ async function printPageLoading() {
         CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken_j'),
         CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken_j'),
             async function(result){
             async function(result){
                 const signatureRelArr = [];
                 const signatureRelArr = [];
-                STAGE_AUDIT = result.stageAudit;
+                STAGE_AUDIT = result.stageAudit || [];
                 // sessionStorage.waterMarkStr = result.waterMarkStr;
                 // sessionStorage.waterMarkStr = result.waterMarkStr;
                 if (params.needWaterMark) sessionStorage.waterMarkStr = result.waterMarkStr;
                 if (params.needWaterMark) sessionStorage.waterMarkStr = result.waterMarkStr;
                 for (const signatureRel of result.signatureRelInfo) {
                 for (const signatureRel of result.signatureRelInfo) {
@@ -78,12 +78,12 @@ async function printPageLoading() {
                             rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
                             rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true);
                             await rptSignatureHelper.resetDummySignature(result.data[idx], null); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
                             await rptSignatureHelper.resetDummySignature(result.data[idx], null); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
-                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
+                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit || []);
                         } else {
                         } else {
                             rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false, true);
                             rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false, true);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true, true);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true, true);
                             await rptSignatureHelper.resetDummySignature(result.data[idx], singleSignatureRelArr, false, true); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
                             await rptSignatureHelper.resetDummySignature(result.data[idx], singleSignatureRelArr, false, true); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
-                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit, true);
+                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit || [], true);
                         }
                         }
                         if (isTextSignature) {
                         if (isTextSignature) {
                             resetTextSignature(result.data[idx], singleSignatureRelArr, _current_stage_status !== 3);
                             resetTextSignature(result.data[idx], singleSignatureRelArr, _current_stage_status !== 3);

+ 4 - 0
app/public/report/js/rpt_print.js

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