From c570b6c93c15dce07e37a3e65a977cf1efefc848 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, 7 May 2025 20:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shipmentDetail.js                    |  9 ++++++
 src/views/logistics/shipmentDetail/index.vue | 32 ++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/api/shipmentDetail.js b/src/api/shipmentDetail.js
index 734513b..db8d726 100644
--- a/src/api/shipmentDetail.js
+++ b/src/api/shipmentDetail.js
@@ -22,6 +22,15 @@ export function calcShipmentFee() {
   })
 }
 
+export function getShipmentDetailTj(params) {
+  return request({
+    url: 'api/shipmentDetail/getShipmentDetailTj',
+    method: 'get',
+    query: params
+  })
+}
+
+
 
 export function edit(data) {
   return request({
diff --git a/src/views/logistics/shipmentDetail/index.vue b/src/views/logistics/shipmentDetail/index.vue
index 28d9c43..21f886b 100644
--- a/src/views/logistics/shipmentDetail/index.vue
+++ b/src/views/logistics/shipmentDetail/index.vue
@@ -35,6 +35,18 @@
     <!--工具栏-->
     <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-select v-model="query.isCalc" clearable placeholder="计算状态" class="filter-item" style="width: 130px">
+        <el-option v-for="item in isCalcOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
       <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"/>
@@ -86,6 +98,7 @@
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
+    <div></div>
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="waybillNo" label="运单编号"/>
       <el-table-column prop="custName" label="客户名称"/>
@@ -132,7 +145,7 @@
 <script>
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
-import { del,calcShipmentFee, downloadShipmentDetail } from '@/api/shipmentDetail'
+import { del,calcShipmentFee, downloadShipmentDetail, getShipmentDetailTj } from '@/api/shipmentDetail'
 import eForm from './form'
 import { getToken } from "@/utils/auth";
 export default {
@@ -140,6 +153,7 @@ export default {
   mixins: [initData],
   data() {
     return {
+      tjData: {},
       upload: {
         // 是否显示弹出层（用户导入）
         open: false,
@@ -154,12 +168,15 @@ export default {
       },
       calLoading: false,
       delLoading: false,
+      isCalcOptions: [
+        { key: '1', display_name: '已计算' },
+        { key: '0', display_name: '未计算' },
+      ],
       queryTypeOptions: [
         { key: 'waybillNo', display_name: '运单编号' },
         { key: 'custName', display_name: '客户名称' },
         { key: 'custNo', display_name: '客户编号' },
-        { key: 'sendTime', display_name: '寄件时间' },
-        { key: 'isCalc', display_name: '是否已经计算运费' }
+        { key: 'receiveProvince', display_name: '收件省份' },
       ]
     }
   },
@@ -178,6 +195,15 @@ export default {
       const type = query.type
       const value = query.value
       if (type && value) { this.params[type] = value }
+      if (this.query.isCalc) { this.params.isCalc = this.query.isCalc }
+      if (this.query.date) {
+        this.params['startTime'] = query.date[0]
+        this.params['endTime'] = query.date[1]
+      }
+      getShipmentDetailTj(this.params).then(res => {
+        this.tjData = res.data
+        console.log(res.data)
+      })
       return true
     },
     calcShipmentFee() {