修改订单详情图片显示问题

src/views/order/rentVehicleInfo/index.vue

@@ -18,7 +18,7 @@
 					</el-col>
 					<el-col :span="5">
 						<el-form-item label="所属公司" prop="startCompanyId">
-							<el-select
+							<!-- <el-select
 								class="filter-item"
 								v-model="listQuery.startCompanyId"
 								placeholder="请选择"
@@ -26,6 +26,22 @@
 							>
 								<el-option :key="undefined" label="无" :value="undefined"></el-option>
 								<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
+							</el-select>-->
+
+							<el-select
+								v-model="listQuery.startCompanyId"
+								class="filter-item"
+								filterable
+								placeholder="请选择"
+								@change="getAllBranchCompanyChange"
+							>
+								<el-option :key="undefined" label="无" :value="undefined"></el-option>
+								<el-option
+									v-for="item in allBranchCompany"
+									:key="item.id"
+									:label="item.name"
+									:value="item.id"
+								></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -242,6 +258,12 @@
 			v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
 		></rentOrderDetailModal>
 
+		<!-- 交车记录 -->
+		
+
+
+
+
 		<el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible">
 			<el-form :model="form" :rules="rules" ref="form" label-width="90px">
 				<div class="label-title">
@@ -382,14 +404,9 @@
 						<span style="margin-left:110px;">身份证号:</span>
 						<span class="label-text">{{orderReturnVehicleCrosstown.licenseIdCard}}</span>
 						<br />
-						<!-- <img
-							:src="orderReturnVehicleCrosstown.licenseImg"
-							style="width: 100px; height: 100px;margin-left:110px;"
-							@click="lookPic(orderReturnVehicleCrosstown.licenseImg)"
-						/>-->
 						<viewer>
 							<img
-								:src="orderReturnVehicleCrosstown.licenseImg"
+								:src="orderReturnVehicleCrosstown.userLicenseImg"
 								style="width: 100px; height: 100px;margin-left:110px;"
 							/>
 						</viewer>
@@ -398,14 +415,6 @@
 					<div>
 						<span class="label-text">拍照取证*:</span>
 						<br />
-						<!-- <img
-							v-for="(item,index) in otherImg"
-							:src="item"
-							:key="index"
-							style="width: 100px; height: 100px;margin-left:110px;"
-              				@click="lookPic(item)"
-						/>-->
-
 						<viewer :images="otherImg">
 							<img
 								v-for="src in otherImg"
@@ -414,21 +423,12 @@
 								style="width: 100px; height: 100px;margin-left:110px;"
 							/>
 						</viewer>
-
-						<!-- 	<img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>
-              <img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>
-						<img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>-->
 					</div>
 					<div v-if="handover">
 						<span class="label-text">房车公里数*:</span>
 						<span class="label-text">当前公里数:</span>
 						<span class="label-text">{{orderReturnVehicleCrosstown.mileage}}Km</span>
 						<br />
-						<!-- <img
-							:src="orderReturnVehicleCrosstown.mileageImg"
-							style="width: 100px; height: 100px;margin-left:110px;"
-              	@click="lookPic(orderReturnVehicleCrosstown.mileageImg)"
-						/>-->
 						<viewer>
 							<img
 								:src="orderReturnVehicleCrosstown.mileageImg"
@@ -439,11 +439,6 @@
 					<div v-if="returnVehicle">
 						<span class="label-text">钥匙照片*:</span>
 						<br />
-						<!-- <img
-							:src="orderReturnVehicleCrosstown.vehicleKey"
-							style="width: 100px; height: 100px;margin-left:110px;"
-              	@click="lookPic(orderReturnVehicleCrosstown.vehicleKey)"
-						/>-->
 						<viewer>
 							<img
 								:src="orderReturnVehicleCrosstown.vehicleKey"
@@ -943,6 +938,7 @@ export default {
 						this.form.orderRentVehicleDetail.costDetail
 					)
 					var cost = ''
+					// console.log(this.costDetail.children);
 					if (this.costDetail.children) {
 						this.costDetail.children.forEach(function(a) {
 							var detail = a.detail == undefined ? '' : a.detail
@@ -953,6 +949,7 @@ export default {
 					this.templateModel()
 				}
 			}
+			// console.log(cost);
 			this.tourCostDetail = cost
 			if (this.form.orderRentVehicleDetail.driverType == 1) {
 				this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600

src/views/vehicle/bookRecord/index.vue

@@ -399,7 +399,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="操作人">
+						<el-form-item label="交车人">
 							<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.checkMan}}</span>
 						</el-form-item>
 					</el-col>
@@ -448,7 +448,7 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="操作人">
+						<el-form-item label="收车人">
 							<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.recycleMan}}</span>
 						</el-form-item>
 					</el-col>