From 62e9a2700aa7bb91ef94a8e324fd7818c0d44255 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 24 Sep 2024 17:40:57 +0800
Subject: [PATCH] =?UTF-8?q?HL-6137=E3=80=8A=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=8B=E6=96=B0=E5=A2=9E=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E8=BF=87=E6=BB=A4=E6=8E=89=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?=E6=9A=82=E4=BC=B0=E5=AE=A2=E6=88=B7=E7=9A=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain.data.ts                 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 54425d775..f74036ea5 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -108,8 +108,17 @@ export const CustomerreturnRequestMain = useCrudSchemas(
           searchCondition: [
             {
               key: 'available',
+              action: '==',
               value: 'TRUE',
-              isMainValue: false
+              isMainValue: false,
+              isSearch: true
+            },
+            {
+              key: 'type',
+              action: '!=',
+              value: 'PROVISIONAL_ESTIMATE',
+              isMainValue: false,
+              isSearch: true,
             }
           ],
           verificationParams: [