机构管理相关

src/api/inspect/inspectorg/index.ts

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 // 机构 VO
 export interface InspectOrgVO {
-  orgID: string // 机构ID
+  orgid: string // 机构ID
   orgName: string // 机构名称
   address: string // 机构地址
   contactTel: string // 联系电话

src/views/inspect/inspectorg/InspectOrgForm.vue

@@ -19,7 +19,7 @@
             <el-input v-model="formData.orgSN" placeholder="请输入机构编号" />
           </el-form-item>
           <el-form-item label="机构码" prop="inHisCode">
-            <el-input v-model="formData.inHisCode" placeholder="请输入在his系统中的 hiscode 机构码" />
+            <el-input v-model="formData.inHisCode" placeholder="请输入机构码" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -86,6 +86,7 @@ const formRules = reactive({
   orgType: [{ required: true, message: '请选择医院机构类型', trigger: 'change' }],
   orgName: [{ required: true, message: '请输入机构名称', trigger: 'change' }],
   contactPerson: [{ required: true, message: '请输入联系人姓名', trigger: 'change' }],
+  inHisCode: [{ required: true, message: '请输入机构码', trigger: 'change' }],
   contactTel: [
     { required: true, message: '请填入正确的手机号', trigger: 'blur' },
     {

src/views/inspect/inspectorg/index.vue

@@ -54,7 +54,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="机构编号" align="center" prop="orgSN" />
+      <el-table-column label="机构码" align="center" prop="inHisCode" />
       <el-table-column label="机构名称" align="center" prop="orgName" />
       <el-table-column label="机构地址" align="center" prop="address" />
       <el-table-column label="联系电话" align="center" prop="contactTel" />

src/views/system/user/DeptTree.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="head-container">
-    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入科室名称">
+    <el-input v-model="orgName" class="mb-20px" clearable placeholder="请输入机构名称">
       <template #prefix>
         <Icon icon="ep:search" />
       </template>
@@ -9,12 +9,12 @@
   <div class="dept-list-container">
     <div 
       v-for="item in filteredDeptList" 
-      :key="item.departmentCode"
+      :key="item.orgid"
       class="dept-item"
-      :class="{ 'active': selectedDept === item.departmentCode }"
+      :class="{ 'active': selectedDept === item.orgid }"
-      @click="handleDeptChange(item.departmentCode)"
+      @click="handleDeptChange(item.orgid)"
     >
-      {{ item.departmentName }}
+      {{ item.orgName }}
     </div>
   </div>
 </template>
@@ -24,29 +24,31 @@ import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { DepartmentApi, DepartmentVO } from '@/api/inspect/inspectdepartment/index'
+import { InspectOrgApi, InspectOrgVO } from '@/api/inspect/inspectorg/index'
 defineOptions({ name: 'SystemUserDeptTree' })
 
-const deptName = ref('')
+const orgName = ref('')
-const deptList = ref<DepartmentVO[]>([]) // 改为普通数组
+const orgList = ref<InspectOrgVO[]>([]) // 改为普通数组
 const selectedDept = ref('')
 
 /** 获取科室列表 */
 const getList = async () => {
-  const res = await DepartmentApi.getListDepartment()
+  const res = await InspectOrgApi.getInspectOrgAll({})
-  deptList.value = res
+  orgList.value = res
+  console.log(orgList.value)
 }
 
 /** 过滤后的科室列表 */
 const filteredDeptList = computed(() => {
-  if (!deptName.value) return deptList.value
+  if (!orgName.value) return orgList.value.list
-  return deptList.value.filter(item => 
+  return orgList.value.list.filter(item => 
-    item.departmentName.includes(deptName.value)
+    item.orgName.includes(orgName.value)
   )
 })
 
 /** 处理科室选择 */
 const handleDeptChange = (deptId: string | number) => {
-  const selectedDepartment = deptList.value.find(item => item.departmentCode === deptId)
+  const selectedDepartment = orgList.value.list.find(item => item.orgid === deptId)
   emits('node-click', selectedDepartment)
 }
 

src/views/system/user/UserForm.vue

@@ -14,13 +14,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="归属科室" prop="deptId">
+          <el-form-item label="归属机构" prop="deptId">
-            <el-select v-model="formData.deptId" placeholder="请选择归属科室">
+            <el-select v-model="formData.deptId" placeholder="请选择归属机构">
               <el-option
-                v-for="item in deptList"
+                v-for="item in orgList.list"
-                :key="item.departmentName"
+                :key="item.orgid"
-                :label="item.departmentName"
+                :label="item.orgName"
-                :value="item.departmentCode"
+                :value="item.orgid"
               />
             </el-select>
           </el-form-item>
@@ -103,7 +103,7 @@ import * as PostApi from '@/api/system/post'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { FormRules } from 'element-plus'
-import { DepartmentApi, DepartmentVO } from '@/api/inspect/inspectdepartment/index'
+import { InspectOrgApi, InspectOrgVO } from '@/api/inspect/inspectorg/index'
 
 defineOptions({ name: 'SystemUserForm' })
 
@@ -148,7 +148,7 @@ const formRules = reactive<FormRules>({
   ]
 })
 const formRef = ref() // 表单 Ref
-const deptList = ref<DepartmentVO[]>([]) // 树形结构
+const orgList = ref<InspectOrgVO[]>([]) // 树形结构
 const postList = ref([] as PostApi.PostVO[]) // 岗位列表
 
 /** 打开弹窗 */
@@ -168,7 +168,8 @@ const open = async (type: string, id?: number) => {
   }
   // 加载科室
   // deptList.value = handleTree(await DeptApi.getSimpleDeptList())
-  deptList.value = await DepartmentApi.getListDepartment()
+  orgList.value = await InspectOrgApi.getInspectOrgAll({})
+  console.log(orgList.value)
   // 加载岗位列表
  // postList.value = await PostApi.getSimplePostList()
 }

src/views/system/user/index.vue

@@ -110,7 +110,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column
-            label="科室"
+            label="机构"
             align="center"
             key="deptName"
             prop="deptName"
@@ -258,7 +258,7 @@ const resetQuery = () => {
 
 /** 处理部门被点击 */
 const handleDeptNodeClick = async (row) => {
-  queryParams.deptId = row.departmentCode
+  queryParams.deptId = row.orgid
   await getList()
 }