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

src/api/his/his.js

@@ -519,6 +519,18 @@ export function refunddetail(params) {
 
 
 
+export function getPrivateExpensesOrder(params) {
+  return request({
+    url: "/api/privateexpensesorder/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
 
 
 

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,8 +14,10 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
-      <printTwo v-if="org_id == 10106" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
+      <printOne v-if="org_id != 10106 && this.paramsObj.balance_accounts_type != 2" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <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>
+      <!--<printThree v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printThree>-->
+      <print-three v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
     </div>
   </div>
 </template>
@@ -23,13 +25,17 @@
 <script>
   import printOne from './listTemplate/printOne'
   import printTwo from './listTemplate/printTwo'
-  import { getHisOrderDetail } from '@/api/his/his'
+  // import printThree from './listTemplate/printThree'
+
+  import { getHisOrderDetail,getPrivateExpensesOrder } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import axios from 'axios'
+  import PrintThree from './listTemplate/printThree'
 
   export default {
     name: 'listPrint',
     components: {
+      PrintThree,
       printOne,
       printTwo
     },
@@ -42,8 +48,7 @@
         patient:{},
         order:{},
         admin:{},
-
-
+        order_infos:null,
         info:null,
         p_admin:{},
         charge_admin:{},
@@ -53,8 +58,17 @@
     created() {
       this.getInfo(this.paramsObj.id)
       this.org_id = this.$store.getters.xt_user.org_id
-      if(this.org_id == 10106){
-        this.getInfo10106(this.paramsObj.id)
+      if(this.org_id == 0){
+        if(this.paramsObj.balance_accounts_type == 2){
+
+          this.getInfoPrivateExpenses10106(this.paramsObj.id)
+
+        }else{
+          this.getInfo10106(this.paramsObj.id)
+
+
+
+        }
       }
 
     },
@@ -204,6 +218,28 @@
         //     scanStyles: false
         //   });
         // }
+      },getInfoPrivateExpenses10106(order_id){
+        let params = {
+          order_id: order_id,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        getPrivateExpensesOrder(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.info = response.data.data.info
+            this.info['org_name'] = response.data.data.org_name
+            this.info['date'] = response.data.data.date
+            this.info['number'] = response.data.data.number
+            this.info['name'] = response.data.data.name
+            this.p_admin = response.data.data.printor_admin
+            this.charge_admin = response.data.data.charge_admin
+            this.order_infos = response.data.data
+          }
+        })
+
       },
       getInfo10106(order_id) {
         if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {

src/xt_pages/outpatientCharges/listTemplate/printTwo.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '310'">医保费用明细清单</div>
-    <div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">医保费用明细清单</div>
+    <div class="statementTitle" style="margin-top:20px;" >医保费用明细清单</div>
+    <!--<div class="statementTitle" style="margin-top:20px;" v-if="info.insutype == '390'">医保费用明细清单</div>-->
 
     <div style="display:flex">
       <div style="width:70%">医疗机构名称：{{info.fixmedins_name}}</div>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -173,7 +173,8 @@ export default {
           listVisible:false,
           allListVisible:false,
           paramsObj:{
-            id:this.$route.query.id
+            id:this.$route.query.id,
+            balance_accounts_type:0
           },
             crumbs: [
                 { path: false, name: '门诊收费' },
@@ -213,10 +214,13 @@ export default {
       open(val){
         if(val == 1){
           this.paramsObj.id == this.$route.query.id
+          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
           this.listVisible = true
 
         }else if(val == 2){
           this.paramsObj.id == this.$route.query.id
+          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
+
           this.allListVisible = true
         }
       },