From 53f2e4b5a647c2f6707067610676a9a25cb9263b Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 15 May 2024 14:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/containerMainRequest/index.ts | 71 ++++++++++++++++++- .../containerMainRequest.data.ts | 16 ++--- .../containerMainRequest/index.vue | 17 ++++- .../containerRecordMain.data.ts | 16 ++--- .../initialContainerMainRequest/index.vue | 8 +-- .../initialContainerMainRequest.data.ts | 16 ++--- .../scrapContainerMainRequest/index.vue | 6 +- .../scrapContainerMainRequest.data.ts | 16 ++--- 8 files changed, 118 insertions(+), 48 deletions(-) diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts index 35e7a9f8d..91d143784 100644 --- a/src/api/wms/containerMainRequest/index.ts +++ b/src/api/wms/containerMainRequest/index.ts @@ -14,7 +14,7 @@ export interface ContainerMainRequestVO { export const getContainerMainRequestPage = async (params) => { if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return await request.post({ url: '/wms/container-main-request/senior', data }) } else { return await request.get({ url: `/wms/container-main-request/page`, params }) @@ -43,7 +43,74 @@ export const deleteContainerMainRequest = async (id: number) => { // 导出器具管理申请主 Excel export const exportContainerMainRequest = async (params) => { - return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + params.businessType = 'ContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出初始化器具管理申请主 Excel +export const exportInitialContainerMainRequest = async (params) => { + params.businessType = 'InitialContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出初始化器具管理申请主 Excel +export const exportScrapContainerMainRequest = async (params) => { + params.businessType = 'ScrapContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出移动器具管理申请主 Excel +export const exportMoveContainerMainRequest = async (params) => { + params.businessType = 'MoveContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出返回器具管理申请主 Excel +export const exportReturnContainerMainRequest = async (params) => { + params.businessType = 'ReturnContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出发运器具管理申请主 Excel +export const exportDeliverContainerMainRequest = async (params) => { + params.businessType = 'DeliverContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 9b7584156..122339949 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -96,6 +96,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + isTable: false }, { label: '部门', @@ -219,9 +220,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, }, { @@ -247,9 +246,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'siteId', sort: 'custom', isForm: false, - table: { - width: 100 - }, + isTable: false, }, { label: '操作', @@ -439,6 +436,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable: false }, { label: '创建时间', @@ -453,9 +451,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, isTableForm: false }, @@ -495,6 +491,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain:true, + isTableForm: false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 98a33615b..a85c7ba7b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -298,7 +298,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 @@ -466,8 +466,19 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params) - download.excel(data, '器具管理申请主.xlsx') + if(routeName.value == 'ReturnContainerManageRequest'){ + const data = await ContainerMainRequestApi.exportReturnContainerMainRequest(tableObject.params) + download.excel(data, '器具返回申请.xlsx') + }else if ( routeName.value == 'MoveContainerManageRequest') { + const data = await ContainerMainRequestApi.exportMoveContainerMainRequest(tableObject.params) + download.excel(data, '器具转移申请.xlsx') + }else if ( routeName.value == 'DeliverContainerManageRequest') { + const data = await ContainerMainRequestApi.exportDeliverContainerMainRequest(tableObject.params) + download.excel(data, '器具发运申请.xlsx') + }else{ + const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params) + download.excel(data, '器具管理申请.xlsx') + } } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index 862df9340..f29e5788f 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -63,6 +63,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable: false }, { label: '部门', @@ -112,9 +113,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ field: 'siteId', sort: 'custom', isForm: false, - table: { - width: 100 - }, + isTable: false, }, { label: '创建时间', @@ -129,9 +128,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, }, { @@ -220,6 +217,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable: false }, { label: '创建时间', @@ -234,9 +232,7 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, isTableForm: false }, @@ -276,6 +272,8 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain:true, + isTableForm: false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index bed6ff8ad..702675c83 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -250,7 +250,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 @@ -420,8 +420,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params) - download.excel(data, '器具管理申请主.xlsx') + const data = await ContainerMainRequestApi.exportInitialContainerMainRequest(tableObject.params) + download.excel(data, '初始化器具管理申请主.xlsx') } catch { } finally { exportLoading.value = false @@ -436,7 +436,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'importFileName.xlsx' + templateTitle: importFileName.value + '.xlsx' }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 93ef9ec97..74474265e 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -100,6 +100,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + isTable:false, }, { label: '部门', @@ -223,9 +224,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable:false, isForm: false, }, { @@ -251,9 +250,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'siteId', sort: 'custom', isForm: false, - table: { - width: 100 - }, + isTable:false, }, { label: '操作', @@ -410,6 +407,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable:false, }, { label: '创建时间', @@ -424,9 +422,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable:false, isForm: false, isTableForm: false }, @@ -466,6 +462,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain:true, + isTableForm: false, table: { width: 200, fixed: 'right' diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index ea5089cda..52374a011 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -273,7 +273,7 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 @@ -446,8 +446,8 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params) - download.excel(data, '器具管理申请主.xlsx') + const data = await ContainerMainRequestApi.exportScrapContainerMainRequest(tableObject.params) + download.excel(data, '报废器具管理申请主.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index d14b1c371..ad74af33a 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -96,6 +96,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: true, + isTable: false }, { label: '部门', @@ -219,9 +220,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, }, { @@ -247,9 +246,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'siteId', sort: 'custom', isForm: false, - table: { - width: 100 - }, + isTable: false, }, { label: '操作', @@ -437,6 +434,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', + isTable: false }, { label: '创建时间', @@ -451,9 +449,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - table: { - width: 200 - }, + isTable: false, isForm: false, isTableForm: false }, @@ -493,6 +489,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + hiddenInMain:true, + isTableForm: false, table: { width: 150, fixed: 'right'