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

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -821,6 +821,11 @@ export default {
       default: function() {
         return {}
       }
+    },list:{
+      type: Array,
+      default: function() {
+        return []
+      }
     }
   },
   data(){

src/xt_pages/hospitalStation/statementPrint.vue

@@ -21,7 +21,7 @@
 <!--      <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>-->
 <!--      <printOne :info="info" v-else></printOne>-->
 <!--      <print-one :info="info" ></print-one>-->
-      <hospital-settle-print :info="info"></hospital-settle-print>
+      <hospital-settle-print :info="info" :list="list"></hospital-settle-print>
     </div>
 
 <!--    <div class='dialysisPage' style="padding-top:40px;" v-else>-->
@@ -76,7 +76,8 @@ export default {
       prescription_id: 0,
       ids: '',
       info: null,
-      org_id: ''
+      org_id: '',
+      list:[],
     }
   },
   methods: {