Skip to content

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

修改车辆订单

parent 03dbdfb2
Hide 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
...@@ -294,574 +311,598 @@ ...@@ -294,574 +311,598 @@
<script> <script>
import Illegal from "./illegalModal";//违章查询 import Illegal from "./illegalModal";//违章查询
import Detail from "./detail";//违章查询 import Detail from "./detail";//违章查询
import rentOrderDetailModal from "../modal/rentOrderDetailModal";//租车订单详情 import rentOrderDetailModal from "../modal/rentOrderDetailModal";//租车订单详情
import { import {
formatDate formatDate
} from '../../../utils/dateFormattor'; } from '../../../utils/dateFormattor';
import { import {
page, page,
getAllBranchCompany, getAllBranchCompany,
getAllBranchCompanyByZoneId, getAllBranchCompanyByZoneId,
getOrderVehicleCrosstown, getOrderVehicleCrosstown,
getStep getStep
} from 'api/order/rentVehicle'; } from 'api/order/rentVehicle';
import { import {
timestamp2Date timestamp2Date
} from 'utils/dateUtils'; } from 'utils/dateUtils';
import {mapGetters} from 'vuex'; import {mapGetters} from 'vuex';
import rsCode from '../../../utils/rsCode'; import rsCode from '../../../utils/rsCode';
import { import {
getSysRegionByIds getSysRegionByIds
} from 'api/vehicle/vehicleInfo/'; } from 'api/vehicle/vehicleInfo/';
import { import {
getAllZone getAllZone
} from 'api/base_info/constant/'; } from 'api/base_info/constant/';
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import ElCol from "element-ui/packages/col/src/col"; import ElCol from "element-ui/packages/col/src/col";
import ElButton from "../../../../node_modules/element-ui/packages/button/src/button.vue"; import ElButton from "../../../../node_modules/element-ui/packages/button/src/button.vue";
export default { export default {
name: 'branchCompanyStock', name: 'branchCompanyStock',
components: { components: {
ElButton, ElButton,
ElCol, ElCol,
ElRow, ElRow,
Illegal, Illegal,
Detail, Detail,
rentOrderDetailModal rentOrderDetailModal
},
data() {
return {
pictureList: [],
dedDetail: [],
depositRefundRecord: [],
dedTotal: '',
Tel: '',
form: {
couponAmount: undefined,
crtHost: undefined,
crtName: undefined,
crtTime: undefined,
crtUser: undefined,
detailId: undefined,
endCompanyName: undefined,
goodsAmount: undefined,
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
name: undefined,
realName:undefined,
no: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderVehicleCrosstownDto: {
licenseIdCard: "",
licenseImg: "",
licenseName: "",
licensePhone: ""
},
orderRentVehicleDetail: {
bookRecordId: undefined,
costDetail: undefined,
crtTime: undefined,
dayNum: undefined,
deposit: undefined,
driverType: undefined,
endAddr: undefined,
endCity: undefined,
endCityName: undefined,
endCompanyId: undefined,
endTime: undefined,
freeDays: undefined,
handelViolation: undefined,
id: undefined,
modelId: undefined,
myDriverIds: undefined,
orderId: undefined,
score: undefined,
startAddr: undefined,
startCity: undefined,
startCityName: undefined,
startCompanyId: undefined,
startTime: undefined,
stime: undefined,
suserid: undefined,
updTime: undefined,
vehicleId: undefined,
},
payOrigin: undefined,
picture: undefined,
realAmount: undefined,
refundStatus: undefined,
startCompanyName: undefined,
status: undefined,
ststusName: undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
userId: undefined,
username: undefined,
vehicleNumberPlat: undefined,
version: undefined
}, },
data() { orderVehicleCrosstownVisible: false,
return { rentDialogVisible: false,//租车详情弹框
pictureList: [], modalTitle: '订单详情',
dedDetail: [], illegalVisible: false,//违章查询弹框
depositRefundRecord: [], detailVisible: false,
dedTotal: '', rules: {
Tel: '', // companyName: [
form: { // {
couponAmount: undefined, // required: true,
crtHost: undefined, // message: '请输入用户',
crtName: undefined, // trigger: 'blur'
crtTime: undefined, // }
crtUser: undefined, // ],
detailId: undefined,
endCompanyName: undefined,
goodsAmount: undefined,
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
name: undefined,
no: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderVehicleCrosstownDto: {
licenseIdCard: "",
licenseImg: "",
licenseName: "",
licensePhone: ""
},
orderRentVehicleDetail: {
bookRecordId: undefined,
costDetail: undefined,
crtTime: undefined,
dayNum: undefined,
deposit: undefined,
driverType: undefined,
endAddr: undefined,
endCity: undefined,
endCityName: undefined,
endCompanyId: undefined,
endTime: undefined,
freeDays: undefined,
handelViolation: undefined,
id: undefined,
modelId: undefined,
myDriverIds: undefined,
orderId: undefined,
score: undefined,
startAddr: undefined,
startCity: undefined,
startCityName: undefined,
startCompanyId: undefined,
startTime: undefined,
stime: undefined,
suserid: undefined,
updTime: undefined,
vehicleId: undefined,
},
payOrigin: undefined,
picture: undefined,
realAmount: undefined,
refundStatus: undefined,
startCompanyName: undefined,
status: undefined,
ststusName: undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
userId: undefined,
username: undefined,
vehicleNumberPlat: undefined,
version: undefined
},
orderVehicleCrosstownVisible: false,
rentDialogVisible: false,//租车详情弹框
modalTitle: '订单详情',
illegalVisible: false,//违章查询弹框
detailVisible: false,
rules: {
// companyName: [
// {
// required: true,
// message: '请输入用户',
// trigger: 'blur'
// }
// ],
},
list: null,
total: null,
listLoading: true,
listQuery: {
page: 1,
limit: 20,
type: 1,
no: null,
status: null,
startTime: undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined,
plateNumber: undefined
},
baranchQuery: {
zoneId: null
},
orderVehicleQuery: {
orderId: null,
type: undefined
},
dialogFormVisible: false,
dialogStatus: '',
btn_del: true,
btn_buy: true,
btn_cancel: true,
allZoneArr: [],//全部片区
allBranchCompany: [],
tourCostDetail: '',
damageSafe: '',
serviceCost: 0,
orderReturnVehicleCrosstown: {
crtTime: undefined,
deduction: undefined,
id: undefined,
imgs: undefined,
isDel: undefined,
mileage: undefined,
mileageImg: undefined,
orderId: undefined,
orderNo: undefined,
orperaterId: undefined,
remak: undefined,
status: undefined,
statusId: undefined,
statusTime: undefined,
type: undefined,
updTime: undefined,
userLicenseId: undefined,
username: undefined,
licenseIdCard: undefined,
licenseImg: undefined,
licenseName: undefined,
licensePhone: undefined
},//还车记录
tableKey: 0,
otherImg: [],
handover: false,
returnVehicle: false,
refundshow: false,//退款信息
vehicleDetail: false, //交还车信息，默认全部显示
order_btn_order_violcation_save: false,
depositDetail: false,
}
}, },
created() { list: null,
this.getList(); total: null,
this.btn_del = this.elements['branchCompany/stockApply:btn_delete']; listLoading: true,
this.order_btn_order_violcation_save = this.elements['order:btn_order_violcation_save']; listQuery: {
page: 1,
limit: 20,
type: 1,
no: null,
status: null,
startTime: undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined,
plateNumber: undefined,
realName: undefined,
vehicleCode: undefined
}, },
computed: { baranchQuery: {
...mapGetters([ zoneId: null
'elements'
]),
provinceRegions() {
return getSonRegionByCodes(1);
},
//获取大区列表
getAllZoneList() {
return getAllZone();
},
cityRegions() {
if (!this.$utils.isInteger(this.form.addrProvince)) {
return null;
}
return getSonRegionByCodes(this.form.addrProvince);
}
}, },
methods: { orderVehicleQuery: {
handleOrderDetail(row) { orderId: null,
this.form = row; type: undefined
if (this.form.status == 2) { },
this.form.ststusName = '取消'; dialogFormVisible: false,
} dialogStatus: '',
if (this.form.status == 3) { btn_del: true,
this.form.ststusName = '待付款'; btn_buy: true,
} btn_cancel: true,
if (this.form.status == 4) { allZoneArr: [],//全部片区
this.form.ststusName = '待出行'; allBranchCompany: [],
} tourCostDetail: '',
if (this.form.status == 5) { damageSafe: '',
this.form.ststusName = '出行中'; serviceCost: 0,
} orderReturnVehicleCrosstown: {
if (this.form.status == 6) { crtTime: undefined,
this.form.ststusName = '已完成'; deduction: undefined,
} id: undefined,
this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime) imgs: undefined,
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) isDel: undefined,
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) mileage: undefined,
var cost = ''; mileageImg: undefined,
this.costDetail.children.forEach(function (a) { orderId: undefined,
var detail = a.detail == undefined ? '' : a.detail orderNo: undefined,
cost += a.key + ":" + detail + " " orperaterId: undefined,
}) remak: undefined,
this.tourCostDetail = cost status: undefined,
if (this.form.orderRentVehicleDetail.driverType == 1) { statusId: undefined,
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 statusTime: undefined,
} type: undefined,
this.rentDialogVisible = true; updTime: undefined,
}, userLicenseId: undefined,
/** username: undefined,
* 租车订单详情弹框关闭 licenseIdCard: undefined,
* */ licenseImg: undefined,
rentOrderDetailDialogEvent(e) { licenseName: undefined,
this.rentDialogVisible = false; licensePhone: undefined
if (e) { },//还车记录
this.getList() tableKey: 0,
} otherImg: [],
}, handover: false,
/** returnVehicle: false,
* 操作-违章查询按钮，显示违章弹框 refundshow: false,//退款信息
*/ vehicleDetail: false, //交还车信息，默认全部显示
illegalInquiry(row) { order_btn_order_violcation_save: false,
this.currentRow = row; depositDetail: false,
this.illegalVisible = true; }
}, },
/** created() {
* 操作-查看详情按钮，显示详情弹框 this.getList();
*/ this.btn_del = this.elements['branchCompany/stockApply:btn_delete'];
detailInquiry(row) { this.order_btn_order_violcation_save = this.elements['order:btn_order_violcation_save'];
this.currentRow = row; },
this.detailVisible = true; computed: {
}, ...mapGetters([
/** 'elements'
* 关闭违章查询弹框 ]),
* */ provinceRegions() {
illegalEvent(params) { return getSonRegionByCodes(1);
this.illegalVisible = false; },
if (params) { //获取大区列表
console.log(params); getAllZoneList() {
} return getAllZone();
}, },
/** cityRegions() {
* 关闭违章查询弹框 if (!this.$utils.isInteger(this.form.addrProvince)) {
* */ return null;
detailEvent(params) { }
this.detailVisible = false; return getSonRegionByCodes(this.form.addrProvince);
if (params) { }
console.log(params); },
} methods: {
}, handleOrderDetail(row) {
handleHandoverOrderVehicle(row) { this.form = row;
console.log(row) if (this.form.status == 2) {
this.modalTitle = "交车记录" this.form.ststusName = '取消';
this.form = row; }
if (this.form.status == 2) { if (this.form.status == 3) {
this.form.ststusName = '取消'; this.form.ststusName = '待付款';
} }
if (this.form.status == 3) { if (this.form.status == 4) {
this.form.ststusName = '待付款'; this.form.ststusName = '待出行';
} }
if (this.form.status == 4) { if (this.form.status == 5) {
this.form.ststusName = '待出行'; this.form.ststusName = '出行中';
} }
if (this.form.status == 5) { if (this.form.status == 6) {
this.form.ststusName = '出行中'; this.form.ststusName = '已完成';
} }
if (this.form.status == 6) { this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime)
this.form.ststusName = '已完成'; this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
} this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail)
this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime) var cost = '';
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.costDetail.children.forEach(function (a) {
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) var detail = a.detail == undefined ? '' : a.detail
var cost = ''; cost += a.key + ":" + detail + " "
this.costDetail.children.forEach(function (a) { })
cost += a.key + ":" + a.detail + " " this.tourCostDetail = cost
}) if (this.form.orderRentVehicleDetail.driverType == 1) {
this.tourCostDetail = cost this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
if (this.form.orderRentVehicleDetail.driverType == 1) { }
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.rentDialogVisible = true;
} },
this.orderVehicleQuery.orderId = this.form.id /**
this.orderVehicleQuery.type = 1 * 租车订单详情弹框关闭
this.getAllOrderVehicleCrosstown(); * */
this.handover = true rentOrderDetailDialogEvent(e) {
this.returnVehicle = false this.rentDialogVisible = false;
this.vehicleDetail = true if (e) {
this.depositDetail = false this.getList()
}
},
/**
* 操作-违章查询按钮，显示违章弹框
*/
illegalInquiry(row) {
this.currentRow = row;
this.illegalVisible = true;
},
/**
* 操作-查看详情按钮，显示详情弹框
*/
detailInquiry(row) {
this.currentRow = row;
this.detailVisible = true;
},
/**
* 关闭违章查询弹框
* */
illegalEvent(params) {
this.illegalVisible = false;
if (params) {
console.log(params);
}
},
/**
* 关闭违章查询弹框
* */
detailEvent(params) {
this.detailVisible = false;
if (params) {
console.log(params);
}
},
handleHandoverOrderVehicle(row) {
console.log(row)
this.modalTitle = "交车记录"
this.form = row;
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.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 = '';
this.costDetail.children.forEach(function (a) {
cost += a.key + ":" + a.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.getAllOrderVehicleCrosstown();
this.handover = true
this.returnVehicle = false
this.vehicleDetail = true
this.depositDetail = false
}, },
getAllOrderVehicleCrosstown() { getAllOrderVehicleCrosstown() {
getOrderVehicleCrosstown(this.orderVehicleQuery) getOrderVehicleCrosstown(this.orderVehicleQuery)
.then(response => { .then(response => {
console.log(response) console.log(response)
if (response.data.length <= 0) { if (response.data.length <= 0) {
alert("交还车记录不存在") alert("交还车记录不存在")
} else { } else {
this.orderVehicleCrosstownVisible = true this.orderVehicleCrosstownVisible = true
this.orderReturnVehicleCrosstown = response.data[0]; this.orderReturnVehicleCrosstown = response.data[0];
if (response.data[0].imgs) { if (response.data[0].imgs) {
this.otherImg = response.data[0].imgs.split(',') this.otherImg = response.data[0].imgs.split(',')
} }
} }
}) })
}, },
handleReturnOrderVehicle(row) { handleReturnOrderVehicle(row) {
console.log(row) console.log(row)
this.modalTitle = "还车记录" this.modalTitle = "还车记录"
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = '取消'; this.form.ststusName = '取消';
} }
if (this.form.status == 3) { if (this.form.status == 3) {
this.form.ststusName = '待付款'; this.form.ststusName = '待付款';
} }
if (this.form.status == 4) { if (this.form.status == 4) {
this.form.ststusName = '待出行'; this.form.ststusName = '待出行';
} }
if (this.form.status == 5) { if (this.form.status == 5) {
this.form.ststusName = '出行中'; this.form.ststusName = '出行中';
} }
if (this.form.status == 6) { if (this.form.status == 6) {
this.form.ststusName = '已完成'; this.form.ststusName = '已完成';
} }
this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime) this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail) this.costDetail = JSON.parse(this.form.orderRentVehicleDetail.costDetail)
var cost = ''; var cost = '';
this.costDetail.children.forEach(function (a) { this.costDetail.children.forEach(function (a) {
cost += a.key + ":" + a.detail + " " cost += a.key + ":" + a.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 = 2
this.getAllOrderVehicleCrosstown();
this.returnVehicle = true
this.handover = false
this.vehicleDetail = true
this.depositDetail = false
},
handleRefundVehicle(row) {
console.log(row)
var that = this;
that.pictureList = [];
that.dedDetail = [];
that.depositRefundRecord = [];
that.dedTotal = 0;
that.Tel = '';
getStep(row.no).then(response => {
response.data.forEach(function (item) {
if (item.type != 1) {
that.Tel = item.customerPhone
that.type = item.type
if (item.dedDetail) {
var dedTotal = 0
var dedDetail = JSON.parse(item.dedDetail);
that.dedDetail = dedDetail;
dedDetail.forEach(function (item) {
dedTotal += Number(item.cost)
}) })
this.tourCostDetail = cost that.dedTotal = dedTotal.toFixed(2);
if (this.form.orderRentVehicleDetail.driverType == 1) { }
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 item.depositRefundRecord.forEach(function (itm) {
itm.updTimeStr = timestamp2Date(itm.updTime);
if (itm.status == 3) {
itm.endTimeStr = timestamp2Date(Number(itm.updTime) + 2592000000)
if (itm.orderViolation) {
if (itm.orderViolation.picture) {
var Arr = itm.orderViolation.picture.split(",");
var arrivalPicList = [];
Arr.map(function (it) {
arrivalPicList.push(it);
});
itm.pictureList = arrivalPicList;
}
}
} }
this.orderVehicleQuery.orderId = this.form.id })
this.orderVehicleQuery.type = 2 if (item.type == 3) {
this.getAllOrderVehicleCrosstown(); var arr = item.depositRefundRecord;
this.returnVehicle = true var item = arr.shift();
this.handover = false arr.push(item)
this.vehicleDetail = true } else {
this.depositDetail = false var arr = item.depositRefundRecord;
}, }
handleRefundVehicle(row) {
console.log(row)
var that = this;
that.pictureList = [];
that.dedDetail = [];
that.depositRefundRecord = [];
that.dedTotal = 0;
that.Tel = '';
getStep(row.no).then(response => {
response.data.forEach(function (item) {
if (item.type != 1) {
that.Tel = item.customerPhone
that.type = item.type
if (item.dedDetail) {
var dedTotal = 0
var dedDetail = JSON.parse(item.dedDetail);
that.dedDetail = dedDetail;
dedDetail.forEach(function (item) {
dedTotal += Number(item.cost)
})
that.dedTotal = dedTotal.toFixed(2);
}
item.depositRefundRecord.forEach(function (itm) {
itm.updTimeStr = timestamp2Date(itm.updTime);
if (itm.status == 3) {
itm.endTimeStr = timestamp2Date(Number(itm.updTime) + 2592000000)
if (itm.orderViolation) {
if (itm.orderViolation.picture) {
var Arr = itm.orderViolation.picture.split(",");
var arrivalPicList = [];
Arr.map(function (it) {
arrivalPicList.push(it);
});
itm.pictureList = arrivalPicList;
}
}
}
})
if (item.type == 3) {
var arr = item.depositRefundRecord;
var item = arr.shift();
arr.push(item)
} else {
var arr = item.depositRefundRecord;
}
that.depositRefundRecord = arr that.depositRefundRecord = arr
console.log(that.depositRefundRecord) console.log(that.depositRefundRecord)
} }
}); });
}) })
this.modalTitle = "押金记录" this.modalTitle = "押金记录"
this.form = row; this.form = row;
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = '取消'; this.form.ststusName = '取消';
} }
if (this.form.status == 3) { if (this.form.status == 3) {
this.form.ststusName = '待付款'; 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.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime)
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime)
this.orderVehicleCrosstownVisible = true
this.vehicleDetail = false
this.depositDetail = true
},
//监听change事件
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.startCompanyId = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allBranchCompany = response.data;
})
},
getAllBranchCompanyChange(item) {
this.listQuery.startCompanyId = item
},
handleCancel(row) {
this.$confirm('此操作将放弃购买, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
cancelApply(row.id)
.then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
});
this.getList();
});
});
},
handleDelete(row) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
delObj(row.id)
.then(() => {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
});
const index = this.list.indexOf(row);
this.list.splice(index, 1);
});
});
},
handleFilter() {
this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList();
} else {
return false;
}
});
},
clearSearch() {
this.listQuery = {
page: 1,
limit: 20,
type: 1,
no: null,
status: null,
startTime: undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined
}
this.getList()
},
/**
* 获取订单列表
*/
getList() {
this.listLoading = true;
// if(this.listQuery.startTime){
// this.listQuery.startTime = this.listQuery.startTime.getTime();
// }
// if(this.listQuery.endTime){
// this.listQuery.endTime = this.listQuery.endTime.getTime();
// }
page(this.listQuery)
.then(response => {
if (response.data.data){
response.data.data.map(function (el) {
console.log(el)
if (el.status == 2) {
el.ststusName = '取消';
} }
if (this.form.status == 4) { if (el.status == 3) {
this.form.ststusName = '待出行'; el.ststusName = '待付款';
} }
if (this.form.status == 5) { if (el.status == 4) {
this.form.ststusName = '出行中'; el.ststusName = '待出行';
} }
if (this.form.status == 6) { if (el.status == 5) {
this.form.ststusName = '已完成'; el.ststusName = '出行中';
} }
this.form.orderRentVehicleDetail.startTime = timestamp2Date(this.form.orderRentVehicleDetail.startTime) if (el.status == 6) {
this.form.orderRentVehicleDetail.endTime = timestamp2Date(this.form.orderRentVehicleDetail.endTime) el.ststusName = '已完成';
this.orderVehicleCrosstownVisible = true
this.vehicleDetail = false
this.depositDetail = true
},
//监听change事件
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.startCompanyId = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allBranchCompany = response.data;
})
},
getAllBranchCompanyChange(item) {
this.listQuery.startCompanyId = item
},
handleCancel(row) {
this.$confirm('此操作将放弃购买, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
cancelApply(row.id)
.then(() => {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
duration: 2000
});
this.getList();
});
});
},
handleDelete(row) {
this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
delObj(row.id)
.then(() => {
this.$notify({
title: '成功',
message: '删除成功',
type: 'success',
duration: 2000
});
const index = this.list.indexOf(row);
this.list.splice(index, 1);
});
});
},
handleFilter() {
this.listQuery.page = 1;
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList();
} else {
return false;
}
});
},
clearSearch() {
this.listQuery = {
page: 1,
limit: 20,
type: 1,
no: null,
status: null,
startTime: undefined,
endTime: undefined,
zoneId: undefined,
startCompanyId: undefined
} }
this.getList() })
},
/**
* 获取订单列表
*/
getList() {
this.listLoading = true;
console.log(this.listQuery)
// if(this.listQuery.startTime){
// this.listQuery.startTime = this.listQuery.startTime.getTime();
// }
// if(this.listQuery.endTime){
// this.listQuery.endTime = this.listQuery.endTime.getTime();
// }
page(this.listQuery)
.then(response => {
this.list = response.data.data;
this.total = response.data.totalCount;
this.listLoading = false;
})
},
handleSizeChange(val) {
this.listQuery.limit = val;
this.getList();
},
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
},
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
} }
} this.list = response.data.data;
this.total = response.data.totalCount;
this.listLoading = false;
})
},
handleSizeChange(val) {
this.listQuery.limit = val;
this.getList();
},
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
},
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
}
} }
}
</script> </script>
<style scpoed> <style scpoed>
......
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,40 +40,53 @@ ...@@ -40,40 +40,53 @@
</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>
<td>成人:{{form.orderTourDetail.adultNum}} 儿童:{{form.orderTourDetail.childNum}}</td> <td>成人:{{form.orderTourDetail.adultNum}} 儿童:{{form.orderTourDetail.childNum}}</td>
<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>
<tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index"> <th>身份</th>
<td v-if="item && item.isdel == 0 && item.isChild == 0">成人</td> <th>姓名</th>
<td v-if="item && item.isdel == 0 && item.isChild == 1">儿童</td> <th>电话</th>
<td v-if="item && item.isdel == 0">{{item.name}}</td> <th>身份证号</th>
<td v-if="item && item.isdel == 0">{{item.phone}}</td> </tr>
<td v-if="item && item.isdel == 0">{{item.idCard}}</td> <tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index">
<td v-if="item && item.isdel == 0 && item.isChild == 0">成人</td>
</tr> <td v-if="item && item.isdel == 0 && item.isChild == 1">儿童</td>
<td v-if="item && item.isdel == 0">{{item.name}}</td>
<td v-if="item && item.isdel == 0">{{item.phone}}</td>
<td v-if="item && item.isdel == 0">{{item.idCard}}</td>
</tr>
</table> </table>
</div> </div>
</el-form> </el-form>
...@@ -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',
...@@ -105,83 +119,84 @@ ...@@ -105,83 +119,84 @@
return { return {
dialogVisible: false, dialogVisible: false,
form: { form: {
couponAmount: undefined, couponAmount: undefined,
crtHost: undefined, crtHost: undefined,
crtName: undefined, crtName: undefined,
crtTime: undefined, crtTime: undefined,
crtUser: undefined, crtUser: undefined,
detailId: undefined, detailId: undefined,
endCompanyName: undefined, endCompanyName: undefined,
goodsAmount: undefined, goodsAmount: undefined,
hasDiscount: undefined, hasDiscount: undefined,
hasMemberRight: undefined, hasMemberRight: undefined,
hasPay: undefined, hasPay: undefined,
id: undefined, id: undefined,
name: undefined, name: undefined,
no: undefined, realName: undefined,
orderAmount: undefined, no: undefined,
orderOrigin: undefined, orderAmount: undefined,
orderTourDetail: { orderOrigin: undefined,
adultNum: undefined, orderTourDetail: {
childNum: undefined, adultNum: undefined,
contactEmail: undefined, childNum: undefined,
contactMan: undefined, contactEmail: undefined,
contactPhone: undefined, contactMan: undefined,
costDetail: undefined, contactPhone: undefined,
crtTime: undefined, costDetail: undefined,
dayNum: undefined, crtTime: undefined,
endAddr: undefined, dayNum: undefined,
endTime: undefined, endAddr: undefined,
goodId: undefined, endTime: undefined,
hasInsure: undefined, goodId: undefined,
id: undefined, hasInsure: undefined,
isOutside: undefined, id: undefined,
orderId: undefined, isOutside: undefined,
siteId: undefined, orderId: undefined,
spePriceId: undefined, siteId: undefined,
startAddr: undefined, spePriceId: undefined,
startCity: undefined, startAddr: undefined,
startCityName: undefined, startCity: undefined,
startCompanyId: undefined, startCityName: undefined,
startTime: undefined, startCompanyId: undefined,
totalNumber: undefined, startTime: undefined,
tourUserIds: undefined, totalNumber: undefined,
updTime: undefined, tourUserIds: undefined,
verificationId: undefined updTime: undefined,
}, verificationId: undefined
payOrigin: undefined, },
picture: undefined, payOrigin: undefined,
realAmount: undefined, picture: undefined,
refundStatus: undefined, realAmount: undefined,
startCompanyName: undefined, refundStatus: undefined,
status: undefined, startCompanyName: undefined,
ststusName:undefined, status: undefined,
telephone: undefined, ststusName: undefined,
type: undefined, telephone: undefined,
updTime: undefined, type: undefined,
userId: undefined, updTime: undefined,
username: undefined, userId: undefined,
vehicleNumberPlat: undefined, username: undefined,
version: undefined, vehicleNumberPlat: undefined,
}, version: undefined,
costDetail:{ },
key:undefined, costDetail: {
val:undefined, key: undefined,
children:[ val: undefined,
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,44 +206,44 @@ ...@@ -191,44 +206,44 @@
}, },
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 = '取消';
// } // }
// if (this.form.status == 3) { // if (this.form.status == 3) {
// this.form.ststusName = '待付款'; // this.form.ststusName = '待付款';
// } // }
// if (this.form.status == 4) { // if (this.form.status == 4) {
// this.form.ststusName = '待出行'; // this.form.ststusName = '待出行';
// } // }
// if (this.form.status == 5) { // if (this.form.status == 5) {
// this.form.ststusName = '出行中'; // this.form.ststusName = '出行中';
// } // }
// 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
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<memberOrderDetailModal :memberRow="memberRow" :memberCostDetail="memberCostDetail" v-if="memberDialogVisible" <memberOrderDetailModal :memberRow="memberRow" :memberCostDetail="memberCostDetail" v-if="memberDialogVisible"
v-on:memberOrderDetailDialogEvent="memberOrderDetailDialogEvent"></memberOrderDetailModal> v-on:memberOrderDetailDialogEvent="memberOrderDetailDialogEvent"></memberOrderDetailModal>
</div> </div>
</template> </template>
...@@ -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