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

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -568,6 +568,7 @@
       case_history:{
         handler(val){
           console.log("南京人明",this.case_history)
+          this.allergic_history = this.case_history.allergic_history
           if(this.case_history.breathing == 0){
             this.case_history.breathing = ""
           }
@@ -578,7 +579,7 @@
             this.case_history.diagnose = ""
           }
           this.form.id = this.case_history.id
-          this.allergic_history = this.case_history.allergic_history
+         
           this.watchSign++
         },
         deep:true

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -710,7 +710,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-      console.log("本月最后一天",timeEnd)
+      // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量