From 6de553796675644bf69785301c847f7d0e458c81 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 16 Jul 2024 16:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRequestMain/scrapRequestMain.data.ts      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 4865fc301..b26be7afc 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -491,10 +491,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceItemPage,
       searchCondition: [{
+        message: '请填写从仓库代码！',
         key: 'warehouseCode',
         value: 'fromWarehouseCode',
-        message: '请填写从仓库代码！',
-        isMainValue: true
+        isFormModel:true, // filters中添加筛选的数据--取于formModel
+        required:true, // 前置添加必有，和isFormModel结合使用
+        action: '==',
+        isSearch: true,
+        isMainValue: false
       },{
         key: 'businessType',
         value: 'Scrap',
@@ -507,12 +511,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         action: '==',
         isSearch: true,
         isMainValue: false
-      },{
-        key: 'inventoryStatus',
-        value: 'SCRAP',
-        action: '==',
-        isSearch: true,
-        isMainValue: false
       }]
     },
     form: {