上架申请--主子表合并

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="PutawayRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PutawayRequestMain.allSchemas.searchSchema,...PutawayRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="PutawayRequestMain.allSchemas"
+      :detailAllSchemas="PutawayRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -117,7 +118,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(PutawayRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...PutawayRequestMain.allSchemas.tableColumns,...PutawayRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {