From 00b8a712a6ae50ae8c44d350fc18b4fb142e91f6 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Wed, 3 Apr 2024 11:28:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8E=A5=E5=8F=A3=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/RepeatTaskTableModal.vue |  2 +-
 src/views/final/content/Content.vue           | 12 +++++++-----
 src/views/final/index.vue                     |  3 ++-
 src/views/home/aside/comp/Search.vue          |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 951f9d7..496cb3d 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -69,7 +69,7 @@ const columns: DataTableColumns<RowData> = [
       tooltip: true,
     },
     render(row: any) {
-      return row.pictureid
+      return row.fromtaskid
     },
   },
   {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 101d3ec..e660239 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -248,9 +248,7 @@ async function getColumns() {
   // #endregion
 
   columnsRef.value.push(actionsColumns as any)
-  console.log(columnsRef.value, 'columnsRef111')
   formatColumns()
-  console.log(columnsRef.value, 'columnsRef222')
 }
 
 async function formatColumns() {
@@ -278,7 +276,7 @@ async function formatColumns() {
             'text-color': '#507AFD',
             'onClick': () => goDetail(row),
           },
-          { default: () => row.pictureid },
+          { default: () => row.fromtaskid },
         )
       },
     }
@@ -463,7 +461,7 @@ const dialog = useDialog()
 const message = useMessage()
 const finalStore = useFinal()
 
-async function query(page: number, pageSize: number, filterId?: any) {
+async function query(page: number, pageSize: number, filterId?: any,taskName?:string) {
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   const params = filterId ? { userSearchId: filterId } : asideParmas
@@ -472,6 +470,7 @@ async function query(page: number, pageSize: number, filterId?: any) {
     pageSize,
     currPage: page,
     sortname: 'states',
+    taskName:taskName,
     ...params,
   })
   const { data, pageCount, totalCount } = result
@@ -801,8 +800,11 @@ async function refreshHandler(searchId?: any) {
 }
 
 function filterTableData(keyword) {
+  pagination.page = 1;
+  pagination.pageSize = 10;
   if (keyword)
-    tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+    // tableData.value = tableData.value.filter(item => item.id.includes(keyword))
+    query(pagination.page, pagination.pageSize,'',keyword)
   else
     query(pagination.page, pagination.pageSize)
 }
diff --git a/src/views/final/index.vue b/src/views/final/index.vue
index f3b3415..f47cf36 100644
--- a/src/views/final/index.vue
+++ b/src/views/final/index.vue
@@ -5,9 +5,10 @@ import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
 
 const showList = ref(false);
-const contentRef = ref(null);
+const contentRef:any = ref(null);
 const inputChange = (keyword)=>{
   contentRef.value.filterTableData(keyword)
+  
 }
 
 </script>
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index df4acad..b0434f6 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -54,6 +54,7 @@ function selectHandler(item: SearchEntity) {
 // 模糊搜索
 const searchName = () => {
   configStore.setSearchValue(searchKeyword.value);
+  emit('inputChange',searchKeyword.value);
 }
 
 const close = () => {
-- 
2.39.3