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/PatientBox.vue

     },
     open(schedual){
      
-     
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id
       this.modedata = 1

src/xt_pages/dialysis/details/NavIgation.vue

       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      console.log("粗32323232",this.prescription)
       this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open);
     },
     showAccepts: function() {
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment);
     },
     showDoubleCheck: function() {
-      console.log("h322323232323232332",this.prescription)
+      
       this.$refs.doubleCheck.show();
     },
     showrTeatmentSummary: function() {

src/xt_pages/dialysis/details/acceptsAssessment.vue

         conditions: {
           '1': '住院',
           '2': '门诊',
-          '3': '手术期'
+          '3': '手术期',
+          '4': '急诊'
         },
         consciousnesses:[],
         appetites: [],

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

       schedual: {
         type: Object
       },
-      // is_open: {
-      //   type: Number,
-      //   default: () => {
-      //     return 0
-      //   }
-      // },
+      is_open: {
+        type: Number,
+        default: () => {
+          return 0
+        }
+      },
       waitUploadAdvices: {
         type: Array,
         default: () => {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre, schedual, last, his_is_open) {
-        console.log('pre222222', this.predialysis)
-        console.log("his_is_opne",his_is_open)
+        
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
             this.oxygenShow = true
         this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
         if (pre.id > 0) {
           this.dialysisPrescription.mode_id = pre.mode_id
-          
         }
-        console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
-        console.log('this.schedual', schedual.mode_id)
+        // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
+        // console.log('this.schedual', schedual.mode_id)
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
         } else {
           last_weight_after = this.last_record.weight_after
         }
-
+        console.log("last2323232323232332",last)
         if (this.predialysis == null || this.predialysis.id == 0) {
           if (last != null) {
-
+            
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
           weight_before = this.predialysis.weight_before
         }
 
-        //获取最后一次血管通路
-        //   console.log("最后一次血管通路",this.predialysis)
-        //  if(this.predialysis!=null){
-        //     if(this.lastAssessment!=null){
-        //       var blood_id = 0
-        //       for(let i= 0;i<this.blood_access_option.length;i++){
-        //           if(this.lastAssessment.blood_access_part_opera_id == this.blood_access_option[i].name){
-        //             blood_id = this.blood_access_option[i].id
-        //           }
-        //       }
-        //        console.log("中国人名职员",this.lastAssessment)
-        //        this.dialysisPrescription.blood_access = blood_id
-        //     }else{
-        //       if(this.last_prescription!=null){
-        //           var blood_id = 0
-        //           for(let i= 0;i<this.blood_access_option.length;i++){
-        //               if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
-        //                 blood_id = this.blood_access_option[i].id
-        //               }
-        //           }
-        //            this.dialysisPrescription.blood_access = blood_id
-        //       }
-        //     }
-
-        //  }
 
         if (weight_before > 0 && last_weight_after > 0) {
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
 
       },
       handleCommit: function() {
+        console.log("触发了么2323323233223")
         if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
           this.dialysisPrescription.anticoagulant = 3
         }

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

           if(this.doubleReview.modifier == 0){
             this.doubleReview.modifier = ""
           }
-          console.log( this.first_check_time )
-          console.log( this.check_time )
-
-
+       
         } else {
           var nowDate = new Date()
           var nowHours = nowDate.getHours()
           var nowMinutes = nowDate.getMinutes()
-          if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
-            this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-          }
+          // if(this.$store.getters.xt_user.user.id != this.double_check.creater && this.double_check.modifier == 0){
+          //   this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
+          // }
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
           console.log( this.first_check_time )
           console.log( this.check_time )

src/xt_pages/dialysis/details/index.vue

           var schedual = resp.data.schedual // 患者排班信息
           console.log("排班22222222222",schedual)
           var prescription = resp.data.prescription // 透析处方
-          console.log("中华人民共和过2332233232323223",prescription)
+        
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
         } else {
           this.$message.error(resp.msg)
         }
-
-        if (this.lastDialysisPrescribe != null) {
-          delete this.lastDialysisPrescribe.target_ultrafiltration
-        }
-        if (this.solution != null) {
-          delete this.solution.target_ultrafiltration
-        }
+       
+       // 目标超滤量是否默认上次数据
+        // if (this.lastDialysisPrescribe != null) {
+        //   delete this.lastDialysisPrescribe.target_ultrafiltration
+        // }
+        // if (this.solution != null) {
+        //   delete this.solution.target_ultrafiltration
+        // }
         if(this.predialysis_evaluation.id > 0){
           this.newTime = parseTime(this.predialysis_evaluation.created_time, '{h}:{i}')
         }
     },
     requestDialysisSchedules: function() {
       var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+      console.log("ymd233223232",ymd)
+      console.log("prescription",this.prescription)
       getDialysisSchedules(ymd).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           var schedules = resp.data.schedules
-         
-          // for(let i=0;i<schedules.length;i++){
-          //   if(this.prescription.patient_id == schedules[i].patient_id){
-          //      this.prescription = schedules[i].prescription
+          // if(this.prescription!=null){
+          //   for(let i=0;i<schedules.length;i++){
+          //     if(this.prescription.patient_id == schedules[i].patient_id){
+          //       this.prescription = schedules[i].prescription
+          //     }
           //   }
           // }
-          // console.log("hh2332223323232",this.prescription)
+         
+          console.log("hh2332223323232",schedules)
           this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
           const patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
           if (this.activeName == 'first') {