Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/houseSelfCollect/paymentManagement.vue

public/static/payprint.html

@@ -597,8 +597,9 @@
         let _type = decodeURIComponent(this.getQueryVariable('type'))
         this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
         this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
-        
-        if (sessionStorage.getItem('cwprint')) {
+        console.log('cwprint',sessionStorage.getItem('cwprint'))
+        var cwprint = sessionStorage.getItem('cwprint')
+        if (cwprint == "true") {
           this.identity = this.customerList.cardAddressUrl.split(',')
           this.bank = this.customerList.payeeAddressUrl.split(',')
           this.imageUrl1 = this.identity[0]

src/views/houseSelfCollect/paymentManagement.vue

@@ -285,7 +285,7 @@ import {
         isShowPrintType4: true,
         customerInfo: false,
         form: {},
-        formLabelWidth: "300px",
+        formLabelWidth: '300px',
         customerlist: {
           payeeAddressUrls: [],
         },
@@ -616,32 +616,33 @@ import {
           searchParam = this.searchType
         }
 
-        getpayment({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchKeyWord: this.searchKeyWord,
-            searchType: searchParam,
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            compId: sessionStorage.getItem('ws-pf_compId')
-          })
-          .toPromise()
-          .then(response => {
-            this.paymentList = response.records
-            for (let i = 0; i < this.paymentList.length; i++) {
-              this.paymentList.textcss = ""
-            }
-            this.deptBudgetTotal = response.total
-          })
-        getJurisdiction({
-            managementType: 1,
-            warehouseName: this.warehouseName,
-            compId: sessionStorage.getItem('ws-pf_compId')
-          })
-          .toPromise()
-          .then(response => {
-            this.isShowAdopt = response
-          })
+      getpayment({
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        searchType: searchParam,
+        warehouseName: this.warehouseName,
+        managementType: 1,
+        compId: sessionStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then(response => {
+          this.paymentList = response.records
+          for(let i = 0 ; i < this.paymentList.length ; i++){
+            this.paymentList.textcss = ''
+          }
+          this.deptBudgetTotal = response.total
+        })
+      // getJurisdiction({
+      //   managementType: 1,
+      //   warehouseName: this.warehouseName,
+      //   compId: sessionStorage.getItem('ws-pf_compId')
+      // })
+      //   .toPromise()
+      //   .then(response => {
+      //     this.isShowAdopt = response
+      //   })
+
 
         //   getJurisdiction({
         //  managementType:1,