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

src/pages/main/newActionBar/assessmentAfter.vue

@@ -751,7 +751,7 @@ export default {
       }
 
       //干体重默认透前评估里面的干体重
-      if(this.$store.getters.user.template_info.org_id==10138 || this.$store.getters.user.template_info.org_id==10278 ||  this.$store.getters.user.template_info.org_id==0 || this.$store.getters.user.template_info.org_id==3877 || this.$store.getters.user.template_info.org_id==10551 || this.$store.getters.user.template_info.org_id==10558 || this.$store.getters.user.template_info.org_id==10515 || this.$store.getters.user.template_info.org_id==10597 || this.$store.getters.user.template_info.org_id==10599 || this.$store.getters.user.template_info.org_id==10598  || this.$store.getters.user.template_info.org_id==10510 || this.$store.getters.user.template_info.org_id==10629 || this.$store.getters.user.template_info.org_id==10702 ){
+      if(this.$store.getters.user.template_info.org_id==10138 || this.$store.getters.user.template_info.org_id==10278 ||  this.$store.getters.user.template_info.org_id==0 || this.$store.getters.user.template_info.org_id==3877 || this.$store.getters.user.template_info.org_id==10551 || this.$store.getters.user.template_info.org_id==10558 || this.$store.getters.user.template_info.org_id==10515 || this.$store.getters.user.template_info.org_id==10597 || this.$store.getters.user.template_info.org_id==10599 || this.$store.getters.user.template_info.org_id==10598  || this.$store.getters.user.template_info.org_id==10510 || this.$store.getters.user.template_info.org_id==10629 || this.$store.getters.user.template_info.org_id==10702 || this.$store.getters.user.template_info.org_id==10721 ){
           this.formValue.additional_weight = this.predialysis.additional_weight
           this.formValue.patient_gose = "1"
       }

src/pages/main/newActionBar/computer.vue

@@ -576,6 +576,9 @@ export default {
     last_order: {
       type: Object,
     },
+    predialysis: {
+      type: Object
+    },
   },
   data() {
     return {
@@ -692,6 +695,8 @@ export default {
     };
   },
   created() {
+    console.log("透前=======================",this.predialysis)
+  
     setRem();
     this.getToken();
     this.getPatientSign();
@@ -830,6 +835,17 @@ export default {
       this.nuclein_date_str = this.getTimeOne(this.record.nuclein_date);
     }
 
+    if(this.predialysis!=null){
+      if(this.predialysis.internal_fistula!=''){
+          this.change_nurse = 0
+          this.puncture_nurse = this.record == null || this.record.id == ""? this.$store.getters.user.admin.id : this.record.puncture_nurse;
+      }
+      if(this.predialysis.catheter!=""){
+         this.puncture_nurse = 0
+         this.change_nurse = this.record == null || this.record.id == ""? this.$store.getters.user.admin.id : this.record.change_nurse;
+      }
+    }
+
     for (let index = 0; index < this.temp_device_numbers.length; index++) {
       const device_number = this.temp_device_numbers[index];
       this.temp_device_numbers[index]["zoneNumber"] =
@@ -2078,6 +2094,7 @@ export default {
    }
   },
   watch: {
+
     "record.id": function (val) {
       if (val > 0) {
         if (this.record.creator == 0) {
@@ -2085,7 +2102,10 @@ export default {
         } else {
           this.creator = this.record.creator;
         }
+
+
       }
+    
     },
     schedual_type: {
       handler(newVal, oldVal) {

src/pages/main/today/TodayTab.vue

@@ -155,6 +155,7 @@
                   :last_order="lastOrder"
                   :stockType="stockType"
                   @did_start="closeDialysisComputer"
+                   :predialysis="predialysis_evaluation"
                   @did_add_monitor="didAddMonitor"
 
                   ></computer>