Skip to content

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

后台订单

parent bc6796e1
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 199 deletions
src/api/order/rentVehicle.js
View file @ 0baae5b7
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 @ 0baae5b7
<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,16 @@ 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()
},
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/tourOrderInfo/index.vue
View file @ 0baae5b7
......@@ -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