From 3f41f1fb7df497570569c5888970eef5dfd17424 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 14 May 2024 14:12:12 +0800
Subject: [PATCH] =?UTF-8?q?SearchTable=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchTable/src/SearchTable.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 92fc2ef02..39e93b2ce 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -1,7 +1,9 @@
 <template>
   <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth" >
     <!-- 搜索工作栏 -->
-    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+    <!-- <ContentWrap>
+      <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
+    </ContentWrap> -->
 
     <!-- 列表头部 -->
     <TableHead
@@ -61,7 +63,7 @@ const getListRef = ref()
 const setSearchParamsRef = ref()
 const tableObjectRef = ref()
 const getPage:any = ref()
-// const searchSchema = ref()
+const searchSchema = ref()
 const tableColumns = ref()
 const formFieldRef = ref()
 const searchFieldRef = ref()
@@ -81,7 +83,7 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
   searchDialogVisible.value = true
   multipleBol.value = multiple
   allSchemasRef.value = allSchemas
-  // searchSchema.value = allSchemas.searchSchema
+  searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
 }
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => {
@@ -94,7 +96,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   formFieldRef.value = formField
   searchFieldRef.value = searchField
   allSchemasRef.value = allSchemas
-  // searchSchema.value = allSchemas.searchSchema
+  searchSchema.value = allSchemas.searchSchema
   if(isConcatDetailSchemas){
     //主子表合并
     console.log('detailSchemas',detailSchemas)
@@ -117,9 +119,8 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   if (searchCondition) tableObjectRef.value.params = searchCondition;
 
   // 获得表格的各种操作
-  const { getList } = tableMethods
-  // setSearchParamsRef.value = setSearchParams
-  setSearchParamsRef.value = tableObject.params
+  const { getList , setSearchParams } = tableMethods
+  setSearchParamsRef.value = setSearchParams
   getListRef.value = getList
   getList()
 }