Commit 9d195699 authored by lixy's avatar lixy

旅游活动天数计算

parent d50e5922
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
this.num = this.num*1; this.num = this.num*1;
if(this.num>0){ if(this.num>0){
this.list.map(function(item){ this.list.map(function(item){
let t = new Date(new Date(item.startTime).getTime() + 3600 * 1000 * 24 * that.num); let t = new Date(new Date(item.startTime).getTime() + 3600 * 1000 * 24 * (that.num-1));
item.startTime = formatDate(new Date(item.startTime), 'yyyy-MM-dd'); item.startTime = formatDate(new Date(item.startTime), 'yyyy-MM-dd');
item.endTime = formatDate(t, 'yyyy-MM-dd'); item.endTime = formatDate(t, 'yyyy-MM-dd');
}); });
......
...@@ -510,17 +510,25 @@ ...@@ -510,17 +510,25 @@
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'}; this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(ii.bookType == 1){ } else if(ii.bookType == 1){
if(!ii.vehicleBookRecord.orderNo){
this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
} else{
this.getOneVechi(ii.vehicleBookRecord.orderNo); this.getOneVechi(ii.vehicleBookRecord.orderNo);
// this.rentOrder = true; }
// this.rentOrderInfo = {};
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"}; this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
}else if(ii.bookType == 9){ }else if(ii.bookType == 9){
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'}; this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(ii.bookType == 5) { } else if(ii.bookType == 5) {
//房车游订单详情 //房车游订单详情
this.tourRow = {no: ii.vehicleBookRecord.orderNo}; // this.tourRow = {no: ii.vehicleBookRecord.orderNo};
this.tourDialogVisible = true // this.tourDialogVisible = true
} else if(ii.bookType == 8) { } else if(ii.bookType == 8) {
//禁用 //禁用
this.jinyong = true; this.jinyong = true;
......
...@@ -279,15 +279,25 @@ ...@@ -279,15 +279,25 @@
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "预定用车",upkeepName:'预定'}; this.currentItem = {item: item, ii: ii, title: "预定用车",upkeepName:'预定'};
} else if(cc.bookType == 1){ } else if(cc.bookType == 1){
if(!cc.orderNo){
this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
} else{
this.getOneVechi(cc.orderNo); this.getOneVechi(cc.orderNo);
}
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"}; this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(cc.bookType == 9){ } else if(cc.bookType == 9){
this.zhanlan = true; this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'}; this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(cc.bookType == 5) { } else if(cc.bookType == 5) {
//房车游订单详情 //房车游订单详情
this.tourRow = {no: cc.vehicleBookRecord.orderNo}; // this.tourRow = {no: cc.vehicleBookRecord.orderNo};
this.tourDialogVisible = true // this.tourDialogVisible = true
} else if(cc.bookType == 8) { } else if(cc.bookType == 8) {
//禁用 //禁用
this.jinyong = true; this.jinyong = true;
......
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