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/DialysisPrintOrderFiftyThree.vue

@@ -745,7 +745,7 @@
 
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
-              {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
+              {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
             </span>
           </td>
 
@@ -2348,6 +2348,8 @@ export default {
     ) {
       this.queryParams.xtdate = xtdate;
       this.queryParams.xtno = xtno;
+      this.xtdate = xtdate
+      
       this.getDialysisRecord();
     } else {
       this.$message.error("参数不齐");

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -113,13 +113,13 @@
                 >  （
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 1 ? true : false
+                    prescription.mode_id == 2 && prescription.displace_liqui_part == 1 ? true : false
                   "
                   showValue="前稀释"
                 ></label-box>
                 <label-box
                   :isChecked="
-                    prescription.displace_liqui_part == 2 ? true : false
+                    prescription.mode_id == 2 && prescription.displace_liqui_part == 2 ? true : false
                   "
                   showValue="后稀释"
                 ></label-box>
@@ -127,7 +127,7 @@
                   ,置换量
                   <span style="width: 50px; display: inline-block">
                     {{
-                      prescription.displace_liqui_value
+                      prescription.displace_liqui_value && prescription.mode_id == 2
                         ? prescription.displace_liqui_value
                         : "/"
                     }}