ccjgmwz 3 vuotta sitten
vanhempi
commit
7bb12c7d84

+ 4 - 2
public/static/payprint.html

@@ -14,7 +14,9 @@
         height: 88vh;
         height: 88vh;
         position: relative;
         position: relative;
       }
       }
-
+      .simple{
+        height: 120vh !important;
+      }
       .content {
       .content {
         width: 1000px;
         width: 1000px;
         margin: auto;
         margin: auto;
@@ -548,7 +550,7 @@
           </div>
           </div>
           <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
           <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
         </div>
         </div>
-        <div class="center part1" v-if="isShowPrintType3">
+        <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
           <div class="header1">{{ printData.compName}}结算凭证</div>
           <div class="header1">{{ printData.compName}}结算凭证</div>
           <div class="line"></div>
           <div class="line"></div>
           <div class="line"></div>
           <div class="line"></div>

+ 1 - 2
src/views/houseSelfCollect/paymentManagement.vue

@@ -1234,7 +1234,6 @@
         localStorage.setItem('cwprint', true)
         localStorage.setItem('cwprint', true)
       },
       },
       print(row) {
       print(row) {
-        debugger
         this.printType = 2
         this.printType = 2
         localStorage.setItem('cwprint', false)
         localStorage.setItem('cwprint', false)
         getpaymentexamine({
         getpaymentexamine({
@@ -1243,7 +1242,7 @@
           .toPromise()
           .toPromise()
           .then((response) => {
           .then((response) => {
             this.printData = response
             this.printData = response
-            if (response == '黑龙江秋收有限公司') {
+            if (response.compName == '黑龙江秋收有限公司') {
               this.printData.compName = '黑龙江中天昊元贸易有限公司'
               this.printData.compName = '黑龙江中天昊元贸易有限公司'
             }
             }
             this.isShowPrint = true
             this.isShowPrint = true

+ 2 - 3
src/views/houseSelfCollect/settlement.vue

@@ -736,19 +736,18 @@ export default {
           })
           })
           return
           return
         }
         }
-
       this.paymentList.id=this.$route.query.id 
       this.paymentList.id=this.$route.query.id 
       this.paymentList.amountIngPayable = this.paymentList.actualPayment
       this.paymentList.amountIngPayable = this.paymentList.actualPayment
       this.paymentList.settlementClerk =  localStorage.getItem('ws-pf_staffName')
       this.paymentList.settlementClerk =  localStorage.getItem('ws-pf_staffName')
       postpaymentedit(this.paymentList).toPromise().then((response) => {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
              this.printData= response
-              if (response == '黑龙江秋收有限公司') {
+              if (response.compName == '黑龙江秋收有限公司') {
               this.printData.compName = '黑龙江中天昊元贸易有限公司'
               this.printData.compName = '黑龙江中天昊元贸易有限公司'
             }
             }
              console.log(this.printData,'结算打印')
              console.log(this.printData,'结算打印')
+          this.isShowPrint = true
          })
          })
-         this.isShowPrint = true
         },
         },
         )
         )
     },
     },