From 87192f0b17ef24e4c7823c37ad8ae49a6d6bef27 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 19:28:02 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerManage/customerDeliveryForecast/index.vue | 5 +++-- .../itemManage/relegate/relegateRecord/index.vue | 3 ++- .../itemManage/relegate/relegateRequest/index.vue | 5 +++-- .../customerreceiptRecordMain/index.vue | 3 ++- .../customerreceiptRequestMain/index.vue | 3 ++- .../customerreturn/customerreturnJobMain/index.vue | 3 ++- .../customerreturn/customerreturnRecordMain/index.vue | 3 ++- .../customerreturnRequestMain/index.vue | 5 +++-- .../customersettle/customersettleRecordMain/index.vue | 3 ++- .../customersettleRequestMain/index.vue | 5 +++-- .../deliver/deliverJobMain/index.vue | 3 ++- .../deliver/deliverRecordMain/index.vue | 3 ++- .../deliver/deliverRequestMain/index.vue | 11 ++++++----- .../deliverplan/deliverPlanMain/index.vue | 11 ++++++----- .../deliverplan/saleMain/index.vue | 5 +++-- .../saleShipmentMainRecord/index.vue | 3 ++- .../saleShipmentMainRequest/index.vue | 5 +++-- .../stockup/stockupMainJob/index.vue | 3 ++- .../stockup/stockupMainRecord/index.vue | 3 ++- .../stockup/stockupMainRequest/index.vue | 5 +++-- 20 files changed, 55 insertions(+), 35 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index 0a8ef27a1..b3a8bcf8c 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue @@ -65,6 +65,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: 'CustomerDeliveryForecast' }) @@ -221,7 +222,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerDeliveryForecastApi.exportCustomerDeliveryForecast(tableObject.params) - download.excel(data, '客户发货预测.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -236,7 +237,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '客户发货预测导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue index 501d78c97..e04e54f9e 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue @@ -81,6 +81,7 @@ import * as RelegateRecordDetailApi from '@/api/wms/relegateRecordDetail' 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: 'RelegateRecordMain' }) @@ -234,7 +235,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RelegateRecordMainApi.exportRelegateRecordMain(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/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 7497dabc6..711b328cb 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -99,6 +99,7 @@ import * as PackageApi from "@/api/wms/package"; import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'RelegateRequestMain' }) @@ -715,7 +716,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await RelegateRequestMainApi.exportRelegateRequestMain(tableObject.params) - download.excel(data, '物料降级申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -730,7 +731,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '物料降级申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue index c077173d5..fb5102cb4 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue @@ -68,6 +68,7 @@ import * as CustomerreceiptRecordMainApi from '@/api/wms/customerreceiptRecordMa import * as CustomerreceiptRecordDetailApi from '@/api/wms/customerreceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 客户收货记录主 defineOptions({ name: 'CustomerreceiptRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerreceiptRecordMainApi.exportCustomerreceiptRecordMain(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/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index 47b5b1aab..092693924 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -88,6 +88,7 @@ import { CustomerreceiptRequestMain,CustomerreceiptRequestMainRules,Customerrece import * as CustomerreceiptRequestMainApi from '@/api/wms/customerreceiptRequestMain' import * as CustomerreceiptRequestDetailApi from '@/api/wms/customerreceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 客户收货申请 defineOptions({ name: 'CustomerreceiptRequestMain' }) @@ -326,7 +327,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerreceiptRequestMainApi.exportCustomerreceiptRequestMain(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/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index 4a7a883b2..0e18f8d4a 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -73,6 +73,7 @@ import * as CustomerreturnJobMainApi from '@/api/wms/customerreturnJobMain' import * as CustomerreturnJobDetailApi from '@/api/wms/customerreturnJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 客户退货任务主 defineOptions({ name: 'CustomerreturnJobMain' }) @@ -365,7 +366,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerreturnJobMainApi.exportCustomerreturnJobMain(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/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue index cd714d6bf..fbbc43f99 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue @@ -70,6 +70,7 @@ import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 客户退货记录主 defineOptions({ name: 'CustomerreturnRecordMain' }) @@ -162,7 +163,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerreturnRecordMainApi.exportCustomerreturnRecordMain(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/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a6b1b8c67..57a386960 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -116,6 +116,7 @@ import { import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 客户退货申请 defineOptions({ name: 'CustomerreturnRequestMain' }) @@ -654,7 +655,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomerreturnRequestMainApi.exportCustomerreturnRequestMain(tableObject.params) - download.excel(data, '客户退货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -777,7 +778,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '客户退货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue index 4cdd0b633..44f8292f7 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue @@ -68,6 +68,7 @@ import * as CustomersettleRecordMainApi from '@/api/wms/customersettleRecordMain import * as CustomersettleRecordDetailApi from '@/api/wms/customersettleRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 客户结算记录主 defineOptions({ name: 'CustomersettleRecordMain' }) @@ -156,7 +157,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomersettleRecordMainApi.exportCustomersettleRecordMain(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/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index cac0f472d..d0cba855a 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -89,6 +89,7 @@ import { CustomersettleRequestMain,CustomersettleRequestMainRules,Customersettle import * as CustomersettleRequestMainApi from '@/api/wms/customersettleRequestMain' import * as CustomersettleRequestDetailApi from '@/api/wms/customersettleRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 客户结算申请 defineOptions({ name: 'CustomersettleRequestMain' }) @@ -337,7 +338,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await CustomersettleRequestMainApi.exportCustomersettleRequestMain(tableObject.params) - download.excel(data, '客户结算申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -399,7 +400,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '客户结算申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 142ca8905..389ada838 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -73,6 +73,7 @@ import * as DeliverJobMainApi from '@/api/wms/deliverJobMain' import * as DeliverJobDetailApi from '@/api/wms/deliverJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 发货任务主 defineOptions({ name: 'DeliverJobMain' }) @@ -350,7 +351,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DeliverJobMainApi.exportDeliverJobMain(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/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index 6c3944f96..e8ebfb94a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -70,6 +70,7 @@ import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 发货记录主 defineOptions({ name: 'DeliverRecordMain' }) @@ -184,7 +185,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await DeliverRecordMainApi.exportDeliverRecordMain(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/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 59a449b0c..10c39628d 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -95,6 +95,7 @@ import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain' import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as AreabasicApi from '@/api/wms/areabasic' +import { formatDate } from '@/utils/formatTime' // 发货申请 defineOptions({ name: 'DeliverRequestMain' }) @@ -475,11 +476,11 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value == 'DeliverRequestMain'){ const data = await DeliverRequestMainApi.exportDeliverRequestMain(tableObject.params) - download.excel(data, '发货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ - const data = await DeliverRequestMainApi.exportZZBJDeliverRequestMain(tableObject.params) - download.excel(data, '自制备件发货申请主.xlsx') - } + const data = await DeliverRequestMainApi.exportZZBJDeliverRequestMain(tableObject.params) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + } } catch { } finally { exportLoading.value = false @@ -580,7 +581,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 031b80c78..5733a471c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -87,6 +87,7 @@ import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as AreabasicApi from '@/api/wms/areabasic' +import { formatDate } from '@/utils/formatTime' // 发货计划 defineOptions({ name: 'DeliverPlanMain' }) @@ -434,11 +435,11 @@ const handleExport = async () => { exportLoading.value = true if(routeName.value == 'DeliverRequestMain'){ const data = await DeliverPlanMainApi.exportDeliverPlanMain(tableObject.params) - download.excel(data, '发货计划主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) }else{ - const data = await DeliverPlanMainApi.exportZZBJDeliverPlanMain(tableObject.params) - download.excel(data, '自制备件发货计划主.xlsx') - } + const data = await DeliverPlanMainApi.exportZZBJDeliverPlanMain(tableObject.params) + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) + } } catch { } finally { exportLoading.value = false @@ -546,7 +547,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '发货计划主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue index 7bd7a29e7..7eae33f06 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue @@ -84,6 +84,7 @@ import { SaleMain,SaleMainRules,SaleDetail,SaleDetailRules } from './saleMain.da import * as SaleMainApi from '@/api/wms/saleMain' import * as SaleDetailApi from '@/api/wms/saleDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 销售订单主 defineOptions({ name: 'SaleMain' }) @@ -253,7 +254,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SaleMainApi.exportSaleMain(tableObject.params) - download.excel(data, '销售订单主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -315,7 +316,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '销售订单主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index c59689fbf..9d6be17a4 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -72,6 +72,7 @@ import * as SaleShipmentDetailRecordApi from '@/api/wms/saleShipmentDetailRecord 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: 'SaleShipmentMainRecord' }) @@ -206,7 +207,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(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/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 2ded90f16..8c253fe6a 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/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: 'SaleShipmentMain' }) const message = useMessage() // 消息弹窗 @@ -447,7 +448,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await SaleShipmentMainApi.exportSaleShipmentMain(tableObject.params) - download.excel(data, '结算出库申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -462,7 +463,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '结算出库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 0ab075f66..a41360243 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -76,6 +76,7 @@ import * as StockupJobMainApi from '@/api/wms/stockupMainJob' import * as StockupJobDetailApi from '@/api/wms/stockupDetailJob' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 备货任务主 defineOptions({ name: 'StockupJobMain' }) @@ -239,7 +240,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await StockupJobMainApi.exportStockupMainJob(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/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue index 5e5dda7fa..8e8f73ae9 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue @@ -68,6 +68,7 @@ import * as StockupMainRecordApi from '@/api/wms/stockupMainRecord' import * as StockupDetailRecordApi from '@/api/wms/stockupDetailRecord' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 备货记录主 defineOptions({ name: 'StockupMainRecord' }) @@ -157,7 +158,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await StockupMainRecordApi.exportStockupMainRecord(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/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 7ea3de8f5..8856be868 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -95,6 +95,7 @@ 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 * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' +import { formatDate } from '@/utils/formatTime' // 备货申请 defineOptions({ name: 'StockupMainRequest' }) @@ -411,7 +412,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await StockupMainRequestApi.exportStockupMainRequest(tableObject.params) - download.excel(data, '备货申请主.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -505,7 +506,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '备货申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From a63f35c53f0b4b005ad3d7b519fb329bb64be3ec Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 19:46:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=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 --- src/views/wms/inventoryManage/balance/index.vue | 5 +++-- src/views/wms/inventoryManage/expectin/index.vue | 5 +++-- src/views/wms/inventoryManage/expectout/index.vue | 5 +++-- src/views/wms/inventoryManage/locationcapacity/index.vue | 5 +++-- src/views/wms/inventoryManage/package/index.vue | 5 +++-- src/views/wms/inventoryManage/transaction/index.vue | 5 +++-- src/views/wms/inventoryManage/transferlog/index.vue | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 1d0d36a8b..efd4ef5fa 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -71,6 +71,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 库存余额 defineOptions({ name: 'Balance' }) @@ -298,7 +299,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await BalanceApi.exportBalance(tableObject.params) - download.excel(data, '库存余额.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -313,7 +314,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库存余额导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index 79d3229be..7cf744d97 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -68,6 +68,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: 'Expectin' }) @@ -226,7 +227,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ExpectinApi.exportExpectin(tableObject.params) - download.excel(data, '预计入库存.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -241,7 +242,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '预计入库存导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index b433d8ae1..9e9395716 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -69,6 +69,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: 'Expectout' }) @@ -225,7 +226,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ExpectoutApi.exportExpectout(tableObject.params) - download.excel(data, '预计出库存.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -240,7 +241,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '预计出库存导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue index 39d37e344..e3eff998b 100644 --- a/src/views/wms/inventoryManage/locationcapacity/index.vue +++ b/src/views/wms/inventoryManage/locationcapacity/index.vue @@ -65,6 +65,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: 'Locationcapacity' }) @@ -180,7 +181,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await LocationcapacityApi.exportLocationcapacity(tableObject.params) - download.excel(data, '库位容量.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -195,7 +196,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库位容量导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 58aa92a26..2207101a0 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -68,6 +68,7 @@ import * as PackageApi from '@/api/wms/package' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain"; +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'package' }) @@ -250,7 +251,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PackageApi.exportPackage(tableObject.params) - download.excel(data, '包装.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -336,7 +337,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '包装信息导入模板.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue index d08aec392..5a12857c4 100644 --- a/src/views/wms/inventoryManage/transaction/index.vue +++ b/src/views/wms/inventoryManage/transaction/index.vue @@ -65,6 +65,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: 'Transaction' }) @@ -181,7 +182,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await TransactionApi.exportTransaction(tableObject.params) - download.excel(data, '事务类型.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -196,7 +197,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '事务类型导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue index a59a5d54b..ae4f21ba6 100644 --- a/src/views/wms/inventoryManage/transferlog/index.vue +++ b/src/views/wms/inventoryManage/transferlog/index.vue @@ -65,6 +65,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: 'Transferlog' }) @@ -180,7 +181,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ExpectinApi.exportTransferlog(tableObject.params) - download.excel(data, '库存转移日志.xlsx') + download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -195,7 +196,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库存转移日志导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 const importSuccess = () => { From f687a6df11026192d4131dbc3ad736feb4deba2d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 20:22:15 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 00ebc7854..8434e20ef 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -100,6 +100,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' // 发货申请 +// 物料库区配置管理 defineOptions({ name: 'Itemarea' }) const message = useMessage() // 消息弹窗 From df3986caf49ff6b767ce6576b6f5f778eeaa3b7a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 20:22:30 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=8B=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93=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?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRecordMain/index.vue | 4 +++- .../inventoryinitial/inventoryinitRequestMain/index.vue | 6 ++++-- .../transferissue/transferissueJobMain/index.vue | 4 +++- .../transferissue/transferissueRecordMain/index.vue | 4 +++- .../transferissue/transferissueRequestMain/index.vue | 6 ++++-- .../transferreceipt/transferreceiptJobMain/index.vue | 4 +++- .../transferreceipt/transferreceiptRecordMain/index.vue | 4 +++- .../transferreceipt/transferreceiptRequestMain/index.vue | 6 ++++-- .../unplannedissue/unplannedissueJobMain/index.vue | 4 +++- .../unplannedissue/unplannedissueRecordMain/index.vue | 4 +++- .../unplannedissue/unplannedissueRequestMain/index.vue | 6 ++++-- 11 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index 7fd3c08e0..8c5fdde93 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -72,6 +72,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 库存初始化记录主 defineOptions({ name: 'InventoryinitRecordMain' }) @@ -163,8 +164,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await InventoryinitRecordMainApi.exportInventoryinitRecordMain(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/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 90793b7ac..8dea8e088 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -91,6 +91,7 @@ import { InventoryinitRequestMain,InventoryinitRequestMainRules,InventoryinitReq import * as InventoryinitRequestMainApi from '@/api/wms/inventoryinitRequestMain' import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 库存初始化申请 defineOptions({ name: 'InventoryinitRequestMain' }) @@ -404,8 +405,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await InventoryinitRequestMainApi.exportInventoryinitRequestMain(tableObject.params) - download.excel(data, '库存初始化申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -479,7 +481,7 @@ const handleImportLine = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库存初始化申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue index 9697f55f1..5c16481de 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue @@ -75,6 +75,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as PurchasereceiptJobMainApi from "@/api/wms/purchasereceiptJobMain"; import {acceptTransferissueJobMain} from "@/api/wms/transferissueJobMain"; import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 调拨出库任务主 defineOptions({ name: 'TransferissueJobMain' }) @@ -268,8 +269,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferissueJobMainApi.exportTransferissueJobMain(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/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue index 9fa022af5..986d92fc5 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue @@ -68,6 +68,7 @@ import * as TransferissueRecordMainApi from '@/api/wms/transferissueRecordMain' import * as TransferissueRecordDetailApi from '@/api/wms/transferissueRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 调拨出库记录主 defineOptions({ name: 'TransferissueRecordMain' }) @@ -155,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferissueRecordMainApi.exportTransferissueRecordMain(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/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index a9052abb3..a409a3ff4 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -91,6 +91,7 @@ import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueReq import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain' import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 调拨出库申请 defineOptions({ name: 'TransferissueRequestMain' }) @@ -393,8 +394,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferissueRequestMainApi.exportTransferissueRequestMain(tableObject.params) - download.excel(data, '调拨出库申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -487,7 +489,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '调拨出库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue index 95e5f8989..6e2efbd83 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue @@ -73,6 +73,7 @@ import * as TransferreceiptJobMainApi from '@/api/wms/transferreceiptJobMain' import * as TransferreceiptJobDetailApi from '@/api/wms/transferreceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 调拨入库任务主 defineOptions({ name: 'TransferreceiptJobMain' }) @@ -228,8 +229,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferreceiptJobMainApi.exportTransferreceiptJobMain(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/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue index 9322b57ce..33bb3a901 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue @@ -68,6 +68,7 @@ import * as TransferreceiptRecordMainApi from '@/api/wms/transferreceiptRecordMa import * as TransferreceiptRecordDetailApi from '@/api/wms/transferreceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 调拨入库记录主 defineOptions({ name: 'TransferreceiptRecordMain' }) @@ -155,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferreceiptRecordMainApi.exportTransferreceiptRecordMain(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/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index 4cf20d1f1..ace5ed623 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -89,6 +89,7 @@ import { TransferreceiptRequestMain,TransferreceiptRequestMainRules,Transferrece import * as TransferreceiptRequestMainApi from '@/api/wms/transferreceiptRequestMain' import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 调拨入库申请 @@ -356,8 +357,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await TransferreceiptRequestMainApi.exportTransferreceiptRequestMain(tableObject.params) - download.excel(data, '调拨入库申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -420,7 +422,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '调拨入库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index e53943ae3..837dba3dc 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/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: 'UnplannedissueJobMain' }) @@ -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/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue index 3940755fd..08ffbf748 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/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: 'UnplannedissueRecordMain' }) @@ -155,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + 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/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 31581700c..56bf85919 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/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: 'UnplannedissueRequestMain' }) @@ -437,8 +438,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + 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 @@ -549,7 +551,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '计划外出库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From 3e69cc6ac51e00c4b4f0b9e3ba2e0fa16acd3cda Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 20:41:02 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryjobManage/scrap/scrapJobMain/index.vue | 4 +++- .../wms/inventoryjobManage/scrap/scrapRecordMain/index.vue | 4 +++- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 6 ++++-- .../unplannedreceipt/unplannedreceiptJobMain/index.vue | 4 +++- .../unplannedreceipt/unplannedreceiptRecordMain/index.vue | 4 +++- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 6 ++++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index 676beaacc..7a36cd35c 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -73,6 +73,7 @@ import * as ScrapJobMainApi from '@/api/wms/scrapJobMain' import * as ScrapJobDetailApi from '@/api/wms/scrapJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 报废出库任务主 defineOptions({ name: 'ScrapJobMain' }) @@ -228,8 +229,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ScrapJobMainApi.exportScrapJobMain(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/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue index cba209798..c964cf14d 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue @@ -68,6 +68,7 @@ import * as ScrapRecordMainApi from '@/api/wms/scrapRecordMain' import * as ScrapRecordDetailApi from '@/api/wms/scrapRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 报废出库记录主 defineOptions({ name: 'ScrapRecordMain' }) @@ -155,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ScrapRecordMainApi.exportScrapRecordMain(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/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 20177ff95..831ecf7ed 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -94,6 +94,7 @@ import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain' import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as StdcostpriceApi from '@/api/wms/stdcostprice' +import { formatDate } from '@/utils/formatTime' // 报废出库申请 defineOptions({ name: 'ScrapRequestMain' }) @@ -395,8 +396,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await ScrapRequestMainApi.exportScrapRequestMain(tableObject.params) - download.excel(data, '报废出库申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -493,7 +495,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '报废出库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index 34ba89d23..77d639ded 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -73,6 +73,7 @@ import * as UnplannedreceiptJobMainApi from '@/api/wms/unplannedreceiptJobMain' import * as UnplannedreceiptJobDetailApi from '@/api/wms/unplannedreceiptJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 计划外入库任务主 defineOptions({ name: 'UnplannedreceiptJobMain' }) @@ -228,8 +229,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await UnplannedreceiptJobMainApi.exportUnplannedreceiptJobMain(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/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue index 68d68e27b..0c89f0917 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue @@ -68,6 +68,7 @@ import * as UnplannedreceiptRecordMainApi from '@/api/wms/unplannedreceiptRecord import * as UnplannedreceiptRecordDetailApi from '@/api/wms/unplannedreceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 调拨入库记录主 defineOptions({ name: 'UnplannedreceiptRecordMain' }) @@ -155,8 +156,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await UnplannedreceiptRecordMainApi.exportUnplannedreceiptRecordMain(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/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 596f9eaa7..407c8487c 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -131,6 +131,7 @@ import * as PackageApi from "@/api/wms/package"; import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import { formatDate } from '@/utils/formatTime' // 计划外入库申请 defineOptions({ name: 'UnplannedreceiptRequestMain' }) @@ -666,8 +667,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await UnplannedreceiptRequestMainApi.exportUnplannedreceiptRequestMain(tableObject.params) - download.excel(data, '计划外入库申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -773,7 +775,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '计划外入库申请主导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 From ec59c7efb68964e046400ab236fafd8b61849cb1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 20:59:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=82=B1=E6=99=A8=EF=BC=9A=E9=A2=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E,=E9=80=89=E6=8B=A9=E8=BD=A6=E9=97=B4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=BB=98=E8=AE=A4PRC,=E8=A3=85=E9=85=8D=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4PRA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain/index.vue | 17 +++++++++++++++++ .../productreceiptAssembleRequestMain/index.vue | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 1ba04efcc..8abddc4c0 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -151,6 +151,8 @@ import dayjs from 'dayjs' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as BomApi from "@/api/wms/bom"; import { formatDate } from '@/utils/formatTime' +import * as WorkshopApi from '@/api/wms/workshop' + // 制品收货申请 // 预生产收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) @@ -798,8 +800,23 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ message.error('创建标签失败') }) } +const getDefaultWorkshopCode = async ()=>{ + let res = await WorkshopApi.getWorkshopPage({ + available: "TRUE" + }) + if(res&&res.list.length>0){ + if(res.list.find(item=>item.code=='PRC')){ + ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => { + if(itemColumns.field == 'workshopCode') { + itemColumns.value = 'PRC' + } + }) + } + } +} /** 初始化 **/ onMounted(async () => { + getDefaultWorkshopCode() getList() importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate() }) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index db480fd1e..953c73c5f 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -151,6 +151,7 @@ import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' import * as BomApi from "@/api/wms/bom"; import { formatDate } from '@/utils/formatTime' +import * as WorkshopApi from '@/api/wms/workshop' // 装配收货申请 defineOptions({ name: 'ProductreceiptRequestMainA' }) @@ -800,9 +801,23 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r message.error('创建标签失败') }) } - +const getDefaultWorkshopCode = async ()=>{ + let res = await WorkshopApi.getWorkshopPage({ + available: "TRUE" + }) + if(res&&res.list.length>0){ + if(res.list.find(item=>item.code=='PRC')){ + ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => { + if(itemColumns.field == 'workshopCode') { + itemColumns.value = 'PRA' + } + }) + } + } +} /** 初始化 **/ onMounted(async () => { + getDefaultWorkshopCode() getList() importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate() }) From d1409d90690169b5a2ccb1e61ac95181c27751d2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 13 Aug 2024 21:10:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9=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 --- .../inventorychangeRecordMain/index.vue | 4 +++- .../inventorychangeRequestMain/index.vue | 6 ++++-- .../inventorymoveJobMain/index.vue | 16 +++++++++------- .../inventorymoveRecordMain/index.vue | 18 ++++++++++-------- .../inventorymoveRecordMainNew/index.vue | 6 ++++-- .../inventorymoveRequestMain/index.vue | 14 ++++++++------ .../inventorymoveRequestMainOKHOLD/index.vue | 14 ++++++++------ 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index 1160b62f2..97a9fc005 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -68,6 +68,7 @@ import * as InventorychangeRecordMainApi from '@/api/wms/inventorychangeRecordMa import * as InventorychangeRecordDetailApi from '@/api/wms/inventorychangeRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 库存修改记录主 defineOptions({ name: 'InventorychangeRecordMain' }) @@ -201,8 +202,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await InventorychangeRecordMainApi.exportInventorychangeRecordMain(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/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 8aaab1ed4..21289bbea 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -105,6 +105,7 @@ import { InventorychangeRequestMain,InventorychangeRequestMainRules,Inventorycha import * as InventorychangeRequestMainApi from '@/api/wms/inventorychangeRequestMain' import * as InventorychangeRequestDetailApi from '@/api/wms/inventorychangeRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' const message = useMessage() // 消息弹窗 @@ -404,8 +405,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await InventorychangeRequestMainApi.exportInventorychangeRequestMain(tableObject.params) - download.excel(data, '库存修改申请.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -507,7 +509,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '库存修改申请导入模版.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index 496dd016e..74a558456 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -73,6 +73,7 @@ import * as InventorymoveJobMainApi from '@/api/wms/inventorymoveJobMain' import * as InventorymoveJobDetailApi from '@/api/wms/inventorymoveJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 库存转移任务主 defineOptions({ name: 'InventorymoveJobMain' }) @@ -299,27 +300,28 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) if(routeName.value == 'OktoholdJobMain'){ const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params) - download.excel(data, '合格转隔离任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookJobMain') { const data = await InventorymoveJobMainApi.exportNokToHoldJobMain(tableObject.params) - download.excel(data, '不合格转隔离任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookJobMain') { const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params) - download.excel(data, '隔离转合格任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtoscrapJobMain') { const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params) - download.excel(data, '隔离转报废任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'OktoscrapJobtMain') { const data = await InventorymoveJobMainApi.exportOkToScrapJobMain(tableObject.params) - download.excel(data, '合格转报废任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'ScraptoholdJobMain') { const data = await InventorymoveJobMainApi.exportScrapToHoldJobMain(tableObject.params) - download.excel(data, '报废转隔离任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await InventorymoveJobMainApi.exportInventorymoveJobMain(tableObject.params) - download.excel(data, '库存转移任务主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 4fed4c42e..101139d83 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -71,6 +71,7 @@ import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain' import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 库存转移记录主 defineOptions({ name: 'InventorymoveRecordMain' }) @@ -227,27 +228,28 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) if(routeName.value == 'OktoholdRecordMain'){ const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) - download.excel(data, '合格转隔离记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookRecordMain') { const data = await InventorymoveRecordMainApi.exportNokToHoldRecordMain(tableObject.params) - download.excel(data, '不合格转隔离记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params) - download.excel(data, '隔离转合格记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtoscrapRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params) - download.excel(data, '隔离转报废记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'OktoscrapRecordtMain') { const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params) - download.excel(data, '合格转报废记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'ScraptoholdRecordMain') { const data = await InventorymoveRecordMainApi.exportScrapToHoldRecordMain(tableObject.params) - download.excel(data, '报废转隔离记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else{ const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params) - download.excel(data, '库存转移记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { @@ -264,7 +266,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 35b55234f..aafffdb83 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -97,6 +97,7 @@ import * as InventorymoveRecordMainApi from '@/api/wms/inventorymoveRecordMain' import * as InventorymoveRecordDetailApi from '@/api/wms/inventorymoveRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import { formatDate } from '@/utils/formatTime' // 库存转移记录主 defineOptions({ name: 'InventorymoveRecordMainNew' }) @@ -290,8 +291,9 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params) - download.excel(data, '库存转移记录主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { exportLoading.value = false @@ -421,7 +423,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.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 499e908c3..9695926a6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -88,6 +88,7 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain' import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { formatDate } from '@/utils/formatTime' // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -639,18 +640,19 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) if(routeName.value == 'OktoholdRequestMain'){ const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) - download.excel(data, '物料转隔离申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookRequestMain') { const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) - download.excel(data, '隔离转合格申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtoscrapRequestMain') { const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) - download.excel(data, '隔离转报废申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'OktoscrapRequestMain') { const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) - download.excel(data, '合格转报废申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } // else if ( routeName.value == 'ScraptoholdRequestMain') { // const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params) @@ -658,7 +660,7 @@ const handleExport = async () => { // } else{ const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) - download.excel(data, '库存转移申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { @@ -762,7 +764,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 7ddee302a..d58c2c9f7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -89,6 +89,7 @@ import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as LocationApi from '@/api/wms/location' +import { formatDate } from '@/utils/formatTime' // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -668,18 +669,19 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + const excelTitle = ref(route.meta.title) if(routeName.value == 'OktoholdRequestMain'){ const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) - download.excel(data, '物料转隔离申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtookRequestMain') { const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) - download.excel(data, '隔离转合格申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtoscrapRequestMain') { const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) - download.excel(data, '隔离转报废申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'OktoscrapRequestMain') { const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) - download.excel(data, '合格转报废申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } // else if ( routeName.value == 'ScraptoholdRequestMain') { // const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params) @@ -687,7 +689,7 @@ const handleExport = async () => { // } else{ const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) - download.excel(data, '库存转移申请主.xlsx') + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { } finally { @@ -791,7 +793,7 @@ const handleImport = () => { // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: importFileName.value + '.xlsx' + templateTitle: `【${route.meta.title}】导入模版.xlsx` }) // 导入成功之后