Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/assets/config/apiConfig.ts

@@ -19,4 +19,5 @@ export enum apiConfig{
     "organizationMemberSearch"="organization/member/search",//搜索成员
     "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表
     "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表
+    "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表
 }

src/components/registration/Edit.vue

@@ -35,19 +35,9 @@
                   <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
                 </el-form-item>
               </el-descriptions-item>
-              <el-descriptions-item label="科室">
+              <el-descriptions-item label="手机号">
-                <el-form-item>
+                <el-form-item prop="phone">
-                  <el-select
+                  <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
-                      v-model="edit_data.organizationSectionId"
-                      placeholder="选择科室"
-                  >
-                    <el-option
-                        v-for="item in sectionList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    />
-                  </el-select>
                 </el-form-item>
               </el-descriptions-item>
               <el-descriptions-item label="医生">
@@ -67,6 +57,22 @@
                   </el-select>
                 </el-form-item>
               </el-descriptions-item>
+              <el-descriptions-item label="科室">
+                <el-form-item>
+                  <el-select
+                      v-model="edit_data.organizationSectionId"
+                      placeholder="选择科室"
+                  >
+                    <el-option
+                        v-for="item in sectionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+
 
               <el-descriptions-item label="证件类型">
                 <el-form-item prop="certType">
@@ -86,11 +92,7 @@
                 </el-form-item>
               </el-descriptions-item>
 
-              <el-descriptions-item label="手机号">
+
-                <el-form-item prop="phone">
-                  <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
-                </el-form-item>
-              </el-descriptions-item>
               <el-descriptions-item label="就诊类型">
                 <el-form-item prop="visitType">
                   <el-select v-model="edit_data.visitType" placeholder="就诊类型">
@@ -327,6 +329,9 @@ const sectionList = ref<any>([])
 const getSectionList = () => {
   post(apiConfig.OrganizationSectionListByMemberId,{memberId:edit_data.value.organizationDoctorId}).then((res: any) => {
     sectionList.value = res
+    if (res.length > 0) {
+      edit_data.value.organizationSectionId = res[0].id
+    }
   })
 }
 const loading = ref(false)