From 1961a96fa7275ef75c25f7d4037548634b493240 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 14 Aug 2024 09:30:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=87=E8=BF=B9=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerBindRecord/index.vue | 6 +++-- .../containerinit/containerRepair/index.vue | 6 +++-- .../containerUnbindRecord/index.vue | 6 +++-- .../containerinit/containerinitadd/index.vue | 6 +++-- .../containerinitrecord/index.vue | 6 +++-- .../containerMainRequest/index.vue | 12 +++++----- .../containerRecordMain/index.vue | 4 +++- .../initialContainerMainRequest/index.vue | 6 +++-- .../scrapContainerMainRequest/index.vue | 6 +++-- .../sparepartsrequisitionJobMain/index.vue | 4 +++- .../sparepartsrequisitionRecordMain/index.vue | 4 +++- .../index.vue | 6 +++-- .../inventorymoveRequestMain/index.vue | 22 +++++++++---------- 13 files changed, 59 insertions(+), 35 deletions(-) diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue index acad54469..67cc9d1f6 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue @@ -87,6 +87,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerBindRecordMain' }) @@ -220,8 +221,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerBindRecordMainApi.exportContainerBindRecordMain(tableObject.params) - download.excel(data, '器具绑定记录主.xls') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -280,7 +282,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '器具绑定记录主导入模版.xls' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index a24731e90..a459eca51 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -86,6 +86,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerRepairRecordMain' }) @@ -219,8 +220,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerRepairRecordMainApi.exportContainerRepairRecordMain(tableObject.params) - download.excel(data, '器具维修记录主.xls') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -279,7 +281,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '器具维修记录主导入模版.xls' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index 5e637cf70..649bb0b99 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -86,6 +86,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerUnbindRecordMain' }) @@ -219,8 +220,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerUnbindRecordMainApi.exportContainerUnbindRecordMain(tableObject.params) - download.excel(data, '器具解绑记录主.xls') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -279,7 +281,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '器具解绑记录主导入模版.xls' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index bf6823ad5..7f48d2a10 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -75,6 +75,7 @@ import * as ContainerDetailApi from '@/api/wms/containerDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerMain' }) @@ -271,8 +272,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerMainApi.exportContainerMain(tableObject.params) - download.excel(data, '器具主.xls') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -287,7 +289,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '器具主导入模版.xls' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue index 8e995910d..86f5017c6 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -84,6 +84,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerInitRecordMain' }) @@ -217,8 +218,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerInitRecordMainApi.exportContainerInitRecordMain(tableObject.params) - download.excel(data, '器具初始化记录主.xls') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -272,7 +274,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '器具初始化记录主导入模版.xls' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 67102c45b..f029c541a 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerManageRequest' }) @@ -518,20 +519,21 @@ const handleExport = async () => { try { // 导出的二次确认 await message.exportConfirm() + const excelTitle = ref(route.meta.title) // 发起导出 exportLoading.value = true if(routeName.value == 'ReturnContainerManageRequest'){ const data = await ContainerMainRequestApi.exportReturnContainerMainRequest(tableObject.params) - download.excel(data, '器具返回申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'MoveContainerManageRequest') { const data = await ContainerMainRequestApi.exportMoveContainerMainRequest(tableObject.params) - download.excel(data, '器具转移申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'DeliverContainerManageRequest') { const data = await ContainerMainRequestApi.exportDeliverContainerMainRequest(tableObject.params) - download.excel(data, '器具发运申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params) - download.excel(data, '器具管理申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { @@ -547,7 +549,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'importFileName.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index 6c8da9a16..6d8a06bb9 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -74,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import Detail from '@/components/Detail/src/Detail.vue' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ContainerRecordMain' }) const message = useMessage() // 消息弹窗 @@ -233,8 +234,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params) - download.excel(data, '器具管理记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index cdb1ec34a..00eaa5e01 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'InitialContainerManageRequest' }) @@ -475,8 +476,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerMainRequestApi.exportInitialContainerMainRequest(tableObject.params) - download.excel(data, '初始化器具管理申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -491,7 +493,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index dcf98de1c..8889a0601 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'ScrapContainerManageRequest' }) @@ -500,8 +501,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ContainerMainRequestApi.exportScrapContainerMainRequest(tableObject.params) - download.excel(data, '报废器具管理申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -516,7 +518,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: 'importFileName.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index eb90f3cc6..b066d50f2 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -73,6 +73,7 @@ import * as UnplannedissueJobMainApi from '@/api/wms/unplannedissueJobMain' import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 计划外出库任务主 defineOptions({ name: 'UnplannedissueJobMainSpare' }) @@ -228,8 +229,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await UnplannedissueJobMainApi.exportUnplannedissueJobMain(tableObject.params) - download.excel(data, '计划外出库任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index 327a991b8..87c2eb2d8 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -68,6 +68,7 @@ import * as UnplannedissueRecordMainApi from '@/api/wms/unplannedissueRecordMain import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 计划外出库记录主 defineOptions({ name: 'UnplannedissueRecordMainSpare' }) @@ -156,8 +157,9 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true tableObject.params.detailDataType = 2 + const excelTitle = ref(route.meta.title) const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params) - download.excel(data, '计划外出库记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 040be1d7b..bba9b77d4 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -91,6 +91,7 @@ import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,Unplannedissue import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain' import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 计划外出库申请 defineOptions({ name: 'UnplannedissueRequestMainSpare' }) @@ -401,8 +402,9 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true tableObject.params.detailDataType = 2 + const excelTitle = ref(route.meta.title) const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params) - download.excel(data, '备件领用申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -510,7 +512,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '备件领用申请导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9695926a6..ea9c14210 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -644,24 +644,24 @@ const handleExport = async () => { if(routeName.value == 'OktoholdRequestMain'){ const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'HoldtookRequestMain') { - const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) + }else if ( routeName.value == 'HoldtookRequestMain') { + const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'OktoscrapRequestMain') { - const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) + }else if ( routeName.value == 'OktoscrapRequestMain') { + const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - } + } // else if ( routeName.value == 'ScraptoholdRequestMain') { // const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params) // download.excel(data, '报废转隔离申请主.xlsx') // } - else{ - const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - } + else{ + const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + } } catch { } finally { exportLoading.value = false