修改打印模版问题

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -269,7 +269,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="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 style="line-height:16px;padding:0px;"><div style="min-height:40px;line-height:40px; 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>
@@ -285,7 +285,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="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 style="line-height:16px;padding:0px;"> <div style="min-height:40px;line-height:40px; 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 ></td>
                     </tr>
                     </tbody>
@@ -324,7 +324,7 @@
               <div class="inline_block" style="margin-left: 10px;">
                 性别：
                 <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-                &nbsp
+                &nbsp;
                 <check-box text="女" :checked="record.patient.gender == 2"></check-box>
               </div>
               <div class="inline_block" style="margin-left: 10px;">
@@ -373,7 +373,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="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 style="line-height:16px;padding:0px;"> <div style="min-height:40px;line-height:40px; 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 ></td>
                     </tr>
                     </tbody>
@@ -635,7 +635,7 @@
             <div class="inline_block" style="margin-left: 10px;">
               性别：
               <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-              &nbsp
+              &nbsp;
               <check-box text="女" :checked="record.patient.gender == 2"></check-box>
             </div>
             <div class="inline_block" style="margin-left: 10px;">
@@ -971,7 +971,7 @@
                 <div class="inline_block" style="margin-left: 10px;">
                   性别：
                   <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-                  &nbsp
+                  &nbsp;
                   <check-box text="女" :checked="record.patient.gender == 2"></check-box>
                 </div>
                 <div class="inline_block" style="margin-left: 10px;">

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -265,7 +265,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="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 style="line-height:16px;padding:0px;"><div style="min-height:40px;line-height:40px; 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>
@@ -281,7 +281,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="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 style="line-height:16px;padding:0px;"> <div style="min-height:40px;line-height:40px; 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 ></td>
                     </tr>
                     </tbody>
@@ -320,7 +320,7 @@
               <div class="inline_block" style="margin-left: 10px;">
                 性别：
                 <check-box text="男" :checked="record.patient.gender == 1"></check-box>
-                &nbsp
+                &nbsp;
                 <check-box text="女" :checked="record.patient.gender == 2"></check-box>
               </div>
               <div class="inline_block" style="margin-left: 10px;">
@@ -368,7 +368,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="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 style="line-height:16px;padding:0px;"> <div style="min-height:40px;line-height:40px; 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 ></td>
                     </tr>
                     </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -458,7 +458,7 @@
                   <td style="line-height:16px;padding:0px;">
                     <div style="min-height:35px;line-height:35px; 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;">
-                            <template v-if="monindex == 0">【开始透析】</template>
+                            <template v-if="monitor.operate_time == dialysisOrder.start_time">【开始透析】</template>
                             {{monitor.end}}
                             {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}
                           </span>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -254,7 +254,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="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 style="line-height:16px;padding:0px;"> <div style="min-height:40px;line-height:40px; 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>
@@ -272,7 +272,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="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 style="line-height:16px;padding:0px;"><div style="min-height:40px;line-height:40px; 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>
@@ -358,7 +358,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="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 style="line-height:16px;"><div style="min-height:40px;line-height:40px; 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>