Commit b237f566 authored by hanfeng's avatar hanfeng

修改车辆订单

parent 1b84ba0e
...@@ -551,10 +551,12 @@ ...@@ -551,10 +551,12 @@
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) { if (this.costDetail.children){
var detail = a.detail == undefined ? '' : a.detail this.costDetail.children.forEach(function (a) {
cost += a.key + ":" + detail + " " var detail = a.detail == undefined ? '' : a.detail
}) cost += a.key + ":" + detail + " "
})
}
this.tourCostDetail = cost this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
...@@ -625,9 +627,12 @@ ...@@ -625,9 +627,12 @@
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) { if (this.costDetail.children){
cost += a.key + ":" + a.detail + " " this.costDetail.children.forEach(function (a) {
}) var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ":" + detail + " "
})
}
this.tourCostDetail = cost this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
...@@ -682,9 +687,12 @@ ...@@ -682,9 +687,12 @@
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) { if (this.costDetail.children){
cost += a.key + ":" + a.detail + " " this.costDetail.children.forEach(function (a) {
}) var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ":" + detail + " "
})
}
this.tourCostDetail = cost this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<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>
<td v-if="item && item.isdel == 0">{{item.name}}</td> <td v-if="item && item.isdel == 0">{{item.namename}}</td>
<td v-if="item && item.isdel == 0">{{item.phone}}</td> <td v-if="item && item.isdel == 0">{{item.phone}}</td>
<td v-if="item && item.isdel == 0">{{item.idCard}}</td> <td v-if="item && item.isdel == 0">{{item.idCard}}</td>
...@@ -220,10 +220,12 @@ ...@@ -220,10 +220,12 @@
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) { if (this.costDetail.children){
var detail = a1.detail == undefined ? '' : a1.detail this.costDetail.children.forEach(function (a1) {
cost += a1.key + ":" + detail + " " var detail = a1.detail == undefined ? '' : a1.detail
}) cost += a1.key + ":" + detail + " "
})
}
// if (this.form.status == 2) { // if (this.form.status == 2) {
// this.form.ststusName = '取消'; // this.form.ststusName = '取消';
// } // }
......
...@@ -829,10 +829,12 @@ ...@@ -829,10 +829,12 @@
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) { if (this.costDetail.children) {
var detail = a.detail == undefined ? '' : a.detail this.costDetail.children.forEach(function (a) {
cost += a.key + ":" + detail + " " var detail = a.detail == undefined ? '' : a.detail
}) cost += a.key + ":" + detail + " "
})
}
this.rentCostDetail = cost this.rentCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) { if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600 this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
......
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