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

src/xt_pages/dialysis/details/NavIgation.vue

       :admins="admin_users"
       :device_numbers="device_numbers"
       :special_premission="special_premission"
+      :patient="patient"
     ></computer-dialog>
 
     <monitor-dialog
       ref="monitor_dialog"
       :monitors="monitor_records"
       @monitor="add_monitor"
+      :patient="patient"
     ></monitor-dialog>
 
     <finish-dialog
       :prescription="prescription"
       @assessmentAfterDislysis="assessmentAfterDislysisFunc"
       :special_premission="special_premission"
+      :patient="patient"
     ></finish-dialog>
 
     <assessment-after-dislysis

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

     this.channels = this.$store.getters.channels
 
     var date = this.$route.query && this.$route.query.date
-    this.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+    this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
   },
   components: {
     MultiSelectBox

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

   created() {
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
-    this.record_date = uParseTime(date, "{y}-{m}-{d}") ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}');
+    this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}');
+    console.log('this.record_date',this.record_date)
 
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");

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

 
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
-      this.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
+      this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}')
       //获取皮肤
       this.skins = getDataConfig('hemodialysis','skin')
       console.log("皮肤",this.skins)

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

       },
       special_premission: {
         type: Array
+      },
+      patient:{
+        type: Object
       }
     }, mounted() {
 
      
     },
     watch: {
+      patient:{
+        handler(newVal){
+          this.patient_id = newVal.id
+        },
+        deep:true
+      },
       'schedule.id': function() {
       },
       'dialysis_order.id': function() {

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

     created() {
      
       var date = this.$route.query && this.$route.query.date
-      this.record_date = uParseTime(date, '{y}-{m}-{d}') ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
+      this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
 
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()

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

       }, special_premission: {
         type: Array,
       },
+      patient:{
+        type: Object
+      }
     },
     created() {
 
         } else {
           this.form.nurse_id = this.dialysis_order.finish_nurse
         }
+      },
+      patient:{
+        handler(newVal){
+          this.patient_id = newVal.id
+        },
+        deep:true
       }
     },
     methods: {
           (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
+
         this.patient_id = this.$route.query.patient_id
         this.schedule_date = this.$route.query.date
 

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

   props: {
     monitors: {
       type: Array
+    },
+    patient:{
+      type: Object
     }
   },
   computed: {
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
     var date = this.$route.query.date;
     var patient_id = this.$route.query.patient_id;
-    this.patient_id = patient_id;
-    this.schedule_date = date ? date : new Date(new Date().toLocaleDateString()).getTime();
-    this.form.monitoring_date = date;
+    this.patient_id = patient_id ? patient_id : this.patient.id;
+    console.log('this.patient_id',this.patient_id)
+    this.schedule_date = date ? date : new Date(new Date().toLocaleDateString()).getTime() / 1000;
+    this.form.monitoring_date = date ? date : new Date(new Date().toLocaleDateString()).getTime() / 1000;
     // this.form.operate_date = parseInt((new Date()).getTime() / 1000)
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
     this.form.operate_time = new Date().getTime();
       }
       return name
     }
+  },
+  watch:{
+    patient:{
+      handler(newVal){
+        this.patient_id = newVal.id
+      },
+      deep:true
+    }
   }
 }
 </script>