Commit 49ae46b3 authored by hanfeng's avatar hanfeng

修改订单详情

parent b603274f
......@@ -199,15 +199,22 @@
if (res.status == 200) {
let a = res.data;
this.form = a;
this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime)
this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime)
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if ( this.costDetail.children){
this.costDetail.children.forEach(function(a1) {
var detail = a1.detail==undefined?'':a1.detail
cost += a1.key + ":" +detail+" "
})
this.form.orderTourDetail.startTime =a.orderTourDetail.startTime? timestamp2Date(a.orderTourDetail.startTime):''
this.form.orderTourDetail.endTime = a.orderTourDetail.endTime?timestamp2Date(a.orderTourDetail.endTime):''
if (a.orderTourDetail.costDetail){
try {
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if ( this.costDetail.children){
this.costDetail.children.forEach(function(a1) {
var detail = a1.detail==undefined?'':a1.detail
cost += a1.key + ":" +detail+" "
})
}
}catch (e) {
this.templateModel()
}
}
if (this.form.status == 2) {
this.form.ststusName = '取消';
......@@ -239,6 +246,19 @@
this.$emit("tourOrderDetailDialogEvent", false);
}
});
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
}
}
}
......
......@@ -504,6 +504,17 @@
vehicleDetail: false, //交还车信息,默认全部显示
order_btn_order_violcation_save: false,
depositDetail: false,
costDetail:{
key:undefined,
val:undefined,
children:[
{
key:undefined,
detail:undefined,
val:undefined
}
]
},
}
},
created() {
......@@ -547,15 +558,22 @@
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 = '';
if (this.costDetail.children){
this.costDetail.children.forEach(function (a) {
var detail = a.detail == undefined ? '' : a.detail
cost += a.key + ":" + detail + " "
})
this.form.orderRentVehicleDetail.startTime =this.form.orderRentVehicleDetail.startTime?timestamp2Date(this.form.orderRentVehicleDetail.startTime):''
this.form.orderRentVehicleDetail.endTime = this.form.orderRentVehicleDetail.endTime?timestamp2Date(this.form.orderRentVehicleDetail.endTime):''
if(this.form.orderRentVehicleDetail.costDetail){
try {
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 + " "
})
}
}catch (e) {
this.templateModel()
}
}
this.tourCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) {
......@@ -908,6 +926,19 @@
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
}
}
}
......
......@@ -216,15 +216,22 @@
// if (res.status == 200) {
let a = this.tourRow;
this.form = a;
this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime)
this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime)
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if (this.costDetail.children){
this.costDetail.children.forEach(function (a1) {
var detail = a1.detail == undefined ? '' : a1.detail
cost += a1.key + ":" + detail + " "
})
this.form.orderTourDetail.startTime = a.orderTourDetail.startTime ? timestamp2Date(a.orderTourDetail.startTime) : ''
this.form.orderTourDetail.endTime = a.orderTourDetail.endTime ? timestamp2Date(a.orderTourDetail.endTime) : ''
if (a.orderTourDetail.costDetail) {
try {
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if (this.costDetail.children) {
this.costDetail.children.forEach(function (a1) {
var detail = a1.detail == undefined ? '' : a1.detail
cost += a1.key + ":" + detail + " "
})
}
}catch (e) {
this.templateModel()
}
}
// if (this.form.status == 2) {
// this.form.ststusName = '取消';
......@@ -256,7 +263,21 @@
// this.$emit("tourOrderDetailDialogEvent", false);
// }
// });
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
}
}
}
</script>
......
......@@ -791,7 +791,17 @@
userList_btn_del: false,//删除
admin_btn_user_postion_put: false,//身份设置
settingList: [],
costDetail:{
key:undefined,
val:undefined,
children:[
{
key:undefined,
detail:undefined,
val:undefined
}
]
},
}
},
created() {
......@@ -824,17 +834,26 @@
if (row.type == "租车") {
this.form = row;
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.form.orderRentVehicleDetail.startTime =this.form.orderRentVehicleDetail.startTime?timestamp2Date(this.form.orderRentVehicleDetail.startTime):''
this.form.orderRentVehicleDetail.endTime = this.form.orderRentVehicleDetail.endTime?timestamp2Date(this.form.orderRentVehicleDetail.endTime):''
if(this.form.orderRentVehicleDetail.costDetail){
try {
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 + " "
})
}
}catch (e) {
this.templateModel()
}
}
this.rentCostDetail = cost
if (this.form.orderRentVehicleDetail.driverType == 1) {
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
......@@ -1401,6 +1420,19 @@
trigger: 'blur'
};
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
}
}
}
</script>
......
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