Skip to content

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

租车订单管理

parent 7d0ca3c8
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 58 deletions
config/dev.env.js
View file @ b4369734
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API:'"https://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.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://dev.dfangche.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.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(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/views/order/modal/rentOrderDetailModal.vue
View file @ b4369734
...@@ -97,11 +97,13 @@ ...@@ -97,11 +97,13 @@
<th>取/还时间</th> <th>取/还时间</th>
<th>交车公司</th> <th>交车公司</th>
<th>还车公司</th> <th>还车公司</th>
<th>免费天数</th> <th>免费天数</th>
<th>车辆租赁费</th> <th>车辆租赁费</th>
<th>优惠券</th> <th>优惠券</th>
<th>不计免赔</th> <th>不计免赔</th>
<th>租房车押金</th> <th>租房车押金</th>
<th>专职司机服务费</th>
</tr> </tr>
<tr> <tr>
<td>{{form.name}}</td> <td>{{form.name}}</td>
...@@ -111,8 +113,27 @@ ...@@ -111,8 +113,27 @@
</td> </td>
<td>{{form.startCompanyName}}</td> <td>{{form.startCompanyName}}</td>
<td>{{form.endCompanyName}}</td> <td>{{form.endCompanyName}}</td>
<td></td>
<td></td>
<td>
<p v-if="form.rentVehiclePriceVO">
会员特权{{form.rentVehiclePriceVO.freeDayNum}}天
</p>
<p v-else>
{{orderInfo('免费天数')}}
</p>
</td>
<td>
<p v-if="form.rentVehiclePriceVO">
¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天
</p>
<p v-else>
{{orderInfo('车辆租赁费')}}
</p>
</td>
<td> <td>
<p v-if="form.couponList"> <p v-if="form.couponList">
优惠券: 优惠券:
...@@ -121,19 +142,32 @@ ...@@ -121,19 +142,32 @@
:key="index" :key="index"
>{{item.title}}-{{item.usedAmount}}元</span> >{{item.title}}-{{item.usedAmount}}元</span>
</p> </p>
<p v-else>优惠券:无</p> <p v-else>无</p>
</td> </td>
<td></td>
<td> <td>
<!-- {{form.orderRentVehicleDetail.costDetail.children}} --> <p v-if="form.rentVehiclePriceVO">
<!-- <div v-show="form.orderRentVehicleDetail.costDetail"> ¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天
<p </p>
v-for="(item,index) in JSON.parse(form.orderRentVehicleDetail.costDetail).children" <p v-else>
:key="index" {{orderInfo('不计免赔')}}
>{{item.key}}:{{item.detail || '无'}}</p> </p>
</div> --> </td>
<td>
<p v-if='form.rentVehiclePriceVO'>
{{form.rentVehiclePriceVO.deposit}}
</p>
<p v-else>
{{orderInfo('租房车押金')}}
</p>
</td>
<td>
<p v-if='form.rentVehiclePriceVO'>
¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天
</p>
<p v-else>
{{orderInfo('专职司机服务费')}}
</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -149,7 +183,7 @@ ...@@ -149,7 +183,7 @@
@click="resetReturn = true" @click="resetReturn = true"
>更换</el-button> >更换</el-button>
</td> </td>
<td colspan="5">{{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> </tr>
</table> </table>
...@@ -298,6 +332,14 @@ export default { ...@@ -298,6 +332,14 @@ export default {
this.getAllFn() this.getAllFn()
}, },
methods: { methods: {
orderInfo(val){
let info = this.form.detailsOfExpenses.filter(item=>item.key == val)
if (info == '' || info < 0) {
return '无'
}else{
return info[0].detail || info[0].val
}
},
timestamp(now) { timestamp(now) {
var year = now.getFullYear() var year = now.getFullYear()
var month = now.getMonth() + 1 var month = now.getMonth() + 1
......
src/views/order/rentVehicleInfo/illegalModal.vue
View file @ b4369734
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</span> </span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>-->
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="违章截图" :style="{display:'block'}"> <el-form-item label="违章截图" :style="{display:'block'}">
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="违章罚款" style="display: inline-block;width:100%"> <el-form-item label="违章罚款" style="display: inline-block;width:100%">
<el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input><span style="margin-left:10px">元</span> <el-input style="width:300px" v-model="price" type="number" placeholder="请输入违章罚款金额"></el-input>
<span style="margin-left:10px">元</span>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
...@@ -157,18 +158,20 @@ export default { ...@@ -157,18 +158,20 @@ export default {
let t = this let t = this
getOneIllegalRow(id).then(response => { getOneIllegalRow(id).then(response => {
if (response.status == 200) { if (response.status == 200) {
let arr = response.data.picture.split(',') if (response.data) {
let fileList2 = [] let arr = response.data.picture.split(',')
let p = {} let fileList2 = []
arr.map(function(item) { let p = {}
p = { arr.map(function(item) {
url: item p = {
} url: item
fileList2.push(p) }
}) fileList2.push(p)
t.price = parseFloat(response.data.price) })
t.fileList2 = fileList2 t.price = parseFloat(response.data.price)
t.id = response.data.id ? response.data.id : undefined t.fileList2 = fileList2
t.id = response.data.id ? response.data.id : undefined
}
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
......
src/views/order/rentVehicleInfo/index.vue
View file @ b4369734
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form ref="queryForm" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="所属地区." prop="zoneId"> <el-form-item label="所属地区" prop="zoneId">
<el-select <el-select
class="filter-item" class="filter-item"
v-model="listQuery.zoneId" v-model="listQuery.zoneId"
...@@ -190,19 +190,19 @@ ...@@ -190,19 +190,19 @@
<template scope="scope"> <template scope="scope">
<el-button <el-button
size="small" size="small"
v-if="scope.row.status >=4" v-if="scope.row.status >=4 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleHandoverOrderVehicle(scope.row)" @click="handleHandoverOrderVehicle(scope.row)"
>交车记录</el-button> >交车记录</el-button>
<el-button <el-button
size="small" size="small"
v-if="scope.row.status == 6" v-if="scope.row.status == 6 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleReturnOrderVehicle(scope.row)" @click="handleReturnOrderVehicle(scope.row)"
>还车记录</el-button> >还车记录</el-button>
<el-button <el-button
size="small" size="small"
v-if="scope.row.status!=5&&scope.row.status > 3" v-if="scope.row.status!=5&&scope.row.status > 3 || scope.row.status == '-1'"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="handleRefundVehicle(scope.row)" @click="handleRefundVehicle(scope.row)"
>押金记录</el-button> >押金记录</el-button>
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="定损时间:"> <el-form-item label="定损时间:">
<span>{{dateFormat(orderReturnVehicleCrosstown.statusTime)}}</span> <span>{{dateFormat(orderReturnVehicleCrosstown.updTime)}}</span>
</el-form-item> </el-form-item>
</div> </div>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="收车时间:"> <el-form-item label="收车时间:">
<span class="label-text">{{dateFormat(orderReturnVehicleCrosstown.operatorTime)}}</span> <span class="label-text">{{orderReturnVehicleCrosstown.operatorTime ? dateFormat(orderReturnVehicleCrosstown.operatorTime): ''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1067,7 +1067,6 @@ export default { ...@@ -1067,7 +1067,6 @@ export default {
}, },
getAllOrderVehicleCrosstown() { getAllOrderVehicleCrosstown() {
getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => { getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => {
// console.log(response);
if (response.data.length <= 0) { if (response.data.length <= 0) {
alert('交还车记录不存在') alert('交还车记录不存在')
} else { } else {
...@@ -1082,7 +1081,6 @@ export default { ...@@ -1082,7 +1081,6 @@ export default {
) )
this.dedDetailDTOListAll = sum this.dedDetailDTOListAll = sum
} }
if (response.data[0].imgs) { if (response.data[0].imgs) {
this.otherImg = response.data[0].imgs.split(',') this.otherImg = response.data[0].imgs.split(',')
} }
...@@ -1396,6 +1394,7 @@ export default { ...@@ -1396,6 +1394,7 @@ export default {
width: 100px; width: 100px;
height: 100px; height: 100px;
border: 1px solid #d9d9d9; border: 1px solid #d9d9d9;
margin-right: 20px;
} }
.label-text { .label-text {
margin-left: 10px; margin-left: 10px;
......
src/views/vehicleType/priceList.vue
View file @ b4369734
...@@ -273,25 +273,26 @@ export default { ...@@ -273,25 +273,26 @@ export default {
setPrice() { setPrice() {
let params = [] let params = []
//全局设置 //全局设置
console.log(this.setForm.isGlobal);
if (this.setForm.isGlobal == 1) { if (this.setForm.isGlobal == 1) {
if (this.chooseData == '') { if (this.chooseData == '') {
this.$message.error('请选择要设置的日期') this.$message.error('请选择要设置的日期')
return false return false
} else if(this.setForm.type == 1 && this.setForm.multiple == ''){ } else if (
this.setForm.type == 1 &&
this.setForm.multiple == ''
) {
this.$message.error('请输入倍数') this.$message.error('请输入倍数')
return false return false
}else if(this.setForm.type == 2 && !this.setForm.price){ } else if (this.setForm.type == 2 && !this.setForm.price) {
this.$message.error('请输入绝对值') this.$message.error('请输入绝对值')
return false return false
}else if(this.setForm.type == 3 && this.setForm.level == ''){ } else if (this.setForm.type == 3 && this.setForm.level == '') {
this.$message.error('请选择会员等级') this.$message.error('请选择会员等级')
return false return false
}else if(this.setForm.freeDays == ''){ } else if (this.setForm.freeDays == '') {
this.$message.error('请设置天数') this.$message.error('请设置天数')
return false return false
}else{ } else {
this.chooseData.forEach(element => { this.chooseData.forEach(element => {
let defaults = {} let defaults = {}
defaults.date = element defaults.date = element
...@@ -308,10 +309,11 @@ export default { ...@@ -308,10 +309,11 @@ export default {
: Number(this.setForm.price) : Number(this.setForm.price)
defaults.freeDays = Number(this.setForm.freeDays) defaults.freeDays = Number(this.setForm.freeDays)
defaults.level = this.setForm.level defaults.level = this.setForm.level
params.push(defaults) params=[defaults]
}) })
} }
} else { } else {
//特殊设置
this.dayListData.forEach(element => { this.dayListData.forEach(element => {
if (this.setForm.type == 1) { if (this.setForm.type == 1) {
if (!!element.multiple || !!element.freeDays) { if (!!element.multiple || !!element.freeDays) {
...@@ -324,10 +326,11 @@ export default { ...@@ -324,10 +326,11 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格1')
// return false
// }
} else if (this.setForm.type == 2) { } else if (this.setForm.type == 2) {
if (!!element.price || !!element.freeDays) { if (!!element.price || !!element.freeDays) {
params.push({ params.push({
...@@ -339,10 +342,11 @@ export default { ...@@ -339,10 +342,11 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格2')
// return false
// }
} else { } else {
if (!!element.level || !!element.freeDays) { if (!!element.level || !!element.freeDays) {
params.push({ params.push({
...@@ -354,15 +358,17 @@ export default { ...@@ -354,15 +358,17 @@ export default {
vehicleModelId: element.vehicleModelId, vehicleModelId: element.vehicleModelId,
type: this.setForm.type type: this.setForm.type
}) })
} else {
this.$message.error('请设置不同车型不同价格')
return false
} }
// else {
// this.$message.error('请设置不同车型不同价格3')
// return false
// }
} }
}) })
} }
if (params == '') { if (params == '') {
this.$message.error('请设置不同车型不同价格') this.$message.error('请设置不同车型不同价格4')
return false return false
} else { } else {
add_edit(params).then(data => { add_edit(params).then(data => {
...@@ -389,10 +395,10 @@ export default { ...@@ -389,10 +395,10 @@ export default {
if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) { if (this.calendarStatus == 1 && this.setForm.isGlobal == 0) {
dayList(val).then(data => { dayList(val).then(data => {
data.data.forEach(element => { data.data.forEach(element => {
element.multiple = '' element.multiple = element.multiple || ''
element.price = '' element.price = element.price || ''
element.level = '' element.level = element.level||''
element.freeDays = '' element.freeDays = element.freeDays||''
}) })
this.dayListData = data.data this.dayListData = data.data
this.setMultiplePop = true this.setMultiplePop = true
......
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