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/components/registerDialog.vue

             <el-form-item label="诊疗费：">
                 <el-input v-model="form.medical_expenses"></el-input>
             </el-form-item>
+
+            <el-form-item label="医生：" prop="doctor">
+                <el-select v-model="form.doctor" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in doctors"
+                            :key="index"
+                            :label="item.user_name"
+                            :value="item.admin_user_id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="科室：" prop="department">
+                <el-select v-model="form.department" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in departments"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
         </el-form>
 
         <span slot="footer" class="dialog-footer">
       }
     },
     props: {
-
+      departments: {
+        type: Array
+      },
+      doctors: {
+        type: Array
+      },
       titles: {
         type: String,
         default: ''
       diagnoses: Array
     },
     methods: {
+      changeDoctor() {
+        for (let i = 0; i < this.doctors.length; i++) {
+          if (this.doctors[i].admin_user_id == this.form.doctor) {
+            console.log(this.doctors[i].department_id)
+            this.form.department = this.doctors[i].department_id
+            if (this.form.department == 0) {
+
+              this.form.department = ''
+            }
+          }
+        }
+      },
       handleSelect(val) {
         this.form.id = val.id
         this.form.name = val.name
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function() {
+      show: function(doctors,departments) {
         this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
         this.form.id = 0
         this.form.id_card_type = 2
         this.form.certificates = 1
 
+        if (departments.length > 0) {
+          this.form.department = departments[0].id
+        }
+        if (doctors.length > 0) {
+          this.form.doctor = doctors[0].admin_user_id
+        }
+
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         <additionalCharges ref='additionalCharges' @click="addCharges"
                            :addtions_charge="addtions_charge"></additionalCharges>
 
-        <register-dialog ref='register' :doctors="doctors" :department="department" :sick="sick" :diagnoses="diagnoses"
+        <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                          v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
 
         <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
           if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088) {
             this.$refs.register9504.show()
           } else {
-            this.$refs.register.show()
+            this.$refs.register.show(this.doctors, this.department)
           }
 
         } else if (index == 8) {