修改科室管理和新增科室分类的字典

openhis-ui-vue3/src/views/basicmanage/organization/components/api.js

@@ -41,7 +41,7 @@ export function getOrgDetail(id) {
 export function initOrgTypeOption() {
   return request({
     url: '/base-data-manage/organization/init',
-    method: 'get',
+    method: 'get'
   })
 }
 

openhis-ui-vue3/src/views/basicmanage/organization/index.vue

@@ -141,15 +141,7 @@
 </template>
 
 <script setup name="Organization">
-import {
+import { getList, deleteOrganization, addOrganization, updateOrganization, disableOrg, initOrgTypeOption, enableOrg } from './components/api';
-  getList,
-  deleteOrganization,
-  addOrganization,
-  updateOrganization,
-  disableOrg,
-  initOrgTypeOption,
-  enableOrg,
-} from './components/api';
 
 const { proxy } = getCurrentInstance();
 const loading = ref(true);
@@ -181,11 +173,29 @@ const rules = ref({
 
 getPageList();
 initOption();
+
+// 使用系统标准字典获取方法
+const { organization_class } = proxy.useDict('organization_class');
+
+// 监听字典数据变化
+watch(() => organization_class.value, (newVal) => {
+  if (newVal && newVal.length > 0) {
+    // 转换为组件需要的格式（使用dict_label作为label）
+    classEnumOption.value = newVal.map(item => ({
+      value: item.value,
+      info: item.label // 使用dict_label的值作为显示文本
+    }));
+  }
+}, { immediate: true });
+
 function initOption() {
   if (orgTypeOption.value.length == 0) {
     initOrgTypeOption().then((res) => {
       orgTypeOption.value = res.data.organizationTypeOptions;
-      classEnumOption.value = res.data.organizationClassOptions;
+      // 科室分类优先使用字典数据，如果没有再使用接口返回的数据
+      if (!classEnumOption.value || classEnumOption.value.length === 0) {
+        classEnumOption.value = res.data.organizationClassOptions || [];
+      }
     });
   }
 }
@@ -205,7 +215,7 @@ function getPageList() {
 }
 
 function handleAdd() {
-  title.value = '添加药库药房';
+  title.value = '添加科室';
   open.value = true;
   reset();
   console.log(form.value);