From 492753db1a81e001a75d4a985af65a295e29b8a0 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 09:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8F=AF=E9=80=89=E5=8F=AF=E7=A9=BA=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index a99e22aa7..a32ee78b6 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -49,7 +49,9 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                 params.value[searchCondition[i].key] == '' ||
                 params.value[searchCondition[i].key] == undefined
               ) {
-                isNull = true
+                if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+                  isNull = true
+                }
               }
               if (isNull) {
                 message.warning(
@@ -58,6 +60,9 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                 row[headerItem.field] = ''
                 return
               }
+              if(searchCondition[i].isOptional&&!params.value[searchCondition[i].key]){ // 添加参数可选可空的判断
+                continue
+              }
               filters.push({
                 action: searchCondition[i].action || '==',
                 column: searchCondition[i].key,
@@ -493,7 +498,11 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form
             params.value[searchCondition1[i].key] == '' ||
             params.value[searchCondition1[i].key] == undefined
           ) {
-            isNull = true
+              if(!searchCondition1[i].isOptional){ // 添加参数可选可空的判断
+                if(!searchCondition1[i].isOptional){ // 添加参数可选可空的判断
+                  isNull = true
+                }
+              }
           }
           if (isNull) {
             message.warning(