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

@@ -116,7 +116,7 @@
               {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : '/'}}kg
             </span>
           </td>
-          <td style="text-align:left;" colspan="1" rowspan="2">
+          <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               透后体重:
               {{ afterdialysis.weight_after ? afterdialysis.weight_after : '/' }} kg
@@ -130,6 +130,13 @@
               {{ afterdialysis.weight_loss ? afterdialysis.weight_loss : "/" }}kg
             </span>
           </td>
+          <td style="text-align:left;" colspan="1">
+            <span style="display:inline-block;margin-left:15px;">
+              透析时长:
+              {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}h
+              {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}min
+            </span>
+          </td>
         </tr>
         <tr>
           <td style="text-align:left;" colspan="1">
@@ -151,7 +158,7 @@
           </td>
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
-                机温: {{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "/" }} ℃
+                透析液温度: {{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "/" }} ℃
             </span>
           </td>
           <td style="text-align:left;" colspan="1">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -330,12 +330,16 @@
                     </div>
                     ml/min
                   </div>
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
+                  <div class="inline_block" style="margin-left:1px;flex:1;">
                     透析时间：
-                    <div class="under_line" style="width: 50px;text-align: center">
+                    <div class="under_line" style="width: 30px;text-align: center">
                       {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
                     </div>
                     h
+                    <div class="under_line" style="width: 30px;text-align: center">
+                      {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "/" }}
+                    </div>
+                    min
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -179,7 +179,10 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                    <div class="under_line" style="width: 100px;text-align: center">
+                      {{ predialysis.puncture_way ? predialysis.puncture_way : '/' }}
+                    </div>
+                     <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
@@ -190,7 +193,7 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
                       区域
-                    </div>
+                    </div> -->
                     <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -557,7 +557,8 @@ export default {
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
 
       },
-      deep:true
+      deep:true,
+      immediate:true
     }
   }