From 1a847e1f35dc1b327ad120993a6170d2072b0816 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 16 Apr 2024 18:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/demandforecastingMain/index.vue          | 5 +++--
 .../supplierinvoice/supplierinvoiceRecordMain/index.vue      | 2 +-
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 38e3afb7e..4e9667ac0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="DemandforecastingMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="DemandforecastingMain.allSchemas"
+      :detailAllSchemas="DemandforecastingDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -92,7 +93,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
+const tableColumns = ref([...DemandforecastingMain.allSchemas.tableColumns,...DemandforecastingDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 319b90c35..b7830977c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -90,7 +90,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...SupplierinvoiceRecordMain.allSchemas.tableColumns,...SupplierinvoiceRecordDetail.allSchemas.tableColumns])
+const tableColumns = ref([...SupplierinvoiceRecordMain.allSchemas.tableColumns,...SupplierinvoiceRecordDetail.allSchemas.tableMainColumns])
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 42999da40..9ec12fe82 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -143,7 +143,7 @@
   const route = useRoute() // 路由信息
   const routeName = ref()
   routeName.value = route.name
-  const tableColumns = ref([...SupplierinvoiceRequestMain.allSchemas.tableColumns,...SupplierinvoiceRequestDetail.allSchemas.tableColumns])
+  const tableColumns = ref([...SupplierinvoiceRequestMain.allSchemas.tableColumns,...SupplierinvoiceRequestDetail.allSchemas.tableMainColumns])
 
   // 字段设置 更新主列表字段
   const updataTableColumns = (val) => {