Skip to content

C
cloud-platform-ui
Commit f4491eda authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-bg'

parents 999cdedd c3ee4a48
Show whitespace changes
Inline Side-by-side
Showing with 341 additions and 302 deletions
src/api/order/rentVehicle.js
View file @ f4491eda
import fetch from 'utils/fetch';
//获取租车订单
export function page(query) {
return fetch({
url: '/api/order/baseOrder/getOrderList',
url: '/api/order/baseOrder/getAll',
method: 'get',
params:query
params: query
});
}
//获取旅游订单
export function getOrderList(query) {
return fetch({
url: '/api/order/baseOrder/getOrderList',
method: 'get',
params: query
});
}
/**
* 获取所有分公司
*/
......@@ -22,7 +30,7 @@ export function getAllBranchCompanyByZoneId(query) {
return fetch({
url: '/vehicle/branchCompany/app/unauth/getByZone',
method: 'get',
params:query
params: query
});
}
......@@ -30,7 +38,7 @@ export function getOrderVehicleCrosstown(query) {
return fetch({
url: '/api/order/orderVehicle/getByOrderId',
method: 'get',
params:query
params: query
});
}
......@@ -76,7 +84,7 @@ export function inquire(query) {
return fetch({
url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
method: 'get',
params:query
params: query
});
}
......@@ -85,16 +93,16 @@ export function addIndent(params) {
return fetch({
url: '/api/order/orderRentVehicle/back-stage/add',
method: 'post',
data:params
data: params
});
}
//删除订单
export function calculate(no, params) {
return fetch({
url: '/api/order/baseOrder/back-stage/cancel/'+ no,
url: '/api/order/baseOrder/back-stage/cancel/' + no,
method: 'post',
data:params
data: params
});
}
......@@ -104,7 +112,7 @@ export function calculate(no, params) {
*/
export function getViolatePrice(no) {
return fetch({
url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
method: 'get',
});
}
......@@ -114,7 +122,7 @@ export function orderStatistics(params) {
return fetch({
url: 'api/order/orderStatistics/order',
method: 'post',
data:params
data: params
});
}
......@@ -154,3 +162,12 @@ export function user_info(id) {
method: 'get'
});
}
//获取订单详情
export function orderDetail(query) {
return fetch({
url: '/api/order/baseOrder/orderDetail',
method: 'get',
params: query
});
}
src/views/order/modal/rentOrderDetailModal.vue
View file @ f4491eda
<template>
<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="110px">
<el-form :model="orderDetailInfo" ref="orderDetailInfo" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="订单号:">
<span>{{form.no}}</span>
<span v-if="orderDetailInfo.no">{{orderDetailInfo.no}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建订单时间:">
<span>{{form.crtTime}}</span>
<span v-if="orderDetailInfo.crtTime">{{orderDetailInfo.crtTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际支付时间:">
<span>{{!!form.payTime ? timestamp(new Date(form.payTime)) : '无'}}</span>
<span>{{!!orderDetailInfo.payTime ? timestamp(new Date(orderDetailInfo.payTime)) : '无'}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="订单状态:">
<span>{{form.ststusName}}</span>
<span>{{orderDetailInfo.ststusName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名/手机号:">
<span v-if="form.realName">{{form.realName}}/{{form.telephone}}</span>
<span v-if="orderDetailInfo.username">{{orderDetailInfo.username}}/{{orderDetailInfo.telephone}}</span>
<span v-else>无</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员等级/身份:">
<span v-if="form.memberName">{{form.memberName}}/{{form. jobTitle}}</span>
<span v-if="orderDetailInfo != undefined && orderDetailInfo.memberLevel">{{orderDetailInfo.memberName}}/{{orderDetailInfo. jobTitle}}</span>
<span v-else>无</span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="配车:">
<span
style="margin-right: 10px;"
>{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span>
<el-button
size="small"
type="primary"
icon="edit"
v-if="form.status==4"
@click="resetCar"
>重新配车</el-button>
</el-form-item>
</el-col>-->
</el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="取车:">
<span>{{form.orderRentVehicleDetail.startTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label label-width="10px">
<span>{{form.orderRentVehicleDetail.startAddr}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="交车公司:">
<span>{{form.startCompanyName}}</span>
</el-form-item>
</el-col>
</el-row>-->
<!-- <el-row>
<el-col :span="8">
<el-form-item label="还车:">
<span>{{form.orderRentVehicleDetail.endTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label label-width="10px">
<span>{{form.orderRentVehicleDetail.endAddr}}</span>
</el-form-item>
</el-col>
<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-form-item>
</el-col>
</el-row>-->
<table class="orderDetail">
<tr>
<th>房车</th>
......@@ -109,68 +54,66 @@
</tr>
<tr>
<td>
{{form.name}}{{form.vehicleNumberPlat}}
<span v-if="form.vehicleCode">({{form.vehicleCode}})</span>
{{orderDetailInfo.name}} </br> {{orderDetailInfo.vehicalNumberPlat}}
<span v-if="orderDetailInfo.code">({{orderDetailInfo.code}})</span>
<span v-else></span>
</td>
<td>
<p>取:{{form.orderRentVehicleDetail.startTime}}</p>
<p>还:{{form.orderRentVehicleDetail.endTime}}</p>
<p v-show="form.orderRentVehicleDetail.dayNum">租借天数{{form.orderRentVehicleDetail.dayNum}}天</p>
<p>取:{{orderDetailInfo.orderRentVehicleDetail.startTime}}</p>
<p>还:{{orderDetailInfo.orderRentVehicleDetail.endTime}}</p>
<p v-show="orderDetailInfo.orderRentVehicleDetail.dayNum">租借天数{{orderDetailInfo.orderRentVehicleDetail.dayNum}}天</p>
</td>
<td>{{form.startCompanyName}}</td>
<td>{{form.endCompanyName}}</td>
<td>{{orderDetailInfo.startCompanyName}}</td>
<td>{{orderDetailInfo.endCompanyName}}</td>
<td>
<p v-if="form.rentVehiclePriceVO">
<span v-if="form.rentVehiclePriceVO.freeDayNum == 0">无</span>
<span v-else>会员特权{{form.rentVehiclePriceVO.freeDayNum}}天</span>
<p v-if="orderDetailInfo.rentVehiclePriceVO">
<span v-if=" orderDetailInfo.rentVehiclePriceVO.freeDayNum && orderDetailInfo.rentVehiclePriceVO.freeDayNum > 0">会员特权{{orderDetailInfo.rentVehiclePriceVO.freeDayNum}}天</span>
<span v-else>无</span>
</p>
<p v-else>{{orderInfo('免费天数')}}</p>
<p v-else>无</p>
</td>
<td>
<p
v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.vehicleDayNum > 0"
>¥{{form.rentVehiclePriceVO.modelAmount}}*{{form.rentVehiclePriceVO.vehicleNum}}/{{form.rentVehiclePriceVO.vehicleDayNum}}天</p>
<p v-else>{{orderInfo('车辆租赁费')}}</p>
v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.vehicleDayNum > 0"
>¥{{orderDetailInfo.rentVehiclePriceVO.modelAmount}}*{{orderDetailInfo.rentVehiclePriceVO.vehicleNum}}/{{orderDetailInfo.rentVehiclePriceVO.vehicleDayNum}}天</p>
<p v-else>{{orderDetailInfo.costDetail.children[0].key}} : {{orderDetailInfo.costDetail.children[0].detail}}</p>
</td>
<td>
<p v-if="form.couponList">
<span
v-for="(item,index) in form.couponList"
:key="index"
>{{item.title}}-{{item.usedAmount}}元</span>
<p v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.couponAmount > 0">
<span>{{orderDetailInfo.rentVehiclePriceVO.couponDesc}}-{{orderDetailInfo.rentVehiclePriceVO.couponAmount}}元</span>
</p>
<p v-else-if="orderDetailInfo.costDetail.children && orderDetailInfo.costDetail.children[2]">{{orderDetailInfo.costDetail.children[2].key}} : {{orderDetailInfo.costDetail.children[2].val}}</p>
<p v-else>无</p>
</td>
<td>
<p
v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.damageSafeAmount > 0"
>¥{{form.rentVehiclePriceVO.damageSafePrice}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>{{orderInfo('不计免赔')}}</p>
v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.damageSafeAmount > 0"
>¥{{orderDetailInfo.rentVehiclePriceVO.damageSafePrice}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>无</p>
</td>
<td>
<p v-if="form.rentVehiclePriceVO">{{form.rentVehiclePriceVO.deposit}}</p>
<p v-else>{{orderInfo('租房车押金')}}</p>
<p v-if="orderDetailInfo.rentVehiclePriceVO">{{orderDetailInfo.rentVehiclePriceVO.deposit}}</p>
<p v-else>{{orderDetailInfo.costDetail.children[1].key}} : {{orderDetailInfo.costDetail.children[1].val}}</p>
</td>
<td>
<p
v-if="form.rentVehiclePriceVO && form.rentVehiclePriceVO.driverAmount > 0"
>¥{{form.rentVehiclePriceVO.driverPrice}}*{{form.rentVehiclePriceVO.driverNum}}/{{form.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>{{orderInfo('专职司机服务费')}}</p>
v-if="orderDetailInfo.rentVehiclePriceVO && orderDetailInfo.rentVehiclePriceVO.driverAmount > 0"
>¥{{orderDetailInfo.rentVehiclePriceVO.driverPrice}}*{{orderDetailInfo.rentVehiclePriceVO.driverNum}}/{{orderDetailInfo.rentVehiclePriceVO.dayNum}}天</p>
<p v-else>无</p>
</td>
</tr>
<tr>
<td>
<el-button size="small" type="text" v-if="form.status==4" @click="resetCar">重新配车</el-button>
<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
</td>
<td></td>
<td></td>
<td>
<el-button
v-show="form.status == 4 || form.status == 5"
v-show="orderDetailInfo.status == 4 || orderDetailInfo.status == 5"
size="mini"
type="text"
@click="resetReturn = true"
......@@ -178,15 +121,15 @@
</td>
<td
colspan="6"
>{{form.payWay == 1 ? '微信支付' : form.payWay == 2 ? '支付宝支付' : form.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{form.realAmount}}</td>
>{{orderDetailInfo.payWay == 1 ? '微信支付' : orderDetailInfo.payWay == 2 ? '支付宝支付' : orderDetailInfo.payWay == 3 ? '银联支付' : '微信支付'}} 共计:￥{{orderDetailInfo.realAmount}}</td>
</tr>
</table>
<p>
<b>额外随车物品:</b>
<span v-if="this.form.carArticlesJson">
<span v-if="this.orderDetailInfo.carArticlesJson">
<span
v-for="(item,index) in JSON.parse(this.form.carArticlesJson)"
v-for="(item,index) in JSON.parse(this.orderDetailInfo.carArticlesJson)"
:key="index"
style="margin-right:10px"
>{{item.name || '无'}}</span>
......@@ -194,13 +137,13 @@
</p>
<p>
<b>内部邀请人:</b>
<span>{{form.facilitatePhone || '无'}}</span>
<span>{{orderDetailInfo.facilitatePhone || '无'}}</span>
</p>
<p>
<b>驾驶证:</b>
<span
v-if="form.orderVehicleCrosstownDto"
>{{form.orderVehicleCrosstownDto.licenseName}} {{form.orderVehicleCrosstownDto.licensePhone}} {{form.orderVehicleCrosstownDto.licenseIdCard}}</span>
v-if="orderDetailInfo.orderVehicleCrosstownDto"
>{{orderDetailInfo.orderVehicleCrosstownDto.licenseName}} {{orderDetailInfo.orderVehicleCrosstownDto.licensePhone}} {{orderDetailInfo.orderVehicleCrosstownDto.licenseIdCard}}</span>
<span v-else>无</span>
</p>
<!-- <div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;">
......@@ -257,7 +200,7 @@ import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.v
import { editObj } from 'api/vehicle/vehicleInfo'
import { getAll, updateEndCompany } from 'api/base_info/branch_company'
export default {
props: ['form', 'rentCostDetail'],
props: ['orderDetailInfo'],
name: 'rentOrderDetailModal',
components: {
ElFormItem,
......@@ -310,31 +253,17 @@ export default {
},
mounted() {
this.dialogVisible = true
if (this.form.status == 2) {
this.form.ststusName = '取消'
}
if (this.form.status == 3) {
this.form.ststusName = '待付款'
}
if (this.form.status == 4) {
this.form.ststusName = '待出行'
}
if (this.form.status == 5) {
this.form.ststusName = '出行中'
}
if (this.form.status == 6) {
this.form.ststusName = '已完成'
}
this.getAllFn()
console.log(this.orderDetailInfo)
},
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
}
// 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) {
var year = now.getFullYear()
......
src/views/order/rentVehicleInfo/index.vue
View file @ f4491eda
......@@ -115,12 +115,12 @@
>
<el-table-column align="center" label="ID" width="70">
<template scope="scope">
<span>{{scope.row.id}}</span>
<span>{{scope.row.orderId}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="订单号/下单时间">
<template scope="scope">
<span>{{scope.row.no}}</span>
<span>{{scope.row.orderNo}}</span>
<br />
<span>{{scope.row.crtTime}}</span>
</template>
......@@ -132,23 +132,23 @@
</el-table-column>
<el-table-column min-width="250" align="center" label="名称/车牌号">
<template scope="scope">
<span>{{scope.row.name}}</span>
<span>{{scope.row.vehicleName}}</span>
<br />
<span>{{scope.row.vehicleNumberPlat}}</span>
<span>{{scope.row.numberPlate}}</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="姓名/手机号">
<template scope="scope">
<span>{{scope.row.realName}}</span>/
<span>{{scope.row.username}}</span>/
<span>{{scope.row.telephone}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="取车时间/还车时间">
<template scope="scope">
取:
<span>{{dateFormat(scope.row.orderRentVehicleDetail.startTime)}}</span>
<span>{{dateFormat(scope.row.startTime)}}</span>
<br />还:
<span>{{dateFormat(scope.row.orderRentVehicleDetail.endTime)}}</span>
<span>{{dateFormat(scope.row.endTime)}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="交车公司">
......@@ -167,7 +167,7 @@
</el-table-column>
<el-table-column width="110" align="center" label="订单金额">
<template scope="scope">
<span>{{scope.row.orderAmount}}元</span>
<span>{{scope.row.realAmount}}元</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="支付方式">
......@@ -246,8 +246,7 @@
<!-- 订单详情 -->
<rentOrderDetailModal
:form="form"
:rentCostDetail="tourCostDetail"
:orderDetailInfo="orderDetailInfo"
v-if="rentDialogVisible"
v-on:rentOrderDetailDialogEvent="rentOrderDetailDialogEvent"
></rentOrderDetailModal>
......@@ -259,7 +258,7 @@
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="客户姓名:">
<span>{{form.realName}}</span>
<span>{{form.username}}</span>
</el-form-item>
</el-col>
<el-col :span="10">
......@@ -358,8 +357,8 @@
</div>
<div v-show="modalTitle=='还车记录'">
<div v-show="orderReturnVehicleCrosstown.type == 3">
<el-form-item label="定损类型:">
<span></span>
<!-- <el-form-item label="定损类型:">
<span></span> -->
</el-form-item>
<el-form-item label="定损总赔:">
<span>{{dedDetailDTOListAll}}</span>
......@@ -573,7 +572,8 @@ import {
getOrderVehicleCrosstown,
getStep,
calculate,
getViolatePrice
getViolatePrice,
orderDetail
} from 'api/order/rentVehicle'
import {
toEast8Date,
......@@ -627,10 +627,12 @@ export default {
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
orderId: undefined,
name: undefined,
realName: undefined,
no: undefined,
username: undefined,
orderNo: undefined,
startTime: undefined,
endTime: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderVehicleCrosstownDto: {
......@@ -769,6 +771,89 @@ export default {
order_btn_order_violcation_save: false,
depositDetail: false,
checkUserInfo: [],
orderDetailInfo: {
code: undefined,
couponAmount: undefined,
crtHost: undefined,
crtName: undefined,
crtTime: undefined,
crtUser: 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,
......@@ -780,6 +865,8 @@ export default {
}
]
}
},
}
},
created() {
......@@ -941,6 +1028,65 @@ export default {
that.row = row
}
},
getOrderDetail() {
if(this.form.orderNo) {
var param = {
"orderNo":this.form.orderNo,
"flag" : true
}
orderDetail(param).then(response => {
console.log(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)
}
console.log(this.orderDetailInfo.items)
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 = '已完成'
}
}
console.log(this.orderDetailInfo)
this.rentDialogVisible = true
})
}
},
checkViolateAmount() {
console.log(this.topAmount)
console.log(this.violateAmount)
......@@ -988,7 +1134,8 @@ export default {
cancelReason: '后台取消',
appUserId: row.userId
}
getViolatePrice(row.no).then(data => {
console.log(row)
getViolatePrice(row.orderNo).then(data => {
if (data.status == 200) {
that.topAmount = data.data.topAmount
that.cancel(row, data.data.cutAmount)
......@@ -1022,37 +1169,15 @@ export default {
if (this.form.status == -1) {
this.form.ststusName = '定损中'
}
this.form.orderRentVehicleDetail.startTime = this.form
.orderRentVehicleDetail.startTime
? timestamp2Date(this.form.orderRentVehicleDetail.startTime)
this.form.startTime = this.form
.startTime
? timestamp2Date(this.form.startTime)
: ''
this.form.orderRentVehicleDetail.endTime = this.form
.orderRentVehicleDetail.endTime
? timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.form.endTime = this.form
.endTime
? timestamp2Date(this.form.endTime)
: ''
if (this.form.orderRentVehicleDetail.costDetail) {
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
this.getOrderDetail();
},
/**
* 租车订单详情弹框关闭
......@@ -1118,27 +1243,7 @@ export default {
if (this.form.status == -1) {
this.form.ststusName = '定损中'
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date(
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.orderId = this.form.orderId
this.orderVehicleQuery.type = 1
this.orderVehicleQuery.types = null
this.getAllOrderVehicleCrosstown()
......@@ -1197,27 +1302,14 @@ export default {
if (this.form.status == -1) {
this.form.ststusName = '定损中'
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime
)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(
this.form.orderRentVehicleDetail.endTime
this.form.startTime = timestamp2Date(
this.form.startTime
)
this.costDetail = JSON.parse(
this.form.orderRentVehicleDetail.costDetail
this.form.endTime = timestamp2Date(
this.form.endTime
)
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.orderId = this.form.orderId
this.orderVehicleQuery.types = '2,3'
this.orderVehicleQuery.type = null
this.getAllOrderVehicleCrosstown()
......@@ -1235,7 +1327,7 @@ export default {
that.depositRefundRecord = []
that.dedTotal = 0
that.Tel = ''
getStep(row.no + '&address=1').then(response => {
getStep(row.orderNo + '&address=1').then(response => {
this.activeRecord = response.data[0]
response.data.forEach(function(item) {
......@@ -1304,11 +1396,11 @@ export default {
if (this.form.status == -1) {
this.form.ststusName = '定损中'
}
this.form.orderRentVehicleDetail.startTime = timestamp2Date(
this.form.orderRentVehicleDetail.startTime
this.form.startTime = timestamp2Date(
this.form.startTime
)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(
this.form.orderRentVehicleDetail.endTime
this.form.endTime = timestamp2Date(
this.form.endTime
)
this.orderVehicleCrosstownVisible = true
this.vehicleDetail = false
......
src/views/order/tourOrderInfo/index.vue
View file @ f4491eda
......@@ -156,6 +156,7 @@
import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情
import {
page,
getOrderList,
getAllBranchCompany,
getAllBranchCompanyByZoneId,
calculate,
......@@ -614,7 +615,7 @@ import {getAllCompany } from 'api/base_info/branch_company'
if(this.listQuery){
localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery));
}
page(this.listQuery)
getOrderList(this.listQuery)
.then(response => {
this.list = response.data.data;
this.total = response.data.totalCount;
......
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