租车订单管理

src/views/order/rentVehicleInfo/index.vue

@@ -18,32 +18,13 @@
 					</el-col>
 					<el-col :span="5">
 						<el-form-item label="所属公司" prop="startCompanyId">
-<<<<<<< HEAD
-							<!-- <el-select
-								class="filter-item"
-=======
 							<el-select
->>>>>>> base-modify
 								v-model="listQuery.startCompanyId"
 								filterable
 								placeholder="请选择"
 								getAllBranchCompanyChange
 							>
 								<el-option :key="undefined" label="无" :value="undefined"></el-option>
-<<<<<<< HEAD
-								<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>
-=======
->>>>>>> base-modify
 								<el-option
 									v-for="item in allBranchCompany"
 									:key="item.id"
@@ -271,16 +252,7 @@
 			v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
 		></rentOrderDetailModal>
 
-<<<<<<< HEAD
-		<!-- 交车记录 -->
-		
-
-
-
-
-=======
 		<!-- 交车记录,还车记录,押金记录 -->
->>>>>>> base-modify
 		<el-dialog :title="modalTitle" :visible.sync="orderVehicleCrosstownVisible">
 			<el-form :model="form" :rules="rules" ref="form" label-width="90px">
 				<div v-if="modalTitle=='交车记录'">
@@ -558,75 +530,6 @@
 						</li>
 					</ul>
 				</div>
-<<<<<<< HEAD
-				<div v-if="vehicleDetail" style="border: 1px solid;">
-					<div style="border-bottom: 1px solid;">
-						<span class="label-text">交车交接人:</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.username}}</span>
-					</div>
-					<div>
-						<span class="label-text">上传驾驶证*:</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.licenseName}}</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.licensePhone}}</span>
-						<br />
-						<span style="margin-left:110px;">身份证号:</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.licenseIdCard}}</span>
-						<br />
-						<viewer>
-							<img
-								:src="orderReturnVehicleCrosstown.userLicenseImg"
-								style="width: 100px; height: 100px;margin-left:110px;"
-							/>
-						</viewer>
-					</div>
-
-					<div>
-						<span class="label-text">拍照取证*:</span>
-						<br />
-						<viewer :images="otherImg">
-							<img
-								v-for="src in otherImg"
-								:src="src"
-								:key="src"
-								style="width: 100px; height: 100px;margin-left:110px;"
-							/>
-						</viewer>
-					</div>
-					<div v-if="handover">
-						<span class="label-text">房车公里数*:</span>
-						<span class="label-text">当前公里数:</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.mileage}}Km</span>
-						<br />
-						<viewer>
-							<img
-								:src="orderReturnVehicleCrosstown.mileageImg"
-								style="width: 100px; height: 100px;margin-left:110px;"
-							/>
-						</viewer>
-					</div>
-					<div v-if="returnVehicle">
-						<span class="label-text">钥匙照片*:</span>
-						<br />
-						<viewer>
-							<img
-								:src="orderReturnVehicleCrosstown.vehicleKey"
-								style="width: 100px; height: 100px;margin-left:110px;"
-							/>
-						</viewer>
-					</div>
-					<div v-if="returnVehicle">
-						<span class="label-text">押金扣除项*:</span>
-						<span>{{orderReturnVehicleCrosstown.deduction?'有扣除项':'没有扣除项'}}</span>
-						<br />
-					</div>
-					<div>
-						<span class="label-text">备注:</span>
-						<span class="label-text">{{orderReturnVehicleCrosstown.remak}}</span>
-					</div>
-					<div></div>
-				</div>
-=======
->>>>>>> base-modify
 			</el-form>
 		</el-dialog>