Commit bc6796e1 authored by hezhen's avatar hezhen

Merge branch 'base-modify'

# Conflicts:
#	src/views/order/rentVehicleInfo/index.vue
parents 07e1e4b6 67eeab46
...@@ -191,10 +191,13 @@ export function dayList(day) { ...@@ -191,10 +191,13 @@ export function dayList(day) {
} }
// 日历价格设置 // 日历价格设置
export function add_edit(params) { export function add_edit(params, date) {
return fetch({ return fetch({
url: '/vehicle/admin/vehicle_model/calendar_price/add_edit', url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
method: 'post', method: 'post',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
data: params data: params
}); });
} }
......
...@@ -381,7 +381,7 @@ export default { ...@@ -381,7 +381,7 @@ export default {
duration: 2000 duration: 2000
}) })
} else { } else {
this.returnForm.id = this.form.detailId this.returnForm.id = this.orderDetailInfo.orderRentVehicleDetail.id
updateEndCompany(this.returnForm).then(data => { updateEndCompany(this.returnForm).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$notify({ this.$notify({
...@@ -407,7 +407,7 @@ export default { ...@@ -407,7 +407,7 @@ export default {
resetCar() { resetCar() {
this.clearFrom() this.clearFrom()
this.resetCarVisible = true this.resetCarVisible = true
this.resetCarForm.no = this.form.no this.resetCarForm.no = this.orderDetailInfo.no
}, },
cancelResetCar() { cancelResetCar() {
this.resetCarVisible = false this.resetCarVisible = false
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
duration: 2000 duration: 2000
}) })
this.resetCarVisible = false this.resetCarVisible = false
this.form.vehicleNumberPlat = this.resetCarForm.numberPlate this.orderDetailInfo.vehicleNumberPlat = this.resetCarForm.numberPlate
this.updateNumberPlat = true this.updateNumberPlat = true
} else { } else {
this.$notify({ this.$notify({
......
...@@ -115,12 +115,12 @@ ...@@ -115,12 +115,12 @@
> >
<el-table-column align="center" label="ID" width="70"> <el-table-column align="center" label="ID" width="70">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.id}}</span> <span>{{scope.row.orderId}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="订单号/下单时间"> <el-table-column width="200" align="center" label="订单号/下单时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.no}}</span> <span>{{scope.row.orderNo}}</span>
<br /> <br />
<span>{{scope.row.crtTime}}</span> <span>{{scope.row.crtTime}}</span>
</template> </template>
...@@ -132,23 +132,23 @@ ...@@ -132,23 +132,23 @@
</el-table-column> </el-table-column>
<el-table-column min-width="250" align="center" label="名称/车牌号"> <el-table-column min-width="250" align="center" label="名称/车牌号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.vehicleName}}</span>
<br /> <br />
<span>{{scope.row.vehicleNumberPlat}}</span> <span>{{scope.row.numberPlate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="姓名/手机号"> <el-table-column width="150" align="center" label="姓名/手机号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.realName}}</span>/ <span>{{scope.row.username}}</span>/
<span>{{scope.row.telephone}}</span> <span>{{scope.row.telephone}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="取车时间/还车时间"> <el-table-column width="200" align="center" label="取车时间/还车时间">
<template scope="scope"> <template scope="scope">
取: 取:
<span>{{dateFormat(scope.row.orderRentVehicleDetail.startTime)}}</span> <span>{{dateFormat(scope.row.startTime)}}</span>
<br />还: <br />还:
<span>{{dateFormat(scope.row.orderRentVehicleDetail.endTime)}}</span> <span>{{dateFormat(scope.row.endTime)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="交车公司"> <el-table-column width="200" align="center" label="交车公司">
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="订单金额"> <el-table-column width="110" align="center" label="订单金额">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.orderAmount}}</span> <span>{{scope.row.realAmount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="支付方式"> <el-table-column width="110" align="center" label="支付方式">
...@@ -246,8 +246,7 @@ ...@@ -246,8 +246,7 @@
<!-- 订单详情 --> <!-- 订单详情 -->
<rentOrderDetailModal <rentOrderDetailModal
:form="form" :orderDetailInfo="orderDetailInfo"
:rentCostDetail="tourCostDetail"
v-if="rentDialogVisible" v-if="rentDialogVisible"
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
></rentOrderDetailModal> ></rentOrderDetailModal>
...@@ -259,7 +258,7 @@ ...@@ -259,7 +258,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="客户姓名:"> <el-form-item label="客户姓名:">
<span>{{form.realName}}</span> <span>{{form.username}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
...@@ -358,8 +357,8 @@ ...@@ -358,8 +357,8 @@
</div> </div>
<div v-show="modalTitle=='还车记录'"> <div v-show="modalTitle=='还车记录'">
<div v-show="orderReturnVehicleCrosstown.type == 3"> <div v-show="orderReturnVehicleCrosstown.type == 3">
<el-form-item label="定损类型:"> <!-- <el-form-item label="定损类型:">
<span></span> <span></span> -->
</el-form-item> </el-form-item>
<el-form-item label="定损总赔:"> <el-form-item label="定损总赔:">
<span>{{dedDetailDTOListAll}}</span> <span>{{dedDetailDTOListAll}}</span>
...@@ -573,7 +572,8 @@ import { ...@@ -573,7 +572,8 @@ import {
getOrderVehicleCrosstown, getOrderVehicleCrosstown,
getStep, getStep,
calculate, calculate,
getViolatePrice getViolatePrice,
orderDetail
} from 'api/order/rentVehicle' } from 'api/order/rentVehicle'
import { import {
toEast8Date, toEast8Date,
...@@ -627,10 +627,12 @@ export default { ...@@ -627,10 +627,12 @@ export default {
hasDiscount: undefined, hasDiscount: undefined,
hasMemberRight: undefined, hasMemberRight: undefined,
hasPay: undefined, hasPay: undefined,
id: undefined, orderId: undefined,
name: undefined, name: undefined,
realName: undefined, username: undefined,
no: undefined, orderNo: undefined,
startTime: undefined,
endTime: undefined,
orderAmount: undefined, orderAmount: undefined,
orderOrigin: undefined, orderOrigin: undefined,
orderVehicleCrosstownDto: { orderVehicleCrosstownDto: {
...@@ -769,17 +771,102 @@ export default { ...@@ -769,17 +771,102 @@ export default {
order_btn_order_violcation_save: false, order_btn_order_violcation_save: false,
depositDetail: false, depositDetail: false,
checkUserInfo: [], checkUserInfo: [],
costDetail: { orderDetailInfo: {
key: undefined, code: undefined,
val: undefined, couponAmount: undefined,
children: [ crtHost: undefined,
{ crtName: undefined,
key: undefined, crtTime: undefined,
detail: undefined, crtUser: undefined,
val: undefined damagesAmount: undefined,
} dedDetailDTO: undefined,
] detailId: undefined,
} endCompanyName: undefined,
extraAmount: undefined,
goodsAmount: undefined,
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
illegalReserve: undefined,
items: [],
memberLevel: undefined,
memberName: undefined,
name: undefined,
no: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderRentVehicleDetail: {
bookRecordId: undefined,
costDetail: undefined,
crtTime: undefined,
damageSafe: undefined,
dayNum: 0,
deposit: undefined,
driverType: undefined,
endAddr: undefined,
endCity: undefined,
endCityName: undefined,
endCompanyId: undefined,
endTime: undefined,
fixedLossStatus: undefined,
freeDays: undefined,
handelViolation: undefined,
id: undefined,
modelId: undefined,
orderId: undefined,
rebate: undefined,
score: undefined,
startAddr: undefined,
startCity: undefined,
startCityName: undefined,
startCompanyId: undefined,
startTime: undefined,
stime: undefined,
suserid: undefined,
updTime: undefined,
usedDay: undefined,
vehicleId: undefined,
violateTrafficAmount: undefined
},
orderVehicleCrosstownDto: {
licenseIdCard: '',
licenseImg: '',
licenseName: '',
licensePhone: ''
},
outTradeNo: undefined,
payOrigin: undefined,
payTime: undefined,
picture: undefined,
realAmount: undefined,
refundStatus: undefined,
rentVehiclePriceVO: undefined,
startCompanyName: undefined,
status: undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
userCompanyStatus: undefined,
userId: undefined,
username: undefined,
vehicalNumberPlat: undefined,
vehicleUserLicenses: undefined,
version: undefined,
violateAmount: undefined,
costDetail: {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
},
} }
}, },
created() { created() {
...@@ -899,7 +986,7 @@ export default { ...@@ -899,7 +986,7 @@ export default {
appUserId: row.userId, appUserId: row.userId,
changeViolateAmount: null changeViolateAmount: null
} }
calculate(row.no, params).then(data => { calculate(row.orderNo, params).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$notify({ this.$notify({
title: '成功', title: '成功',
...@@ -941,9 +1028,63 @@ export default { ...@@ -941,9 +1028,63 @@ export default {
that.row = row that.row = row
} }
}, },
getOrderDetail() {
if(this.form.orderNo) {
var param = {
"orderNo":this.form.orderNo,
"flag" : true
}
orderDetail(param).then(response => {
this.orderDetailInfo = response.data
if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
if(this.orderDetailInfo.memberLevel == 1) {
this.orderDetailInfo.memberName = "普通会员"
}
if(this.orderDetailInfo.memberLevel == 2) {
this.orderDetailInfo.memberName = "黄金会员"
}
if(this.orderDetailInfo.memberLevel == 3) {
this.orderDetailInfo.memberName = "钻石会员"
}
if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
}
if(this.orderDetailInfo.costDetail.paramJson) {
this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
}
if(this.orderDetailInfo.items) {
for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
if(this.orderDetailInfo.items[i].type == 104) {
this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
}
}
}
if (this.orderDetailInfo.status == 2) {
this.orderDetailInfo.ststusName = '取消'
}
if (this.orderDetailInfo.status == -1) {
this.orderDetailInfo.ststusName = '定损中'
}
if (this.orderDetailInfo.status == 3) {
this.orderDetailInfo.ststusName = '待付款'
}
if (this.orderDetailInfo.status == 4) {
this.orderDetailInfo.ststusName = '待出行'
}
if (this.orderDetailInfo.status == 5) {
this.orderDetailInfo.ststusName = '出行中'
}
if (this.orderDetailInfo.status == 6) {
this.orderDetailInfo.ststusName = '已完成'
}
}
this.rentDialogVisible = true
})
}
},
checkViolateAmount() { checkViolateAmount() {
console.log(this.topAmount)
console.log(this.violateAmount)
if (this.topAmount < this.violateAmount) { if (this.topAmount < this.violateAmount) {
this.$notify({ this.$notify({
title: '失败', title: '失败',
...@@ -959,7 +1100,7 @@ export default { ...@@ -959,7 +1100,7 @@ export default {
appUserId: this.row.userId, appUserId: this.row.userId,
changeViolateAmount: this.violateAmount changeViolateAmount: this.violateAmount
} }
calculate(this.row.no, params).then(data => { calculate(this.row.orderNo, params).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$notify({ this.$notify({
title: '成功', title: '成功',
...@@ -988,7 +1129,7 @@ export default { ...@@ -988,7 +1129,7 @@ export default {
cancelReason: '后台取消', cancelReason: '后台取消',
appUserId: row.userId appUserId: row.userId
} }
getViolatePrice(row.no).then(data => { getViolatePrice(row.orderNo).then(data => {
if (data.status == 200) { if (data.status == 200) {
that.topAmount = data.data.topAmount that.topAmount = data.data.topAmount
that.cancel(row, data.data.cutAmount) that.cancel(row, data.data.cutAmount)
...@@ -1022,37 +1163,15 @@ export default { ...@@ -1022,37 +1163,15 @@ export default {
if (this.form.status == -1) { if (this.form.status == -1) {
this.form.ststusName = '定损中' this.form.ststusName = '定损中'
} }
this.form.orderRentVehicleDetail.startTime = this.form this.form.startTime = this.form
.orderRentVehicleDetail.startTime .startTime
? timestamp2Date(this.form.orderRentVehicleDetail.startTime) ? timestamp2Date(this.form.startTime)
: '' : ''
this.form.orderRentVehicleDetail.endTime = this.form this.form.endTime = this.form
.orderRentVehicleDetail.endTime .endTime
? timestamp2Date(this.form.orderRentVehicleDetail.endTime) ? timestamp2Date(this.form.endTime)
: '' : ''
if (this.form.orderRentVehicleDetail.costDetail) { this.getOrderDetail();
try {
this.costDetail = JSON.parse(
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
cost += a.key + ':' + detail + ' '
})
}
} catch (e) {
this.templateModel()
}
}
// console.log(cost);
this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
}
this.rentDialogVisible = true
}, },
/** /**
* 租车订单详情弹框关闭 * 租车订单详情弹框关闭
...@@ -1084,7 +1203,6 @@ export default { ...@@ -1084,7 +1203,6 @@ export default {
illegalEvent(params) { illegalEvent(params) {
this.illegalVisible = false this.illegalVisible = false
if (params) { if (params) {
// console.log(params);
} }
}, },
/** /**
...@@ -1093,11 +1211,10 @@ export default { ...@@ -1093,11 +1211,10 @@ export default {
detailEvent(params) { detailEvent(params) {
this.detailVisible = false this.detailVisible = false
if (params) { if (params) {
// console.log(params);
} }
}, },
handleHandoverOrderVehicle(row) { handleHandoverOrderVehicle(row) {
// console.log(row);
this.modalTitle = '交车记录' this.modalTitle = '交车记录'
this.form = row this.form = row
if (this.form.status == 2) { if (this.form.status == 2) {
...@@ -1118,27 +1235,7 @@ export default { ...@@ -1118,27 +1235,7 @@ export default {
if (this.form.status == -1) { if (this.form.status == -1) {
this.form.ststusName = '定损中' this.form.ststusName = '定损中'
} }
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.orderVehicleQuery.orderId = this.form.orderId
this.form.orderRentVehicleDetail.startTime
)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(
this.form.orderRentVehicleDetail.endTime
)
this.costDetail = JSON.parse(
this.form.orderRentVehicleDetail.costDetail
)
var cost = ''
if (this.costDetail.children) {
this.costDetail.children.forEach(function(a) {
var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ':' + detail + ' '
})
}
this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
}
this.orderVehicleQuery.orderId = this.form.id
this.orderVehicleQuery.type = 1 this.orderVehicleQuery.type = 1
this.orderVehicleQuery.types = null this.orderVehicleQuery.types = null
this.getAllOrderVehicleCrosstown() this.getAllOrderVehicleCrosstown()
...@@ -1176,7 +1273,6 @@ export default { ...@@ -1176,7 +1273,6 @@ export default {
}, },
handleReturnOrderVehicle(row) { handleReturnOrderVehicle(row) {
// console.log(row);
this.modalTitle = '还车记录' this.modalTitle = '还车记录'
this.form = row this.form = row
if (this.form.status == 2) { if (this.form.status == 2) {
...@@ -1197,27 +1293,14 @@ export default { ...@@ -1197,27 +1293,14 @@ export default {
if (this.form.status == -1) { if (this.form.status == -1) {
this.form.ststusName = '定损中' this.form.ststusName = '定损中'
} }
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.form.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime this.form.startTime
) )
this.form.orderRentVehicleDetail.endTime = timestamp2Date( this.form.endTime = timestamp2Date(
this.form.orderRentVehicleDetail.endTime this.form.endTime
) )
this.costDetail = JSON.parse(
this.form.orderRentVehicleDetail.costDetail this.orderVehicleQuery.orderId = this.form.orderId
)
var cost = ''
if (this.costDetail.children) {
this.costDetail.children.forEach(function(a) {
var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ':' + detail + ' '
})
}
this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
}
this.orderVehicleQuery.orderId = this.form.id
this.orderVehicleQuery.types = '2,3' this.orderVehicleQuery.types = '2,3'
this.orderVehicleQuery.type = null this.orderVehicleQuery.type = null
this.getAllOrderVehicleCrosstown() this.getAllOrderVehicleCrosstown()
...@@ -1227,7 +1310,6 @@ export default { ...@@ -1227,7 +1310,6 @@ export default {
this.depositDetail = false this.depositDetail = false
}, },
handleRefundVehicle(row) { handleRefundVehicle(row) {
// console.log(row);
this.activeInfo = row this.activeInfo = row
var that = this var that = this
that.pictureList = [] that.pictureList = []
...@@ -1235,7 +1317,7 @@ export default { ...@@ -1235,7 +1317,7 @@ export default {
that.depositRefundRecord = [] that.depositRefundRecord = []
that.dedTotal = 0 that.dedTotal = 0
that.Tel = '' that.Tel = ''
getStep(row.no + '&address=1').then(response => { getStep(row.orderNo + '&address=1').then(response => {
this.activeRecord = response.data[0] this.activeRecord = response.data[0]
response.data.forEach(function(item) { response.data.forEach(function(item) {
...@@ -1280,7 +1362,7 @@ export default { ...@@ -1280,7 +1362,7 @@ export default {
var arr = item.depositRefundRecord var arr = item.depositRefundRecord
} }
that.depositRefundRecord = arr that.depositRefundRecord = arr
// console.log(that.depositRefundRecord);
} }
}) })
}) })
...@@ -1304,11 +1386,11 @@ export default { ...@@ -1304,11 +1386,11 @@ export default {
if (this.form.status == -1) { if (this.form.status == -1) {
this.form.ststusName = '定损中' this.form.ststusName = '定损中'
} }
this.form.orderRentVehicleDetail.startTime = timestamp2Date( this.form.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime this.form.startTime
) )
this.form.orderRentVehicleDetail.endTime = timestamp2Date( this.form.endTime = timestamp2Date(
this.form.orderRentVehicleDetail.endTime this.form.endTime
) )
this.orderVehicleCrosstownVisible = true this.orderVehicleCrosstownVisible = true
this.vehicleDetail = false this.vehicleDetail = false
...@@ -1415,7 +1497,6 @@ export default { ...@@ -1415,7 +1497,6 @@ export default {
page(this.listQuery).then(response => { page(this.listQuery).then(response => {
if (response.data.data) { if (response.data.data) {
response.data.data.map(function(el) { response.data.data.map(function(el) {
// console.log(el);
if (el.status == 2) { if (el.status == 2) {
el.ststusName = '取消' el.ststusName = '取消'
} }
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="收款账号"> <el-table-column align="center" label="收款账号">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.accountNumber}}</span> <span>{{scope.row.accountName}}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
<el-radio v-model="dialogFrom.status" label="1">通过</el-radio> <el-radio v-model="dialogFrom.status" label="1">通过</el-radio>
<el-radio v-model="dialogFrom.status" label="2">拒绝</el-radio> <el-radio v-model="dialogFrom.status" label="2">拒绝</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="订单号" v-if="dialogFrom.status==1" required> <el-form-item label="订单号" v-if="dialogFrom.status==1 && this.activeOfflineWay == 2" required>
<el-input v-model="dialogFrom.cono" placeholder="请输入订单号"></el-input> <el-input v-model="dialogFrom.payMentNo" placeholder="请输入订单号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="拒绝原因" v-if="dialogFrom.status==2" required> <el-form-item label="拒绝原因" v-if="dialogFrom.status==2" required>
<el-input type="textarea" v-model="dialogFrom.reason" placeholder="拒绝原因"></el-input> <el-input type="textarea" v-model="dialogFrom.reason" placeholder="拒绝原因"></el-input>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancelHandel">取 消</el-button> <el-button @click="cancelHandel">取 消</el-button>
<el-button type="primary" @click="edit('dialogFrom')">确 定</el-button> <el-button type="primary" @click="edit('dialogFrom')" :loading="submitBtn">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
}, },
data() { data() {
return { return {
submitBtn:false,
time:[],//提现时间 time:[],//提现时间
typeOptions: [ typeOptions: [
{ {
...@@ -170,6 +171,7 @@ export default { ...@@ -170,6 +171,7 @@ export default {
val: '1' val: '1'
} }
], ],
activeOfflineWay:null,
dialogVisible: false, dialogVisible: false,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
showLoadingBody: false, showLoadingBody: false,
...@@ -190,7 +192,7 @@ export default { ...@@ -190,7 +192,7 @@ export default {
tableKey: 0, tableKey: 0,
dialogFrom: { dialogFrom: {
status: '1', status: '1',
cono: '', payMentNo: '',
reason: '' reason: ''
} }
} }
...@@ -254,14 +256,16 @@ export default { ...@@ -254,14 +256,16 @@ export default {
}, },
handleUpdate(row) { handleUpdate(row) {
this.dialogFrom.cathId = row.id this.dialogFrom.cathId = row.id
this.activeOfflineWay = row.offlineWay
this.dialogVisible = true this.dialogVisible = true
}, },
edit(formName) { edit(formName) {
var that = this var that = this
const set = this.$refs const set = this.$refs
set[formName].validate(valid => { set[formName].validate(valid => {
if (this.dialogFrom.status == 1) { if (this.dialogFrom.status == 1 && this.activeOfflineWay == 2) {
if (this.dialogFrom.cono == '') { if (this.dialogFrom.payMentNo == '') {
this.$notify({ this.$notify({
title: '警告', title: '警告',
message: '请输入订单号', message: '请输入订单号',
...@@ -283,6 +287,7 @@ export default { ...@@ -283,6 +287,7 @@ export default {
} }
} }
if (valid) { if (valid) {
this.submitBtn = true;
editObj(that.dialogFrom).then(response => { editObj(that.dialogFrom).then(response => {
if (response.status === 200) { if (response.status === 200) {
this.dialogVisible = false this.dialogVisible = false
...@@ -293,6 +298,7 @@ export default { ...@@ -293,6 +298,7 @@ export default {
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.submitBtn = false;
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
...@@ -302,6 +308,7 @@ export default { ...@@ -302,6 +308,7 @@ export default {
type: 'error', type: 'error',
duration: 2000 duration: 2000
}) })
this.submitBtn = false;
} }
}) })
} else { } else {
......
...@@ -9,99 +9,81 @@ ...@@ -9,99 +9,81 @@
label-width="100px" label-width="100px"
> >
<el-row> <el-row>
<el-col :span="5"> <el-form-item label="车牌">
<el-form-item label="车牌"> <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input> </el-form-item>
</el-form-item> <el-form-item label="车辆编码">
</el-col> <el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
<el-col :span="5"> </el-form-item>
<el-form-item label="车辆编码"> <el-form-item label="车辆状态">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
</el-form-item> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
</el-col> <el-option
<el-col :span="5"> v-for="(val,index) in getAllVehicleStatus() "
<el-form-item label="车辆状态"> :key="index"
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态"> :label="val.val"
<el-option :key="undefined" label="全部" :value="undefined"></el-option> :value="val.code"
<el-option ></el-option>
v-for="(val,index) in getAllVehicleStatus() " </el-select>
:key="index" </el-form-item>
:label="val.val" <el-form-item label="分公司" prop="subordinateBranch">
:value="val.code" <el-autocomplete
></el-option> class="inline-input"
</el-select> v-model="state1"
</el-form-item> :fetch-suggestions="querySearch"
</el-col> placeholder="请输入分公司"
<el-col :span="5"> @select="handleSelect"
<el-form-item label="分公司" prop="subordinateBranch"> ></el-autocomplete>
<el-autocomplete </el-form-item>
class="inline-input" <el-form-item label="区域" prop="zoneId">
v-model="state1" <el-select
:fetch-suggestions="querySearch" class="filter-item"
placeholder="请输入分公司" v-model="listQuery.zoneId"
@select="handleSelect" placeholder="请选择"
></el-autocomplete> @change="getProvinceRegions()"
</el-form-item> >
</el-col> <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-row> </el-select>
<el-row> </el-form-item>
<el-col :span="5"> <el-form-item label="省份" prop="addrProvince">
<el-form-item label="区域" prop="zoneId"> <el-autocomplete
<el-select class="inline-input"
class="filter-item" v-model="listQuery.addrProvinceName"
v-model="listQuery.zoneId" :fetch-suggestions="querySearchProvinceName"
placeholder="请选择" placeholder="请输入省份(直辖市)"
@change="getProvinceRegions()" @select="handleSelectProvince"
> ></el-autocomplete>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option> </el-form-item>
</el-select> <!--<el-form-item label="省份" prop="addrProvince">-->
</el-form-item> <!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份(直辖市)" @change="cityRegions4Query()">-->
</el-col> <!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"-->
<el-col :span="5"> <!--:value="item.id"></el-option>-->
<el-form-item label="省份" prop="addrProvince"> <!--</el-select>-->
<el-autocomplete <!--</el-form-item>-->
class="inline-input" <el-form-item label="城市" prop="addrCity">
v-model="listQuery.addrProvinceName" <el-autocomplete
:fetch-suggestions="querySearchProvinceName" class="inline-input"
placeholder="请输入省份(直辖市)" v-model="listQuery.addrCityName"
@select="handleSelectProvince" :fetch-suggestions="querySearchCityName"
></el-autocomplete> placeholder="请输入城市"
</el-form-item> @select="handleSelectCity"
<!--<el-form-item label="省份" prop="addrProvince">--> ></el-autocomplete>
<!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份(直辖市)" @change="cityRegions4Query()">--> </el-form-item>
<!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"--> <!--<el-form-item label="城市" prop="addrCity">-->
<!--:value="item.id"></el-option>--> <!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
<!--</el-select>--> <!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
<!--</el-form-item>--> <!--:value="item.id"></el-option>-->
</el-col> <!--</el-select>-->
<el-col :span="5"> <!--</el-form-item>-->
<el-form-item label="城市" prop="addrCity"> <el-form-item label="车型" prop="modelId">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
v-model="listQuery.addrCityName" v-model="vehicleArr"
:fetch-suggestions="querySearchCityName" :fetch-suggestions="queryVehicleModelSearch"
placeholder="请输入城市" placeholder="请选择车型"
@select="handleSelectCity" @select="handleVehicleModelSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<!--<el-form-item label="城市" prop="addrCity">-->
<!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
<!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
<!--:value="item.id"></el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="5">
<el-form-item label="车型" prop="modelId">
<el-autocomplete
class="inline-input"
v-model="vehicleArr"
:fetch-suggestions="queryVehicleModelSearch"
placeholder="请选择车型"
@select="handleVehicleModelSelect"
></el-autocomplete>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-button <el-button
class="filter-item" class="filter-item"
...@@ -423,14 +405,14 @@ ...@@ -423,14 +405,14 @@
</el-table> </el-table>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]" :page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
<!-- 对话框相关html元素 --> <!-- 对话框相关html元素 -->
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop">
...@@ -546,16 +528,14 @@ ...@@ -546,16 +528,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年审日期" prop="manufacturer"> <el-form-item label="年审日期" prop="manufacturer">
<el-date-picker <el-date-picker
v-model="form.annualVerificationDate" v-model="form.annualVerificationDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
style="width:100%"> style="width:100%"
</el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p> <p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
...@@ -751,11 +731,10 @@ ...@@ -751,11 +731,10 @@
<!--</el-col>--> <!--</el-col>-->
</el-row> </el-row>
<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p> <p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}"> <el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'" :action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
...@@ -771,7 +750,15 @@ ...@@ -771,7 +750,15 @@
class="avatar" class="avatar"
:style="{display:'block'}" :style="{display:'block'}"
/> />
<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证正面</span></i> <i
v-else
class="el-icon-plus avatar-uploader-icon"
:style="{lineHeight:'350px'}"
style="position: relative;"
>
<br />
<span class="driving-title">行驶证正面</span>
</i>
</el-upload> </el-upload>
<el-upload <el-upload
...@@ -789,8 +776,15 @@ ...@@ -789,8 +776,15 @@
class="avatar" class="avatar"
:style="{display:'block'}" :style="{display:'block'}"
/> />
<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证副本</span></i> <i
v-else
class="el-icon-plus avatar-uploader-icon"
:style="{lineHeight:'350px'}"
style="position: relative;"
>
<br />
<span class="driving-title">行驶证副本</span>
</i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1066,7 +1060,7 @@ export default { ...@@ -1066,7 +1060,7 @@ export default {
showLoadingBody: false, showLoadingBody: false,
allVehicleList: [], //全部车型 allVehicleList: [], //全部车型
form: { form: {
insuranceEndDate:null,//商业险日期 insuranceEndDate: null, //商业险日期
vehicleModelName: '', //车型 vehicleModelName: '', //车型
subordinateBranchName: '', //所属分公司 subordinateBranchName: '', //所属分公司
subordinateBranch: undefined, subordinateBranch: undefined,
...@@ -2606,7 +2600,7 @@ export default { ...@@ -2606,7 +2600,7 @@ export default {
// console.log(this.getAllVehicleStatus()[1].val); // console.log(this.getAllVehicleStatus()[1].val);
// let demo = this.getAllVehicleStatus.filter(item => item) // let demo = this.getAllVehicleStatus.filter(item => item)
// console.log(this.vehicleStatus[code]); // console.log(this.vehicleStatus[code]);
return this.getAllVehicleStatus()[code].val return this.getAllVehicleStatus()[code].val
}, },
getAllVehicleStatus: function() { getAllVehicleStatus: function() {
...@@ -2648,7 +2642,8 @@ export default { ...@@ -2648,7 +2642,8 @@ export default {
VEHICLE_CONSTANT_VEHICLE_BRAND, VEHICLE_CONSTANT_VEHICLE_BRAND,
code code
) )
? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code).val ? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code)
.val
: '品牌不存在' : '品牌不存在'
}, },
getAllBranch: () => { getAllBranch: () => {
...@@ -2662,7 +2657,8 @@ export default { ...@@ -2662,7 +2657,8 @@ export default {
return '未知' return '未知'
} }
return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code) return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code).val ? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
.val
: '用途未知' : '用途未知'
}, },
getAllUseType: () => { getAllUseType: () => {
...@@ -2698,8 +2694,7 @@ export default { ...@@ -2698,8 +2694,7 @@ export default {
if (!this.listQuery.belongToName) { if (!this.listQuery.belongToName) {
this.listQuery.belongToName = undefined this.listQuery.belongToName = undefined
} }
page(listQueryTemp).then(response => { page(listQueryTemp).then(response => {
if (response.code == 1) { if (response.code == 1) {
let totalCountRs = undefined let totalCountRs = undefined
...@@ -2715,8 +2710,8 @@ export default { ...@@ -2715,8 +2710,8 @@ export default {
// }) // })
// } // }
this.listLoading = false this.listLoading = false
console.log(response.data.data); console.log(response.data.data)
this.list = response.data.data this.list = response.data.data
this.total = response.data.totalCount this.total = response.data.totalCount
} else { } else {
...@@ -3087,12 +3082,12 @@ export default { ...@@ -3087,12 +3082,12 @@ export default {
mileageLastUpdate: undefined, mileageLastUpdate: undefined,
// receiveTime: undefined, // receiveTime: undefined,
drivingLicensePath: undefined, drivingLicensePath: undefined,
drivingLicenseDuplicatePath:undefined, drivingLicenseDuplicatePath: undefined,
remark: undefined, remark: undefined,
strongInsuranceEndDate: undefined, strongInsuranceEndDate: undefined,
strongInsuranceNo: undefined, strongInsuranceNo: undefined,
strongInsuranceCompany: undefined, strongInsuranceCompany: undefined,
insuranceEndDate:null insuranceEndDate: null
} }
}, },
resetTemp4Apply() { resetTemp4Apply() {
...@@ -3128,10 +3123,10 @@ export default { ...@@ -3128,10 +3123,10 @@ export default {
} }
</script> </script>
<style> <style>
.driving-title{ .driving-title {
position: absolute; position: absolute;
top: 34px; top: 34px;
left: 140px; left: 140px;
font-size: 14px; font-size: 14px;
} }
</style> </style>
\ No newline at end of file
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal> <vehiclePlanModal v-if="anpai" :currentItem="currentItem" v-on:anpaiDialogEvent = "anpaiDialogEvent"></vehiclePlanModal>
<!--租车详情弹框--> <!--租车详情弹框-->
<!--rentOrder--> <!--rentOrder-->
<rentOrderDetailModal :form="rentOrderInfo" :rentCostDetail="rentCostDetail" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal> <rentOrderDetailModal :orderDetailInfo="orderDetailInfo" v-if="rentOrder" v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"></rentOrderDetailModal>
<!--旅游订单详情--> <!--旅游订单详情-->
<tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal> <tourOrderDetailModal :tourRow="tourRow" v-if="tourDialogVisible" v-on:tourOrderDetailDialogEvent="tourOrderDetailDialogEvent"></tourOrderDetailModal>
<!--禁用弹框--> <!--禁用弹框-->
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
} from 'api/base_info/branch_company/'; } from 'api/base_info/branch_company/';
import { import {
getAllBranchCompanyByZoneId, getAllBranchCompanyByZoneId,
page orderDetail
} from 'api/order/rentVehicle'; } from 'api/order/rentVehicle';
import { import {
formatDate formatDate
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
anpai: false,//安排用车弹框 anpai: false,//安排用车弹框
jinyong: false,//禁用弹框 jinyong: false,//禁用弹框
currentItem: {},//待操作数据 currentItem: {},//待操作数据
rentOrderInfo: {},//租车订单详情 orderDetailInfo: {},//租车订单详情
rentCostDetail: {},//租车订单费用明细 rentCostDetail: {},//租车订单费用明细
tourDialogVisible: false,//旅游订单弹框 tourDialogVisible: false,//旅游订单弹框
tourRow: {},//旅游订单详情-当前行 tourRow: {},//旅游订单详情-当前行
...@@ -686,50 +686,58 @@ ...@@ -686,50 +686,58 @@
* 根据订单号获取订单详情 * 根据订单号获取订单详情
* */ * */
getOneVechi: function(orderNo) { getOneVechi: function(orderNo) {
let params = { var param = {
oneNo: orderNo "orderNo":orderNo,
}; "flag" : true
page(params).then(res => { }
if (res.status == 200) { orderDetail(param).then(response => {
let a = res.data.data[0]; this.orderDetailInfo = response.data
let vehicleUserLicenses = {}; if(this.orderDetailInfo && this.orderDetailInfo.memberLevel) {
// if (a.status == 5) { if(this.orderDetailInfo.memberLevel == 1) {
// vehicleUserLicenses = { this.orderDetailInfo.memberName = "普通会员"
// name: a.orderVehicleCrosstownDto.licenseName, }
// phone: a.orderVehicleCrosstownDto.licensePhone, if(this.orderDetailInfo.memberLevel == 2) {
// idCard: a.orderVehicleCrosstownDto.licenseIdCard this.orderDetailInfo.memberName = "黄金会员"
// }; }
// } else { if(this.orderDetailInfo.memberLevel == 3) {
// if (a.vehicleUserLicenses.length > 0) { this.orderDetailInfo.memberName = "钻石会员"
// vehicleUserLicenses = a.vehicleUserLicenses[0]; }
// } if(this.orderDetailInfo.orderRentVehicleDetail.costDetail) {
// } this.orderDetailInfo.costDetail = JSON.parse(this.orderDetailInfo.orderRentVehicleDetail.costDetail)
a.orderRentVehicleDetail.startTime = timestamp2Date(a.orderRentVehicleDetail.startTime);
a.orderRentVehicleDetail.endTime = timestamp2Date(a.orderRentVehicleDetail.endTime); }
let arr = a.picture ? a.picture.split(",") : []; if(this.orderDetailInfo.costDetail.paramJson) {
a.picture = arr.length > 0 ? arr[0] : ""; this.orderDetailInfo.rentVehiclePriceVO = JSON.parse(this.orderDetailInfo.costDetail.paramJson)
a.payTime = timestamp2Date(a.payTime);
this.rentOrderInfo = a; }
if(this.orderDetailInfo.items) {
this.costDetail = JSON.parse(this.rentOrderInfo.orderRentVehicleDetail.costDetail); for (var i = 0;i< this.orderDetailInfo.items.length;i++) {
var cost = ''; if(this.orderDetailInfo.items[i].type == 104) {
this.costDetail.children.map(function(a) { this.orderDetailInfo.carArticlesJson = this.orderDetailInfo.items[i].detail
cost += a.key + ":" +a.detail+" "; }
}); }
this.rentCostDetail = cost; }
if(this.rentOrderInfo.orderRentVehicleDetail.driverType==1) { if (this.orderDetailInfo.status == 2) {
this.serviceCost = this.rentOrderInfo.orderRentVehicleDetail.dayNum * 600 this.orderDetailInfo.ststusName = '取消'
} }
this.rentOrder = true; if (this.orderDetailInfo.status == -1) {
} else { this.orderDetailInfo.ststusName = '定损中'
this.$notify({ }
title: '失败', if (this.orderDetailInfo.status == 3) {
message: '操作失败!', this.orderDetailInfo.ststusName = '待付款'
type: 'error', }
duration: 2000 if (this.orderDetailInfo.status == 4) {
}); this.orderDetailInfo.ststusName = '待出行'
} }
}); if (this.orderDetailInfo.status == 5) {
this.orderDetailInfo.ststusName = '出行中'
}
if (this.orderDetailInfo.status == 6) {
this.orderDetailInfo.ststusName = '已完成'
}
}
this.rentOrder = true
})
}, },
/** /**
* 关闭保养弹框后逻辑处理 * 关闭保养弹框后逻辑处理
......
...@@ -366,15 +366,22 @@ export default { ...@@ -366,15 +366,22 @@ export default {
} }
}) })
} }
if (params == '') { if (params == '') {
this.$message.error('请设置不同车型不同价格4') add_edit('',this.activeTime).then(data => {
return false if (data.status == 200) {
this.$message.success('设置成功')
this.chooseData = []
this.getList()
} else {
this.$message.error(data.message)
}
})
} else { } else {
add_edit(params).then(data => { add_edit(params,this.activeTime).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('设置成功') this.$message.success('设置成功')
this.chooseData = [] this.chooseData = []
this.changeIsGlobal(0)
this.getList() this.getList()
} else { } else {
this.$message.error(data.message) this.$message.error(data.message)
...@@ -398,8 +405,8 @@ export default { ...@@ -398,8 +405,8 @@ export default {
data.data.forEach(element => { data.data.forEach(element => {
element.multiple = element.multiple || '' element.multiple = element.multiple || ''
element.price = element.price || '' element.price = element.price || ''
element.level = element.level||'' element.level = element.level || ''
element.freeDays = 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