From 89db9793e6f90aaeb5edafe29310f5ecefd533bc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 15:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97?= =?UTF-8?q?=EF=BC=8C1.=20=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B2=A1=E6=9C=89=E7=94=B3=E8=AF=B7=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A8=A1=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E4=B9=9F=E6=B2=A1=E6=9C=89=202.=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E6=96=99=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=90=8D=E5=AD=97=E6=94=B9=E4=B8=BA=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=94=B6=E6=96=99=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRecordMain.data.ts | 16 ++++++++-------- .../purchasereceiptJobMain/index.vue | 3 ++- .../purchasereceiptRecordMain/index.vue | 6 ++++-- .../purchasereceiptRecordRefuseMain/index.vue | 5 +++-- .../purchasereceiptRequestMain/index.vue | 4 ++-- .../purchasereturnJobMain/index.vue | 3 ++- .../purchasereturnRecordMain/index.vue | 6 +++--- .../purchasereturnRequestMain/index.vue | 5 +++-- .../sparereceipt/sparereceiptJobMain/index.vue | 3 ++- .../sparereceiptRecordMain/index.vue | 3 ++- .../sparereceiptRequestMain/index.vue | 4 ++-- 11 files changed, 33 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index b4da910ea..ce27beb2c 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,14 +11,14 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '任务单据号', field: 'jobNumber', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 80dbd8b06..6cf95dc4e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -104,6 +104,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -363,7 +364,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(tableObject.params) - download.excel(data, '采购收货任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index b51dbbefd..8eb9603f4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -115,6 +115,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' + +import { formatDate } from '@/utils/formatTime' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) const message = useMessage() // 消息弹窗 @@ -303,10 +305,10 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue index c96206f80..2dcb35833 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue @@ -115,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getReportUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordRefuseMain' }) const message = useMessage() // 消息弹窗 @@ -292,10 +293,10 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordRefuseMain(tableObject.params) - download.excel(data, `${t('ts.采购拒收记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d7dd91517..c05b715f6 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -762,7 +762,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params) - download.excel(data, '采购收货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -838,7 +838,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购收货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index 07e80cbb0..e5365a2ca 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -73,6 +73,7 @@ import * as PurchasereturnJobMainApi from '@/api/wms/purchasereturnJobMain' import * as PurchasereturnJobDetailApi from '@/api/wms/purchasereturnJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 采购退货任务主 defineOptions({ name: 'PurchasereturnJobMain' }) @@ -238,7 +239,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(tableObject.params) - download.excel(data, '采购退货任务主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index e3e3e3a18..6765de99b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -70,6 +70,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getAccessToken } from '@/utils/auth' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购退货记录主 defineOptions({ name: 'PurchasereturnRecordMain' }) @@ -170,12 +171,11 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value.includes('SCP')){ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } - } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 2bf3d83ec..700d90eda 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -139,6 +139,7 @@ import { getAccessToken } from '@/utils/auth' import * as BalanceApi from '@/api/wms/balance' import { async } from '@antv/x6/lib/registry/marker/async' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMain' }) @@ -758,7 +759,7 @@ const handleExport = async () => { const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain( tableObject.params ) - download.excel(data, '采购退货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -983,7 +984,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购退货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index 76e6d66a4..b32591516 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -74,6 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain"; +import { formatDate } from '@/utils/formatTime' // 备件收货任务主 defineOptions({ name: 'PurchasereceiptJobMain' }) @@ -259,7 +260,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params) - download.excel(data, '备件收货任务.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index f5270ed4f..0682aad0b 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -85,6 +85,7 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns]) const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas) +import { formatDate } from '@/utils/formatTime' // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -160,7 +161,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params) - download.excel(data, '备件收货记录.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 622c5196f..8020ef79d 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -561,7 +561,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params) - download.excel(data, '备件收货申请.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -628,7 +628,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '采购收货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后