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

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -569,9 +569,9 @@
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex" >
                       <div class="inline_block" style=" flex: 1">
                         处方脱水量：
-                          <div class="under_line" style="width: 60px; text-align: center" >
-                            {{ record.prescription.prescription_water ? record.prescription.prescription_water : "/" }}
-                          </div>ml
+                        <div class="under_line" style="width: 50px; text-align: center" >
+                          {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }}
+                        </div>ml
                       </div>             
                       <div class="inline_block" style=" flex: 1">
                         超滤总量：
@@ -589,8 +589,10 @@
                               record.prescription && record.prescription.dialysis_duration_hour
                               ? record.prescription.dialysis_duration_hour : "/"  
                             }}
-                          </span>
-                        </div>h
+                          </span>h
+                          <span v-if="record.prescription.dialysis_duration_minute>0">
+                            {{record.prescription.dialysis_duration_minute}}min</span>
+                        </div>
                       </div>
                       <div class="inline_block" style=" flex: 1">
                         透析方式：
@@ -665,15 +667,16 @@
                       <div class="inline_block" style="flex: 2">
                         人工肾装置：
                         <div class="under_line" style="width: 50%; text-align: center">
-                        {{ record.prescription &&
-                            record.prescription.dialysis_irrigation
+                          <!-- {{ record.prescription && record.prescription.dialysis_irrigation
                               ? record.prescription.dialysis_irrigation
                               : "" }}&nbsp;
                             {{
                               record.prescription.dialysis_dialyszers
                                 ? record.prescription.dialysis_dialyszers
                                 : ""
-                            }}
+                            }} -->
+                            {{record.prescription.dialyzer_perfusion_apparatus ? 
+                              record.prescription.dialyzer_perfusion_apparatus :''}}
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -2458,13 +2461,13 @@ export default {
   /* white-space: nowrap; */
   width: 50%;
 }
-.under_line::before {
+/* .under_line::before {
   content: "\00A0";
 }
 
 .under_line::after {
   content: "\00A0";
-}
+} */
 
 .under_line_two {
   display: inline-block;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -4,8 +4,7 @@
     <el-button type="primary" @click="toUpload">一键上传</el-button>
 
     <div id="dialysis-print-box-1"  ref="pdfContent">
-      <div
-        id="dialysis-print-box-1-1"
+      <div id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
         <div style="display: inline-block; width: 100%; text-align: center">
@@ -539,7 +538,7 @@
                     <div class="inline_block" style="flex: 1">
                       处方脱水量：
                       <div class="under_line" style="width: 50px; text-align: center">
-                        {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
+                        {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                       </div>ml
                     </div>
                      <div class="inline_block" style="flex: 1">
@@ -632,10 +631,11 @@
                     <div class="inline_block" style="flex: 2">
                       人工肾装置：
                       <div class="under_line" style="width: 50%; text-align: center">
-                        {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:""}}&nbsp;
+                        <!-- {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:""}}&nbsp;
                         {{
                           prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : ""
-                        }}
+                        }} -->
+                          {{prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus :''}}
                       </div>
                     </div>
                      <div class="inline_block" style="flex: 1">