浏览代码

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 3 周前
父节点
当前提交
250a663c13

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eightyfour.vue 查看文件

@@ -325,7 +325,7 @@
325 325
                       <td>{{ advice[0].delivery_way }}</td>
326 326
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
327 327
                       <td style="height:30px;line-height:30px">
328
-                        徐华
328
+                        <span v-if="advice[0].start_time>0">徐华</span>
329 329
                         <!-- <span v-if="advice[0].start_time>0">杨能华/</span>
330 330
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
331 331
                           {{ getAdminUser(advice[0],'advice_doctor')}}

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue 查看文件

@@ -278,7 +278,7 @@
278 278
                 <td>{{ advice.delivery_way }}</td>
279 279
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
280 280
                 <td style="height:30px;line-height:30px">
281
-                  徐华
281
+                  <span v-if="advice.start_time>0">徐华</span>
282 282
                   <!-- <span v-if="advice.start_time>0">徐华/</span>
283 283
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
284 284
                     {{ getAdminUser(advice.advice_doctor)}}