Browse Source

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 1 month ago
parent
commit
31b365fbce

+ 5 - 5
src/xt_pages/outpatientCharges/invoicePrint.vue View File

@@ -57,17 +57,17 @@
57 57
       </div>
58 58
     </div>
59 59
 
60
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 10217">
60
+    <div class="app-container" style="" v-if="org_id == 10188 || org_id == 10217">
61 61
       <div class='dialysisPage'>
62 62
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
63 63
       </div>
64 64
     </div>
65 65
     <!-- 新发票 -->
66
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id ==0 ">
67
-      <div class='dialysisPage'>
66
+    <!-- <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id ==0 ">
67
+      <div class='dialysisPage'> -->
68 68
 <!--        <printseventeen :paramsObj="invoiceParams"></printseventeen>-->
69
-      </div>
70
-    </div>
69
+      <!-- </div>
70
+    </div> -->
71 71
 
72 72
     <!-- <div class="app-container" style="" v-if="org_id == 0">
73 73
       <div class='dialysisPage'>

+ 1 - 1
src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue View File

@@ -1,7 +1,7 @@
1 1
 
2 2
 <template>
3 3
   <div id='invoice-print'>
4
-    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;">
4
+    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;page-break-after: always;">
5 5
       <div v-if="org_id==10188" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
6 6
       <div v-if="org_id==10217" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">大丰燕舞血液透析中心</div>
7 7
       <div style="display: flex; margin: 15px 0 5px 0;">