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

@@ -578,12 +578,17 @@
                       <td v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && ( dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
                       </td>
-                      <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))" style="width:50px">
-                        {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
+                      <td style="width:50px">
+                        <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
+                          {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
+                        </span>
+                        <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))">
+                          {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
+                        </span>
                       </td>
-                      <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))" style="width:50px">
+                      <!-- <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time))" style="width:50px">
                         {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
-                      </td>
+                      </td> -->
                       <td width="200" v-if="org_id == 9919">{{monitor.ktv}}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySix.vue

@@ -1410,7 +1410,7 @@ export default {
           }
           this.jilurow = this.monitors.length + 1
 
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = response.data.data.advices
           var tableAdvice = doctorAdevieInfo
           if (tableAdvice.length < 30) {
             var nl = 30 - tableAdvice.length