123

src/views/order/rentVehicleInfo/index.vue

@@ -337,16 +337,16 @@
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="交车操作人:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</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">
 							<el-form-item label="交车时间:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>-->
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime) : ''}}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -380,16 +380,16 @@
 					<el-row :gutter="20">
 						<el-col :span="10">
 							<el-form-item label="收车操作人:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorName}} {{orderReturnVehicleCrosstown.operatorPhone}}</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">
 							<el-form-item label="收车时间:">
-								<!-- <span
+								<span
 									class="label-text"
-								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>-->
+								>{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -426,7 +426,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>
@@ -444,7 +444,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>
@@ -749,7 +749,8 @@ export default {
 				licenseIdCard: undefined,
 				licenseImg: undefined,
 				licenseName: undefined,
-				licensePhone: undefined
+				licensePhone: undefined,
+				checkUserInfo: undefined
 			}, //还车记录
 			tableKey: 0,
 			dedDetailDTOListAll: undefined,
@@ -760,6 +761,7 @@ export default {
 			vehicleDetail: false, //交还车信息，默认全部显示
 			order_btn_order_violcation_save: false,
 			depositDetail: false,
+			checkUserInfo: [],
 			costDetail: {
 				key: undefined,
 				val: undefined,
@@ -1150,6 +1152,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(',')
 					}