From d1f3e223881c234c0361a35005e33c65504f13d5 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 19:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1--=E4=B8=BB?=
 =?UTF-8?q?=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

---
 .../purchasereceiptManage/putaway/putawayJobMain/index.vue   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 9a39229a8..b8df3a84b 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PutawayJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PutawayJobMain.allSchemas"
+      :detailAllSchemas="PutawayJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -104,7 +105,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PutawayJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...PutawayJobMain.allSchemas.tableColumns,...PutawayJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {