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

@@ -171,29 +171,30 @@
             <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>
 
-        <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>
 
         <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>