Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFive.vue

@@ -545,12 +545,12 @@
 
                         <div class="under-line" v-if="org_id == 9987">
                           <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:prescription.creater)) }} </span>
-                          <img class="es-img" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+                          <img class="es-img" style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
                         </div>
                         <div class="under-line" v-else>
                           <span v-if="advices.length == 0"></span>
                           <span v-else-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{ getAdminUser(advices[0][0].advice_doctor) }}</span>
-                          <img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)" alt="" srcset="" v-else />
+                          <img class="es-img" style="height:30px;" :src="setAdminUserES(advices[0][0].advice_doctor)" alt="" srcset="" v-else />
                         </div>
                       </td>
                       <td width="70">上机护士:</td>
@@ -558,7 +558,7 @@
                         <div class="under-line">
                           <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) == ''">
                             {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.start_nurse) }}</span>
-                          <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
+                          <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.start_nurse)" alt="" srcset="" v-else />
                         </div>
                       </td>
                     </tr>
@@ -834,8 +834,18 @@
                           <!--<span v-if="afterdialysis.creater==0">&nbsp;</span>-->
                           <!--<img class="es-img" :src="setAdminUserES(afterdialysis.creater)" alt="" srcset="" v-else>-->
 
-                          <span v-if="setAdminUserES(afterdialysis.creater) == ''">{{ getAdminUser(afterdialysis.creater) }}</span>
-                          <img class="es-img" :src="setAdminUserES(afterdialysis.creater)" alt="" srcset="" v-else />
+                          <span v-if="dialysisOrder.start_nurse != check.modifier">
+                            <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                            {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+                          </span>
+                          <span v-else>
+                            <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                            {{ getAdminUser(check == null ? 0 : check.creater) }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
+                          </span>
                         </div>
                       </td>
                       <td width=""></td>
@@ -844,7 +854,7 @@
                         <div class="under-line">
                           <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
                             {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
-                          <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                          <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
                         </div>
                       </td>
                     </tr>
@@ -904,14 +914,14 @@
                 <!--v-show="advice[0].advice_doctor>0">-->
                 <!---->
                 <span v-if="setAdminUserES(advice[0].advice_doctor) == ''">{{ getAdminUser(advice[0].advice_doctor) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[0].advice_doctor)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[0].advice_doctor)" alt="" srcset="" v-else />
               </td>
               <td>
                 <!--<img class="es-img" :src="setAdminUserES(advice[0].execution_staff)" alt="" srcset=""-->
                 <!--v-show="advice[0].execution_staff>0">-->
 
                 <span v-if="setAdminUserES(advice[0].execution_staff) == ''">{{ getAdminUser(advice[0].execution_staff) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[0].execution_staff)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[0].execution_staff)" alt="" srcset="" v-else />
               </td>
               <td>
                 <span v-if="advice[0].execution_time">
@@ -924,7 +934,7 @@
                 <!--v-show="advice[0].checker>0">-->
 
                 <span v-if="setAdminUserES(advice[0].checker) == ''">{{ getAdminUser(advice[0].checker) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[0].checker)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[0].checker)" alt="" srcset="" v-else />
               </td>
               <td></td>
               <td v-if="advice[1] != undefined">
@@ -964,7 +974,7 @@
                 <!--v-show="advice[1].advice_doctor>0"></td>-->
 
                 <span v-if="setAdminUserES(advice[1].advice_doctor) == ''">{{ getAdminUser(advice[1].advice_doctor) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[1].advice_doctor)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[1].advice_doctor)" alt="" srcset="" v-else />
               </td>
 
               <td v-else>
@@ -976,7 +986,7 @@
                 <!--v-show="advice[1].execution_staff>0">-->
 
                 <span v-if="setAdminUserES(advice[1].execution_staff) == ''">{{ getAdminUser(advice[1].execution_staff) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[1].execution_staff)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[1].execution_staff)" alt="" srcset="" v-else />
               </td>
               <!--<td><span v-if="advice[1].execution_time">{{advice[1].execution_time| parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>-->
               <!--</td>-->
@@ -996,7 +1006,7 @@
                 <!--v-show="advice[1].checker>0">-->
                 <!--<span v-show="advice[1].checker>0">setAdminUserES(advice[1].checker)</span>-->
                 <span v-if="setAdminUserES(advice[1].checker) == ''">{{ getAdminUser(advice[1].checker) }}</span>
-                <img class="es-img" :src="setAdminUserES(advice[1].checker)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(advice[1].checker)" alt="" srcset="" v-else />
               </td>
               <td v-else>
                 <span></span>