From 4477f65d572abbb092266fa3f4bb758ce2468247 Mon Sep 17 00:00:00 2001
From: siyaqi <http://172.16.1.12:8700/>
Date: Thu, 10 Jul 2025 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A8=A1=E5=9D=97=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_admin/dao/datastd_dao.py           |  9 ++++-
 .../src/views/datastd/stdcode/index.vue       |  5 +++
 .../src/views/datastd/stddict/AddEditForm.vue | 39 ++++++++++++++-----
 .../src/views/datastd/stddict/index.vue       | 14 ++++++-
 4 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
index a16996f..d9b54ef 100644
--- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py
+++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
@@ -301,7 +301,12 @@ class DataStdDao:
         # 构建查询条件
         filters = []
         if query_object.data_dict_cn_name:
-            filters.append(DataStdDict.data_dict_cn_name.like(f"%{query_object.data_dict_cn_name}%"))
+            filters.append(or_(
+        DataStdDict.data_dict_cn_name.like(f"%{query_object.data_dict_cn_name}%"),
+        DataStdDict.data_dict_eng_name.like(f"%{query_object.data_dict_cn_name}%")
+            ))
+        if query_object.data_dict_no:
+            filters.append(DataStdDict.data_dict_no.like(f"%{query_object.data_dict_no}%"))    
         if query_object.data_dict_eng_name:
             filters.append(DataStdDict.data_dict_eng_name.like(f"%{query_object.data_dict_eng_name}%"))
         if query_object.data_dict_vest:
@@ -776,6 +781,8 @@ class DataStdDao:
         filters = []
         if query_object.data_std_cn_name:
             filters.append(DataStdMain.data_std_cn_name.like(f"%{query_object.data_std_cn_name}%"))
+        if query_object.data_std_busi_defn:
+            filters.append(DataStdMain.data_std_busi_defn.like(f"%{query_object.data_std_busi_defn}%"))
         if query_object.data_std_no:
             filters.append(DataStdMain.data_std_no.like(f"%{query_object.data_std_no}%"))
         if query_object.src_sys:
diff --git a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
index f85c1c3..f6ef31c 100644
--- a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
@@ -235,7 +235,12 @@ const handleNodeClick = (data) => {
  
   handleQuery();
 };
+watch(dbResoursName, (val) => {
 
+proxy.$refs["tree"].filter(val);
+
+
+});
 const dbResourceOptions = ref(undefined);
 const form = ref({
   id: '',
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
index 92a0ed3..6da5dd7 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
@@ -53,15 +53,21 @@
         <el-input v-model="formData.dataDictDataType" placeholder="请输入数据类型" clearable />
       </el-form-item>
       <el-form-item label="数据标准" prop="dataStdNo">
-        <el-select v-model="formData.dataStdNo" placeholder="数据标准">
-          <el-option
-                v-for="dict in stdList"
-                :key="dict.onum"
-                :label="dict.dataStdNo+'-'+dict.dataStdEngName+'-'+dict.dataStdCnName"
-                :value="dict.dataStdNo"
-              ></el-option>
-        </el-select>  
-      </el-form-item>
+  <el-select
+    v-model="formData.dataStdNo"
+    placeholder="数据标准"
+    filterable
+    clearable
+    :filter-method="filterStdList"
+  >
+    <el-option
+      v-for="dict in filteredStdList"
+      :key="dict.onum"
+      :label="dict.dataStdNo + '-' + dict.dataStdEngName + '-' + dict.dataStdCnName"
+      :value="dict.dataStdNo"
+    ></el-option>
+  </el-select>
+</el-form-item>
       
 
          <!-- 底部按钮区域 -->
@@ -131,6 +137,21 @@ function dataChange(data) {
     formData.value.sysName = '';
   }
 }
+const searchQuery = ref(''); // 存储用户输入的搜索词
+
+const filteredStdList = computed(() => {
+  if (!searchQuery.value) return props.stdList; // 如果没有输入，返回全部
+  const query = searchQuery.value.toLowerCase();
+  return props.stdList.filter(dict => 
+    dict.dataStdNo.toLowerCase().includes(query) ||
+    dict.dataStdEngName.toLowerCase().includes(query) ||
+    dict.dataStdCnName.toLowerCase().includes(query)
+  );
+});
+
+const filterStdList = (query) => {
+  searchQuery.value = query; // 更新搜索词
+};
 // 监听 props.visible 的变化，确保同步到 local visible
 watch(() => props.visible, (newVal) => {
   visible.value = newVal;
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
index 109125b..bdd22bf 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
@@ -42,7 +42,14 @@
               style="width: 220px"
             />
           </el-form-item>
-
+          <el-form-item label="字典名称" prop="dataDictCnName">
+            <el-input
+              v-model="queryParams.dataDictCnName"
+              placeholder="请输入标准字典中/英文名称"
+              clearable
+              style="width: 220px"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -296,7 +303,12 @@ const handleStdClick = (code) => {
   });
 
 };
+watch(dbResoursName, (val) => {
+
+proxy.$refs["tree"].filter(val);
 
+
+});
 const transCodetoId = (dataStdNo) => {
   const match = stdList.value.find(item => item.dataStdNo === dataStdNo);
   return match ? match.onum : '';