From 7c4a4c54399d50eab166ef954e6ef895a96cd6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 14 Aug 2024 09:04:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRecordMain/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 6765de99b..7e218fafa 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -141,15 +141,15 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.id,row.masterId) + handleDocumentPrint(row.id) } } // 单据打印 const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) -const handleDocumentPrint = async (id,masterId) => { - window.open(documentSrc.value + '&id=' + id+ '&masterId=' + masterId) +const handleDocumentPrint = async (id) => { + window.open(documentSrc.value + '&id=' + id) } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() From 6f5a4b875083fa92aac0a7aa12a969b6eeae5fba Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 14 Aug 2024 09:17:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=85=E6=9B=B4=E6=96=B0=E8=80=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businesstype/businesstype.data.ts | 4 +- .../documentsetting/documentsetting.data.ts | 4 +- .../jobsetting/jobsetting.data.ts | 4 +- .../plansetting/plansetting.data.ts | 4 +- .../recordsetting/recordsetting.data.ts | 4 +- .../requestsetting/requestsetting.data.ts | 4 +- .../documentSetting/switch/switch.data.ts | 4 +- .../transactiontype/transactiontype.data.ts | 4 +- .../labelManage/barcode/barcode.data.ts | 4 +- .../callmaterials/callmaterials.data.ts | 4 +- .../labelManage/labeltype/labeltype.data.ts | 4 +- .../locationLabel/locationLabel.data.ts | 4 +- .../labelManage/manufacturePackage/index.vue | 2 - .../manufacturePackage.data.ts | 4 +- .../purchasePackage/purchasePackage.data.ts | 34 ++++++++++ .../utensilPackage/utensilPackage.data.ts | 4 +- .../orderManage/carrier/carrier.data.ts | 4 +- .../orderManage/owner/owner.data.ts | 4 +- .../orderManage/shift/shift.data.ts | 4 +- .../orderManage/team/team.data.ts | 4 +- .../strategySetting/rule/rule.data.ts | 66 ++++++++++++++++++- .../basicDataManage/subject/mstr/mstr.data.ts | 59 +++++++++++++++-- .../qadCostcentre/qadCostcentre.data.ts | 43 ++++++++++++ .../subject/qadProject/qadProject.data.ts | 43 ++++++++++++ .../subjectAccount/subjectAccount.data.ts | 43 ++++++++++++ .../preparetoissueMain.data.ts | 4 +- .../sparereceiptJobMain.data.ts | 2 +- 27 files changed, 321 insertions(+), 47 deletions(-) diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index 52907c4d6..674fafe5f 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -364,7 +364,7 @@ export const Businesstype = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -387,7 +387,7 @@ export const Businesstype = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts index 40165f836..8ac296385 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts @@ -221,7 +221,7 @@ export const Documentsetting = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -244,7 +244,7 @@ export const Documentsetting = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts index a50809ca0..ab7e06116 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts @@ -354,7 +354,7 @@ export const Jobsetting = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -377,7 +377,7 @@ export const Jobsetting = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts index dc0df6732..76f34605f 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts @@ -224,7 +224,7 @@ export const Plansetting = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -247,7 +247,7 @@ export const Plansetting = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts index e14cac633..bcaa6d7bc 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts @@ -126,7 +126,7 @@ export const Recordsetting = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -149,7 +149,7 @@ export const Recordsetting = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts index f5272600e..49e56c61f 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts @@ -224,7 +224,7 @@ export const Requestsetting = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -247,7 +247,7 @@ export const Requestsetting = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts index e55807042..1fc5f10fe 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts @@ -98,7 +98,7 @@ export const Switch = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -121,7 +121,7 @@ export const Switch = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts index 1e36faade..ffa7b9c2e 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts @@ -170,7 +170,7 @@ export const Transactiontype = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -193,7 +193,7 @@ export const Transactiontype = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index 118ac63be..5679412b3 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -181,7 +181,7 @@ export const Barcode = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -204,7 +204,7 @@ export const Barcode = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 7f972f067..7fb84fc88 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -475,7 +475,7 @@ export const Callmaterials = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -498,7 +498,7 @@ export const Callmaterials = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts index 06f17ce22..c499afb9d 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts +++ b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts @@ -215,7 +215,7 @@ export const Labeltype = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -238,7 +238,7 @@ export const Labeltype = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index 3cb66d40a..8ee009d61 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -127,7 +127,7 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -150,7 +150,7 @@ export const Package = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index bda0f5106..0a21ea875 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -155,7 +155,6 @@ const buttonBaseClick = (val, item) => { } else if (val == 'import') { // 导入 handleImport() } else if (val == 'export') { // 导出 - debugger handleExport() } else if (val == 'refresh') { // 刷新 if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { @@ -243,7 +242,6 @@ const handleDelete = async (id: number) => { const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { try { - debugger // 导出的二次确认 await message.exportConfirm() // 发起导出 diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index d1022a2ce..327ae6a65 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -137,7 +137,7 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -160,7 +160,7 @@ export const Package = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index d8ec8c9e8..899a80443 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -140,6 +140,40 @@ export const Package = useCrudSchemas(reactive([ isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index 252706b55..ba2ac4af2 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -139,7 +139,7 @@ export const Package = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -162,7 +162,7 @@ export const Package = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts index f12d20073..18eadba87 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts +++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts @@ -243,7 +243,7 @@ export const Carrier = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -266,7 +266,7 @@ export const Carrier = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts index d5425e739..1121ed880 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts +++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts @@ -242,7 +242,7 @@ export const Owner = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -265,7 +265,7 @@ export const Owner = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index 045efa49a..9f773e074 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -216,7 +216,7 @@ export const Shift = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -239,7 +239,7 @@ export const Shift = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index 05adb9ea6..46278d47e 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -173,7 +173,7 @@ export const Team = useCrudSchemas(reactive([ sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -196,7 +196,7 @@ export const Team = useCrudSchemas(reactive([ field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts index ebd689dc1..d25d1142b 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts +++ b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts @@ -48,6 +48,70 @@ export const Rule = useCrudSchemas(reactive([ field: 'configuration', sort: 'custom', }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, // { // label: '操作', // field: 'action', @@ -74,4 +138,4 @@ export const RuleRules = reactive({ configuration: [ { required: true, message: '请输入配置', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts index 953bd7515..d7304e8cb 100644 --- a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts +++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts @@ -75,17 +75,66 @@ export const Mstr = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - sort: 'custom', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, - search: { + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, + isTable: true, + table: { + width: 150 + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts index 4600bf6bd..1278bf90a 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts @@ -99,6 +99,49 @@ export const QadCostcentre = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '删除时间', field: 'deletionTime', diff --git a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts index a6213b199..9191d3ffc 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts +++ b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts @@ -118,6 +118,49 @@ export const QadProject = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '删除时间', field: 'deletionTime', diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index 5a3a0f763..1ed2be4ca 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -246,6 +246,49 @@ export const SubjectAccount = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index a060bade1..57c263447 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -412,7 +412,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -440,7 +440,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 396494053..c1db0f98c 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -388,7 +388,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, }, { label: '创建时间', 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 3/9] =?UTF-8?q?=E5=A5=87=E8=BF=B9=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=A2=86?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=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 From 1a33f8cd666d848c6fd6ad64d937d14089d570db Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 14 Aug 2024 10:13:10 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=EF=BC=88=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BD=BF=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/itemManage/packageunit/packageunit.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 0da0ba386..70d24363b 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -669,6 +669,9 @@ export const PackageunitRules = reactive({ type: [ { required: true, message: '请选择包装类型', trigger: 'change' } ], + reuse: [ + { required: true, message: '请选择是否重复使用', trigger: 'change' } + ], desc: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, { required: true, message: '请输入包装描述', trigger: 'change' } From 5a16a4923b78230dd5f7ef16b30356f5912be85b Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 14 Aug 2024 11:25:01 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E7=BF=BB?= =?UTF-8?q?=E5=8C=85=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/countManage/count/countJobMain/index.vue | 10 +++++++--- .../wms/countManage/count/countPlanMain/index.vue | 6 ++++-- .../wms/countManage/count/countRecordMain/index.vue | 4 +++- .../wms/countManage/count/countRequestMain/index.vue | 6 ++++-- .../countadjust/countadjustRecordMain/index.vue | 4 +++- .../countadjust/countadjustRequestMain/index.vue | 6 ++++-- .../packageManage/packagemergeMain/index.vue | 4 +++- .../packageoverMain/packageoverJobMain/index.vue | 4 +++- .../packageoverMain/packageoverRecordMain/index.vue | 4 +++- .../packageoverMain/packageoverRequestMain/index.vue | 6 ++++-- .../packageoverMain/packageoverRetrospect/index.vue | 4 +++- .../packageManage/packagesplitMain/index.vue | 4 +++- 12 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index b09b17706..f7ccf55c2 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -87,6 +87,7 @@ import * as CountJobDetailApi from '@/api/wms/countJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import * as PackageunitApi from "@/api/wms/packageunit"; +import { formatDate } from '@/utils/formatTime' // 盘点任务主 defineOptions({ name: 'CountJobMain' }) @@ -307,8 +308,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountJobMainApi.exportCountJobMain(tableObject.params) - download.excel(data, '盘点任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -320,8 +322,10 @@ const handleExportCountJob = async (id: number,number: string) => { try { await message.exportConfirm() exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountJobMainApi.handleExportCountJob(id) - download.excel(data, '盘点任务主'+number+'.xlsx') + // download.excel(data, '盘点任务主'+number+'.xlsx') + download.excel(data, `【${excelTitle.value}${number}】【${formatDate(new Date())}】.xlsx`) } catch { }finally { exportLoading.value = false @@ -339,7 +343,7 @@ const handleImport = (id: string) => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '盘点任务导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index c911417c1..6a301f0f2 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -144,6 +144,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue' +import { formatDate } from '@/utils/formatTime' // 盘点计划主 defineOptions({ name: 'CountPlanMain' }) @@ -620,8 +621,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountPlanMainApi.exportCountPlanMain(tableObject.params) - download.excel(data, '盘点计划主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -708,7 +710,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '盘点计划主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue index 830bf6e65..88ae6448c 100644 --- a/src/views/wms/countManage/count/countRecordMain/index.vue +++ b/src/views/wms/countManage/count/countRecordMain/index.vue @@ -67,6 +67,7 @@ import * as CountRecordMainApi from '@/api/wms/countRecordMain' import * as CountRecordDetailApi from '@/api/wms/countRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 盘点记录主 defineOptions({ name: 'CountRecordMain' }) @@ -165,8 +166,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountRecordMainApi.exportCountRecordMain(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/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index cd29c597c..4a90f6378 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -114,6 +114,7 @@ import * as CountRequestMainApi from '@/api/wms/countRequestMain' import * as CountRequestDetailApi from '@/api/wms/countRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { SearchTableCount } from '@/components/SearchTableCount' +import { formatDate } from '@/utils/formatTime' // 盘点申请 defineOptions({ name: 'CountRequestMain' }) @@ -500,8 +501,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountRequestMainApi.exportCountRequestMain(tableObject.params) - download.excel(data, '盘点申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -564,7 +566,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '盘点申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue index 3b22a5f60..1d3ed4146 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue @@ -67,6 +67,7 @@ import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain' import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 盘点调整记录主 defineOptions({ name: 'CountadjustRecordMain' }) @@ -151,8 +152,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountadjustRecordMainApi.exportCountadjustRecordMain(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/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index 3d5f41c6f..dd89dd566 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -87,6 +87,7 @@ import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDe import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain' import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 盘点调整申请 defineOptions({ name: 'CountadjustRequestMain' }) @@ -320,8 +321,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await CountadjustRequestMainApi.exportCountadjustRequestMain(tableObject.params) - download.excel(data, '盘点调整申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -384,7 +386,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '盘点调整申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue index 03db5751b..c257c159b 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue @@ -66,6 +66,7 @@ import { PackagemergeMain,PackagemergeMainRules, PackagemergeDetail, Packagemerg import * as PackagemergeMainApi from '@/api/wms/packagemergeMain' import * as PackagemergeDetailApi from '@/api/wms/packagemergeDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 合包记录 defineOptions({ name: 'PackagemergeMain' }) @@ -139,8 +140,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackagemergeMainApi.exportPackagemergeMain(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/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index 14ae005fc..6ada64194 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/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: 'PackageoverJobMain' }) const message = useMessage() // 消息弹窗 @@ -251,8 +252,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackageoverJobMainApi.exportPackageoverJobMain(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/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index 286652a40..26fa917f0 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -71,6 +71,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 翻包记录 defineOptions({ name: 'PackageoverMain' }) @@ -185,8 +186,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackageoverRecordMainApi.exportPackageoverMain(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/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 7edb981c1..ef44e8787 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -85,6 +85,7 @@ import { PackageoverRequestMain,PackageoverRequestMainRules, PackageoverRequestD import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain' import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'PackageoverRequestMain' }) @@ -366,8 +367,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackageoverRequestMainApi.exportPackageoverRequestMain(tableObject.params) - download.excel(data, '翻包申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -458,7 +460,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '翻包申请导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 3f2ee68f7..4010fc996 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -51,6 +51,7 @@ import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PackageApi from '@/api/wms/package' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'PackageoverRetrospect' }) @@ -153,8 +154,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackageoverRetrospectApi.exportPackageoverRetrospect(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/packageManage/packagesplitMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue index ea18981cc..0bde40094 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue @@ -66,6 +66,7 @@ import { PackagesplitMain,PackagesplitMainRules, PackagesplitDetail, Packagespli import * as PackagesplitMainApi from '@/api/wms/packagesplitMain' import * as PackagesplitDetailApi from '@/api/wms/packagesplitDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 拆包记录 defineOptions({ name: 'PackagesplitMain' }) @@ -139,8 +140,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await PackagesplitMainApi.exportPackagesplitMainApi(tableObject.params) - download.excel(data, '拆包记录.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false From a4806d71eb3ce2efb8ddfbb9cd2ad33b9c1dec40 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 14 Aug 2024 11:53:49 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/labelForm.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index ec839dc3b..8b8b4610b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -154,7 +154,9 @@ - + + + @@ -180,6 +182,7 @@