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

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

                           <td>{{''}}</td>
                           <td>{{''}}</td>
                           <td>{{''}}</td>
-                          <td style="line-height:16px;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span> {{record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length>0?record.assessment_before_dislysis.remark:''}}</span></p></td>
+                          <td style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{record.assessment_before_dislysis&&record.assessment_before_dislysis.remark.length>0?record.assessment_before_dislysis.remark:''}}</span></div></td>
                           <td>
                             <span v-if="setAdminUserES(record.assessment_before_dislysis.creater) == ''">{{getAdminUser(record.assessment_before_dislysis.creater)}}</span>
                             <img class="es-img" :src="setAdminUserES(record.assessment_before_dislysis.creater)"  alt="" srcset="" v-else>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
-                          <td style="line-height:16px;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span> {{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></p></td>
+                          <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
                           <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
                         </tr>
                       </tbody>
                           <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
                           <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</td>
                           <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
-                          <td style="line-height:16px;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span> {{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></p></td>
+                          <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{monitor_record.symptom}}&nbsp;{{monitor_record.dispose}}&nbsp;{{monitor_record.result}}</span></div></td>
                           <td><span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span><img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""  v-else style="height: 20px;"></td>
                         </tr>
                       </tbody>
             this.advice_groups_2 = []
             var dlegh = 0
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
+              dlegh = 7 - this.records[recordIndex].monitor_records.length
             } 
             if(this.records[recordIndex].monitor_records.length <=0 ){
-              dlegh = 8
+              dlegh = 7
             }
             if (dlegh > 0) {
               if (typeof (this.records[recordIndex].monitor_records) === 'undefined' || this.records[recordIndex].monitor_records == null) {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

                       <td>{{''}}</td>
                       <td>{{''}}</td>
                       <td>{{''}}</td>
-                      <td style="line-height:16px;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span> {{predialysis.remark}}</span></p></td>
+                      <td style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> {{predialysis.remark}}</span></div></td>
                       <td>
                         <span v-if="setAdminUserES(predialysis.creater) == ''">{{getAdminUser(predialysis.creater)}}</span>
                         <img class="es-img" :src="setAdminUserES(predialysis.creater)"  alt="" srcset="" v-else>
                       <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;padding:0px;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span>{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}  </span></p></td>
+                      <td style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}} </span> </div></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>
                       <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;"> <p style="height:48px;overflow:hidden;padding:0;margin:0; display: flex;flex-direction: row;justify-content: center;align-items: center;"><span>{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}</span></p>  </td>
+                      <td style="line-height:16px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">{{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}</span></div>  </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>