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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -389,7 +389,7 @@
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
                       <td style="line-height:16px;padding:0px;">
-                        <div style="min-height:40px;line-height:40px; overflow:hidden;">
+                        <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>
                             {{monitor.end}}
@@ -436,13 +436,13 @@
                     </tr>
                     <!-- <template v-for="group in doctor_advices" > -->
                       <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index" >
-                        <td height="35px" >
+                        <td height="32px" >
                             <span v-if="advice.start_time">
                               {{getTime(advice.start_time,'{h}:{i}')}}
                             </span>
                           <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                         </td>
-                        <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
+                        <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
                           <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
@@ -458,7 +458,7 @@
                           <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                         </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                        <td height="35px">
+                        <td height="32px">
                           <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{getAdminUser(advice.advice_doctor)}}</span>
                           <img style="height:20px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else>
                         </td>
@@ -466,11 +466,11 @@
                           <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                           <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                         </td> -->
-                        <td height="35px">
+                        <td height="32px">
                           <span v-if="setAdminUserES(advice.execution_staff) == ''">{{getAdminUser(advice.execution_staff)}}</span>
                           <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else>
                         </td>
-                        <td height="35px">
+                        <td height="32px">
                           <span v-if="advice.execution_time">{{getTime(advice.execution_time,'{h}:{i}')}}</span>
                         </td>
                       </tr>
@@ -657,10 +657,9 @@
 
 
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:1; display:inline-block;">
                   治疗小结：
                   <div class="under_line" style="width: 90%;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
-
                 </div>
               </div>