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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -909,7 +909,7 @@
                             record.prescription &&
                             record.prescription.dialysis_duration_hour
                               ? record.prescription.dialysis_duration_hour
-                              : "/"
+                              : "0"
                           }}
                         </div>
                         h
@@ -921,7 +921,7 @@
                             record.prescription &&
                             record.prescription.dialysis_duration_minute
                               ? record.prescription.dialysis_duration_minute
-                              : "/"
+                              : "0"
                           }}
                         </div>
                         min

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -64,6 +64,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('透后体重')">
+            <el-form-item label="透后体重(kg): " :prop="isName('透后体重')" :rules="isCheckmust('透后体重')">
+              <el-input v-model="form.after_weight"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('穿刺处血肿')">
             <el-form-item label="穿刺处血肿: " :prop="isName('穿刺处血肿')" :rules="isCheckmust('穿刺处血肿')">
               <el-radio-group v-model="form.puncture_point_haematoma">
@@ -900,6 +906,7 @@ export default {
         condenser:"",
         last_after_weight:"",
         displace_liqui_value:"",
+        after_weight:"",
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1043,6 +1050,9 @@ export default {
 
          this.form.additional_weight = this.predialysis_evaluation.additional_weight
        }
+    },
+    'form.after_weight':function(){
+      this.form.after_weight = this.form.weight_after - this.form.additional_weight 
     }
   },
   methods: {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -994,7 +994,7 @@
                         {{
                           prescription.dialysis_duration_hour
                             ? prescription.dialysis_duration_hour
-                            : "/"
+                            : "0"
                         }}
                       </div>
                       h
@@ -1005,7 +1005,7 @@
                         <span v-if="org_id!=10624">{{
                           prescription.dialysis_duration_minute
                             ? prescription.dialysis_duration_minute
-                            : "/"
+                            : "0"
                         }}
                         </span>