主子表合并

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ContainerRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="ContainerRecordMain.allSchemas"
+      :detailAllSchemas="ContainerRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -79,7 +80,7 @@ const routeName = ref()
 routeName.value = route.name
 const businessType = ref()
 const importFileName = ref()
-const tableColumns = ref(ContainerRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
 
 const { tableObject, tableMethods } = useTable({
   getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage // 分页接口