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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -971,7 +971,7 @@
                   <div class="inline_block" style="flex:1;">
                     穿刺护士：
                     <div class="under_line" style="width: 80px;text-align: center">
-                      <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}</span>
                       <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
                     </div>
@@ -979,7 +979,7 @@
                   <div class="inline_block" style="flex:1;">
                     治疗护士：
                     <div class="under_line" style="width: 80px;text-align: center">
-                      <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) }}</span>
                       <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
                     </div>
@@ -987,25 +987,25 @@
                   <div class="inline_block" style="flex:1;">
                     核对人员：
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder == null">
-                      <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
-                      <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.creater">
-                      <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                         {{ getAdminUser(check == null ? 0 : check.modifier) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
                     </div>
                     <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater && dialysisOrder.start_nurse != check.modifier">
-                      <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
                         {{ getAdminUser(check == null ? 0 : check.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt="" srcset="" v-else />
@@ -1014,7 +1014,7 @@
                   <div class="inline_block" style="flex:1;">
                     下机护士：
                     <div class="under_line" style="width: 80px;text-align: center">
-                      <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                         {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
@@ -1023,7 +1023,7 @@
                   <div class="inline_block" style="flex:1;">
                     治疗医生：
                     <div class="under_line" style="width: 80px;text-align: center">
-                      <span v-if="setAdminUserES(prescription.creater) == ''">
+                      <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
                         {{ getAdminUser(prescription.creater) }}
                       </span>
                       <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -231,6 +231,7 @@ export default {
   created() {
     this.getInfo(this.paramsObj.order_id)
     this.org_id = this.$store.getters.xt_user.org_id
+    console.log("this.org_id",this.org_id)
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化