From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaOrderDetail.vue | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/admin/src/components/business/OperaOrderDetail.vue b/admin/src/components/business/OperaOrderDetail.vue
index e9271d9..4a3fb67 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.type ===1">
<span class="label">璁㈠崟绾у埆锛�</span>
- <span class="value">{{ detailInfo.order.orderLevel || '-' }}</span>
+ <span class="value">{{ detailInfo.isUrgent === 1?'鏋侀�熻揪':'鏍囬�熻揪' }}</span>
</div>
<div class="info-item">
<span class="label">棰勮鍒板簵鏃堕棿锛�</span>
@@ -281,7 +281,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 +292,18 @@
<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.exceptionAmount ||0)/ 100).toFixed(2) }}</span>
</div>
</div>
</div>
@@ -327,6 +327,13 @@
}
},
methods: {
+ headerRowStyle({ rowIndex }) {
+ return {
+ background: '#007bff' ,
+ color : '#333',
+ height: '50px'
+ }
+ },
open (row) {
this.title = '璁㈠崟璇︽儏'
getById(row.id).then(res => {
@@ -409,6 +416,7 @@
}
.goods-table {
margin-bottom: 15px;
+ border: 1px solid #f2f2f2;
}
.price-summary {
display: flex;
@@ -419,5 +427,9 @@
border-radius: 4px;
font-size: 14px;
color: #606266;
+
+}
+.price-span{
+ width: 20%;
}
</style>
--
Gitblit v1.9.3