干体重

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -188,32 +188,6 @@ export default {
       }
   },
   computed: {
-<<<<<<< .mine
-      weight_before: function() {
-        if (this.record.id == 0) {
-          return '-'
-        }
-        return this.record.weight_before
-      },
-      systolic_blood_pressure: function() {
-        if (this.record.id == 0) {
-          return '-'
-        }
-        return this.record.systolic_blood_pressure
-      },
-      last_post_dialysis: function() {
-        if (this.record.id == 0) {
-          return '-'
-        }
-        return this.record.last_post_dialysis
-      },
-
-
-
-
-
-
-=======
     weight_before: function() {
       if (this.record.id == 0) {
         return '-'
@@ -238,8 +212,6 @@ export default {
       }
       return this.record.last_post_dialysis
     },
->>>>>>> .theirs
-
       dry_weight: function() {
         if (this.record.id == 0) {
           return '-'

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

@@ -60,8 +60,8 @@
           bed_id: '',
           nurse_id: '',
           start_time: '',
-          puncture_nurse_id: ''
-          lood_drawing:100
+          puncture_nurse_id: '',
+          lood_drawing: 100
         }
       }
     },
@@ -80,20 +80,14 @@
       }
     },
     created() {
-<<<<<<< .mine
-
-
-=======
-      
       this.template_id = this.$store.getters.xt_user.template_info.template_id
->>>>>>> .theirs
       this.patient_id = this.$route.query.patient_id
       this.schedule_date = this.$route.query.date
 
       this.form.bed_id = this.dialysis_order.id == 0 ? this.schedule.bed_id : this.dialysis_order.bed_id
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
-      this.form.lood_drawing = 0 
+      this.form.lood_drawing = 0
 
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
@@ -171,11 +165,7 @@
       },
       submit: function() {
         this.loading = true
-<<<<<<< .mine
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.puncture_nurse_id, this.form.start_time).then(rs => {
-=======
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id,this.form.lood_drawing, this.form.puncture_nurse_id,this.form.start_time).then(rs => {
->>>>>>> .theirs
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {