From 6a3b0c789faea6053d80bf8d7a12f2b737cbbac7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 18:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index b6a64f14a..523c20eba 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PurchasereceiptRequestMain.allSchemas"
+      :detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -148,7 +149,7 @@ const genLabelId = ref(); //主表ID
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
 
 const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
 const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)