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

src/xt_pages/outpatientTool/components/newSettlePrint.vue

@@ -29,8 +29,8 @@ import { uParseTime } from '@/utils/tools'
 import axios from 'axios'
 import { getAllDoctorList, getAllHisPatientList } from '@/api/project/project'
 import { getPrivateExpenses, getPrivateExpensesOrder, getPrivateExpensesTwo } from '@/api/his/his'
-
 import Print9919 from './print9919.vue'
+import printJS from "print-js";
 export default {
   name: 'dialysisPrintOrder',
   components: {

src/xt_pages/outpatientTool/components/print9919.vue

@@ -1,10 +1,8 @@
 <template>
   <div id="statement-print" class="statement-print">
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id != 10480">广东省社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-else>安徽省社会医疗保险医疗费用结算单</div>
-
-    <table class="statementTable" border="1">
+    <div class="statementTitle">广东省社会医疗保险医疗费用结算单</div>
+    <table class="statementTable" border="1" style="border-collapse: collapse;">
       <tr>
         <td width="80">机构名称</td>
         <td colspan="4">{{info.org_name}}</td>
@@ -23,7 +21,6 @@
         <td width="100" v-else-if="info.hosp_lv == '10'">一级丙等</td>
         <td width="100" v-else-if="info.hosp_lv == '11'">无等级</td>
         <td width="100" v-else></td>
-
       </tr>
       <tr>
         <td width="70">就医登记号</td>
@@ -242,6 +239,7 @@
         <td style="text-align:right;padding-right:10px;">{{info.huli_cost_self_total}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.huli_cost_part_self_total}}</td>
       </tr>
+
       <tr>
         <td>合计</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +