From 215fe8b889d0dd8eee612e0aaa0834c8cc1769d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E9=94=A6=E6=B6=9B?= <26050301730@qq.com>
Date: Tue, 11 Nov 2025 16:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=91=E5=AE=A4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E6=96=B0=E5=A2=9E=E7=A7=91=E5=AE=A4=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/api.js            |  2 +-
 .../views/basicmanage/organization/index.vue  | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js b/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js
index 75f63792..cabe8e47 100644
--- a/openhis-ui-vue3/src/views/basicmanage/organization/components/api.js
+++ b/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'
   })
 }
 
diff --git a/openhis-ui-vue3/src/views/basicmanage/organization/index.vue b/openhis-ui-vue3/src/views/basicmanage/organization/index.vue
index 1f5b7ce0..efc7257b 100644
--- a/openhis-ui-vue3/src/views/basicmanage/organization/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/organization/index.vue
@@ -141,15 +141,7 @@
 </template>
 
 <script setup name="Organization">
-import {
-  getList,
-  deleteOrganization,
-  addOrganization,
-  updateOrganization,
-  disableOrg,
-  initOrgTypeOption,
-  enableOrg,
-} from './components/api';
+import { 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);