From 0ce27745f018611898ccdb999de149182e1057f2 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 18:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=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

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

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 67f5736d2..0ac756627 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -2,7 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="PurchasereturnRequestMain.allSchemas.searchSchema"
+      :schema="[...PurchasereturnRequestMain.allSchemas.searchSchema,...PurchasereturnRequestDetail.allSchemas.searchSchema]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,6 +16,7 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="PurchasereturnRequestMain.allSchemas"
+    :detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -119,7 +120,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PurchasereturnRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...PurchasereturnRequestMain.allSchemas.tableColumns,...PurchasereturnRequestDetail.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)