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

@@ -14,7 +14,7 @@
         <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 == 10510 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088 || org_id == 10510" :paramsObj="invoiceParams"></printThree>
             <!-- <printfifteen v-if="org_id == 10510 || org_id == 0" :paramsObj="invoiceParams"></printfifteen> -->
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -32,9 +32,9 @@
 
             <div style="position: absolute;top:200px;left:80px">医疗费总金额: {{list.order.medfee_sumamt?list.order.medfee_sumamt:""}}</div>
             <div style="position: absolute;top:200px;left:250px">个人现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:""}}</div>
-            <div style="position: absolute;top:220px;left:80px">全自费金额: {{list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:""}}</div>
-            <div style="position: absolute;top:220px;left:250px">基金支付总额: {{list.order.fund_pay_sumamt?list.order.fund_pay_sumamt:""}}</div>
-            <div style="position: absolute;top:240px;left:80px">个人账户支付: {{list.order.acct_pay?list.order.acct_pay:""}}</div>
+            <!-- <div style="position: absolute;top:220px;left:80px">全自费金额: {{list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:""}}</div> -->
+            <div style="position: absolute;top:220px;left:80px">基金支付总额: {{list.order.fund_pay_sumamt?list.order.fund_pay_sumamt:""}}</div>
+            <!-- <div style="position: absolute;top:240px;left:80px">个人账户支付: {{list.order.acct_pay?list.order.acct_pay:""}}</div> -->
       <!-- <div style="position: absolute;top:300px;left:80px">医疗费总金额 {{ list.order.medfee_sumamt }}</div>
         <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div> -->
         <div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -59,20 +59,20 @@
       <!-- 阜阳经沃   org_id != 0 && -->
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
       <!-- 大冶 -->
-      <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
+      <!-- <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen> -->
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510  && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480   && this.paramsObj.balance_accounts_type == 1">
       </printOne>
 
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510 && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>