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

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -255,7 +255,7 @@
                           <td>{{''}}</td>
                           <td>{{''}}</td>
                           <td>{{''}}</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 style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>
@@ -270,7 +270,7 @@
                           <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;"> <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 style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>
@@ -349,7 +349,7 @@
                           <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;"> <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 style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>
@@ -982,8 +982,8 @@
             var dlegh = 0
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
               dlegh = 7 - this.records[recordIndex].monitor_records.length
-            } 
-            if(this.records[recordIndex].monitor_records.length <=0 ){
+            }
+            if (this.records[recordIndex].monitor_records.length <= 0) {
               dlegh = 7
             }
             if (dlegh > 0) {
@@ -996,19 +996,19 @@
             }
 
             this.records[recordIndex].monitor_records2 = []
-            if (this.records[recordIndex].monitor_records.length > 15){
+            if (this.records[recordIndex].monitor_records.length > 12) {
               const tempMonitors = []
               const tempMonitors2 = []
 
               for (let index = 0; index < this.records[recordIndex].monitor_records.length; index++) {
-                if (index < 15) {
+                if (index < 12) {
                   tempMonitors.push(this.records[recordIndex].monitor_records[index])
                 } else {
                   tempMonitors2.push(this.records[recordIndex].monitor_records[index])
                 }
               }
-            this.records[recordIndex].monitor_records = tempMonitors
-            this.records[recordIndex].monitor_records2 = tempMonitors2
+              this.records[recordIndex].monitor_records = tempMonitors
+              this.records[recordIndex].monitor_records2 = tempMonitors2
             }
 
             var childMap = {}
@@ -1051,7 +1051,6 @@
                 if ('children' in this.doctor_advices[index] && this.doctor_advices[index].children.length > 0) {
                   new_advice_index = index + this.doctor_advices[index].children.length + 1
 
-
                   var doctor_advice = {
                     delivery_way: this.doctor_advices[index].delivery_way,
                     execution_frequency: this.doctor_advices[index].execution_frequency,
@@ -1063,8 +1062,7 @@
                     execution_staff: this.doctor_advices[index].execution_staff,
                     checker: this.doctor_advices[index].checker,
                     advice_doctor: this.doctor_advices[index].advice_doctor,
-                    execution_time: this.doctor_advices[index].execution_time,
-
+                    execution_time: this.doctor_advices[index].execution_time
 
                   }
                   doctor_advice['isShow'] = 1
@@ -1292,23 +1290,22 @@
         } else {
           return ''
         }
-      },getFloat: function(x) {
+      }, getFloat: function(x) {
         if (x != '.') {
-          var f = Math.round(x * 100) / 100;
-          var s = f.toString();
-          var rs = s.indexOf('.');
+          var f = Math.round(x * 100) / 100
+          var s = f.toString()
+          var rs = s.indexOf('.')
           if (rs <= 0) {
-            rs = s.length;
-            s += '.';
+            rs = s.length
+            s += '.'
           }
           while (s.length <= rs + 1) {
-            s += '0';
+            s += '0'
           }
-          return s;
+          return s
         } else {
-          return '0.0';
+          return '0.0'
         }
-
       },
       getAdminUser(key, id) {
         if (typeof (key) === 'undefined' || key == null || typeof (key[id]) === 'undefined') {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -247,7 +247,7 @@
                       <td>{{''}}</td>
                       <td>{{''}}</td>
                       <td>{{''}}</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 style="line-height:16px;padding:0px;"> <div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>
@@ -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;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 style="line-height:16px;padding:0px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>
@@ -345,7 +345,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;"><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 style="line-height:16px;"><div style="height:48px;line-height:48px; overflow:hidden;"><span style="word-break: break-all;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>