From f8fe2312481c1eddbde1238cace9da146702337c Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 14 Mar 2025 11:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportforms/Mainlinedeliverydetails.js     | 18 ++++++++++++++----
 .../reportforms/Mainlinedeliveryfailure.js     |  6 +++---
 .../reportforms/BusinessDeliveryTimetable.vue  |  6 +-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/option/reportforms/Mainlinedeliverydetails.js b/src/option/reportforms/Mainlinedeliverydetails.js
index af01f360..275493f2 100644
--- a/src/option/reportforms/Mainlinedeliverydetails.js
+++ b/src/option/reportforms/Mainlinedeliverydetails.js
@@ -24,7 +24,6 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
     prop: 'vehicleLicenseNumber',
@@ -169,6 +168,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    isshowSummary: true, //开启统计
   },
   {
     prop: 'remarks',
@@ -278,7 +278,7 @@ export const columnList = [
   },
   {
     prop: 'actualPickupDuration',
-    label: '实际提货时效',
+    label: '实际提货时效（h）',
     type: 1,
     values: '',
     width: '180',
@@ -289,7 +289,7 @@ export const columnList = [
   },
   {
     prop: 'standardPickupDuration',
-    label: '提货标准时效',
+    label: '提货标准时效（h）',
     type: 1,
     values: '',
     width: '150',
@@ -319,7 +319,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-
+  {
+    prop: 'createUserName',
+    label: '创建人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   // {
   //   prop: 'createUserName',
   //   label: '操作',
diff --git a/src/option/reportforms/Mainlinedeliveryfailure.js b/src/option/reportforms/Mainlinedeliveryfailure.js
index 1b603be9..147a2258 100644
--- a/src/option/reportforms/Mainlinedeliveryfailure.js
+++ b/src/option/reportforms/Mainlinedeliveryfailure.js
@@ -46,10 +46,11 @@ export const columnList = [
       fixed: false,
       sortable: true,
       head: false,
+      isshowSummary: true, //开启统计
     },
     {
       prop: 'totalPickupItemCount',
-      label: '提货单总件数',
+      label: '预计提货总件数',
       type: 1,
       values: '',
       width: '150',
@@ -81,7 +82,6 @@ export const columnList = [
       fixed: false,
       sortable: true,
       head: false,
-      isshowSummary: true, //开启统计
     },
     {
       prop: 'scannedPickupItemCount',
@@ -179,7 +179,7 @@ export const columnList = [
     },
     {
       prop: 'averagePickupCycle',
-      label: '平均提货周期',
+      label: '平均提货周期（h）',
       type: 1,
       values: '',
       width: '180',
diff --git a/src/views/reportforms/BusinessDeliveryTimetable.vue b/src/views/reportforms/BusinessDeliveryTimetable.vue
index 128c77cc..46d753db 100644
--- a/src/views/reportforms/BusinessDeliveryTimetable.vue
+++ b/src/views/reportforms/BusinessDeliveryTimetable.vue
@@ -6,7 +6,7 @@
             <div v-h5uShow="search">
                 <!-- 查询模块 -->
                 <el-form :inline="true" :model="TopQuery" class="el-fr-d">
-                    <el-form-item label="创建时间">
+                    <el-form-item label="入库时间">
                         <el-date-picker v-model="TopQuery.Storagetime" type="datetimerange" unlink-panels
                             range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts"
                             :default-time="defaultTime2" />
@@ -145,10 +145,6 @@ const details = reactive({
             label: '商配',
             value: '商配'
         },
-        {
-            label: '市配',
-            value: '市配'
-        },
         {
             label: '自提',
             value: '自提'