Browse Source

水印判断

TonyKang 4 years ago
parent
commit
8a9fa3bc3f
1 changed files with 5 additions and 4 deletions
  1. 5 4
      app/public/report/js/rpt_main.js

+ 5 - 4
app/public/report/js/rpt_main.js

@@ -242,6 +242,7 @@ let zTreeOprObj = {
             params.stage_order = getStageOrder();
             params.stage_times = getStageTimes();
             params.material_order = getMaterialOrder();
+            params.closeWatermark = getCloseWatermark();
             params.custCfg = CUST_CFG;
 
             const gather_select = customSelects.gather_select.find(function (x) {
@@ -495,9 +496,6 @@ let rptControlObj = {
         let rst = document.getElementById("btnRptOrientation").innerHTML.trim();
         return rst;
     },
-    getCloseWatermark: function () {
-        return PAGE_SHOW['closeWatermark'];
-    },
     changeType: function(newType) {
         let me = rptControlObj;
         let excelDom = document.getElementById("EXCEL_TYPE");
@@ -537,7 +535,7 @@ let rptControlObj = {
         rst.stage_times = getStageTimes();
         rst.material_order = getMaterialOrder();
         rst.custCfg = CUST_CFG;
-        rst.closeWatermark = rptControlObj.getCloseWatermark();
+        rst.closeWatermark = getCloseWatermark();
 
         return rst;
     },
@@ -911,3 +909,6 @@ function getMaterialOrder() {
 function getStageTimes() {
     return current_stage_times;
 }
+function getCloseWatermark() {
+    return PAGE_SHOW['closeWatermark'];
+}