Browse Source

HL-6311 器具记录导出拆分

hella_online_20241107
陈放 3 months ago
parent
commit
7e06d4c5df
  1. 63
      src/api/wms/containerRecordMain/index.ts
  2. 10
      src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts
  3. 2
      src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue
  4. 2
      src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts
  5. 124
      src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue
  6. 2
      src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue
  7. 10
      src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts
  8. 2
      src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue
  9. 2
      src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue
  10. 2
      src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue
  11. 12
      src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts

63
src/api/wms/containerRecordMain/index.ts

@ -58,7 +58,8 @@ export const exportContainerRecordMain = async (params) => {
}
// 导出器具管理初始化记录主 Excel
export const exportContainerInitRecordMain = async (params) => {
export const exportContainerInitialRecordMain = async (params) => {
params.businessType = 'InitialContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
@ -68,6 +69,66 @@ export const exportContainerInitRecordMain = async (params) => {
}
}
// 导出器具管理创建记录主 Excel
export const exportContainerCreateRecordMain = async (params) => {
params.businessType = 'CreateContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data })
} else {
return await request.download({ url: `/wms/container-record-main/export-excel-init`, params })
}
}
// 导出器具管理返回记录主 Excel
export const exportContainerReturnRecordMain = async (params) => {
params.businessType = 'CreateContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/container-record-main/export-excel`, params })
}
}
// 导出器具管理移动记录主 Excel
export const exportContainerMoveRecordMain = async (params) => {
params.businessType = 'MoveContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/container-record-main/export-excel`, params })
}
}
// 导出器具管理报废记录主 Excel
export const exportContainerScrapRecordMain = async (params) => {
params.businessType = 'ScrapContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
return await request.downloadPost({ url: '/wms/container-record-main/export-excel-scrap-senior', data })
} else {
return await request.download({ url: `/wms/container-record-main/export-excel-scrap`, params })
}
}
// 导出器具管理发运记录主 Excel
export const exportContainerDeliverRecordMain = async (params) => {
params.businessType = 'DeliverContainerManage'
if (params.isSearch) {
delete params.isSearch
const data = { ...params }
return await request.downloadPost({ url: '/wms/container-record-main/export-excel-init-senior', data })
} else {
return await request.download({ url: `/wms/container-record-main/export-excel-init`, params })
}
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/container-record-main/get-import-template' })

10
src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/createContainerRecordMain.data.ts

@ -232,11 +232,11 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'containerNumber',
sort: 'custom'
},
{
label: '来源库位代码',
field: 'fromLocationCode',
sort: 'custom',
},
// {
// label: '来源库位代码',
// field: 'fromLocationCode',
// sort: 'custom',
// },
{
label: '目标库位代码',
field: 'toLocationCode',

2
src/views/wms/inventoryjobManage/containermanage/createContainerRecordMain/index.vue

@ -141,7 +141,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerCreateRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

2
src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts

@ -39,7 +39,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
dictType: DICT_TYPE.CONTAIN_MANAGE_TYPE,
dictClass: 'string',
isSearch: true,
isSearch: false,
isTable: true,
table: {
width: 120

124
src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/index.vue

@ -1,7 +1,11 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
<Search
:schema="[...ContainerRecordMain.allSchemas.searchSchema,...ContainerRecordDetail.allSchemas.searchSchema]"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap>
<!-- 列表头部 -->
@ -12,7 +16,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ContainerRecordMain.allSchemas"
:detailAllSchemas="ContainerRecordDetailAllSchemas"
:detailAllSchemas="ContainerRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -33,23 +37,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="getList"
:rules="ContainerRecordMainRules"
:formAllSchemas="ContainerRecordMain.allSchemas"
:tableAllSchemas="ContainerRecordDetail.allSchemas"
:tableFormRules="ContainerRecordDetailRules"
:isBusiness="true"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
@ -86,39 +75,16 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const businessType = ref()
const importFileName = ref()
const tableColumns = ref([...ContainerRecordMain.allSchemas.tableColumns, ...ContainerRecordDetail.allSchemas.tableMainColumns])
// const ContainerRecordDetailTableColumns = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns)))
const ContainerRecordDetailAllSchemas = ref(JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas)))
console.log(2233,ContainerRecordDetail.allSchemas.tableMainColumns)
const searchType = ref()
const tableColumns =
ref([ ...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns])
const { tableObject, tableMethods } = useTable({
getListApi: ContainerRecordDetailApi.getContainerRecordDetailPage //
})
//
/**
*
*/
// if ( routeName.value == 'InitialContainerManageRecord') {
// tableObject.params = {
// type:'INITIAL',
// }
// searchType.value = 'INITIAL'
// businessType.value = 'InitialContainerManage'
// importFileName.value = ''
// }
// if ( routeName.value == 'InitialContainerManageRecord') {
// const array = ContainerRecordDetail.allSchemas.tableMainColumns.filter(item=>item.field != "fromLocationCode")
// ContainerRecordDetailAllSchemas.value.tableMainColumns = array
// tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetailAllSchemas.value.tableMainColumns]
// }
// else {
// ContainerRecordDetail.allSchemas.tableMainColumns =JSON.parse(JSON.stringify(ContainerRecordDetail.allSchemas.tableMainColumns))
// tableColumns.value = [...ContainerRecordMain.allSchemas.tableColumns,...ContainerRecordDetail.allSchemas.tableMainColumns]
// }
tableObject.params = {
type:'DELIVER'
}
importFileName.value = '器具发运记录'
//
@ -135,26 +101,11 @@ const HeadButttondata = [
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
const searchList = (model)=>{
model.type = searchType.value
setSearchParams(model)
}
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'export') { //
if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@ -169,28 +120,6 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){
return []
}
return [
// defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), //
// defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), //
]
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
//
const { wsCache } = useCache()
/** 详情操作 */
@ -201,24 +130,8 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,"recordContainerMain")
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ContainerRecordMainApi.deleteContainerRecordMain(id)
message.success(t('common.delSuccess'))
//
buttonBaseClick('refresh',null)
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
@ -228,13 +141,8 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
if(businessType.value = 'InitialContainerManage'){
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else {
const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerDeliverRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}
} catch {
} finally {
loadDone()
@ -246,7 +154,7 @@ const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value': 'CREATE'
'value':'DELIVER'
}
if (!Array.isArray(searchData.filters)) {
searchData.filters = [];

2
src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/index.vue

@ -141,7 +141,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerInitialRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

10
src/views/wms/inventoryjobManage/containermanage/initialContainerRecordMain/initialContainerRecordMain.data.ts

@ -224,11 +224,11 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'containerNumber',
sort: 'custom'
},
{
label: '来源库位代码',
field: 'fromLocationCode',
sort: 'custom',
},
// {
// label: '来源库位代码',
// field: 'fromLocationCode',
// sort: 'custom',
// },
{
label: '目标库位代码',
field: 'toLocationCode',

2
src/views/wms/inventoryjobManage/containermanage/moveContainerRecordMain/index.vue

@ -141,7 +141,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerMoveRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

2
src/views/wms/inventoryjobManage/containermanage/returnContainerRecordMain/index.vue

@ -141,7 +141,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerReturnRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

2
src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/index.vue

@ -140,7 +140,7 @@ const handleExport = async () => {
//
loadStart()
const excelTitle = ref(route.meta.title)
const data = await ContainerRecordMainApi.exportContainerInitRecordMain(tableObject.params)
const data = await ContainerRecordMainApi.exportContainerScrapRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
} catch {
} finally {

12
src/views/wms/inventoryjobManage/containermanage/scrapContainerRecordMain/scrapContainerRecordMain.data.ts

@ -228,13 +228,13 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromLocationCode',
sort: 'custom',
},
// {
// label: '目标库位代码',
// field: 'toLocationCode',
// sort: 'custom',
// },
{
label: '目标库位代码',
field: 'toLocationCode',
sort: 'custom',
},
{
label: '到数量',
label: '数量',
field: 'toQty',
sort: 'custom',
},

Loading…
Cancel
Save