Skip to content

C
cloud-platform-ui
Commit 0828e966 authored by hanfeng's avatar hanfeng
Browse files
Options

修改车辆订单

parent 03dbdfb2
Show whitespace changes
Inline Side-by-side
Showing with 767 additions and 704 deletions
src/views/order/modal/rentOrderDetailModal.vue
View file @ 0828e966
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<span>{{form.username}}</span> <span>{{form.realName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
......
src/views/order/rentVehicleInfo/index.vue
View file @ 0828e966
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
<el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="姓名">
<el-input v-model="listQuery.realName" placeholder="请输入客户姓名"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
...@@ -50,6 +55,11 @@ ...@@ -50,6 +55,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="车辆编号">
<el-input v-model="listQuery.vehicleCode" placeholder="请输入车辆编号"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
...@@ -68,6 +78,13 @@ ...@@ -68,6 +78,13 @@
<span>{{scope.row.no}}</span><br><span>{{scope.row.crtTime}}</span> <span>{{scope.row.no}}</span><br><span>{{scope.row.crtTime}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="status"
label="订单状态" width="100"align="center">
<template scope="scope">
<span>{{scope.row.ststusName}}</span>
</template>
</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><br/><span>{{scope.row.vehicleNumberPlat}}</span> <span>{{scope.row.name}}</span><br/><span>{{scope.row.vehicleNumberPlat}}</span>
...@@ -75,7 +92,7 @@ ...@@ -75,7 +92,7 @@
</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.username}}</span>/<span>{{scope.row.telephone}}</span> <span>{{scope.row.realName}}</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="取车时间/还车时间">
...@@ -102,15 +119,15 @@ ...@@ -102,15 +119,15 @@
</template> </template>
</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 v-if="scope.row.status == '2'">取消</span> <!-- <span v-if="scope.row.status == '2'">取消</span>-->
<span v-if="scope.row.status == '3'">待付款</span> <!-- <span v-if="scope.row.status == '3'">待付款</span>-->
<span v-if="scope.row.status == '4'">待出行</span> <!-- <span v-if="scope.row.status == '4'">待出行</span>-->
<span v-if="scope.row.status == '5'">出行中</span> <!-- <span v-if="scope.row.status == '5'">出行中</span>-->
<span v-if="scope.row.status == '6'">已完成</span> <!-- <span v-if="scope.row.status == '6'">已完成</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column width="100" align="center" label="订单详情" fixed="right"> <el-table-column width="100" align="center" label="订单详情" fixed="right">
<template scope="scope"> <template scope="scope">
...@@ -161,7 +178,7 @@ ...@@ -161,7 +178,7 @@
</div> </div>
<div class="label-title"> <div class="label-title">
<span>姓名/手机号:</span> <span <span>姓名/手机号:</span> <span
class="label-text"><span>{{form.username}}</span>/<span>{{form.telephone}}</span></span> class="label-text"><span>{{form.realName}}</span>/<span>{{form.telephone}}</span></span>
</div> </div>
<div class="label-title"> <div class="label-title">
<span>取车:</span> <span class="label-text">{{form.orderRentVehicleDetail.startTime}}</span><span <span>取车:</span> <span class="label-text">{{form.orderRentVehicleDetail.startTime}}</span><span
...@@ -353,6 +370,7 @@ ...@@ -353,6 +370,7 @@
hasPay: undefined, hasPay: undefined,
id: undefined, id: undefined,
name: undefined, name: undefined,
realName:undefined,
no: undefined, no: undefined,
orderAmount: undefined, orderAmount: undefined,
orderOrigin: undefined, orderOrigin: undefined,
...@@ -433,7 +451,9 @@ ...@@ -433,7 +451,9 @@
endTime: undefined, endTime: undefined,
zoneId: undefined, zoneId: undefined,
startCompanyId: undefined, startCompanyId: undefined,
plateNumber: undefined plateNumber: undefined,
realName: undefined,
vehicleCode: undefined
}, },
baranchQuery: { baranchQuery: {
zoneId: null zoneId: null
...@@ -834,7 +854,7 @@ ...@@ -834,7 +854,7 @@
*/ */
getList() { getList() {
this.listLoading = true; this.listLoading = true;
console.log(this.listQuery)
// if(this.listQuery.startTime){ // if(this.listQuery.startTime){
// this.listQuery.startTime = this.listQuery.startTime.getTime(); // this.listQuery.startTime = this.listQuery.startTime.getTime();
// } // }
...@@ -843,7 +863,28 @@ ...@@ -843,7 +863,28 @@
// } // }
page(this.listQuery) page(this.listQuery)
.then(response => { .then(response => {
if (response.data.data){
response.data.data.map(function (el) {
console.log(el)
if (el.status == 2) {
el.ststusName = '取消';
}
if (el.status == 3) {
el.ststusName = '待付款';
}
if (el.status == 4) {
el.ststusName = '待出行';
}
if (el.status == 5) {
el.ststusName = '出行中';
}
if (el.status == 6) {
el.ststusName = '已完成';
}
})
}
this.list = response.data.data; this.list = response.data.data;
this.total = response.data.totalCount; this.total = response.data.totalCount;
this.listLoading = false; this.listLoading = false;
}) })
......
src/views/userManagement/model/memberOrderDetailModal.vue
View file @ 0828e966
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<span>{{form.username}}</span> <span>{{form.realName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
hasPay: undefined, hasPay: undefined,
id: undefined, id: undefined,
name: undefined, name: undefined,
realName: undefined,
no: undefined, no: undefined,
orderAmount: undefined, orderAmount: undefined,
orderOrigin: undefined, orderOrigin: undefined,
......
src/views/userManagement/model/rentOrderDetailModal.vue
View file @ 0828e966
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<span>{{form.username}}</span> <span>{{form.realName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
......
src/views/userManagement/model/tourOrderDetailModal.vue
View file @ 0828e966
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单状态:"> <el-form-item label="订单状态:">
<span>{{form.ststusName}}</span> <span>{{form.status}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -40,7 +40,12 @@ ...@@ -40,7 +40,12 @@
</el-col> </el-col>
</el-row> </el-row>
<table class="orderDetail"> <table class="orderDetail">
<tr><th>旅行</th><th>价格</th><th>人数</th><th>保险</th></tr> <tr>
<th>旅行</th>
<th>价格</th>
<th>人数</th>
<th>保险</th>
</tr>
<tr> <tr>
<td>{{form.name}}</td> <td>{{form.name}}</td>
<td>{{tourCostDetail}}</td> <td>{{tourCostDetail}}</td>
...@@ -48,24 +53,32 @@ ...@@ -48,24 +53,32 @@
<td>{{insureDetail}}</td> <td>{{insureDetail}}</td>
</tr> </tr>
<tr> <tr>
<td ></td> <td></td>
<td ></td> <td></td>
<td ></td> <td></td>
<td >订单金额:{{form.realAmount}}元</td> <td>订单金额:{{form.realAmount}}元</td>
</tr> </tr>
</table> </table>
<div> <div>
<div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">联系人信息</span></div> <div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">联系人信息</span></div>
<div> <div>
<span style="font-weight: 700">联系人：</span><span class="label-text" >{{form.orderTourDetail.contactMan}}</span> <span style="font-weight: 700">联系人：</span><span class="label-text">{{form.orderTourDetail.contactMan}}</span>
<span style="font-weight: 700">联系电话：</span><span class="label-text" >{{form.orderTourDetail.contactPhone}}</span> <span style="font-weight: 700">联系电话：</span><span
<span style="font-weight: 700">Email:</span><span class="label-text">{{form.orderTourDetail.contactEmail}}</span> class="label-text">{{form.orderTourDetail.contactPhone}}</span>
<span style="font-weight: 700">Email:</span><span
class="label-text">{{form.orderTourDetail.contactEmail}}</span>
</div> </div>
</div> </div>
<div> <div>
<div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">出游人信息 成人{{form.orderTourDetail.adultNum}}人 儿童{{form.orderTourDetail.childNum}}人</span></div> <div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">出游人信息 成人{{form.orderTourDetail.adultNum}}人 儿童{{form.orderTourDetail.childNum}}人</span>
</div>
<table class="orderDetail"> <table class="orderDetail">
<tr><th>身份</th><th>姓名</th><th>电话</th><th>身份证号</th></tr> <tr>
<th>身份</th>
<th>姓名</th>
<th>电话</th>
<th>身份证号</th>
</tr>
<tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index"> <tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index">
<td v-if="item && item.isdel == 0 && item.isChild == 0">成人</td> <td v-if="item && item.isdel == 0 && item.isChild == 0">成人</td>
<td v-if="item && item.isdel == 0 && item.isChild == 1">儿童</td> <td v-if="item && item.isdel == 0 && item.isChild == 1">儿童</td>
...@@ -92,6 +105,7 @@ ...@@ -92,6 +105,7 @@
import { import {
timestamp2Date timestamp2Date
} from 'utils/dateUtils'; } from 'utils/dateUtils';
export default { export default {
props: ["tourRow"], props: ["tourRow"],
name: 'tourOrderDetailModal', name: 'tourOrderDetailModal',
...@@ -118,6 +132,7 @@ ...@@ -118,6 +132,7 @@
hasPay: undefined, hasPay: undefined,
id: undefined, id: undefined,
name: undefined, name: undefined,
realName: undefined,
no: undefined, no: undefined,
orderAmount: undefined, orderAmount: undefined,
orderOrigin: undefined, orderOrigin: undefined,
...@@ -155,7 +170,7 @@ ...@@ -155,7 +170,7 @@
refundStatus: undefined, refundStatus: undefined,
startCompanyName: undefined, startCompanyName: undefined,
status: undefined, status: undefined,
ststusName:undefined, ststusName: undefined,
telephone: undefined, telephone: undefined,
type: undefined, type: undefined,
updTime: undefined, updTime: undefined,
...@@ -164,24 +179,24 @@ ...@@ -164,24 +179,24 @@
vehicleNumberPlat: undefined, vehicleNumberPlat: undefined,
version: undefined, version: undefined,
}, },
costDetail:{ costDetail: {
key:undefined, key: undefined,
val:undefined, val: undefined,
children:[ children: [
{ {
key:undefined, key: undefined,
detail:undefined, detail: undefined,
val:undefined val: undefined
} }
] ]
}, },
insureDetail:'',//保险 insureDetail: '',//保险
tourCostDetail:'' tourCostDetail: ''
} }
}, },
watch: { watch: {
dialogVisible(newValue, oldValue){ dialogVisible(newValue, oldValue) {
if(!newValue){ if (!newValue) {
this.$emit("tourOrderDetailDialogEvent", false); this.$emit("tourOrderDetailDialogEvent", false);
} }
}, },
...@@ -191,24 +206,24 @@ ...@@ -191,24 +206,24 @@
}, },
methods: { methods: {
//获取订单详情 //获取订单详情
getOrderInfo(){ getOrderInfo() {
// let params = { // let params = {
// orderNo: this.tourRow.no // orderNo: this.tourRow.no
// }; // };
this.form=this.tourRow // this.form=this.tourRow
this.dialogVisible = true; // this.dialogVisible = true;
// getVehicleOrderDetail(params).then(res => { // getVehicleOrderDetail(params).then(res => {
// if (res.status == 200) { // if (res.status == 200) {
// let a = res.data; let a = this.tourRow;
// this.form = a; this.form = a;
// this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime) this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime)
// this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime) this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime)
// this.costDetail = JSON.parse(a.orderTourDetail.costDetail) this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
// var cost = ''; var cost = '';
// this.costDetail.children.forEach(function(a1) { this.costDetail.children.forEach(function (a1) {
// var detail = a1.detail==undefined?'':a1.detail var detail = a1.detail == undefined ? '' : a1.detail
// cost += a1.key + ":" +detail+" " cost += a1.key + ":" + detail + " "
// }) })
// if (this.form.status == 2) { // if (this.form.status == 2) {
// this.form.ststusName = '取消'; // this.form.ststusName = '取消';
// } // }
...@@ -224,11 +239,11 @@ ...@@ -224,11 +239,11 @@
// if (this.form.status == 6) { // if (this.form.status == 6) {
// this.form.ststusName = '已完成'; // this.form.ststusName = '已完成';
// } // }
// if(a.orderTourDetail.hasInsure == 0) { if (a.orderTourDetail.hasInsure == 0) {
// this.insureDetail = "不需要保险" this.insureDetail = "不需要保险"
// } }
// this.tourCostDetail = cost; this.tourCostDetail = cost;
// this.dialogVisible = true; this.dialogVisible = true;
// } else { // } else {
// this.$notify({ // this.$notify({
// title: '失败', // title: '失败',
...@@ -244,17 +259,20 @@ ...@@ -244,17 +259,20 @@
} }
</script> </script>
<style> <style>
.label-text{ .label-text {
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
} }
.label-title{
.label-title {
margin-top: 10px; margin-top: 10px;
} }
.orderDetail tr th{
.orderDetail tr th {
background: #eef1f6; background: #eef1f6;
} }
.orderDetail tr td, .orderDetail tr th{
.orderDetail tr td, .orderDetail tr th {
width: 500px; width: 500px;
text-align: center; text-align: center;
border: 1px solid #dfe6ec; border: 1px solid #dfe6ec;
...@@ -262,15 +280,18 @@ ...@@ -262,15 +280,18 @@
margin-right: 100px; margin-right: 100px;
padding: 10px; padding: 10px;
} }
.label-value{
.label-value {
margin-left: 80px; margin-left: 80px;
margin-right: 100px; margin-right: 100px;
} }
#license-img{
#license-img {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.order-details .el-form-item{
.order-details .el-form-item {
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
</style> </style>
src/views/userManagement/userList/index.vue
View file @ 0828e966
...@@ -548,8 +548,8 @@ ...@@ -548,8 +548,8 @@
data() { data() {
return { return {
tourCostDetail: '', tourCostDetail: '',
memberCostDetail:'', memberCostDetail: '',
rentCostDetail:'', rentCostDetail: '',
serviceCost: 0, serviceCost: 0,
inline: true, inline: true,
peopleSettingModal: false, peopleSettingModal: false,
...@@ -606,9 +606,9 @@ ...@@ -606,9 +606,9 @@
file: '' file: ''
}, },
rentDialogVisible: false, rentDialogVisible: false,
tourDialogVisible:false, tourDialogVisible: false,
memberDialogVisible:false, memberDialogVisible: false,
insureDetail:'', insureDetail: '',
fileList: [], fileList: [],
errorHandler: true, errorHandler: true,
list: null, list: null,
...@@ -643,6 +643,7 @@ ...@@ -643,6 +643,7 @@
hasPay: undefined, hasPay: undefined,
id: undefined, id: undefined,
name: undefined, name: undefined,
realName: undefined,
no: undefined, no: undefined,
orderAmount: undefined, orderAmount: undefined,
orderOrigin: undefined, orderOrigin: undefined,
...@@ -697,7 +698,7 @@ ...@@ -697,7 +698,7 @@
version: undefined version: undefined
}, },
tourRow: {}, tourRow: {},
memberRow:{}, memberRow: {},
rules: { rules: {
totalNumber: [this.integerValidator()], totalNumber: [this.integerValidator()],
rentFreeDays: [this.integerValidator()] rentFreeDays: [this.integerValidator()]
...@@ -839,16 +840,15 @@ ...@@ -839,16 +840,15 @@
this.rentDialogVisible = true; this.rentDialogVisible = true;
} }
if (row.type == "旅游") { if (row.type == "旅游") {
this.tourRow=row this.tourRow = row
this.tourDialogVisible = true; this.tourDialogVisible = true;
} }
if (row.type == "会员") { if (row.type == "会员") {
this.memberRow=row; this.memberRow = row;
this.memberDialogVisible=true; this.memberDialogVisible = true;
} }
}, },
/** /**
* 租车订单详情弹框关闭 * 租车订单详情弹框关闭
...@@ -865,7 +865,7 @@ ...@@ -865,7 +865,7 @@
/** /**
* 旅游订单详情弹框关闭 * 旅游订单详情弹框关闭
* */ * */
tourOrderDetailDialogEvent(e){ tourOrderDetailDialogEvent(e) {
this.tourDialogVisible = false; this.tourDialogVisible = false;
}, },
......
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