From b67485baeb586b59417f8289f0cb6f0967e2511e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 7 Jan 2025 13:41:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportforms/AuditTimelinessRatioReport.js | 26 ++++++++++++++----- .../PackageAllTrunklineTimePageReport.js | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/option/reportforms/AuditTimelinessRatioReport.js b/src/option/reportforms/AuditTimelinessRatioReport.js index acf54d36..c3bdf9b2 100644 --- a/src/option/reportforms/AuditTimelinessRatioReport.js +++ b/src/option/reportforms/AuditTimelinessRatioReport.js @@ -52,7 +52,7 @@ export const columnList = [ label: '品牌', type: 1, values: '', - width: '150', + width: '90', checkarr: [], fixed: false, sortable: true, @@ -63,7 +63,7 @@ export const columnList = [ label: '总运单数', type: 1, values: '', - width: '150', + width: '90', checkarr: [], fixed: false, sortable: true, @@ -75,7 +75,19 @@ export const columnList = [ label: '已审单数', type: 1, values: '', - width: '150', + width: '90', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'hasCheckNum', + label: '未审单数', + type: 1, + values: '', + width: '90', checkarr: [], fixed: false, sortable: true, @@ -87,7 +99,7 @@ export const columnList = [ label: '审单率', type: 6, values: '', - width: '150', + width: '90', checkarr: [], fixed: false, sortable: true, @@ -99,7 +111,7 @@ export const columnList = [ label: '准时审单数', type: 1, values: '', - width: '150', + width: '90', checkarr: [], fixed: false, sortable: true, @@ -111,7 +123,7 @@ export const columnList = [ label: '审单准时率', type: 6, values: '', - width: '150', + width: '100', checkarr: [], fixed: false, sortable: true, @@ -123,7 +135,7 @@ export const columnList = [ label: '平均审单时效(小时)', type: 1, values: '', - width: '160', + width: '130', checkarr: [], fixed: false, sortable: true, diff --git a/src/option/reportforms/PackageAllTrunklineTimePageReport.js b/src/option/reportforms/PackageAllTrunklineTimePageReport.js index b55a0c58..a3b967a0 100644 --- a/src/option/reportforms/PackageAllTrunklineTimePageReport.js +++ b/src/option/reportforms/PackageAllTrunklineTimePageReport.js @@ -119,7 +119,7 @@ export const columnList = [ label: '到仓平均干线时效(天)', type: 1, values: '', - width: '150', + width: '160', checkarr: [], fixed: false, sortable: true, From 7d76c0a58cd77fc863af9e7a7dbc5676dac19f97 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 7 Jan 2025 15:57:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=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?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateOrderTimelinessRatioReport.js | 95 +++++++++++-------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/src/option/reportforms/CreateOrderTimelinessRatioReport.js b/src/option/reportforms/CreateOrderTimelinessRatioReport.js index a59226d8..9c75a0b2 100644 --- a/src/option/reportforms/CreateOrderTimelinessRatioReport.js +++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js @@ -59,6 +59,30 @@ export const columnList = [ head: false, isshowSummary: false, //开启统计 }, + { + prop: 'noOpenHasFreezeNum', + label: '未开单已冻结数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'needOpenNum', + label: '应开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, { prop: 'hasOpenNum', label: '已开单数', @@ -84,8 +108,20 @@ export const columnList = [ isshowSummary: false, //开启统计 }, { - prop: 'noOpenRate', - label: '未开单占比', + prop: 'onTimeNum', + label: '准时开单数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, + { + prop: 'onTimeRate', + label: '开单准时率', type: 6, values: '', width: '150', @@ -93,18 +129,31 @@ export const columnList = [ fixed: false, sortable: true, head: false, + isshowSummary: true, //开启统计 }, + { - prop: 'noOpenHasFreezeNum', - label: '未开单已冻结数', + prop: 'avgTime', + label: '平均开单时效(小时)', type: 1, values: '', + width: '160', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: false, //开启统计 + }, + { + prop: 'noOpenRate', + label: '未开单占比', + type: 6, + values: '', width: '150', checkarr: [], fixed: false, sortable: true, head: false, - isshowSummary: true, //开启统计 }, { prop: 'noOpenHasFreezeRate', @@ -166,18 +215,6 @@ export const columnList = [ head: false, isshowSummary: false, //开启统计 }, - { - prop: 'onTimeNum', - label: '准时开单数', - type: 1, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, //开启统计 - }, { prop: 'overTimeNum', label: '超期开单数', @@ -190,28 +227,4 @@ export const columnList = [ head: false, isshowSummary: true, //开启统计 }, - { - prop: 'onTimeRate', - label: '开单准时率', - type: 6, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: true, //开启统计 - }, - { - prop: 'avgTime', - label: '平均开单时效(小时)', - type: 1, - values: '', - width: '160', - checkarr: [], - fixed: false, - sortable: true, - head: false, - isshowSummary: false, //开启统计 - }, ]; From 92211013b39aac2234da17522da5e37cea10d743 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 7 Jan 2025 16:29:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E6=95=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=A4=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/reportformsOption/AllTrunklineConfig.js | 2 +- src/option/reportformsOption/CheckWaybillConfig.js | 2 +- src/option/reportformsOption/DespatchConfig.js | 2 +- src/option/reportformsOption/OpenTimeConfig.js | 2 +- src/option/reportformsOption/TransferConfig.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/option/reportformsOption/AllTrunklineConfig.js b/src/option/reportformsOption/AllTrunklineConfig.js index 41b7c594..063069a3 100644 --- a/src/option/reportformsOption/AllTrunklineConfig.js +++ b/src/option/reportformsOption/AllTrunklineConfig.js @@ -49,7 +49,7 @@ export const columnList = [ }, { prop: 'hoursTime', - label: '时效', + label: '时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportformsOption/CheckWaybillConfig.js b/src/option/reportformsOption/CheckWaybillConfig.js index 41b7c594..063069a3 100644 --- a/src/option/reportformsOption/CheckWaybillConfig.js +++ b/src/option/reportformsOption/CheckWaybillConfig.js @@ -49,7 +49,7 @@ export const columnList = [ }, { prop: 'hoursTime', - label: '时效', + label: '时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportformsOption/DespatchConfig.js b/src/option/reportformsOption/DespatchConfig.js index 41b7c594..063069a3 100644 --- a/src/option/reportformsOption/DespatchConfig.js +++ b/src/option/reportformsOption/DespatchConfig.js @@ -49,7 +49,7 @@ export const columnList = [ }, { prop: 'hoursTime', - label: '时效', + label: '时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportformsOption/OpenTimeConfig.js b/src/option/reportformsOption/OpenTimeConfig.js index 96f5b5e0..f6256907 100644 --- a/src/option/reportformsOption/OpenTimeConfig.js +++ b/src/option/reportformsOption/OpenTimeConfig.js @@ -38,7 +38,7 @@ export const columnList = [ }, { prop: 'hoursTime', - label: '时效', + label: '时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportformsOption/TransferConfig.js b/src/option/reportformsOption/TransferConfig.js index 96f5b5e0..f6256907 100644 --- a/src/option/reportformsOption/TransferConfig.js +++ b/src/option/reportformsOption/TransferConfig.js @@ -38,7 +38,7 @@ export const columnList = [ }, { prop: 'hoursTime', - label: '时效', + label: '时效(小时)', type: 1, values: '', width: '150', From 685aecb9903279148e4e1d0568208fa5fa8d1c23 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 7 Jan 2025 18:21:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/reportforms/OrderAllTime.vue | 38 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/src/views/reportforms/OrderAllTime.vue b/src/views/reportforms/OrderAllTime.vue index 1b9c5e20..2709458e 100644 --- a/src/views/reportforms/OrderAllTime.vue +++ b/src/views/reportforms/OrderAllTime.vue @@ -4,7 +4,7 @@
- + - + + + + + { const end = new Date(submitData.endTimeStr).getTime(); if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31) - return ElMessage.warning('时间不能大于31天'); + return ElMessage.warning('工厂推送时间不能大于31天'); + } + + // 开单时间 + // if ()openTime + if (getObjType(submitData.openTime) === 'array' && submitData.openTime.length > 0) { + submitData.openTimeStartStr = submitData.openTime[0]; + submitData.openTimeEndStr = submitData.openTime[1]; + + const start = new Date(submitData.openTimeStartStr).getTime(); + const end = new Date(submitData.openTimeEndStr).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) { details.data = []; - return ElMessage.warning('请选择时间'); + return ElMessage.warning('请选择工厂推送时间'); } delete submitData.timeArr; + delete submitData.openTime; delete submitData.total; + if (submitData.waybillNo) { + submitData.waybillCode = submitData.waybillNo; + delete submitData.waybillNo; + } + const res = await postOrderAllTimePage(submitData); const { code, data } = res.data; if (code !== 200) return;