Skip to content

C
cloud-platform-ui
Commit c11c4c53 authored by guoyou's avatar guoyou
Browse files
Options

解决冲突

parent e0fb6fa7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1481 additions and 3338 deletions
config/dev.env.js
View file @ c11c4c53
module.exports = {
NODE_ENV: '"development"',
<<<<<<< HEAD
<<<<<<< HEAD
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> 4ae432b1473866a6dc59f10c1ec4b5c66a9ad5cc
APP_ORIGIN: '"https://wallstreetcn.com"'
}
src/views/order/modal/rentOrderDetailModal.vue
View file @ c11c4c53
<template>
<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="90px">
<el-form :model="form" ref="form" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="订单号:">
......@@ -8,28 +8,34 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="支付时间:">
<span>{{form.crtTime}}</span>
<el-form-item label="订单创建时间:">
<span></span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态:">
<span>{{form.ststusName}}</span>
<el-form-item label="实际支付时间:">
<span>{{form.crtTime}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姓名:">
<span>{{form.realName}}</span>
<el-form-item label="订单状态:">
<span>{{form.ststusName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号:">
<span>{{form.telephone}}</span>
<el-form-item label="姓名/手机号:">
<span>{{form.realName}}/{{form.telephone}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员等级/身份:">
<span></span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="配车:">
<span
style="margin-right: 10px;"
......@@ -42,9 +48,9 @@
@click="resetCar"
>重新配车</el-button>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="取车:">
<span>{{form.orderRentVehicleDetail.startTime}}</span>
......@@ -60,8 +66,8 @@
<span>{{form.startCompanyName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
</el-row> -->
<!-- <el-row>
<el-col :span="8">
<el-form-item label="还车:">
<span>{{form.orderRentVehicleDetail.endTime}}</span>
......@@ -75,27 +81,66 @@
<el-col :span="8">
<el-form-item label="还车公司:">
<span>{{form.endCompanyName}}</span>
<el-button v-show="form.status == 4 || form.status == 5" size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button>
<el-button
v-show="form.status == 4 || form.status == 5"
size="mini"
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
>更换</el-button>
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<table class="orderDetail">
<tr>
<th>房车</th>
<th>租借天数</th>
<th>取/还时间</th>
<th>交车公司</th>
<th>还车公司</th>
<th>费用明细</th>
</tr>
<tr>
<td>{{form.name}}{{rentCostDetail}}</td>
<td>{{form.orderRentVehicleDetail.dayNum}}天</td>
<td>{{rentCostDetail}}</td>
<!-- {{rentCostDetail}} -->
<td>{{form.name}}</td>
<td>
<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
<p>租借天数:{{form.orderRentVehicleDetail.dayNum}}</p>
</td>
<td>{{form.startCompanyName}}</td>
<td>{{form.endCompanyName}}</td>
<td>
<p>车辆租赁费:</p>
<p>免费天数:</p>
<p>不计免赔:</p>
<p>租房车押金:</p>
<p>优惠券:</p>
</td>
</tr>
<tr>
<td>
<el-button size="small" type="text" v-if="form.status==4" @click="resetCar">重新配车</el-button>
</td>
<td></td>
<td></td>
<td>
<el-button
v-show="form.status == 4 || form.status == 5"
size="mini"
type="text"
style="padding: 7px 9px;"
@click="resetReturn = true"
>更换</el-button>
</td>
<td>共计:￥{{form.realAmount}}</td>
</tr>
</table>
<p>额外随车物品:11111</p>
<p>内部邀请人:11111</p>
<p>驾驶证:11111</p>
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
<span style="font-size: 18px;font-weight: bold;">驾驶人信息</span>
</div>
......@@ -106,7 +151,6 @@
<th>身份证号</th>
<!-- <th>驾照</th>-->
</tr>
<tr>
<td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
<td>{{form.orderVehicleCrosstownDto.licensePhone}}</td>
......@@ -252,10 +296,9 @@ export default {
type: 'success',
duration: 3000
})
this.resetReturn = false;
this.dialogVisible = false;
this.resetReturn = false
this.dialogVisible = false
this.$emit('rentOrderDetailDialogEvent', true)
} else {
this.$notify({
title: '失败',
......
src/views/order/rentVehicleInfo/index.vue
View file @ c11c4c53
......@@ -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>
......@@ -218,6 +234,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">
......@@ -358,11 +380,6 @@
<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"
......@@ -374,14 +391,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"
......@@ -390,21 +399,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"
......@@ -415,11 +415,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"
......@@ -881,6 +876,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
......@@ -891,6 +887,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/summit/model/reviewPopup.vue
View file @ c11c4c53
......@@ -170,10 +170,6 @@ export default {
beforeAvatarUpload(file) {
var index = file.name.lastIndexOf('.')
var ext = file.name.substr(index + 1)
<<<<<<< HEAD
console.log(ext)
=======
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!')
return false
......@@ -200,11 +196,7 @@ export default {
cre() {
let zipPic = []
this.list.forEach(element => {
<<<<<<< HEAD
zipPic.push(element.url)
=======
zipPic.push(element.response.data)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
})
let mp4Vadio = []
this.vadio.forEach(element => {
......@@ -226,11 +218,8 @@ export default {
: zipPic.join(',') + ',' + this.oldList
: zipPic.join(',')
}
<<<<<<< HEAD
=======
// console.log(params);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
save(params).then(res => {
this.responseResult(res)
})
......
src/views/vehicle/vehicleInfo/index.vue
View file @ c11c4c53
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment