From 578e9c1126b65337bae3cb9c9b797da4a87aa4d7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 17 Apr 2024 08:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E8=AE=B0=E5=BD=95---=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreceipt/productionreceiptJobMain/index.vue     | 5 +++--
 .../productionreceipt/productionreceiptRecordMain/index.vue  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index 660119199..7a22bf2c5 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreceiptJobMain.allSchemas.searchSchema,...ProductionreceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreceiptJobMain.allSchemas"
+      :detailAllSchemas="ProductionreceiptJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreceiptJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreceiptJobMain.allSchemas.tableColumns,...ProductionreceiptJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
index fc1c8413c..3c6045677 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreceiptRecordMain.allSchemas.searchSchema,...ProductionreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreceiptRecordMain.allSchemas"
+      :detailAllSchemas="ProductionreceiptRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreceiptRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreceiptRecordMain.allSchemas.tableColumns,...ProductionreceiptRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {