Skip to content

C
cloud-platform-ui
Commit 259b4187 authored by denghr's avatar denghr
Browse files
Options

首页

parent 8f393ba5
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 65 deletions
src/views/index/index.vue
View file @ 259b4187
...@@ -548,45 +548,68 @@ ...@@ -548,45 +548,68 @@
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if(!ii.bg){ if(!ii.bg){
//空白-可安排用车 //空白-可安排用车
// this.anpai = true; this.anpai = true;
// let arr = item.vehicleModel.keyword.split(","); let arr = item.vehicleModel.keyword.split(",");
// item.vehicleModel.keyword = arr.join(" | "); item.vehicleModel.keyword = arr.join(" | ");
// this.currentItem = {item: item, iitem: iitem, ii: ii}; this.currentItem = {item: item, iitem: iitem, ii: ii};
} else { } else {
if(ii.bookType == 6){ if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框
//保养 this.zhanlan = true;
this.baoyang = true; this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"};
this.currentItem = {item: item, iitem: iitem, ii: ii}; }else{
} else if(ii.bookType == 3){ if(ii.bookType == 6){
//维修 //保养
this.zhanlan = true; this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'}; this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(ii.bookType == 4){ } else if(ii.bookType == 3){
//展览 //维修
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 == 7){ } else if(ii.bookType == 4){
this.zhanlan = true; //展览
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'}; this.zhanlan = true;
} else if(ii.bookType == 1){ this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
this.getOneVechi(ii.vehicleBookRecord.orderNo); } else if(ii.bookType == 7){
// this.rentOrder = true; this.zhanlan = true;
// this.rentOrderInfo = {}; this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"}; } else if(ii.bookType == 1){
} else if(ii.bookType == 9){ if(!ii.vehicleBookRecord.orderNo){
this.zhanlan = true; this.$notify({
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'}; title: '警告',
} else if(ii.bookType == 5) { message: '订单号缺失',
//房车游订单详情 type: 'warning',
this.tourRow = {no: ii.vehicleBookRecord.orderNo}; duration: 2000
this.tourDialogVisible = true });
} else if(ii.bookType == 8) { return false;
//禁用 } else{
this.jinyong = true; this.getOneVechi(ii.vehicleBookRecord.orderNo);
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"}; }
} else if(ii.bookType == 10) { this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
this.zhanlan = true; } else if(ii.bookType == 9){
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'}; this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(ii.bookType == 5) {
//房车游订单详情
if(!ii.vehicleBookRecord.orderNo){
this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
}else{
this.tourRow = {no: ii.vehicleBookRecord.orderNo};
this.tourDialogVisible = true
}
} else if(ii.bookType == 8) {
//禁用
this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
} else if(ii.bookType == 10) {
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "其他",upkeepName:'其他'};
}
} }
} }
}, },
...@@ -915,13 +938,18 @@ ...@@ -915,13 +938,18 @@
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间 if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
pp.bg = "bg-"+ iitem.bookType; if(iitem.status == 1){
//审核中
pp.bg = "bg-7";
} else {
pp.bg = "bg-"+ iitem.bookType;
}
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt){ if(iitem.bookEndDate == tt && iitem.status == 2){
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
pp.timeEtr = h; pp.timeEtr = h;
} }
...@@ -963,29 +991,34 @@ ...@@ -963,29 +991,34 @@
pp.h = h; pp.h = h;
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间 if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
if(iitem.status == 1){
//审核中
pp.bg = "bg-7";
} else {
pp.bg = "bg-"+ iitem.bookType; pp.bg = "bg-"+ iitem.bookType;
pp.vehicleBookRecord = iitem; }
pp.bookType = iitem.bookType; pp.vehicleBookRecord = iitem;
if(iitem.bookEndDate == tt){ pp.bookType = iitem.bookType;
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if(iitem.bookEndDate == tt && iitem.status == 2){
pp.timeEtr = h; if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
if(h == "00"){ pp.timeEtr = h;
let cc = new Date(tt); if(h == "00"){
console.log(cc); let cc = new Date(tt);
let te = cc.getTime()-24*60*60; console.log(cc);
endTime = timestamp2Date(te).substring(0, 13) +":00:00"; let te = cc.getTime()-24*60*60;
console.log(endTime); endTime = timestamp2Date(te).substring(0, 13) +":00:00";
} console.log(endTime);
} }
pp.bg = "";
} }
pp.bg = "";
} }
}); }
children.push(pp); });
children.push(pp);
} }
ttemp.children = children ttemp.children = children
}); });
......
src/views/index/vehicleExhibitionModal.vue
View file @ 259b4187
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span> <span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span>
</el-form-item> </el-form-item>
<el-form-item label="用途:"> <el-form-item label="用途:">
<span>{{currentItem.upkeepName}}</span> <span>{{currentItem.ii.bookType==1?"租房车":currentItem.ii.bookType==3?"维修":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==9?"客户用车":currentItem.ii.bookType==10?"其他":currentItem.ii.bookType==4?"展览":currentItem.ii.bookType==5?"旅游":currentItem.ii.bookType==6?"保养":currentItem.ii.bookType==8?"禁用":currentItem.ii.bookType==2?"分公司使用":'未知用途'}}</span>
</el-form-item> </el-form-item>
<el-form-item label="申请说明:"> <el-form-item label="申请说明:">
<span>{{currentItem.ii.vehicleBookRecord.remark}}</span> <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
......
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ 259b4187
...@@ -527,8 +527,18 @@ ...@@ -527,8 +527,18 @@
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}; if(!ii.vehicleBookRecord.orderNo){
// this.tourDialogVisible = true this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
}else{
this.tourRow = {no: ii.vehicleBookRecord.orderNo};
this.tourDialogVisible = true
}
} else if(ii.bookType == 8) { } else if(ii.bookType == 8) {
//禁用 //禁用
this.jinyong = true; this.jinyong = true;
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ 259b4187
...@@ -296,8 +296,18 @@ ...@@ -296,8 +296,18 @@
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}; if(!ii.vehicleBookRecord.orderNo){
// this.tourDialogVisible = true this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
}else{
this.tourRow = {no: ii.vehicleBookRecord.orderNo};
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