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

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,11 +10,11 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 "><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
@@ -57,11 +57,11 @@
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>
     </div>
-    <div class="app-container" style="" v-if="org_id == 0">
+    <!-- <div class="app-container" style="" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printSixteen :paramsObj="invoiceParams"></printSixteen>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/xt_pages/outpatientCharges/invoiceTemplate/printSixteen.vue

@@ -1,7 +1,7 @@
 <template>
   <div id='invoice-print'>
       <div style="border-bottom: 1px solid black;text-align: center;font-size: 18px;margin-bottom: 10px;">
-        广水市第一人民医院
+        湖北门诊医疗收费发票
       </div>
       <div style="border-bottom: 1px solid black;text-align: center;font-size: 18px;">缴费单</div>
       <div style="display: flex;border-top: 1px solid black;margin-top: 2px;">

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -1,21 +1,20 @@
 <template>
     <div id='invoice-print'>
-        <div style="display:flex;">
-            <!-- <div style="position: absolute;top:30px;left:70px;">{{ list.order_number }}</div> -->
-            <!-- <div>{{ list.id_card_no }}</div> -->
+        <div style="width: 100%;">
+          <span style="position: absolute;left:80px;top:50px;font-size: 18px;">湖 北 门 诊 医 疗 收 费 发 票</span>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;left:250px;top:100px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;left:250px;top:100px;">科室：{{ list.department_name }}</div>
             <!-- <div  style="position: absolute;top:40px;left:300px">{{ list.number }}</div> -->
             <div></div>
             <div>
-                <span style="position: absolute;left:80px;top:80px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;left:80px;top:80px;">收费日期：{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
                 <!-- <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
                 <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>-->
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:100px;left:80px;">姓名：{{ paramsObj.name }}</div>
             <!-- <div style="position: absolute;top:60px;left:210px;">√</div> -->
             <!-- <div>{{ list.pay_way }}</div> -->
             <!-- <div style="position: absolute;top:60px;left:460px;">{{ getTime(list.date, '{y}-{m}-{d}') }}</div>
@@ -109,7 +108,7 @@
         <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div>
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
-            <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>
+            <div style="position: absolute;top:340px;left:120px">收费员：{{ paramsObj.chargeName }}</div>
         </div>
     </div>
 </template>