Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1003,7 +1003,7 @@
                   <td width="0" style="border:none;visibility: hidden;padding:0"></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 >
+                    <img style="height:30px" :src="setAdminUserES(monitor, 'monitoring_nurse')" alt="" srcset=""  v-else >
                   </td>
                 </tr>
               </table>
@@ -1082,7 +1082,7 @@
                                     :key="childindex"
                                     class="advice-children"
                                 >
-                                    <span>▲</span>
+                                    <span>---></span>
                                     <span>
                                     <span>{{ child.advice_name }}</span>
                                     <span v-if="child.advice_desc"
@@ -1130,7 +1130,7 @@
                                     :key="childindex"
                                     class="advice-children"
                                 >
-                                    <span>▲</span>
+                                    <span>---></span>
                                     <span>
                                     <span>{{ child.advice_name }}</span>
                                     <span v-if="child.advice_desc"
@@ -1161,7 +1161,7 @@
                         alt=""
                         srcset=""
                         v-else
-                        style="height: 40px;"
+                        style="height: 30px;"
                         />
                     </td>
                     <td colspan="2" style="height:40px">
@@ -1174,7 +1174,7 @@
                         alt=""
                         srcset=""
                         v-else
-                        style="height: 40px;"
+                        style="height: 30px;"
                         />
                     </td>
                     <td colspan="3" style="width:130px;">
@@ -1255,7 +1255,9 @@
                         <span style="width:70px;display:inline-block">{{
                           record.assessment_after_dislysis.weight_after
                             ? parseFloat(
-                                record.assessment_after_dislysis.weight_after
+                                record.assessment_after_dislysis.weight_after -
+                                    record.assessment_before_dislysis
+                                      .additional_weight
                               ).toFixed(1)
                             : ""
                         }}</span
@@ -1357,7 +1359,6 @@
                             }}</span
                           >
                           <img
-                            class="es-img"
                             :src="
                               setAdminUserES(
                                 record.advices[0][0],
@@ -1367,7 +1368,7 @@
                             alt=""
                             srcset=""
                             v-else
-                            style="height: 20px;"
+                             style="height: 30px;"
                           />
                     </span>
                     核对护士
@@ -1384,12 +1385,11 @@
                           }}</span
                         >
                         <img
-                          class="es-img"
                           :src="setAdminUserES(record.check, 'modifier')"
                           alt=""
                           srcset=""
                           v-else
-                          style="height: 20px;"
+                          style="height: 30px;"
                         />
                     </span>
                     护士签名
@@ -1420,7 +1420,7 @@
                             }}</span
                           >
                           <img
-                            class="es-img"
+                             style="height: 30px;"
                             :src="
                               setAdminUserES(
                                 record.advices[0][0],
@@ -1430,7 +1430,6 @@
                             alt=""
                             srcset=""
                             v-else
-                            style="height: 20px;"
                           />
                       
                     </span>

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -887,7 +887,7 @@
               getAdminUser(monitor.monitoring_nurse)
             }}</span>
             <img
-              class="es-img"
+              style="height:30px"
               :src="setAdminUserES(monitor.monitoring_nurse)"
               alt=""
               srcset=""
@@ -1350,7 +1350,7 @@
               &nbsp;
               <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
-                <img class="es-img" :src="doctorForm.url" />
+                <img style="height:30px" :src="doctorForm.url" />
               </span>
             </span>
             核对护士
@@ -1361,7 +1361,7 @@
                 >{{ getAdminUser(check == null ? 0 : check.modifier) }}</span
               >
               <img
-                style="height:20px;"
+                style="height:30px"
                 :src="setAdminUserES(check == null ? 0 : check.modifier)"
                 alt=""
                 srcset=""
@@ -1377,7 +1377,7 @@
                   >{{ getAdminUser(doctor_advices[0].execution_staff) }}</span
                 >
                 <img
-                  class="es-img"
+                  style="height:30px"
                   :src="setAdminUserES(doctor_advices[0].execution_staff)"
                   alt=""
                   srcset=""