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

@@ -145,16 +145,16 @@
                     </el-form-item>
 
 
-                    <!--<el-form-item label="主治医生：" prop="doctor" :validate-event="is_Name">-->
-                        <!--<el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">-->
-                            <!--<el-option-->
-                                    <!--v-for="item in doctorList"-->
-                                    <!--:key="item.admin_user_id"-->
-                                    <!--:label="item.user_name"-->
-                                    <!--:value="item.admin_user_id">-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
-                    <!--</el-form-item>-->
+                    <el-form-item label="主治医生：" prop="doctor" :validate-event="is_Name">
+                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
+                            <el-option
+                                    v-for="item in doctorList"
+                                    :key="item.admin_user_id"
+                                    :label="item.user_name"
+                                    :value="item.admin_user_id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="入院科室：" prop="department" :validate-event="is_Name">
                         <el-select v-model="form.department" placeholder="请选择">
                             <el-option