breakflow补漏 + 打印签名补漏

app/public/report/js/rpt_preview_common.js

@@ -3,14 +3,36 @@
  */
 
 let G_OFFSET_X = 0, G_OFFSET_Y = 0;
+let STAGE_AUDIT = []; //注意这个，与rpt_main.js不要混了
+// 设置Date对象Format函数
+// -- 打印预览需要重新设置一遍 ------------------------------------------------
+Date.prototype.Format = function(fmt) {
+    const o = {
+        'M+': this.getMonth() + 1, // 月份
+        'd+': this.getDate(), // 日
+        'h+': this.getHours(), // 小时
+        'm+': this.getMinutes(), // 分
+        's+': this.getSeconds(), // 秒
+        'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+        'S': this.getMilliseconds(), // 毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length));
+    for (const k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+    }
+    return fmt;
+};
+
 function printPageLoading() {
     let params = JSON.parse(sessionStorage.report_params);
     let _current_stage_status = parseInt(sessionStorage.current_stage_status);
     let closeWaterMark = parseInt(sessionStorage.closeWaterMark);
+    let refRptTplIds = JSON.parse(sessionStorage.refRptTplIds);
     let scaleFactor = 1;
     CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken'),
         function(result){
             const signatureRelArr = [];
+            STAGE_AUDIT = result.stageAudit;
             // sessionStorage.waterMarkStr = result.waterMarkStr;
             if (params.needWaterMark) sessionStorage.waterMarkStr = result.waterMarkStr;
             for (const signatureRel of result.signatureRelInfo) {

app/public/report/js/rpt_print.js

@@ -24,6 +24,8 @@ let rptPrintHelper = {
             sessionStorage.closeWaterMark = getCloseWatermark();
             sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
             sessionStorage.waterMarkStr = COMMON_WATER_MARK_PIC_DATA;
+            sessionStorage.refRptTplIds = JSON.stringify(refRptTplIds);
+            // sessionStorage.STAGE_AUDIT = JSON.stringify(STAGE_AUDIT);
             if (sessionStorage.pageSize === 'A3') {
                 window.open('/printReport/A3');
             } else {

app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -57,6 +57,7 @@ const JpcDiscreteHelper = {
                                                 }
                                             }
                                             // value = map_data_field[JV.PROP_AD_HOC_DATA][0];
+                                            value = this._getSegPageValue(value, segPageIdx);
                                         } else value = '';
                                     }
                                     if (map_data_field && map_data_field[JV.PROP_PRECISION] && map_data_field.flexiblePrecisionRefObj) {