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

public/static/payprint1.html

@@ -19,7 +19,9 @@
         .simple {
             height: 120vh !important;
         }
-        
+        .simple2 {
+            height: 99vh !important;
+        }
         .content {
             width: 1000px;
             margin: auto;
@@ -592,7 +594,7 @@
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
             </div> -->
-            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="printData.extra2? 'simple2':!selectPrint? 'simple':''" >
                 <div class="header1">{{ printData.compName}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>
@@ -809,7 +811,7 @@
                 </div>
             </div>
 
-            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6" :class="!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6"  :class="printData.extra2? 'simple2':!selectPrint? 'simple':''" >
                 <div class="header1">{{ print_company_name_ew}}结算凭证</div>
                 <div class="line"></div>
                 <div class="line"></div>

public/static/printdry.html

@@ -27,8 +27,8 @@
             width: 1000px;
             padding: 30px 20px 20px 20px;
             font-size: 18px;
-            height: 630px;
-            /* height: 570px; */
+            /* height: 630px; */
+            height: 90vh;
             position: relative;
             margin: auto;
         }