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

@@ -775,6 +775,7 @@
           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
+              this.$emit("change")
               this.$message.success('保存成功')
             }
           })

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -69,7 +69,7 @@
         <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
-                          v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          v-if="titleType == '电子处方'" style="flex:1;" v-on:change="changeTab"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
@@ -208,11 +208,35 @@
         }
 
 
+      },changeTab(){
+        this.radio = 2
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        }
+        this.patientTableData = []
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+            this.cal_one = response.data.data.total_one
+            this.cal_two =  response.data.data.total_two
+            this.admin_info =  response.data.data.info
+           for (let i = 0; i< this.patientTableData.length; i++){
+             if(this.patientTableData[i].patients.id == this.patientid){
+               this.$refs.tab.setCurrentRow(this.patientTableData[i])
+             }
+           }
+
+          }
+        })
+
       },
       change(val) {
         this.getList()
-
-
       },
       getList() {
         let params = {
@@ -394,17 +418,17 @@
 
       },
       choosePatient(val) {
-        let isShowDailog = false
-        for (let i = 0; i < this.prescriptions.length; i++){
-          if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
-            isShowDailog = true
-          }
-        }
-        if(isShowDailog){
-          this.$message.error('需要保存当前处方才能切换')
-          return
-        }
-
+        // let isShowDailog = false
+        // for (let i = 0; i < this.prescriptions.length; i++){
+        //   if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
+        //     isShowDailog = true
+        //   }
+        // }
+        // if(isShowDailog){
+        //   this.$message.error('需要保存当前处方才能切换')
+        //   return
+        // }
+        //
 
         this.patientid = val.patients.id
         let params = {