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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2188,8 +2188,10 @@
                         confirmButtonText: '确 定',
                         type: 'warning'
                       }).then(() => {
+                        that.changeRadioAndPatient(1)
                         that.newLoading = false
                       }).catch(() => {
+                        that.changeRadioAndPatient(1)
                         that.newLoading = false
                       })
                     } else {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -487,6 +487,14 @@
 
   export default {
     props: {
+      drugs:Array,
+      allDrugs:Array,
+      advices_template:Array,
+      doctors: Array,
+      department:Array,
+      sick: Array,
+      diagnoses: Array,
+      additions: Array,
       patientInfo: Object,
       hisPatientInfo: Object,
       prescriptions: Array,
@@ -1700,7 +1708,7 @@
       },
 
       querySearch2(queryString, cb) {
-        var restaurants = this.other_sick
+        var restaurants = this.sick
         restaurants.map(item => {
           item.value = item.name
         })
@@ -1725,30 +1733,30 @@
         return getDictionaryDataConfig(module, filed_name)
 
       },
-      getInitData() {
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
-
-          }
-        })
-
-      },
+      // getInitData() {
+      //   getInitData().then(response => {
+      //     if (response.data.state == 0) {
+      //       this.$message.error(response.data.msg)
+      //       return false
+      //     } else {
+      //       this.drugs = response.data.data.drugs
+      //       this.allDrugs = response.data.data.drugs
+      //       this.advices_template = response.data.data.advices_template
+      //       this.doctors = response.data.data.doctors
+      //       for (let i = 0; i < this.doctors.length; i++) {
+      //         if (this.doctors[i].user_type == 1) {
+      //           this.doctors.splice(i, 1)
+      //         }
+      //       }
+      //       this.department = response.data.data.department
+      //       this.sick = response.data.data.sick
+      //       this.diagnoses = response.data.data.diagnose
+      //       this.additions = response.data.data.additions
+      //
+      //     }
+      //   })
+      //
+      // },
       monthTabclickEvent(val) {
 
         for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1849,7 +1857,10 @@
         this.teamList = []
 
       },
-      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
+      setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
+        this.sick = sick
+        this.diagnoses = diagnoses
+        this.department = department
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
         // this.$refs.tabProjectTeam.clearSelection()
@@ -1926,108 +1937,86 @@
         }
 
         if (this.departmentValue == '' || this.departmentValue == 0) {
-          if (this.department.length > 0) {
-            this.departmentValue = this.department[0].id
+          if (department.length > 0) {
+            this.departmentValue = department[0].id
 
           }
         }
 
-        getInitData().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.onceTime = false
-            this.drugs = response.data.data.drugs
-            this.allDrugs = response.data.data.drugs
-            this.advices_template = response.data.data.advices_template
-            this.doctors = response.data.data.doctors
-            for (let i = 0; i < this.doctors.length; i++) {
-              if (this.doctors[i].user_type == 1) {
-                this.doctors.splice(i, 1)
-              }
-            }
-            this.department = response.data.data.department
-            this.sick = response.data.data.sick
-            this.diagnoses = response.data.data.diagnose
-            this.additions = response.data.data.additions
+        if (info.id > 0) {
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.departments
+        } else {
+          if (admin_info.id > 0 && admin_info.user_type == 2) {
+            this.doctorValue = admin_info.admin_user_id
+            this.departmentValue = department[0].id
 
-            if (info.id > 0) {
-              this.doctorValue = info.doctor_id
-              this.departmentValue = info.departments
-            } else {
-              if (admin_info.id > 0 && admin_info.user_type == 2) {
-                this.doctorValue = admin_info.admin_user_id
-                this.departmentValue = this.department[0].id
+          } else {
+            this.doctorValue = doctors[0].admin_user_id
+            this.departmentValue = department[0].id
+          }
+        }
 
-              } else {
+        // if (info.register_type == 0) {
+        //   for (let i = 0; i < this.register.length; i++) {
+        //     this.register_type = this.register[0].value
+        //   }
+        // } else {
+        //   this.register_type = info.register_type
+        // }
 
-                this.doctorValue = this.doctors[0].admin_user_id
-                this.departmentValue = this.department[0].id
 
-              }
 
-            }
+        this.diagnose = []
 
-            if (info.register_type == 0) {
-              for (let i = 0; i < this.register.length; i++) {
-                this.register_type = this.register[0].value
-              }
-            } else {
-              this.register_type = info.register_type
-            }
+        if (info.id == 0) {
+          if (last_info.diagnosis.length == 0) {
             this.diagnose = []
+          } else {
+            console.log(last_info.diagnosis)
+            for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
+              this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
+            }
+          }
 
-            if (info.id == 0) {
-              if (last_info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
-
-                }
-              }
-
-              if (last_info.sick_history == 0) {
-                this.state2 = ''
-              } else {
-                this.state2 = last_info.sick_history
-              }
-
-            } else {
-              this.state2 = info.sick_history
-              if (this.state2 == 0) {
-                this.state2 = ''
-              }
-              if (info.diagnosis.length == 0) {
-                this.diagnose = []
-              } else {
-                for (let i = 0; i < info.diagnosis.split(",").length; i++) {
-                  this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
-
-                }
+          if (last_info.sick_history == 0) {
+            this.state2 = ''
+          } else {
+            this.state2 = last_info.sick_history
+          }
 
-              }
+        } else {
+          this.state2 = info.sick_history
+          if (this.state2 == 0) {
+            this.state2 = ''
+          }
+          if (info.diagnosis.length == 0) {
+            this.diagnose = []
+          } else {
+            for (let i = 0; i < info.diagnosis.split(",").length; i++) {
+              this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
 
             }
 
-            this.state1 = info.sick_type
-            if (this.state1 == 0 || this.state1 == '') {
-              this.state1 = ''
-              for (let i = 0; i < this.sick.length; i++) {
-                this.state1 = this.sick[0].id
-              }
-            }
+          }
 
-            if (this.departmentValue == '' || this.departmentValue == 0) {
-              if (this.department.length > 0) {
-                this.departmentValue = this.department[0].id
+        }
 
-              }
-            }
+        this.state1 = info.sick_type
+        if (this.state1 == 0 || this.state1 == '') {
+          this.state1 = ''
+          for (let i = 0; i < this.sick.length; i++) {
+            this.state1 = this.sick[0].id
+          }
+        }
+
+        if (this.departmentValue == '' || this.departmentValue == 0) {
+          if (department.length > 0) {
+            this.departmentValue = department[0].id
 
           }
-        })
+        }
+
 
       },
       setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
