解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/layout/components/Navbar.vue
+++ b/openhis-ui-vue3/src/layout/components/Navbar.vue
@@ -49,7 +49,7 @@
      </div>
    </div>
    <el-dialog title="切换科室" v-model="showDialog" width="400px" append-to-body destroy-on-close>
-      <el-select v-model="orgId">
+      <el-select v-model="orgId" filterable clearable>
        <el-option
          v-for="item in orgOptions"
          :key="item.orgId"