From bd6229ebd9cb543a22944ecb1142fad92b675dce Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 14:26:25 +0800
Subject: [PATCH] bug 修复
---
admin/src/components/business/OperaOrderDetailWindow.vue | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/admin/src/components/business/OperaOrderDetailWindow.vue b/admin/src/components/business/OperaOrderDetailWindow.vue
index 8658b5a..0b41e51 100644
--- a/admin/src/components/business/OperaOrderDetailWindow.vue
+++ b/admin/src/components/business/OperaOrderDetailWindow.vue
@@ -59,15 +59,14 @@
<div class="cont"><span class="label">鍝佺锛�</span> <span class="txt">{{info.categoryName || ''}}</span></div>
</div>
<div class="line">
- <div class="cont" v-if="info.workType==1"><span class="label">浜烘暟锛�</span> <span class="txt">{{info.priceNum1 || '' }}浜�</span></div>
- <div class="cont" v-if="info.workType==0"><span class="label">閲嶉噺锛�</span> <span class="txt">{{info.priceNum1 || '' }}鏂�</span></div>
- <div class="cont"><span class="label">鐢ㄥ伐鏃堕棿锛�</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
- <div class="cont"><span class="label">鐢ㄥ伐澶╂暟锛�</span><span class="txt">{{info.totalDays || 0 }}澶�</span></div>
+ <div class="cont" ><span class="label">鐢ㄥ伐鏃堕棿锛�</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }} 锛� {{info.totalDays || 0 }} 锛夊ぉ</span></div>
+ <div class="cont"><span class="label">鐢ㄥ伐鍦扮偣锛�</span> <span class="txt">{{info.location || '' }}</span></div>
+ <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
- <div class="cont"><span class="label">鐢ㄥ伐鍦扮偣锛�</span> <span class="txt">{{info.location || '' }}</span></div>
<div class="cont"><span class="label">璐圭敤鏍囧噯锛�</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
- <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+ <div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
+ <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.originPriceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
</div>
<div class="line">
<div class="cont"><span class="label">鍦扮偣鎻忚堪锛�</span><span class="txt">{{info.locationRemark || '' }}</span></div>
@@ -86,7 +85,7 @@
<template v-if="info.multifileList && info.multifileList.length>0">
<div v-for="item in info.multifileList" style="display: inline-block" :key="'aaa'+item.id">
<el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
- :preview-src-list="[info.fileurlFull]">
+ :preview-src-list="[item.fileurlFull]">
</el-image>
</div>
</template>
@@ -99,9 +98,9 @@
</div>
<div class="detail" v-if="info.type==1">
<div class="line">
- <div class="cont"><span class="label"> 璁㈠崟绫诲瀷锛�</span> <span class="txt">{{(info.type==0?'鐢ㄥ伐鍗�':(info.type==1?'璐ц繍鍗�':'璁㈠崟鍗�')) }}</span></div>
+ <div class="cont"><span class="label"> 璁㈠崟绫诲瀷锛�</span> <span class="txt">{{(info.type==0?'鐢ㄥ伐鍗�':(info.type==1?'璐ц繍鍗�':'璁㈤鍗�')) }}</span></div>
<div class="cont"><span class="label">杞﹁締锛�</span> <span class="txt">{{info.categoryName || ''}}-{{info.carUnit || ''}}</span></div>
- <div class="cont"><span class="label">鐢ㄨ溅鏃堕棿锛�</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
+ <div class="cont"><span class="label">鐢ㄨ溅鏃堕棿锛�</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}锛� {{info.totalDays || 0 }} 锛夊ぉ</span></div>
</div>
<div class="line">
<div class="cont" > <span class="label"> 鍦板潃淇℃伅锛�</span> <span class="label" v-if="!wayList || wayList.length==0">-</span> </div>
@@ -116,12 +115,12 @@
</div>
</div>
<div class="line">
- <div class="cont"><span class="label">鐢ㄥ伐澶╂暟锛�</span><span class="txt">{{info.totalDays || 0 }}</span></div>
+ <div class="cont"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
<div class="cont"><span class="label">杩愯緭閲嶉噺/鏁伴噺锛�</span> <span class="txt">{{info.transportNum || '' }}{{info.transportUnit || ''}}</span></div>
<div class="cont"><span class="label">璐圭敤鏍囧噯锛�</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
</div>
<div class="line">
- <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+ <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
<div class="cont" ><span class="label">闇�姹傝ˉ鍏咃細</span><span class="txt">{{info.supplement || '' }}</span></div>
@@ -137,7 +136,7 @@
<template v-if="info.multifileList && info.multifileList.length>0">
<div v-for="item in info.multifileList" style="display: inline-block" :key="item.id">
<el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
- :preview-src-list="[info.fileurlFull]">
+ :preview-src-list="[item.fileurlFull]">
</el-image>
</div>
</template>
@@ -177,7 +176,7 @@
<template v-if="info.multifileList && info.multifileList.length>0">
<div v-for="item in info.multifileList" style="display: inline-block" :key="'aaa'+item.id">
<el-image v-if="item.fileurlFull" style="width: 50px; height: 50px; margin-right: 10px" :src="item.fileurlFull"
- :preview-src-list="[info.fileurlFull]">
+ :preview-src-list="[item.fileurlFull]">
</el-image>
</div>
</template>
@@ -191,8 +190,8 @@
</div>
<div class="detail" style=" ">
<div class="line">
- <div class="cont"><span class="label">瀹為檯{{feeFrom.priceParam1.name }}锛�</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
- <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">瀹為檯{{feeFrom.priceParam2.name }}锛�</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
+ <div class="cont"><span class="label">瀹為檯{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
+ <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">瀹為檯{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
<div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">鍏朵粬璐圭敤锛�</span> <span class="txt">{{((info.confirmOtherFee||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
@@ -371,30 +370,30 @@
// 鍖呰宸�
if (this.info.carType === 0) {
// 鎸夊ぉ
- this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟'
+ this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟锛�'
this.feeFrom.priceParam1.unit = '澶�'
- this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
+ this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟锛�'
this.feeFrom.priceParam2.unit = '浜�'
} else if (this.info.carType === 1) {
// 鎸夊皬鏃�
- this.feeFrom.priceParam1.name = '宸ヤ綔鏃堕暱'
+ this.feeFrom.priceParam1.name = '宸ヤ綔鏃堕暱锛�'
this.feeFrom.priceParam1.unit = '鏃�'
this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit = '浜�'
- } else if (this.info.carType === 1) {
+ } else if (this.info.carType === 2) {
// 鎸夊皬鏃�
- this.feeFrom.priceParam1.name = '鍖呰閲嶉噺'
+ this.feeFrom.priceParam1.name = '鍖呰閲嶉噺锛�'
this.feeFrom.priceParam1.unit = '鏂�'
this.feeFrom.priceParam2.name = null
this.feeFrom.priceParam2.unit = null
}
} else if (this.info.type === 1 && this.info.carType === 0) {
// 杩愯揣鍗� 鎸夊ぉ鏁�
- this.feeFrom.priceParam1.name = '鐢ㄨ溅澶╂暟'
+ this.feeFrom.priceParam1.name = '鐢ㄨ溅澶╂暟锛�'
this.feeFrom.priceParam1.unit = '澶�'
} else if (this.info.type === 1 && this.info.carType === 1) {
// 杩愯揣鍗� 鎸夋鏁�
- this.feeFrom.priceParam1.name = '鐢ㄨ溅娆℃暟'
+ this.feeFrom.priceParam1.name = '鐢ㄨ溅娆℃暟锛�'
this.feeFrom.priceParam1.unit = '娆�'
}
}
--
Gitblit v1.9.3