From 794138877dc7c23b56bbc5c668140f2cf4dd184c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E5=8B=87?= <995058772@qq.com>
Date: Wed, 11 Jun 2025 16:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=BD=E4=BB=B6=E5=91=98?=
 =?UTF-8?q?=E5=92=8C=E8=B4=A6=E5=8D=95=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/returnItemDetails/index.vue | 9 ++++++++-
 src/views/logistics/shipmentDetail/index.vue    | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/logistics/returnItemDetails/index.vue b/src/views/logistics/returnItemDetails/index.vue
index f06e653..381077b 100644
--- a/src/views/logistics/returnItemDetails/index.vue
+++ b/src/views/logistics/returnItemDetails/index.vue
@@ -36,6 +36,9 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
+        <el-date-picker v-model="query.date" type="daterange" range-separator=":"
+        class="el-range-editor--small filter-item" style="height: 30.5px;width: 220px" value-format="yyyy-MM-dd"
+        start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
         <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
@@ -59,7 +62,7 @@
           class="filter-item"
           type="primary"
           icon="el-icon-plus"
-          @click="handleImport">导入寄件明细</el-button>
+          @click="handleImport">导入退件明细</el-button>
       </div>
       <!-- 导出 -->
       <div style="display: inline-block;">
@@ -219,6 +222,10 @@ export default {
       const query = this.query
       const type = query.type
       const value = query.value
+      if (this.query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
       if (type && value) { this.params[type] = value }
       return true
     },
diff --git a/src/views/logistics/shipmentDetail/index.vue b/src/views/logistics/shipmentDetail/index.vue
index a6a1bd4..2c224a0 100644
--- a/src/views/logistics/shipmentDetail/index.vue
+++ b/src/views/logistics/shipmentDetail/index.vue
@@ -156,7 +156,8 @@ export default {
         { key: 'custName', display_name: '客户名称' },
         { key: 'custNo', display_name: '客户编号' },
         { key: 'receiveProvince', display_name: '收件省份' },
-        { key: 'internalCalculationWeight', display_name: '大于内部计算重量' },        
+        { key: 'internalCalculationWeight', display_name: '大于内部计算重量' },
+        { key: 'pickUpSalesman', display_name: '揽件员' },
       ]
     }
   },