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

src/xt_pages/data/prescription.vue

@@ -1197,7 +1197,7 @@ export default {
     this.body_fluid_option = this.$store.getters.body_fluid;
     this.special_medicine_option = this.$store.getters.special_medicine;
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
-    this.blood_access_option = this.$store.getters.vascular_access_desc;
+    this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
     console.log("列表33333333血管通路",this.blood_access_option)
     this.addPlan.mode = 1;
     this.dialyzerPerfusionApparatus = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -417,9 +417,9 @@
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1.4">
+                  <div class="inline_block" style="flex:1.5">
                     血管通路：
-                    <div class="under_line" style="width: 300px;text-align: center;">
+                    <div class="under_line" style="width: 260px;text-align: center;">
                       {{prescription.blood_access_part_opera_name}}
                     </div>
                   </div>
@@ -429,12 +429,18 @@
                       {{ predialysis.machine_type ? predialysis.machine_type : '' }}
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1">
+                  <div class="inline_block">
                     机号：
                     <div class="under_line" style="width: 60px;text-align: center;">
                       {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                     </div>
                   </div>
+                  <div v-if="org_id == 10101" class="inline_block" style="flex:1;margin-left:10px;">
+                    透析器/灌流器：
+                    <div class="under_line" style="width: 120px;text-align: center;">
+                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+                    </div>
+                  </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                   <div class="inline_block" style="flex:1;">
@@ -1507,7 +1513,7 @@ export default {
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
-
+    this.org_id = this.$store.getters.xt_user.org.id
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
     // this.orgname = "遂溪方济医院";