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

@@ -9,17 +9,17 @@
         @click="printThisPage"
         type="primary"
       >打印</el-button>
-      <!-- <el-button
-      v-if="org_id==10088"
+      <el-button
+      v-if="org_id==10088 || org_id == 0"
       style="position:fixed;right:115px;z-index:999"
       size="small" type="success" 
-      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>  :show="showclick"-->
+      @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</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 != 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 || org_id == 0" :paramsObj="invoiceParams" ></printThree>
+            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams" :show="showclick"></printThree>
             <printfifteen v-if="org_id == 10510  " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -2,18 +2,18 @@
     <div id='invoice-print'>
         <div style="width: 100%;">
           <span style="position: absolute;left:80px;top:50px;font-size: 18px;">
-            <!-- <span v-if="show==false">湖 北 门 诊 医 疗 收 费 发 票</span> -->
+            <span v-if="show==false">湖 北 门 诊 医 疗 收 费 发 票</span>
           </span>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div  style="position: absolute;left:250px;top:100px;">
-              <!-- <span v-if="show==false">科室：</span> -->
+              <span v-if="show==false">科室：</span>
               {{ 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;">
-                  <!-- <span v-if="show==false">收费日期：</span> -->
+                  <span v-if="show==false">收费日期：</span>
                   {{ 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>-->
@@ -21,7 +21,7 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:100px;left:80px;">
-              <!-- <span v-if="show==false">姓名：</span> -->
+              <span v-if="show==false">姓名：</span>
               {{ paramsObj.name }}</div>
             <!-- <div style="position: absolute;top:60px;left:210px;">√</div> -->
             <!-- <div>{{ list.pay_way }}</div> -->
@@ -117,7 +117,7 @@
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
             <div style="position: absolute;top:340px;left:120px">
-              <!-- <span v-if="show==false">收费员：</span> -->
+              <span v-if="show==false">收费员：</span>
               {{ paramsObj.chargeName }}</div>
         </div>
     </div>
@@ -130,7 +130,7 @@ import { uParseTime } from '@/utils/tools'
 export default {
     props:{
         paramsObj:Object,
-        // show:Boolean,
+        show:Boolean,
     },
     data(){
         return{