租车订单管理

src/views/order/rentVehicleInfo/index.vue

@@ -279,23 +279,38 @@
 					<el-form-item label="实退押金:">
 						<span>{{orderReturnVehicleCrosstown.restDeposit}}</span>
 					</el-form-item>
+					<!-- {{orderReturnVehicleCrosstown.violateDetailList != ''}} -->
 					<div v-show="orderReturnVehicleCrosstown.violateDetailList != ''">
+					<!-- <div> -->
 						<el-form-item label="消费超额:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
 								:key="index"
 							>{{item.excessCost}}</span>
 						</el-form-item>
-
-						<el-form-item label="违约赔款:" v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList" :key="index">
-							<span>{{item.statusName}}</span><span style="margin-left:10px">{{item.cost}}</span>元<br/>
-							<span style="color:#999">{{item.deductions}}</span>
+						<el-form-item label="违约赔款:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.cost}}</span>
+						</el-form-item>
+						<el-form-item label="违约类型:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.statusName}}</span>
+						</el-form-item>
+						<el-form-item label="赔款备注:">
+							<span
+								v-for="(item,index) in orderReturnVehicleCrosstown.violateDetailList"
+								:key="index"
+							>{{item.deductions}}</span>
 						</el-form-item>
 						<el-form-item label="优惠券返还:">
 							<span
 								v-for="(item,index) in orderReturnVehicleCrosstown.backCoupons"
 								:key="index"
-							>{{item.title}} 价值{{item.usedAmount}}元</span>
+							>{{item.title}} {{item.usedAmount}}</span>
 						</el-form-item>
 					</div>
 				</div>
@@ -324,9 +339,7 @@
 							<el-form-item label="交车操作人:">
 								<span
 									class="label-text"
-									v-if="orderReturnVehicleCrosstown.check_user || orderReturnVehicleCrosstown.check_tel"
-								>{{orderReturnVehicleCrosstown.check_user}} {{orderReturnVehicleCrosstown.check_tel}}</span>
-								<span>无</span>
+								>{{checkUserInfo.length > 0 && checkUserInfo[0].username? checkUserInfo[0].username : ""}}  {{checkUserInfo.length > 0 && checkUserInfo[0].telephone? checkUserInfo[0].telephone : ""}}</span>
 							</el-form-item>
 							
 						</el-col>
@@ -370,9 +383,7 @@
 							<el-form-item label="收车操作人:">
 								<span
 									class="label-text"
-									v-if="orderReturnVehicleCrosstown.check_user || orderReturnVehicleCrosstown.check_tel"
-								>{{orderReturnVehicleCrosstown.check_user}} {{orderReturnVehicleCrosstown.check_tel}}</span>
-								<span>无</span>
+								>{{checkUserInfo.length > 0 && checkUserInfo[0].username? checkUserInfo[0].username : ""}}  {{checkUserInfo.length > 0 && checkUserInfo[0].telephone? checkUserInfo[0].telephone : ""}}</span>
 							</el-form-item>
 						</el-col>
 						<el-col :span="10">
@@ -416,7 +427,7 @@
 								<template v-if="item.status==2">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -434,7 +445,7 @@
 								<template v-if="item.status==3">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还违章保证金{{item.restAmount}}元（扣除{{item.amount}}元）</div>
-										<div v-show="!item.iscomplete">退还押金5000元</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -458,7 +469,7 @@
 								<template v-if="item.status==6">
 									<div class="picBox">
 										<div v-show="item.iscomplete">退还押金{{item.restAmount}}(扣除{{item.amount}}元)</div>
-										<div v-show="!item.iscomplete">退还押金15000元</div>
+										<div v-show="!item.iscomplete">退还押金{{item.restAmount}}元</div>
 										<div style="color: #999" v-show="item.iscomplete">
 											{{item.updTimeStr}}
 											<span>
@@ -739,7 +750,8 @@ export default {
 				licenseIdCard: undefined,
 				licenseImg: undefined,
 				licenseName: undefined,
-				licensePhone: undefined
+				licensePhone: undefined,
+				checkUserInfo: undefined
 			}, //还车记录
 			tableKey: 0,
 			dedDetailDTOListAll: undefined,
@@ -750,6 +762,7 @@ export default {
 			vehicleDetail: false, //交还车信息，默认全部显示
 			order_btn_order_violcation_save: false,
 			depositDetail: false,
+			checkUserInfo: [],
 			costDetail: {
 				key: undefined,
 				val: undefined,
@@ -1140,6 +1153,9 @@ export default {
 						)
 						this.dedDetailDTOListAll = sum
 					}
+					if(this.orderReturnVehicleCrosstown.checkUserInfo) {
+						this.checkUserInfo = JSON.parse(this.orderReturnVehicleCrosstown.checkUserInfo);
+					}
 					if (response.data[0].imgs) {
 						this.otherImg = response.data[0].imgs.split(',')
 					}