浏览代码

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

28169 3 天前
父节点
当前提交
1bf7e117b6

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

@@ -571,7 +571,6 @@
571 571
                         处方脱水量:
572 572
                         <div class="under_line" style="width: 50px; text-align: center" >
573 573
                           {{ record.prescription.prescription_water ? record.prescription.prescription_water : "/" }}
574
-                          <!-- {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }} -->
575 574
                         </div>ml
576 575
                       </div>             
577 576
                       <div class="inline_block" style=" flex: 1">

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

@@ -912,7 +912,8 @@
912 912
                         class="inline_block"
913 913
                         style="margin-left: 10px; flex: 1"
914 914
                       >
915
-                        置换量:
915
+                        <span v-if="org_id!=9538">置换量:</span>
916
+                        <span v-if="org_id==9538">预计置换液量:</span>
916 917
                         <div
917 918
                           class="under_line"
918 919
                           style="width: 70px; text-align: center"

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

@@ -539,7 +539,6 @@
539 539
                       处方脱水量:
540 540
                       <div class="under_line" style="width: 50px; text-align: center">
541 541
                         {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
542
-                        
543 542
                       </div>ml
544 543
                     </div>
545 544
                      <div class="inline_block" style="flex: 1">

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue 查看文件

@@ -1008,7 +1008,8 @@
1008 1008
                       class="inline_block"
1009 1009
                       style="margin-left: 10px; flex: 1"
1010 1010
                     >
1011
-                      置换量:
1011
+                      <span v-if="org_id!=9538">置换量:</span>
1012
+                      <span v-if="org_id==9538">预计置换液量:</span>
1012 1013
                       <div
1013 1014
                         class="under_line"
1014 1015
                         style="width: 70px; text-align: center"
@@ -3926,7 +3927,7 @@
3926 3927
                             "
3927 3928
                             >({{ advice.remark }})
3928 3929
 
3929
-                            
3930
+
3930 3931
                           </span>
3931 3932
                         </td>
3932 3933