检验申请---主子表合并

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -1,13 +1,13 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="InspectRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...InspectRequestMain.allSchemas.searchSchema,...InspectRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
   <!-- 列表头部 -->
   <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
     @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="InspectRequestMain.allSchemas" />
+    :allSchemas="InspectRequestMain.allSchemas" :detailAllSchemas="InspectRequestDetail.allSchemas"/>
 
   <!-- 列表 -->
   <ContentWrap>
@@ -62,7 +62,7 @@
   const route = useRoute() // 路由信息
   const routeName = ref()
   routeName.value = route.name
-  const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
+  const tableColumns = ref([...InspectRequestMain.allSchemas.tableColumns,...InspectRequestDetail.allSchemas.tableMainColumns])
 
   // 字段设置 更新主列表字段
   const updataTableColumns = (val) => {