From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaOrderDetail.vue | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 28 deletions(-)
diff --git a/admin/src/components/business/OperaOrderDetail.vue b/admin/src/components/business/OperaOrderDetail.vue
index e9271d9..1ecffcb 100644
--- a/admin/src/components/business/OperaOrderDetail.vue
+++ b/admin/src/components/business/OperaOrderDetail.vue
@@ -28,7 +28,7 @@
<span class="label">璁㈠崟绫诲瀷锛�</span>
<span class="value">
<span v-if="detailInfo.order.type === 0">灏卞湴瀛樺彇</span>
- <span v-else-if="detailInfo.order.type === 1">寮傚湴瀛樺彇</span>
+ <span v-else-if="detailInfo.order.type === 1">鍚屽煄瀵勯��</span>
<span v-else>-</span>
</span>
</div>
@@ -50,9 +50,9 @@
</span>
</div>
- <div class="info-item">
+ <div class="info-item" v-if="detailInfo.order.type ===1">
<span class="label">璁㈠崟绾у埆锛�</span>
- <span class="value">{{ detailInfo.order.orderLevel || '-' }}</span>
+ <span class="value">{{ detailInfo.order.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span>
</div>
<div class="info-item">
<span class="label">棰勮鍒板簵鏃堕棿锛�</span>
@@ -75,8 +75,9 @@
<span class="value">楼{{ (detailInfo.order.declaredFee / 100).toFixed(2) }}</span>
</div>
<div class="info-item">
- <span class="label">棰勮瀵勫瓨澶╂暟/閰嶉�侀噷绋嬶細</span>
- <span class="value">{{ detailInfo.order.estimatedDepositDays || '-' }}澶�/{{ detailInfo.order.distance || '-' }}鍏噷</span>
+ <span class="label">{{detailInfo.order.type === 0 ? '棰勮瀵勫瓨澶╂暟' : '閰嶉�侀噷绋�'}}锛�</span>
+ <span class="value" v-if="detailInfo.order.type === 0">{{ detailInfo.order.estimatedDepositDays || '-' }}澶�</span>
+ <span class="value" v-if="detailInfo.order.type === 1">{{ detailInfo.order.distance || '-' }}鍏噷</span>
</div>
<div class="info-item full-width">
<span class="label">瀹㈡埛澶囨敞锛�</span>
@@ -84,13 +85,13 @@
</div>
<div class="info-item full-width">
<span class="label">鐗╁搧鎷嶇収锛�</span>
- <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
+ <div v-if="detailInfo.orderFiles && detailInfo.orderFiles.length" class="image-list">
<el-image
- v-for="(img, index) in detailInfo.depositImages"
+ v-for="(img, index) in detailInfo.orderFiles"
:key="index"
style="width: 80px; height: 80px; margin-right: 10px"
:src="img"
- :preview-src-list="detailInfo.depositImages"
+ :preview-src-list="detailInfo.orderFiles"
fit="cover"
></el-image>
</div>
@@ -130,11 +131,11 @@
</div>
<div class="info-item">
<span class="label">瀵勪欢鍦板潃锛�</span>
- <span class="value">{{ detailInfo.order.depositLocation || '' }}{{ detailInfo.order.depositLocationRemark || '' }}</span>
+ <span class="value">{{ detailInfo.order.depositLocationRemark || '' }}</span>
</div>
<div class="info-item">
<span class="label">鏀朵欢鍦板潃锛�</span>
- <span class="value">{{ detailInfo.order.takeLocation || '' }}{{ detailInfo.order.takeLocationRemark || '' }}</span>
+ <span class="value">{{ detailInfo.order.takeLocationRemark || '' }}</span>
</div>
<div class="info-item">
<span class="label">鏄惁鏀朵欢鏈嶅姟鐐癸細</span>
@@ -146,13 +147,13 @@
</div>
<div class="info-item full-width">
<span class="label">闂ㄥ簵鏀朵欢鎷嶇収锛�</span>
- <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
+ <div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
<el-image
- v-for="(img, index) in detailInfo.storeInImages"
+ v-for="(img, index) in detailInfo.depositImages"
:key="index"
style="width: 80px; height: 80px; margin-right: 10px"
:src="img"
- :preview-src-list="detailInfo.storeInImages"
+ :preview-src-list="detailInfo.depositImages"
fit="cover"
></el-image>
</div>
@@ -172,8 +173,22 @@
</div>
<span v-else>-</span>
</div>
- <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1">
- <span class="label">鍙告満閫佽揪鎷嶇収/闂ㄥ簵鍏ュ簱鎷嶇収锛�</span>
+ <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && detailInfo.order.takeShopId">
+ <span class="label">闂ㄥ簵鍏ュ簱鎷嶇収锛�</span>
+ <div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
+ <el-image
+ v-for="(img, index) in detailInfo.storeInImages"
+ :key="index"
+ style="width: 80px; height: 80px; margin-right: 10px"
+ :src="img"
+ :preview-src-list="detailInfo.storeInImages"
+ fit="cover"
+ ></el-image>
+ </div>
+ <span v-else>-</span>
+ </div>
+ <div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && !detailInfo.order.takeShopId">
+ <span class="label">鍙告満閫佽揪鎷嶇収锛�</span>
<div v-if="detailInfo.driverDoneImages && detailInfo.driverDoneImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.driverDoneImages"
@@ -203,7 +218,45 @@
</div>
</div>
- <div class="section">
+ <div class="section" v-if="detailInfo.order.commentStatus === 1">
+ <div class="section-header">
+ <span class="section-title">璇勪环淇℃伅</span>
+ </div>
+ <div class="info-grid">
+ <div class="info-item" v-if="detailInfo.order.commentDepositLevel">
+ <span class="label">瀵勪欢闂ㄥ簵锛�</span>
+ <span class="value">{{ detailInfo.order.commentDepositLevel + '鏄�' || '-' }}</span>
+ </div>
+ <div class="info-item" v-if="detailInfo.order.commentDriverLevel">
+ <span class="label">閰嶉�佸徃鏈猴細</span>
+ <span class="value">{{ detailInfo.order.commentDriverLevel + '鏄�' || '-' }}</span>
+ </div>
+ <div class="info-item" v-if="detailInfo.order.commentTakeLevel">
+ <span class="label">鏀朵欢闂ㄥ簵锛�</span>
+ <span class="value">{{ detailInfo.order.commentTakeLevel + '鏄�' || '-' }}</span>
+ </div>
+ <div class="info-item">
+ <span class="label">璇勪环鍐呭锛�</span>
+ <span class="value">{{ detailInfo.order.commentInfo || '-' }}</span>
+ </div>
+ <div class="info-item full-width">
+ <span class="label">璇勪环鎷嶇収锛�</span>
+ <div v-if="detailInfo.commentImages && detailInfo.commentImages.length" class="image-list">
+ <el-image
+ v-for="(img, index) in detailInfo.commentImages"
+ :key="index"
+ style="width: 80px; height: 80px; margin-right: 10px"
+ :src="img"
+ :preview-src-list="detailInfo.commentImages"
+ fit="cover"
+ ></el-image>
+ </div>
+ <span v-else>-</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="section" v-if="detailInfo.order.cancelTime">
<div class="section-header">
<span class="section-title">鍙栨秷淇℃伅</span>
</div>
@@ -236,7 +289,7 @@
<div class="info-item">
<span class="label">閫�娆鹃噾棰濓細</span>
- <span class="value">{{ detailInfo.ordersRefund.createTime || '-' }}</span>
+ <span class="value">楼{{ (detailInfo.ordersRefund.refundAmount / 100).toFixed(2) || '-' }}</span>
</div>
<div class="info-item">
<span class="label">閫�娆惧鐞嗘椂闂达細</span>
@@ -281,7 +334,7 @@
<div class="section-header">
<span class="section-title">鐗╁搧淇℃伅</span>
</div>
- <el-table :data="detailInfo.detailList" stripe class="goods-table">
+ <el-table :data="detailInfo.detailList" stripe class="goods-table" :header-row-style="headerRowStyle">
<el-table-column prop="typeName" label="鐗╁搧鍚嶇О" min-width="80px"></el-table-column>
<el-table-column prop="luggageName" label="鐗╁搧灏哄" min-width="80px"></el-table-column>
<el-table-column label="鍗曚环锛堝厓锛�" min-width="100px">
@@ -292,18 +345,20 @@
<el-table-column prop="num" label="鏁伴噺" min-width="60px"></el-table-column>
<el-table-column label="灏忚锛堝厓锛�" min-width="100px">
<template slot-scope="{row}">
- 楼{{ ((row.subtotal ||0) / 100).toFixed(2) }}
+ <span class="yellowstate"> 楼{{ ((row.subtotal ||0) / 100).toFixed(2) }}</span>
</template>
</el-table-column>
</el-table>
<div class="price-summary" v-if="detailInfo.order">
- <span>鍩虹鏈嶅姟璐癸細楼{{ ((detailInfo.order.price||0) / 100).toFixed(2) }}</span>
- <span>鐗╁搧淇濊垂锛毬{ ((detailInfo.order.declaredFee||0) / 100).toFixed(2) }}</span>
- <span>璁㈠崟鎬讳环锛毬{ ((detailInfo.order.totalAmount||0) / 100).toFixed(2) }}</span>
- <span>瀹為檯鏀粯锛毬{ ((detailInfo.order.payAmount||0) / 100).toFixed(2) }}</span>
- <span>閫�娆鹃噾棰濓細楼{{ ((detailInfo.order.refundAmount ||0)/ 100).toFixed(2) }}</span>
- <span>瓒呮椂閲戦锛毬{ ((detailInfo.order.overdueAmount ||0)/ 100).toFixed(2) }}</span>
- <span>寮傚父閲戦锛毬{ ((detailInfo.order.exceptionAmount ||0)/ 100).toFixed(2) }}</span>
+ <span class="price-span">鍩虹鏈嶅姟璐癸細楼{{ ((detailInfo.order.price||0) / 100).toFixed(2) }}</span>
+ <span class="price-span">鐗╁搧淇濊垂锛毬{ ((detailInfo.order.declaredFee||0) / 100).toFixed(2) }}</span>
+ <span class="price-span">璁㈠崟鎬讳环锛毬{ ((detailInfo.order.totalAmount||0) / 100).toFixed(2) }}</span>
+ <span class="price-span">瀹為檯鏀粯锛毬{ ((detailInfo.order.payAmount||0) / 100).toFixed(2) }}</span>
+ <span class="price-span">閫�娆鹃噾棰濓細楼{{ ((detailInfo.order.refundAmount ||0)/ 100).toFixed(2) }}</span>
+ <span class="price-span">瓒呮椂閲戦锛毬{ ((detailInfo.order.overdueAmount ||0)/ 100).toFixed(2) }}</span>
+ <span class="price-span">寮傚父閲戦锛毬{ ((detailInfo.order.exceptionFee ||0)/ 100).toFixed(2) }}</span>
+ <span class="price-span">浼樻儬鍗锋姷鎵ｉ噾棰濓細楼{{ ((detailInfo.order.deductionAmount ||0)/ 100).toFixed(2) }}</span>
+ <span class="price-span">闂ㄥ簵淇濈琛ヨ创锛毬{ ((detailInfo.order.shopCompensationAmount ||0)/ 100).toFixed(2) }}</span>
</div>
</div>
</div>
@@ -327,10 +382,16 @@
}
},
methods: {
+ headerRowStyle({ rowIndex }) {
+ return {
+ background: '#007bff' ,
+ color : '#333',
+ height: '50px'
+ }
+ },
open (row) {
this.title = '璁㈠崟璇︽儏'
- getById(row.id).then(res => {
- console.log(res)
+ getById(row).then(res => {
this.detailInfo = res
this.visible = true
}).catch(e => {
@@ -409,6 +470,7 @@
}
.goods-table {
margin-bottom: 15px;
+ border: 1px solid #f2f2f2;
}
.price-summary {
display: flex;
@@ -419,5 +481,9 @@
border-radius: 4px;
font-size: 14px;
color: #606266;
+
+}
+.price-span{
+ width: 20%;
}
</style>
--
Gitblit v1.9.3