Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -264,7 +264,7 @@
                       <td>{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
-                      <td style="line-height:16px;"> {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}  </td>
+                      <td style="line-height:16px;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}  </p></td>
                       <td>
                         <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">{{getAdminUser(monitor.monitoring_nurse)}}</span>
                         <img class="es-img" :src="setAdminUserES(monitor.monitoring_nurse)"  alt="" srcset="" v-else>