Browse Source

补料任务,补料记录---主子表合并

master_hella_20240701
yufei0306 10 months ago
parent
commit
7b4993789a
  1. 6
      src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
  2. 5
      src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue

6
src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="RepleinshJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...RepleinshJobMain.allSchemas.searchSchema,...RepleinshJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,8 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="RepleinshJobMain.allSchemas" :allSchemas="RepleinshJobMain.allSchemas"
:detailAllSchemas="RepleinshJobDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -81,7 +83,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // const route = useRoute() //
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(RepleinshJobMain.allSchemas.tableColumns) const tableColumns = ref([...RepleinshJobMain.allSchemas.tableColumns,...RepleinshJobDetail.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {

5
src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="RepleinshRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...RepleinshRecordMain.allSchemas.searchSchema,...RepleinshRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="RepleinshRecordMain.allSchemas" :allSchemas="RepleinshRecordMain.allSchemas"
:detailAllSchemas="RepleinshRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // const route = useRoute() //
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(RepleinshRecordMain.allSchemas.tableColumns) const tableColumns = ref([...RepleinshRecordMain.allSchemas.tableColumns,...RepleinshRecordDetail.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {

Loading…
Cancel
Save