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 | 141 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 116 insertions(+), 25 deletions(-)
diff --git a/admin/src/components/business/OperaOrderDetailWindow.vue b/admin/src/components/business/OperaOrderDetailWindow.vue
index f01963f..0b41e51 100644
--- a/admin/src/components/business/OperaOrderDetailWindow.vue
+++ b/admin/src/components/business/OperaOrderDetailWindow.vue
@@ -56,17 +56,17 @@
<span class="txt" v-if="info.type==0">{{(info.workType==0?'閲囨憳宸�':(info.workType==1?'鍒嗘嫞宸�':'鍖呰宸�')) }}</span>
<span v-else>-</span>
</div>
- <div class="cont"><span class="label">閲囨憳鍝佺锛�</span> <span class="txt">{{info.categoryName || ''}}</span></div>
+ <div class="cont"><span class="label">鍝佺锛�</span> <span class="txt">{{info.categoryName || ''}}</span></div>
</div>
<div class="line">
- <div class="cont"><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>
- <div class="line">
+ <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.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>
@@ -85,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>
@@ -98,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.categoryName || ''}}</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.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|| '' }}锛� {{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>
@@ -115,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">杩愯緭閲嶉噺/鏁伴噺锛�</span> <span class="txt">{{info.priceNum1 || '' }}鏂�</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>
@@ -136,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>
@@ -151,10 +151,16 @@
</div>
<div class="line">
<div class="cont"><span class="label">鐢ㄩ鍦扮偣锛�</span><span class="txt">{{info.location || '' }}</span></div>
- <div class="cont" style="flex: 2"><span class="label" >椁愭爣鍜屼唤鏁帮細</span><span class="txt">{{info.locationRemark || '' }}</span></div>
+ <div class="cont" style="flex: 2" >
+ <span class="label"> 椁愭爣/浠芥暟锛�</span>
+ <span v-for="(item,index) in wayList" :key="'bbb'+index">
+ {{item.name || ''}}{{((item.price||0)/100).toFixed(2)}}鍏儃{item.num||0}}浠絳{index != wayList.length-1?'|':''}}
+ </span>
+ <span class="label" v-if="!wayList || wayList.length==0">-</span>
+ </div>
</div>
<div class="line">
- <div class="cont"><span class="label">鍦扮偣鎻忚堪锛�</span><span class="txt">{{info.locationRemark || '' }}</span></div>
+ <div class="cont" ><span class="label">鍦扮偣鎻忚堪锛�</span><span class="txt">{{info.locationRemark || '' }}</span></div>
</div>
<div class="line">
<div class="cont" ><span class="label">闇�姹傛弿杩帮細</span><span class="txt">{{info.supplement || '' }}</span></div>
@@ -170,11 +176,27 @@
<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>
</div>
+ </div>
+ </div>
+ </div>
+ <div class="renzheng" v-if="(info.type ===0 || info.type===1)&&(info.status===5|| info.status===4)" >
+ <div class="info" >
+ <span class="m10">璐圭敤纭</span>
+ </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" :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">
+ <div class="cont"><span class="label">瀹為檯鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+ <div class="cont" style="flex: 2"><span class="label">澶囨敞锛�</span><span class="txt">{{info.confirmFeeRemark || '' }}</span></div>
</div>
</div>
</div>
@@ -186,7 +208,7 @@
<div class="line">
<div class="cont"><span class="label">鏄电О锛�</span> <span class="txt">{{ info.releaseName||'' }}</span></div>
<div class="cont" ><span class="label">鑱旂郴鏂瑰紡锛�</span> <span class="txt ">{{ info.releasePhone||'' }}</span></div>
- <div class="cont" ><span class="label">鍏朵粬鑱旂郴浜猴細</span> <span class="txt ">{{ info.linkName||'鍖垮悕' }}-{{ info.linkPhone||'鏈缃�' }}</span></div>
+ <div class="cont" ><span class="label">鍏朵粬鑱旂郴浜猴細</span> <span class="txt ">{{ info.linkName||'' }}-{{ info.linkPhone||'鏈缃�' }}</span></div>
</div>
</div>
</div>
@@ -241,9 +263,19 @@
data () {
return {
id: '',
- wayList:[],
+ wayList: [],
info: {},
- loading: false
+ loading: false,
+ feeFrom: {
+ priceParam1: {
+ name: null,
+ unit: null
+ },
+ priceParam2: {
+ name: null,
+ unit: null
+ }
+ }
}
},
methods: {
@@ -252,7 +284,17 @@
this.visible = true
this.tableData2 = []
this.id = row.id
- this.wayList=[]
+ this.wayList = []
+ this.feeFrom = {
+ priceParam1: {
+ name: null,
+ unit: null
+ },
+ priceParam2: {
+ name: null,
+ unit: null
+ }
+ }
this.getData()
},
getData () {
@@ -260,9 +302,10 @@
.then(res => {
this.info = res
this.visible = true
- if(this.info.wayInfo){
+ if (this.info.wayInfo) {
this.wayList = JSON.parse(this.info.wayInfo)
}
+ this.initPriceNumParam()
console.log(this.wayList)
})
},
@@ -270,7 +313,7 @@
},
showLogList () {
- this.$refs.orderProgress.open('璁㈠崟娴佽浆鏃ュ織', this.info.orderLogList||[])
+ this.$refs.orderProgress.open('璁㈠崟娴佽浆鏃ュ織', this.info.orderLogList || [])
},
getScoreLevel (num) {
if (this.info.commentLevel && this.info.commentLevel >= num) {
@@ -305,6 +348,54 @@
})
})
})
+ },
+ initPriceNumParam () {
+ this.feeFrom.priceParam1.name = null
+ this.feeFrom.priceParam1.unit = null
+ this.feeFrom.priceParam2.name = null
+ this.feeFrom.priceParam2.unit = null
+ if (this.info.type === 0 && this.info.workType === 1) {
+ // 鍒嗘嫞宸�
+ this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.unit = '澶�'
+ this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.unit = '浜�'
+ } else if (this.info.type === 0 && this.info.workType === 0) {
+ // 閲囨憳宸�
+ this.feeFrom.priceParam1.name = '閲囨憳閲嶉噺锛�'
+ this.feeFrom.priceParam1.unit = '鏂�'
+ this.feeFrom.priceParam2.name = null
+ this.feeFrom.priceParam2.unit = null
+ } else if (this.info.type === 0 && this.info.workType === 2) {
+ // 鍖呰宸�
+ if (this.info.carType === 0) {
+ // 鎸夊ぉ
+ this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.unit = '澶�'
+ this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.unit = '浜�'
+ } else if (this.info.carType === 1) {
+ // 鎸夊皬鏃�
+ this.feeFrom.priceParam1.name = '宸ヤ綔鏃堕暱锛�'
+ this.feeFrom.priceParam1.unit = '鏃�'
+ this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
+ this.feeFrom.priceParam2.unit = '浜�'
+ } else if (this.info.carType === 2) {
+ // 鎸夊皬鏃�
+ 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.unit = '澶�'
+ } else if (this.info.type === 1 && this.info.carType === 1) {
+ // 杩愯揣鍗� 鎸夋鏁�
+ this.feeFrom.priceParam1.name = '鐢ㄨ溅娆℃暟锛�'
+ this.feeFrom.priceParam1.unit = '娆�'
+ }
}
}
}
@@ -328,7 +419,7 @@
color: #ff4d00 !important;
}
.renzheng{
- margin: 0px 0px 50px 20px;
+ margin: 0px 0px 30px 20px;
width: calc(100% - 60px);
.detail{
font-size: 14px;
--
Gitblit v1.9.3