From dfe35bb7f01b229b78d3ce86199bc72936c9a5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E9=94=A6=E6=B6=9B?= <26050301730@qq.com>
Date: Wed, 19 Nov 2025 16:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90/=E8=AF=8A?=
 =?UTF-8?q?=E7=96=97=E7=BB=91=E5=AE=9A=EF=BC=8C=E8=80=97=E6=9D=90=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=8D=AF=E5=93=81=E7=9A=84=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumablesBinding/components/api.js      | 11 ++++++++-
 .../components/deviceList.vue                 | 24 ++++++++++++-------
 .../device/components/deviceDialog.vue        | 11 ++++-----
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js
index 4c5dc02f..c6f30349 100644
--- a/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js
+++ b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/api.js
@@ -18,7 +18,7 @@ export function getBindList(queryParams) {
   })
 }
 
-// 获取耗材列表
+// 获取耗材列表（受限制的API，只返回单次消耗类耗材）
 export function getDeviceList(queryParams) {
   return request({
     url: '/personalization/activity-device/device-page',
@@ -27,6 +27,15 @@ export function getDeviceList(queryParams) {
   })
 }
 
+// 获取完整的器材目录列表（使用原始API，不限制categoryCode）
+export function getFullDeviceList(queryParams) {
+  return request({
+    url: '/data-dictionary/device/information-page',
+    method: 'get',
+    params: queryParams
+  })
+}
+
 // 获取耗材列表
 export function init() {
   return request({
diff --git a/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
index ba53fe3f..69486feb 100644
--- a/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/consumablesBinding/components/deviceList.vue
@@ -16,7 +16,7 @@
 </template>
         
 <script setup>
-import { getDeviceList } from './api';
+import { getFullDeviceList } from './api';
 import { watch } from 'vue';
 import { throttle } from 'lodash-es';
 
@@ -27,10 +27,12 @@ const props = defineProps({
   },
 });
 const emit = defineEmits(['selectRow']);
-const queryParams = ref({
-  pageNum: 1,
-  pageSize: 50,
-  itemType: props.itemType,
+// 修改查询参数，添加searchKey字段以匹配搜索框输入
+const queryParams = reactive({
+  searchKey: '',
+  pageNo: 1, // 新API使用pageNo而不是pageNum
+  pageSize: 50
+  // 移除categoryCode参数，避免任何可能的限制
 });
 const deviceList = ref([]);
 
@@ -43,18 +45,22 @@ const throttledGetList = throttle(
   { leading: true, trailing: true }
 );
 
+// 初始化时设置搜索关键字
+queryParams.searchKey = props.searchKey;
+
 watch(
-  () => props,
+  () => props.searchKey,
   (newValue) => {
-    queryParams.value.searchKey = newValue.searchKey;
+    queryParams.searchKey = newValue;
     throttledGetList();
   },
-  { immdiate: true, deep: true }
+  { immediate: true }
 );
 
 getList();
 function getList() {
-  getDeviceList(queryParams.value).then((res) => {
+  // 使用新的不受限制的API，不设置任何会限制查询范围的参数
+  getFullDeviceList(queryParams).then((res) => {
     deviceList.value = res.data.records;
   });
 }
diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
index cf8c5fa6..49039725 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -496,12 +496,11 @@ function getDeptTree() {
 }
 
 /** 查询地点下拉树结构 */
-const getLocationTree = () => {
-  locationTreeSelect({ formList: '11,16,17' }).then((res) => {
-    if (res.data && res.data.records) {
-      locationOptions.value = res.data.records
-    }
-  })
+function getLocationTree() {
+  locationTreeSelect({ formList: '11,16' }).then((response) => {
+    console.log(response, 'response查询部门下拉树结构');
+    locationOptions.value = response.data.records;
+  });
 }
 // 显示弹框
 function edit() {