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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3194,7 +3194,6 @@
         if (this.dayorMonth == 'day') {
           this.$emit('day')
         } else if (this.dayorMonth == 'month') {
-          console.log('~~~~~~')
           let form = {
             id: this.patientInfo.id,
             his_patient_id: this.hisPatientInfo.id

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -318,6 +318,7 @@
     },
     data() {
       return {
+        current_data:null,
         drugs: [],
         allDrugs: [],
         advices_template: [],
@@ -598,6 +599,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -1038,6 +1040,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -1422,6 +1425,7 @@
       },
 
       choosePatient(val) {
+        this.current_data = val
         if (this.titleType == '电子病历') {
 
           if (this.$refs.child.watchSign > 2) {
@@ -4010,6 +4014,7 @@
         }
       }, changeDay() {
         this.current_tab = 'day'
+        this.getPatientInfo(this.current_data)
 
       }, changeMonth(val) {
         this.current_tab = 'month'