Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/payprint.html

@@ -164,6 +164,15 @@
         background: red;
       }
 
+      .part5 {
+        width: 100%
+      }
+
+      .paymentScreenshot {
+        width: 100%;
+        height: 130vh
+      }
+
       /* .onlypz-center{
         height: 130vh;
       } */
@@ -174,6 +183,12 @@
       <div v-if="selectPrint">
         <div v-for="(item,index) in printData1" :key="index">
           <div class="content">
+            <div class="part5" v-if="isShowPrintType5">
+              <div class="header1">
+                付款回执单
+              </div>
+              <img :src=" printData1[index].paymentScreenshot" class="paymentScreenshot" />
+            </div>
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>
               <div class="line"></div>
@@ -522,6 +537,12 @@
       </div>
 
       <div class="content" v-else>
+        <div class="part5" v-if="isShowPrintType5">
+          <div class="header1">
+            付款回执单
+          </div>
+          <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+        </div>
         <div class="center part1" v-if="isShowPrintType3">
           <div class="header1">{{ printData.compName}}结算凭证</div>
           <div class="line"></div>
@@ -1024,6 +1045,7 @@
         isShowPrintType2: false,
         isShowPrintType3: false,
         isShowPrintType4: false,
+        isShowPrintType5:false,
         showType: [],
         printData: {},
         printData1: [],
@@ -1082,6 +1104,7 @@
             localStorage.getItem('selectPrint_selectPrintList')
           )
           for (let i = 0; i < this.printData1.length; i++) {
+            if(!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i].identityAuthenticationInfo.compAddress=''
             if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 28) {
               this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
                 .identityAuthenticationInfo
@@ -1157,6 +1180,9 @@
               case '打印检斤单':
                 this.isShowPrintType4 = !this.isShowPrintType4
                 break
+                case '打印回执单':
+                  this.isShowPrintType5 = !this.isShowPrintType5
+                  break
             }
           }
         } else {

src/views/houseSelfCollect/paymentManagement.vue

@@ -11,7 +11,7 @@
             <el-checkbox label="打印银行卡（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
             <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-            <el-checkbox label="打印付款单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
         </div>
@@ -338,7 +338,7 @@
             '打印银行卡（正反面）',
             '打印结算凭证',
             '打印检斤单',
-            '打印付款单'
+            '打印回执单'
             // '打印发票'
           ],
         },
@@ -402,7 +402,7 @@
       })
     },
     methods: {
-      previewPayOrder(val){debugger
+      previewPayOrder(val){
       this.paymentReceipt = val.paymentScreenshot
       this.isPreviewPayOrder = true
      console.log(val.paymentScreenshot)