From bf6789a35ebd80e15e2fd207540f429dcd7efa85 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 8 Jan 2025 18:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateOrderTimelinessRatioReport.js       | 22 +++++++++----------
 src/option/reportforms/OrderAllTime.js        | 20 +++++++++++++----
 src/views/reportforms/OrderAllTime.vue        |  9 ++++++--
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/option/reportforms/CreateOrderTimelinessRatioReport.js b/src/option/reportforms/CreateOrderTimelinessRatioReport.js
index 9c75a0b2..03415ec5 100644
--- a/src/option/reportforms/CreateOrderTimelinessRatioReport.js
+++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js
@@ -52,7 +52,7 @@ export const columnList = [
     label: '总单数',
     type: 1,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -76,7 +76,7 @@ export const columnList = [
     label: '应开单数',
     type: 1,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -88,7 +88,7 @@ export const columnList = [
     label: '已开单数',
     type: 1,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -100,7 +100,7 @@ export const columnList = [
     label: '未开单数',
     type: 1,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -112,7 +112,7 @@ export const columnList = [
     label: '准时开单数',
     type: 1,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -124,12 +124,12 @@ export const columnList = [
     label: '开单准时率',
     type: 6,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
+    isshowSummary: false, //开启统计
   },
 
   {
@@ -137,7 +137,7 @@ export const columnList = [
     label: '平均开单时效(小时)',
     type: 1,
     values: '',
-    width: '160',
+    width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -149,7 +149,7 @@ export const columnList = [
     label: '未开单占比',
     type: 6,
     values: '',
-    width: '150',
+    width: '100',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -184,7 +184,7 @@ export const columnList = [
     label: '未开单未超时占比',
     type: 6,
     values: '',
-    width: '200',
+    width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -208,7 +208,7 @@ export const columnList = [
     label: '未开单超时占比',
     type: 6,
     values: '',
-    width: '200',
+    width: '150',
     checkarr: [],
     fixed: false,
     sortable: true,
diff --git a/src/option/reportforms/OrderAllTime.js b/src/option/reportforms/OrderAllTime.js
index a2079302..ab4321a4 100644
--- a/src/option/reportforms/OrderAllTime.js
+++ b/src/option/reportforms/OrderAllTime.js
@@ -79,6 +79,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'departureWarehouseName',
@@ -114,8 +115,19 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'loadCode',
-    label: '干线车次号',
+    prop: 'loadingLoadCode',
+    label: '装车车次号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'unloadLoadCode',
+    label: '卸车车次号',
     type: 2,
     values: '',
     width: '150',
@@ -126,7 +138,7 @@ export const columnList = [
   },
   {
     prop: 'createTime',
-    label: '创建时间',
+    label: '工厂推送时间',
     type: 1,
     values: '',
     width: '150',
@@ -148,7 +160,7 @@ export const columnList = [
   },
   {
     prop: 'startTime',
-    label: '发车时间',
+    label: '始发仓发车时间',
     type: 1,
     values: '',
     width: '150',
diff --git a/src/views/reportforms/OrderAllTime.vue b/src/views/reportforms/OrderAllTime.vue
index 2709458e..6dcf96a9 100644
--- a/src/views/reportforms/OrderAllTime.vue
+++ b/src/views/reportforms/OrderAllTime.vue
@@ -322,9 +322,14 @@ const onLoad = async (params = {}) => {
         return ElMessage.warning('开单时间不能大于31天');
     }
 
-    if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
+    if (
+      getObjType(submitData.timeArr) !== 'array' ||
+      submitData.timeArr.length === 0 ||
+      getObjType(submitData.openTime) !== 'array' ||
+      submitData.openTime.length === 0
+    ) {
       details.data = [];
-      return ElMessage.warning('请选择工厂推送时间');
+      return ElMessage.warning('请选择时间');
     }
 
     delete submitData.timeArr;