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

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -14,7 +14,7 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       <printOne v-if="org_id != 9990" :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
-      <printTwo v-if="org_id == 9990" :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
+      <printTwo v-if="org_id == 9990" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
     </div>
   </div>
 </template>
@@ -62,7 +62,8 @@
         info:null,
         p_admin:{},
         charge_admin:{},
-        org_id:''
+        org_id:'',
+        order_infos:null
       };
     },
     methods:{
@@ -177,6 +178,7 @@
                 that.info = response.data.data.info
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
+                that.order_infos = response.data.data
 
 
                 console.log(that.info)

src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue

@@ -67,7 +67,7 @@
       <div style="width:10%;text-align:center;">门诊目录</div>
       <div style="width:10%;text-align:center;">医保目录</div>
     </div>
-    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;" v-for="(item,index) in info.order_infos"
+    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;" v-for="(item,index) in order_infos.order_infos"
          :key="index">
       <div style="width:50%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
       <div style="width:50%;text-align:center;" v-if="item.project_id > 0">{{item.project.project.project_name}}</div>
@@ -108,7 +108,14 @@
         default: function () {
           return {}
         }
-      }, p_admin: {
+      }, 
+      order_infos: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      }, 
+      p_admin: {
         type: Object,
         default: function () {
           return {}

src/xt_pages/outpatientCharges/summary.vue

@@ -104,7 +104,7 @@
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
+                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
                             退费
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>