供应商发货申请--主子表合并

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -2,7 +2,7 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search
-      :schema="SupplierdeliverRequestMain.allSchemas.searchSchema"
+      :schema="[...SupplierdeliverRequestMain.allSchemas.searchSchema,...SupplierdeliverRequestDetail.allSchemas.searchSchema]"
       @search="setSearchParams"
       @reset="setSearchParams"
     />
@@ -16,6 +16,7 @@
     @updataTableColumns="updataTableColumns"
     @searchFormClick="searchFormClick"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
   />
 
   <!-- 列表 -->
@@ -179,7 +180,7 @@ const genLabelId = ref();
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...SupplierdeliverRequestMain.allSchemas.tableColumns,SupplierdeliverRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {