From fba97a68c58ed6fddde6974735a863b5acd418f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 27 Oct 2023 09:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itembasic/index.ts    |  8 +++++++-
 src/views/wms/itembasic/index.vue | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index 6a232222d..d6b9648cc 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -31,7 +31,13 @@ export interface ItembasicVO {
 
 // 查询物品基本信息列表
 export const getItembasicPage = async (params) => {
-  return await request.get({ url: `/wms/itembasic/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/itembasic/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itembasic/page`, params })
+  }
 }
 
 // 查询物品基本信息详情
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index a5fea5197..82de830f3 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -11,6 +11,7 @@
     :tableColumns="tableColumns"
     :routeName="routeName"
     @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
   />
 
   <!-- 列表 -->
@@ -71,8 +72,8 @@ const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
-  // defaultButtons.defaultFilterBtn(), // 筛选
   defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
   // {
   //   label: '自定义扩展按钮',
@@ -113,7 +114,6 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
@@ -190,6 +190,16 @@ const handleExport = async () => {
   }
 }
 
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()