Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/template/DialysisPrintOrdereightyfour.vue

@@ -302,7 +302,8 @@
                 </td>
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                <td style="height:30px;line-height:30px">杨能华/
+                <td style="height:30px;line-height:30px">
+                  <span v-if="advice.start_time>0">杨能华/</span>
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}
                   </span>
@@ -346,11 +347,13 @@
             <div style="flex: 1;">
               <div style="display: inline-block;margin-right: 120px;">
                 <span style="display: inline-block;">医生签名:</span>杨能华/
-                <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
-                  {{ getAdminUser(prescription.creater)}}
-                </span>
-                <span style="display: inline-block;" v-else>
-                  <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
+                <span v-if="tableAdvice.length>0">
+                  <span style="display: inline-block;" v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">
+                    {{ getAdminUser(tableAdvice[0].advice_doctor)}}
+                  </span>
+                  <span style="display: inline-block;" v-else>
+                    <img style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt srcset />
+                  </span>
                 </span>
               </div>
             </div>

src/pages/main/template/DialysisPrintOrdereightytwo.vue

@@ -425,7 +425,7 @@
                     0
                   </span>
                 </td>
-                <td>
+                <td style="line-height: 20px;">
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
                   <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>
                   <span v-if="monitor.result"> {{ "  " + monitor.result }} </span>