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

@@ -268,7 +268,7 @@
                     <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: 70%; text-align: center">
+                        <div class="under_line" style="width: 70%; text-align: left;white-space: normal;">
                           {{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis.internal_fistula
@@ -280,8 +280,8 @@
                       </div>
                       <div class="inline_block" style="flex: 1">
                         导管：
-                        <div
-                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        <div class="under_line"
+                          style="width: 70%; text-align: left;white-space: normal;"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -332,8 +332,10 @@
                       <div class="inline_block" style="flex: 1;">
                         体重增加：
                         <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
-                          {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 ? 
-                          parseFloat(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(2): "/" 
+                          {{ record.assessment_before_dislysis.weight_before > 0 && 
+                          record.assessment_before_dislysis.additional_weight > 0 && 
+                          record.assessment_before_dislysis.dry_weight >0 ? 
+                          parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight - record.assessment_before_dislysis.dry_weight).toFixed(2): "/" 
                           }}
                         </div>kg
                       </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -314,9 +314,8 @@
                         class="under_line"
                         style=" width: 50%;text-align: center;white-space: normal;"
                       >
-                      {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0 ? 
-                        parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/" 
-                      }}
+                      {{ predialysis.weight_before > 0 && predialysis.dry_weight > 0 ? 
+                      parseFloat(predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2): "/" }}
                       </div>kg
                     </div>
                     <div class="inline_block" style=" flex: 1">