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

---
 src/views/wms/issueManage/issue/issueJobMain/index.vue     | 5 +++--
 src/views/wms/issueManage/issue/issueRecordMain/index.vue  | 5 +++--
 src/views/wms/issueManage/issue/issueRequestMain/index.vue | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 3133dcd36..dd1c1dd37 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="IssueJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...IssueJobMain.allSchemas.searchSchema,...IssueJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="IssueJobMain.allSchemas"
+      :detailAllSchemas="IssueJobDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(IssueJobMain.allSchemas.tableColumns)
+const tableColumns = ref([...IssueJobMain.allSchemas.tableColumns,...IssueJobDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
index 011761bd5..86f73873e 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="IssueRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...IssueRecordMain.allSchemas.searchSchema,...IssueRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="IssueRecordMain.allSchemas"
+      :detailAllSchemas="IssueRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(IssueRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...IssueRecordMain.allSchemas.tableColumns,...IssueRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 5829f45d1..5640ba986 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="IssueRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...IssueRequestMain.allSchemas.searchSchema,...IssueRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="IssueRequestMain.allSchemas"
+      :detailAllSchemas="IssueRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -93,7 +94,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(IssueRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...IssueRequestMain.allSchemas.tableColumns,...IssueRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {