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

@@ -561,22 +561,22 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.additions = response.data.data.additions
-            var info = response.data.data.info
-            if (info.user_type == 2 || info.user_type == 1) {
-              this.doctorValue = info.admin_user_id
-              if (info.department_id == 0) {
-                if (this.department.length > 0) {
-                  this.departmentValue = this.department[0].id
-                } else {
-                  this.departmentValue = ''
-
-                }
-              } else {
-                this.departmentValue = info.department_id
-              }
-            }else{
-              this.doctorValue = this.doctors[0].admin_user_id
-            }
+            // var info = response.data.data.info
+            // if (info.user_type == 2 || info.user_type == 1) {
+            //   this.doctorValue = info.admin_user_id
+            //   if (info.department_id == 0) {
+            //     if (this.department.length > 0) {
+            //       this.departmentValue = this.department[0].id
+            //     } else {
+            //       this.departmentValue = ''
+            //
+            //     }
+            //   } else {
+            //     this.departmentValue = info.department_id
+            //   }
+            // }else{
+            //   this.doctorValue = this.doctors[0].admin_user_id
+            // }
           }
         })
 
@@ -630,14 +630,13 @@
         this.teamList = []
 
       },
-      setData(data, info) {
+      setData(data, info, admin_info,doctors,department) {
         this.prescription_id = data[0].id
         this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
-        console.log( this.curPrescriptions)
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
@@ -645,7 +644,6 @@
           this.rightTab = 1
           this.showOne = true
           this.showTwo = false
-
         }
 
         if (this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0) {
@@ -655,23 +653,19 @@
           this.showOne = false
           this.showTwo = true
         }
-
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
-        this.doctorValue = info.doctor_id
-        this.departmentValue = info.departmentValue
-
-        if(this.doctorValue == 0){
 
-        }
 
         this.register_type = info.register_type
 
+        if(info.prescription_status == 0){
+          this.order_status = ''
+        }
+
         if (info.prescription_status == 1 || info.prescription_status == 2) {
           this.order_status = '未收费'
-
         }
-
         if (info.prescription_status == 3) {
           this.order_status = '已结算'
         }
@@ -680,10 +674,40 @@
           this.order_status = '已退费'
         }
 
-        // console.log(this.$refs)
-        // this.$nextTick(() => {
-        //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
-        // })
+        if(info.id > 0){
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.department
+        }else{
+          this.doctorValue = ''
+          this.departmentValue = ''
+
+          if (admin_info.user_type == 2 || admin_info.user_type == 1) {
+            this.doctorValue = admin_info.admin_user_id
+            if (admin_info.department_id == 0) {
+              if (this.department.length > 0) {
+                this.departmentValue = department[0].id
+              } else {
+                this.departmentValue = ''
+              }
+            } else {
+              this.departmentValue = admin_info.department_id
+            }
+          }else{
+            this.doctorValue = doctors[0].admin_user_id
+          }
+
+          if(this.doctorValue == 0){
+            this.doctorValue = ''
+          }
+
+
+
+        }
+
+
+
+
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -1155,13 +1179,15 @@
           }
         })
       }, changeDoctor(val) {
-        console.log(val)
-        console.log(this.doctors)
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.doctorValue) {
             this.departmentValue = this.doctors[i].department_id
           }
         }
+
+        if(this.departmentValue == 0){
+          this.departmentValue = ""
+        }
       }
     },mounted(){
       this.getInitData()

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -173,13 +173,15 @@
         templatedetail:{},
         detalid:0,
         prescription_id:0,
-
+        doctors:[],
+        department:[],
         patientid:0,
         prescriptionList:[],
         centerDialogVisible:false,
         tableData:[],
         selecting_schs: [],
         index:0,
+        admin_info:{},
       }
     },
     methods: {
@@ -227,6 +229,8 @@
             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
+
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
 
             if(this.patientTableData.length > 0) {
@@ -257,6 +261,9 @@
             this.case_history = response.data.data.case_history
 
             this.info = response.data.data.info
+            this.doctors = response.data.data.doctors
+            this.department = response.data.data.department
+
 
 
 
@@ -379,7 +386,7 @@
 
 
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department)
           }
         })
 
@@ -648,8 +655,6 @@
 
       this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
-
-      console.log('1222232434234',document.documentElement.clientHeight)
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight