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/listPrint.vue

@@ -14,8 +14,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <!-- <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485" :list="list" :patient="patient" :order="order" :admin="admin"></printOne> -->
-      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485"
+      <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191"
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>

src/xt_pages/outpatientTool/components/pdetail.vue

@@ -200,7 +200,7 @@ export default {
         let count = order.count
         let price = order.price.toFixed(2)
         let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-        let total = order.total.toFixed(2)
+        let total = parseFloat(order.total).toFixed(2)
 
         let obj = {
           '患者姓名': name,
@@ -226,8 +226,8 @@ export default {
 
     },
     getCostType(type){
-      console.log(this.costClassifyList)
-      console.log(type)
+      // console.log(this.costClassifyList)
+      // console.log(type)
       var name = "";
       for (let i = 0; i < this.costClassifyList.length; i++) {
         if (type == this.costClassifyList[i].value) {