发料申请，发料任务，发料记录--主子表合并

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) => {

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) => {

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) => {