From fb21354ffc74ea49c46f89c8104862bc02864ea1 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 18:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 200aeac55..ad0b5ea4f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -2,7 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="SupplierdeliverRequestMain.allSchemas.searchSchema"
+      :schema="[...SupplierdeliverRequestMain.allSchemas.searchSchema,...SupplierdeliverRequestDetail.allSchemas.searchSchema]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,6 +16,7 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -179,7 +180,7 @@ const genLabelId = ref();
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...SupplierdeliverRequestMain.allSchemas.tableColumns,SupplierdeliverRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {