From 87dfd95d2ba733caed5c37bdf28ae0e2b7161e23 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 26 Dec 2024 11:19:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportforms/AuditTimelinessRatioReport.js | 1 - src/api/reportforms/ConsigneeReport.js | 1 - .../CreateOrderTimelinessRatioReport.js | 1 - .../PackageAllTrunklineTimePageReport.js | 1 - .../reportforms/PackageStartTimePageReport.js | 1 - .../PackageTransferTimePageReport.js | 1 - .../UpdateWaybillQualityPageReport.js | 1 - .../ZeroAllTrunklineTimePageReport.js | 1 - .../reportforms/ZeroStartTimePageReport.js | 1 - .../reportforms/ZeroTransferTimePageReport.js | 1 - .../AuditTimelinessRatioReport.vue | 36 ++++++++---------- .../CreateOrderTimelinessRatioReport.vue | 36 ++++++++---------- .../PackageAllTrunklineTimePageReport.vue | 33 ++++++---------- .../PackageStartTimePageReport.vue | 36 ++++++++---------- .../PackageTransferTimePageReport.vue | 37 ++++++++---------- .../UpdateWaybillQualityPageReport.vue | 36 ++++++++---------- .../ZeroAllTrunklineTimePageReport.vue | 36 ++++++++---------- .../reportforms/ZeroStartTimePageReport.vue | 36 ++++++++---------- .../ZeroTransferTimePageReport.vue | 38 ++++++++----------- 19 files changed, 133 insertions(+), 201 deletions(-) diff --git a/src/api/reportforms/AuditTimelinessRatioReport.js b/src/api/reportforms/AuditTimelinessRatioReport.js index d27a5370..b3fd3bea 100644 --- a/src/api/reportforms/AuditTimelinessRatioReport.js +++ b/src/api/reportforms/AuditTimelinessRatioReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/checkWaybillTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/ConsigneeReport.js b/src/api/reportforms/ConsigneeReport.js index a0531b01..b0563337 100644 --- a/src/api/reportforms/ConsigneeReport.js +++ b/src/api/reportforms/ConsigneeReport.js @@ -5,7 +5,6 @@ export const postDeptIncomingPage = params => { url: '/api/logpm-report/reportIncoming/consigineeIncomingPage', method: 'get', params, - timeout: 30000, }); }; diff --git a/src/api/reportforms/CreateOrderTimelinessRatioReport.js b/src/api/reportforms/CreateOrderTimelinessRatioReport.js index d8708657..4d6959c6 100644 --- a/src/api/reportforms/CreateOrderTimelinessRatioReport.js +++ b/src/api/reportforms/CreateOrderTimelinessRatioReport.js @@ -5,7 +5,6 @@ export const postOpenTimePage = data => { url: '/api/logpm-report/reportTime/openTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/PackageAllTrunklineTimePageReport.js b/src/api/reportforms/PackageAllTrunklineTimePageReport.js index 95a4f3ac..8664a6e3 100644 --- a/src/api/reportforms/PackageAllTrunklineTimePageReport.js +++ b/src/api/reportforms/PackageAllTrunklineTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/packageAllTrunklineTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/PackageStartTimePageReport.js b/src/api/reportforms/PackageStartTimePageReport.js index 4f13d099..13bf0e39 100644 --- a/src/api/reportforms/PackageStartTimePageReport.js +++ b/src/api/reportforms/PackageStartTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/packageStartTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/PackageTransferTimePageReport.js b/src/api/reportforms/PackageTransferTimePageReport.js index f6a82094..6607884a 100644 --- a/src/api/reportforms/PackageTransferTimePageReport.js +++ b/src/api/reportforms/PackageTransferTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/packageTransferTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/UpdateWaybillQualityPageReport.js b/src/api/reportforms/UpdateWaybillQualityPageReport.js index 33141c33..5a2c3177 100644 --- a/src/api/reportforms/UpdateWaybillQualityPageReport.js +++ b/src/api/reportforms/UpdateWaybillQualityPageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportQuality/updateWaybillQualityPage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/ZeroAllTrunklineTimePageReport.js b/src/api/reportforms/ZeroAllTrunklineTimePageReport.js index 612a0ea0..94d990c2 100644 --- a/src/api/reportforms/ZeroAllTrunklineTimePageReport.js +++ b/src/api/reportforms/ZeroAllTrunklineTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/zeroAllTrunklineTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/ZeroStartTimePageReport.js b/src/api/reportforms/ZeroStartTimePageReport.js index cfe0ef3b..0b309d41 100644 --- a/src/api/reportforms/ZeroStartTimePageReport.js +++ b/src/api/reportforms/ZeroStartTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/zeroStartTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/api/reportforms/ZeroTransferTimePageReport.js b/src/api/reportforms/ZeroTransferTimePageReport.js index a6ad5f9f..c600cc1c 100644 --- a/src/api/reportforms/ZeroTransferTimePageReport.js +++ b/src/api/reportforms/ZeroTransferTimePageReport.js @@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => { url: '/api/logpm-report/reportTime/zeroTransferTimePage', method: 'post', data, - timeout: 30000, }); }; diff --git a/src/views/reportforms/AuditTimelinessRatioReport.vue b/src/views/reportforms/AuditTimelinessRatioReport.vue index 9584eb34..f18a324e 100644 --- a/src/views/reportforms/AuditTimelinessRatioReport.vue +++ b/src/views/reportforms/AuditTimelinessRatioReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/CreateOrderTimelinessRatioReport.vue b/src/views/reportforms/CreateOrderTimelinessRatioReport.vue index 3ad0d0b1..c6ba8626 100644 --- a/src/views/reportforms/CreateOrderTimelinessRatioReport.vue +++ b/src/views/reportforms/CreateOrderTimelinessRatioReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -280,6 +274,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -451,25 +451,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue index 7b06d72d..dce2b744 100644 --- a/src/views/reportforms/PackageAllTrunklineTimePageReport.vue +++ b/src/views/reportforms/PackageAllTrunklineTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,16 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/PackageStartTimePageReport.vue b/src/views/reportforms/PackageStartTimePageReport.vue index bc3853f5..07e2c7c4 100644 --- a/src/views/reportforms/PackageStartTimePageReport.vue +++ b/src/views/reportforms/PackageStartTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/PackageTransferTimePageReport.vue b/src/views/reportforms/PackageTransferTimePageReport.vue index 8bb10784..e41e22c8 100644 --- a/src/views/reportforms/PackageTransferTimePageReport.vue +++ b/src/views/reportforms/PackageTransferTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,27 +470,20 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); - } + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); + } delete submitData.timeArr; delete submitData.total; diff --git a/src/views/reportforms/UpdateWaybillQualityPageReport.vue b/src/views/reportforms/UpdateWaybillQualityPageReport.vue index 0b2c0053..c90d4961 100644 --- a/src/views/reportforms/UpdateWaybillQualityPageReport.vue +++ b/src/views/reportforms/UpdateWaybillQualityPageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/ZeroAllTrunklineTimePageReport.vue b/src/views/reportforms/ZeroAllTrunklineTimePageReport.vue index da1262cf..8fd409f8 100644 --- a/src/views/reportforms/ZeroAllTrunklineTimePageReport.vue +++ b/src/views/reportforms/ZeroAllTrunklineTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/ZeroStartTimePageReport.vue b/src/views/reportforms/ZeroStartTimePageReport.vue index 8b0f1747..10b30dad 100644 --- a/src/views/reportforms/ZeroStartTimePageReport.vue +++ b/src/views/reportforms/ZeroStartTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; diff --git a/src/views/reportforms/ZeroTransferTimePageReport.vue b/src/views/reportforms/ZeroTransferTimePageReport.vue index 568885e7..da46f235 100644 --- a/src/views/reportforms/ZeroTransferTimePageReport.vue +++ b/src/views/reportforms/ZeroTransferTimePageReport.vue @@ -32,12 +32,6 @@ start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD" - @change=" - () => { - delete details.query.year; - delete details.query.month; - } - " /> @@ -195,7 +189,7 @@ import { } from '@/utils/util'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; -import { columnList } from '@/option/reportforms/PackageAllTrunklineTimePageReport'; +import { columnList } from '@/option/reportforms/PackageTransferTimePageReport'; // 获取路由实例 const $router = useRouter(); @@ -299,6 +293,12 @@ const onLoad = async (params = {}) => { if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; + + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) { @@ -470,25 +470,19 @@ const ExportData = async () => { if (!element && element !== 0) delete submitData[key]; } - // 月 - if (submitData.month) { - const _arr = submitData.month.split('-'); - submitData.year = _arr[0]; - submitData.month = _arr[1]; - } - // 时间周期 - else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { + if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) { submitData.startTimeStr = submitData.timeArr[0]; submitData.endTimeStr = submitData.timeArr[1]; - } - if ( - (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) && - !submitData.year && - !submitData.month - ) { - return ElMessage.warning('请选择时间'); + const start = new Date(submitData.startTimeStr).getTime(); + const end = new Date(submitData.endTimeStr).getTime(); + console.log('start :>> ', start); + console.log('end :>> ', end); + console.log('end - start :>> ', end - start); + + if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) + return ElMessage.warning('时间不能大于31天'); } delete submitData.timeArr; From 2591e6f529fc8a96e929cd8289c7deb203ee4505 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 26 Dec 2024 11:38:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportforms/PackageStartTimePageReport.js | 2 +- .../reportforms/PackageTransferTimePageReport.js | 4 ++-- .../reportforms/UpdateWaybillQualityPageReport.js | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/option/reportforms/PackageStartTimePageReport.js b/src/option/reportforms/PackageStartTimePageReport.js index b6495891..d6ae17c6 100644 --- a/src/option/reportforms/PackageStartTimePageReport.js +++ b/src/option/reportforms/PackageStartTimePageReport.js @@ -109,7 +109,7 @@ export const columnList = [ { prop: 'onTimeRate', label: '准时发运率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], diff --git a/src/option/reportforms/PackageTransferTimePageReport.js b/src/option/reportforms/PackageTransferTimePageReport.js index 942879ea..33cdefad 100644 --- a/src/option/reportforms/PackageTransferTimePageReport.js +++ b/src/option/reportforms/PackageTransferTimePageReport.js @@ -97,7 +97,7 @@ export const columnList = [ { prop: 'outOnTimeRate', label: '中转准时出库率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], @@ -108,7 +108,7 @@ export const columnList = [ { prop: 'avgTime', label: '平均中转时效', - type: 6, + type: 1, values: '', width: '150', checkarr: [], diff --git a/src/option/reportforms/UpdateWaybillQualityPageReport.js b/src/option/reportforms/UpdateWaybillQualityPageReport.js index 15da303f..b7dcae83 100644 --- a/src/option/reportforms/UpdateWaybillQualityPageReport.js +++ b/src/option/reportforms/UpdateWaybillQualityPageReport.js @@ -132,7 +132,7 @@ export const columnList = [ { prop: 'personProbleRate', label: '人为操作错误率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], @@ -143,7 +143,7 @@ export const columnList = [ { prop: 'financeUpdateNum', label: '财务修改数', - type: 6, + type: 1, values: '', width: '150', checkarr: [], @@ -155,7 +155,7 @@ export const columnList = [ { prop: 'financeUpdateRate', label: '财务修改率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], @@ -167,7 +167,7 @@ export const columnList = [ { prop: 'merchantUpdateNum', label: '商家要求数', - type: 6, + type: 1, values: '', width: '150', checkarr: [], @@ -179,7 +179,7 @@ export const columnList = [ { prop: 'merchantUpdateRate', label: '商家要求率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], @@ -190,7 +190,7 @@ export const columnList = [ { prop: 'businessUpdateNum', label: '业务调整数', - type: 6, + type: 1, values: '', width: '150', checkarr: [], @@ -202,7 +202,7 @@ export const columnList = [ { prop: 'businessUpdateRate', label: '业务调整率', - type: 1, + type: 6, values: '', width: '150', checkarr: [], From 38fc06dfd1a221d97b11a10d370f0274734afef6 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 26 Dec 2024 11:48:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E5=8F=8A=E6=97=B6=E7=8E=87=E6=8A=A5=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateOrderTimelinessRatioReport.js | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/option/reportforms/CreateOrderTimelinessRatioReport.js b/src/option/reportforms/CreateOrderTimelinessRatioReport.js index 3cd2a909..a59226d8 100644 --- a/src/option/reportforms/CreateOrderTimelinessRatioReport.js +++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js @@ -119,8 +119,8 @@ export const columnList = [ isshowSummary: false, //开启统计 }, { - prop: 'noOpenNoFreezeNum', - label: '未开单未处理数', + prop: 'noOpenNoChaoNum', + label: '未开单未超时数', type: 1, values: '', width: '150', @@ -131,8 +131,32 @@ export const columnList = [ isshowSummary: true, //开启统计 }, { - prop: 'noOpenNoFreezeRate', - label: '未处理占比', + prop: 'noOpenNoChaoRate', + label: '未开单未超时占比', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'noOpenChaoNum', + label: '未开单超时数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'noOpenChaoRate', + label: '未开单超时占比', type: 6, values: '', width: '200', From 510e8855e63526348578e66c3131e92755bfffd7 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 26 Dec 2024 18:20:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=98=E7=9B=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicdata/basicdataTray.js | 12 ++++++ .../warehouse/tray/basicdataTrayedt.vue | 42 +++++++++++++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js index 393e7124..37341dc4 100644 --- a/src/api/basicdata/basicdataTray.js +++ b/src/api/basicdata/basicdataTray.js @@ -179,3 +179,15 @@ export const getWarehouseListqx = () => { method: 'get', }); }; + +/** + * 托盘详情导出 + */ +export const getExportTrayData = params => { + return request({ + url: '/api/logpm-basicdata/tray/exportTrayData', + method: 'get', + params, + responseType: 'blob', + }); +}; diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue index f1c2b6cd..7edbc1b0 100644 --- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue +++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue @@ -31,7 +31,11 @@ - 在 托 货 物 +
+ 在 托 货 物 + + 导出 +
@@ -163,13 +167,14 @@ import { getpackList, getinventoryList, getlclList, + getExportTrayData, } from '@/api/basicdata/basicdataTray'; import option from '@/option/basic/basicPdarecords'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import dayjs from 'dayjs'; -import { handleTranslationDataSeclect } from '@/utils/util'; +import { handleTranslationDataSeclect, downloadXls } from '@/utils/util'; export default { data() { @@ -827,7 +832,7 @@ export default { // head: false, // }, { - prop: 'positionCode', + prop: 'goodsAllocation', label: '所在库位', type: 30, values: '', @@ -1482,6 +1487,37 @@ export default { this.handleInventory(this.inventorypage); this.loading = false; }, + /** 导出 */ + async handleExport() { + console.log('this.traydata :>> ', this.traydata); + + try { + this.loading = true; + const res = await getExportTrayData({ id: this.traydata.id }); + const { status, data } = res; + + if (status !== 200) return; + + downloadXls(data, `${this.traydata.palletName} - 在托详情 - ${new Date().getTime()}.xlsx`); + } catch (error) { + console.log('error :>> ', error); + } finally { + this.loading = false; + } + }, }, }; + + From c8c7fe44c1814e3f92126b3af2897819f328b99a Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 26 Dec 2024 21:53:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionStockArticleDetails.js | 2 +- .../warehouse/goodsShelf/basicdataGoodsShelfView.vue | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/option/distribution/distributionStockArticleDetails.js b/src/option/distribution/distributionStockArticleDetails.js index ed0eea4d..fb3ef680 100644 --- a/src/option/distribution/distributionStockArticleDetails.js +++ b/src/option/distribution/distributionStockArticleDetails.js @@ -186,7 +186,7 @@ export const columnList = [ { prop: 'materialCodeMaintainStatus', label: '物料维护状态', - type: 6, + type: 1, values: '', width: '150', checkarr: [], diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index 520967a8..0705ccf4 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -911,12 +911,13 @@ async function checkshelves() { * goodsAreaId 货区ID * goodsShelfId 货架ID */ - let goodsAreaarr = - details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect]; + console.log(details,'details'); + + let goodsAreaarr = details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect]; let goodsShelfarr = goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele]; let data = { - goodsAreaId: goodsAreaarr.id, - goodsShelfId: goodsShelfarr.id, + goodsAreaId: goodsAreaarr?.id, + goodsShelfId: goodsShelfarr?.id, }; const res = await getVisualization(data); // 调用异步函数获取可视化数据 console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');