租车订单管理

src/views/order/modal/rentOrderDetailModal.vue

@@ -108,7 +108,7 @@
 					<th>专职司机服务费</th>
 				</tr>
 				<tr>
-					<td>{{form.name}}{{form.vehicleNumberPlat}}{{form.vehicleCode ? (form.vehicleCode) : ''}}</td>
+					<td>{{form.name}}{{form.vehicleNumberPlat}}<span v-if="form.vehicleCode">({{form.vehicleCode}})</span><span v-else></span></td>
 					<td>
 						<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
 						<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
@@ -121,7 +121,13 @@
 
 					<td>
 						<p v-if="form.rentVehiclePriceVO">
+							<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">
+								无
+							</span>
+							<span v-else>
 								会员特权{{form.rentVehiclePriceVO.freeDayNum}}天
+							</span>
+							
 						</p>
 						<p v-else>
 							{{orderInfo('免费天数')}}
@@ -130,13 +136,14 @@
 
 
 					<td>
-						<p v-if="form.rentVehiclePriceVO">
+						<p v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0">
 							¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天
 						</p>
 						<p v-else>
 							{{orderInfo('车辆租赁费')}}
 						</p>
 					</td>
+
 					<td>
 						<p v-if="form.couponList">
 							<span
@@ -147,7 +154,7 @@
 						<p v-else>无</p>
 					</td>
 					<td>
-						<p v-if="form.rentVehiclePriceVO">
+						<p v-if="form.rentVehiclePriceVO && form.damageSafeAmount > 0">
 							¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>
@@ -163,7 +170,7 @@
 						</p>
 					</td>
 					<td>
-						<p v-if='form.rentVehiclePriceVO'>
+						<p v-if='form.rentVehiclePriceVO && form.driverAmount > 0'>
 							¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
 						</p>
 						<p v-else>
@@ -185,7 +192,7 @@
 							@click="resetReturn = true"
 						>更换</el-button>
 					</td>
-					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信公支付'}} 共计:￥{{form.realAmount}}</td>
+					<td colspan="6">{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
 				</tr>
 			</table>
 

src/views/order/rentVehicleInfo/index.vue

@@ -350,6 +350,7 @@
 							<span>{{dedDetailDTOListAll}}</span>
 						</el-form-item>
 						<el-form-item label="赔偿事项:">
+							<div v-if="orderReturnVehicleCrosstown.dedDetailDTOList != ''">
 								<div v-for="(item,index) in orderReturnVehicleCrosstown.dedDetailDTOList" :key="index">
 									<p
 										style="line-height: 1;position: relative;top: -3px;"
@@ -358,6 +359,8 @@
 										<img v-for="src in item.picList" :src="src" :key="src" class="voucher" />
 									</viewer>
 								</div>
+							</div>
+							<div v-else>暂无赔偿事项</div>
 						</el-form-item>
 						<el-form-item label="定损时间:">
 							<span>{{dateFormat(orderReturnVehicleCrosstown.updTime)}}</span>

src/views/vehicleType/priceList.vue

@@ -374,6 +374,7 @@ export default {
 				add_edit(params).then(data => {
 					if (data.status == 200) {
 						this.$message.success('设置成功')
+						this. this.chooseData = []
 						this.getList()
 					} else {
 						this.$message.error(data.message)