更新

public/static/payprint.html

@@ -1141,7 +1141,14 @@
       },
       mounted() {
         this.date = new Date().toLocaleString()
-        let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        let _data  ={}
+        if(decodeURIComponent(localStorage.getItem('print_pay_data'))){
+            _data=decodeURIComponent(localStorage.getItem('print_pay_data'))
+        }
+        else{
+            _data = decodeURIComponent(this.getQueryVariable("dataList"))
+        }
         if (!_data) {
           this.selectPrint = true
           this.printData1 = JSON.parse(

public/static/payprint1.html

@@ -1137,7 +1137,14 @@
       },
       mounted() {
         this.date = new Date().toLocaleString()
-        let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+        let _data  ={}
+        if(decodeURIComponent(localStorage.getItem('print_pay_data'))){
+            _data=decodeURIComponent(localStorage.getItem('print_pay_data'))
+        }
+        else{
+            _data = decodeURIComponent(this.getQueryVariable("dataList"))
+        }
         if (!_data) {
           this.selectPrint = true
           this.printData1 = JSON.parse(

public/static/weightCheck.html

@@ -590,7 +590,14 @@
         },
         mounted() {
             debugger
-            let _data = decodeURIComponent(this.getQueryVariable("tableData"))
+            let _data  ={}
+            if(decodeURIComponent(localStorage.getItem('print_in_data'))){
+                _data=decodeURIComponent(localStorage.getItem('print_in_data'))
+            }
+            else{
+                _data = decodeURIComponent(this.getQueryVariable("tableData"))
+            }
+            // let _data = decodeURIComponent(this.getQueryVariable("tableData"))
             let _type = this.getQueryVariable("type")
             let _ew = this.getQueryVariable("selectEW")
             let _ewdd = this.getQueryVariable("selectEWDD")

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -195,6 +195,8 @@
         window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
       },
       printBig() {
+        
+          localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
          window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData))
       },
     },

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -735,6 +735,8 @@
           })
           .toPromise()
           .then((response) => {
+            
+           localStorage.removeItem('print_in_data')
             this.dialogDataList = [] //点击确认时先清空要打印的数组
             this.dialogData = response
             if (response.compName == '黑龙江秋收有限公司') {
@@ -756,6 +758,8 @@
               this.dialogData.compName = this.companyName
               this.dialogDataList.push(this.dialogData)
             }
+            
+            localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
             window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
             // this.printBig("", this.radio)
           })

src/views/houseSelfCollect/paymentManagement.vue

@@ -1256,28 +1256,28 @@
           _list1 = JSON.stringify(this.printData)
           _list2 = JSON.stringify(this.customerList)
         }
-        if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
-            window.open(
-              '../../../../../static/payprint.html?type=2&dataList=' +
-              _list1 +
-              '&customerList=' +
-              _list2 +
-              '&printTypeList=' +
-              this.ruleForm.type,
-              '结算凭证'
-            )
-          }
-          else{
+        // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+        //     window.open(
+        //       '../../../../../static/payprint.html?type=2&dataList=' +
+        //       _list1 +
+        //       '&customerList=' +
+        //       _list2 +
+        //       '&printTypeList=' +
+        //       this.ruleForm.type,
+        //       '结算凭证'
+        //     )
+        //   }
+        //   else{
+            
+          localStorage.setItem('print_pay_data',_list1)
             window.open(
-              '../../../../../static/payprint1.html?type=2&dataList=' +
-              _list1 +
-              '&customerList=' +
+              '../../../../../static/payprint1.html?type=2&customerList=' +
               _list2 +
               '&printTypeList=' +
               this.ruleForm.type,
               '结算凭证'
             )
-          }
+          // }
         
       },
       detailpage(){

src/views/houseSelfCollect/weighingManagement.vue

@@ -503,6 +503,8 @@
         localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
       },
       printBig(type, radioType) {
+        
+        localStorage.removeItem('print_in_data')
         // 打印额外
         if (this.checked || this.ddchecked) {
           this.makeEWjjSelectPrintList()
@@ -516,6 +518,8 @@
           localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
+          
+          localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
           window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
         }
       },

src/views/houseSelfCollect/weightCheck.vue

@@ -456,6 +456,8 @@
           .then((response) => {
             // this.isShowPrint = true
             // this.inspect = response
+            
+           localStorage.removeItem('print_in_data')
             if (response.compName == '黑龙江秋收有限公司') {
               this.inspect.compName = '黑龙江中天昊元贸易有限公司'
             }
@@ -478,6 +480,8 @@
               this.dialogDataList.push(dialogData)
             }
             console.log('保存打印', this.dialogDataList)
+            
+          localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
             window.open(
               '../../../../static/weightCheck.html?type=2&tableData=' +
               JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -747,6 +747,7 @@
         window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData).replace(/%/g, 'baifenhao'))
       },
       printBig(type, radioType) {
+           localStorage.removeItem('print_in_data')
         // 打印额外
         if (this.checked || this.ddchecked) {
           this.makeEWjjSelectPrintList()
@@ -761,6 +762,8 @@
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
           console.log(this.dialogDataList)
+          
+          localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
           window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
         }
       },