From f9e2ddb23b4d44f1e91ed89776c039cfee5ad24e Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 27 May 2024 16:13:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6=E4=B8=8D=E5=AF=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchTable/src/SearchTable.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index e0d7a9e15..084a68806 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -159,12 +159,13 @@ const searchFormClick = (searchData) => {
     if (searchConditionRef.value.filters) {
       searchData.filters = searchConditionRef.value.filters
     } else {
+      searchData.filters = []
       Object.keys(searchConditionRef.value).forEach(key => {
-        searchData.filters = [{
+        searchData.filters.push({
           action: "==",
           column: key,
           value: searchConditionRef.value[key]
-        }]
+        })
       });
     }
   }

From 8ebfde8b37d0646af20295bce1b6d47b67179bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Mon, 27 May 2024 16:25:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 858220136..93b47537d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -305,7 +305,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['3']),
+        hide: isShowMainButton(row, ['4']),
         type: 'primary',
         icon: '',
         color: '',