see999 3 gadus atpakaļ
vecāks
revīzija
b898208bc6

+ 10 - 8
src/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine.vue Parādīt failu

@@ -290,10 +290,10 @@
290 290
                             <td width='80'>护士</td>
291 291
                             <td width='80'>时间</td>
292 292
                         </tr>
293
-                        <tr v-for="(advice, advice_index) in record.his_advices.length > 0 ? record.his_advices : record.advices" :key="advice_index">
293
+                        <tr v-for="(advice, advice_index) in record.his_advices" :key="advice_index">
294 294
                         <td style="height:40px;line-height:40px">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
295 295
                         <td class="parent">
296
-                            <span v-if="advice.parent_id > 0"><---></span>
296
+                            <span v-if="advice.parent_id > 0">---></span>
297 297
                             <span>{{ advice.advice_name }}</span>
298 298
                             <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
299 299
                             <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
@@ -303,19 +303,21 @@
303 303
                             <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
304 304
                         </td>
305 305
                         <td>
306
-                            <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
307
-                                {{getAdminUser(advice[0], 'advice_doctor')}}
306
+                            <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
307
+                                {{getAdminUser(advice, 'advice_doctor')}}
308
+                                1
308 309
                             </span>
309 310
                             <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
310
-                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'advice_doctor')" alt srcset />
311
+                                2
312
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'advice_doctor')" alt srcset />
311 313
                             </span>
312 314
                         </td>
313 315
                         <td>
314
-                            <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
315
-                                {{getAdminUser(advice[0], 'execution_staff')}}
316
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
317
+                                {{getAdminUser(advice, 'execution_staff')}}
316 318
                             </span>
317 319
                             <span v-else>
318
-                                <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
320
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
319 321
                             </span>
320 322
                         </td>
321 323
                         <td>{{ getTime(advice.execution_time, "{h}:{i}") }}</td>