From 166b3e37974301a06040f2fc66a22c9ab1d51371 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 17 Apr 2024 08:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E4=BB=BB=E5=8A=A1=20=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7--?=
 =?UTF-8?q?=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

---
 .../productionreturn/productionreturnJobMain/index.vue       | 5 +++--
 .../productionreturn/productionreturnRecordMain/index.vue    | 5 +++--
 .../productionreturn/productionreturnRequestMain/index.vue   | 5 +++--
 .../productionreturn/productionreturnRequestMainNo/index.vue | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 1692e3476..ded9077e2 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreturnJobMain.allSchemas.searchSchema,...ProductionreturnJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreturnJobMain.allSchemas"
+      :detailAllSchemas="ProductionreturnJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreturnJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreturnJobMain.allSchemas.tableColumns,...ProductionreturnJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
index 1e9458787..8fd86c7d0 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreturnRecordMain.allSchemas.searchSchema,...ProductionreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreturnRecordMain.allSchemas"
+      :detailAllSchemas="ProductionreturnRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreturnRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 582f72410..c71cc0350 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreturnRequestMain.allSchemas.searchSchema,...ProductionreturnRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreturnRequestMain.allSchemas"
+      :detailAllSchemas="ProductionreturnRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -112,7 +113,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns,...ProductionreturnRequestDetail.allSchemas.tableMainColumns])
 
 //创建标签
 const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index ce344ef0d..adc402160 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ProductionreturnRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionreturnRequestMain.allSchemas.searchSchema,...ProductionreturnRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ProductionreturnRequestMain.allSchemas"
+      :detailAllSchemas="ProductionreturnRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -113,7 +114,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns,...ProductionreturnRequestDetail.allSchemas.tableMainColumns])
 
 //创建标签
 const detailListTableColumns = ProductionreturnRequestDetailNoLabel.allSchemas