Commit 49ae46b3 authored by hanfeng's avatar hanfeng

修改订单详情

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