@@ -3162,7 +3151,7 @@
       }
     }, mounted() {
       this.request_record_date = this.record_date
-      this.getInitData()
+      // this.getInitData()
       //获取所有项目
       this.getlist()
       //获取所以项目组套

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -144,7 +144,13 @@
                 <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
                 <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
                 <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
-                                   :other_sick="other_sick" :record_date="record_date"
+                                   :sick="sick" :record_date="record_date"
+                                   :drugs="drugs"
+                                   :allDrugs="allDrugs"
+                                   :advices_template="advices_template"
+                                   :additions="additions"
+                                   :doctors="doctors"
+                                   :department="department"
                                    v-on:change="changeOther"
                                    v-on:month="changeMonth"
                                    v-on:day="changeDay"
@@ -313,7 +319,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import deskPrescription from './components/deskPrescription'
   import deskRecord from './components/deskRecord'
-  import { createCaseHistory, getMonthHisPateintInfo, getPatientInfo, getSchedulePatientList } from '@/api/his/his'
+  import { createCaseHistory, getMonthHisPateintInfo, getPatientInfo, getSchedulePatientList, getInitData } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import medicalRecord from './components/medicalRecord'
   import saveRecordTemplate from './components/saveRecordTemplate'
@@ -342,6 +348,16 @@
     },
     data() {
       return {
+        drugs:[],
+        allDrugs:[],
+        advices_template:[],
+        sick:[],
+        diagnoses: [],
+        additions: [],
+        doctors: [],
+        department: [],
+
+
         tableHeight: '',
         saveloading: false,
         fullHeight: document.documentElement.clientHeight,
@@ -372,15 +388,12 @@
         hisPatientInfo: {},
         case_history: {},
         patient_id: 0,
-        diagnoses: [],
         other_sick: [],
         info: {},
         last_info: {},
         templatedetail: {},
         detalid: 0,
         prescription_id: 0,
-        doctors: [],
-        department: [],
         patientid: 0,
         prescriptionList: [],
         centerDialogVisible: false,
@@ -400,7 +413,6 @@
         paramsObj3: {},
         recordVisible: false,
         recordObj: {},
-        additions: [],
         dialysisShow: true,
 
         all_data: [],
@@ -1171,6 +1183,25 @@
       //   this.month_prescriptions.push(p2)
       //
       // },
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugs = response.data.data.drugs
+            this.allDrugs = response.data.data.drugs
+            this.advices_template = response.data.data.advices_template
+
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+            this.diagnoses = response.data.data.diagnose
+            this.additions = response.data.data.additions
+
+          }
+        })
+
+      },
       getList() {
         let params = {
           'record_date': this.record_date,
@@ -1630,7 +1661,7 @@
               }
             }
             console.log('~~~~~00000222222')
-            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+            this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
           }
         })
 
@@ -2137,7 +2168,7 @@
                       //   }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                   this.$refs.child.watchSign = 0
                 }
               })
@@ -2599,7 +2630,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                   this.$refs.child.watchSign = 0
                 }
               })
@@ -3063,7 +3094,7 @@
                     // }
                   }
                 }
-                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 this.$refs.child.watchSign = 0
               }
             })
@@ -3603,7 +3634,7 @@
                       // }
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 }
               })
 
@@ -4039,7 +4070,7 @@
 
                     }
                   }
-                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info)
+                  this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info,this.sick, this.diagnosis)
                 }
               })
             } else {
@@ -4484,6 +4515,7 @@
       }
     },
     created() {
+      this.getInitData()
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
@@ -4496,8 +4528,8 @@
         (nowDay < 10 ? '0' + nowDay : nowDay)
       this.getList()
 
-      this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
-      this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
+      // this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
+      // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight