From 7873202caa28c8d30109c83180bbba3ce38dec7c Mon Sep 17 00:00:00 2001
From: liuhuayong <995058772@qq.com>
Date: Wed, 7 May 2025 23:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/quotation/detail.vue     |  8 +++++---
 src/views/logistics/quotation/index.vue      |  1 +
 src/views/logistics/shipmentDetail/index.vue | 11 ++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/logistics/quotation/detail.vue b/src/views/logistics/quotation/detail.vue
index 946050d..d94264b 100644
--- a/src/views/logistics/quotation/detail.vue
+++ b/src/views/logistics/quotation/detail.vue
@@ -4,9 +4,10 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog"
     title="定价详情" width="60%">
     <el-descriptions :column="3" border size="small">
-      <el-descriptions-item labelClassName="label-style" :span="3" label="客户名称">{{ form.custName }}</el-descriptions-item>
-      <el-descriptions-item label-class-name="label-style" content-class-name="content-style" label="网点名称">{{ form.netName }}</el-descriptions-item>
-      <el-descriptions-item label-class-name="label-style" label="预充单号">{{ form.preChargeNo }}</el-descriptions-item>
+      <el-descriptions-item labelClassName="label-style" :span="2" label="客户名称">{{ form.custName }}</el-descriptions-item>
+      <el-descriptions-item labelClassName="label-style" :span="1" label="客户编号">{{ form.custNo }}</el-descriptions-item>
+      <el-descriptions-item label-class-name="label-style" content-class-name="content-style"label="网点名称">{{ form.netName }}</el-descriptions-item>
+      <el-descriptions-item label-class-name="label-style"  :span="2"  label="预充单号">{{ form.preChargeNo }}</el-descriptions-item>
       <el-descriptions-item label-class-name="label-style" content-class-name="content-style" label="价格执行时间">{{ form.priceExecuteTime }}</el-descriptions-item>
       <el-descriptions-item label-class-name="label-style" content-class-name="content-style" label="网点编码">{{ form.netCode }}</el-descriptions-item>
       <el-descriptions-item :span="2" label-class-name="label-style" label="日均单量">{{ form.avgOrderNum }}</el-descriptions-item>
@@ -54,6 +55,7 @@ export default {
         preChargeNo: '',
         avgOrderNum: '',
         priceExecuteTime: '',
+        custNo: '',
         weightSegment: {},
         quoteType: {},
         quiteList: [],
diff --git a/src/views/logistics/quotation/index.vue b/src/views/logistics/quotation/index.vue
index 025c611..a4065b0 100644
--- a/src/views/logistics/quotation/index.vue
+++ b/src/views/logistics/quotation/index.vue
@@ -216,6 +216,7 @@ export default {
       _this.form = {
         id: data.id,
         custName: data.custName,
+        custNo: data.custNo,
         netName: data.netName,
         netCode: data.netCode,
         preChargeNo: data.preChargeNo,
diff --git a/src/views/logistics/shipmentDetail/index.vue b/src/views/logistics/shipmentDetail/index.vue
index 21f886b..5bf37d8 100644
--- a/src/views/logistics/shipmentDetail/index.vue
+++ b/src/views/logistics/shipmentDetail/index.vue
@@ -94,11 +94,16 @@
           icon="el-icon-download"
           @click="download">导出</el-button>
       </div>
+      <div v-if="false">
+      <div>{{ '总运费：' + this.tjData.totalFee + '元' }}</div>
+      <div>{{ '按照客户统计：'  }} <span v-for="(item, index) in this.tjData.byCustNo" :key="index">{{ item.item + '：' + item.totalFee + '元  ' }}</span></div>
+      <div>{{ '按照省份统计：'  }} <span v-for="(item, index) in this.tjData.byProvince" :key="index">{{ item.item + '：' + item.totalFee + '元  ' }}</span></div>
+    </div>
     </div>
     <!--表单组件-->
     <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="客户名称"/>
@@ -148,6 +153,7 @@ import initData from '@/mixins/initData'
 import { del,calcShipmentFee, downloadShipmentDetail, getShipmentDetailTj } from '@/api/shipmentDetail'
 import eForm from './form'
 import { getToken } from "@/utils/auth";
+import { parseTime, downloadFile, parseDate } from '@/utils/index'
 export default {
   components: { eForm },
   mixins: [initData],
@@ -201,8 +207,7 @@ export default {
         this.params['endTime'] = query.date[1]
       }
       getShipmentDetailTj(this.params).then(res => {
-        this.tjData = res.data
-        console.log(res.data)
+        this.tjData = res
       })
       return true
     },