Skip to content

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

车辆信息、车辆排班

parent 9b668b53
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 38 deletions
src/views/index/index.vue
View file @ a9b6fcac
......@@ -590,18 +590,20 @@
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
}
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
// 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;
......
src/views/vehicle/vehicleInfo/index.vue
View file @ a9b6fcac
......@@ -96,6 +96,16 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="车型">
<el-select class="filter-item" v-model="listQuery.modelId" placeholder="请选择车型">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="item in allVehicleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-button class="filter-item" type="primary" :icon=" showMoreQueryFilter ? 'caret-top' : 'caret-bottom' "
v-waves @click="showMoreQueryFilter=!showMoreQueryFilter">
更多条件
......@@ -1121,7 +1131,8 @@
bookedEndDate: undefined,
notBookedStartDate: undefined,
notBookedEndDate: undefined,
code: undefined
code: undefined,
modelId:undefined
},
showMoreQueryFilter: false,
showMoreMoreCol: false,
......
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ a9b6fcac
......@@ -23,6 +23,12 @@
:value="item.code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="车型">
<el-select class="filter-item" v-model="listQuery.modelId" placeholder="请选择车型">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="item in allVehicleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="listQuery.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
......@@ -353,7 +359,9 @@
import {
formatDate
} from 'utils/dateFormattor';
import {
getAllVehicleList
} from 'api/vehicleType';
import {
toEast8Date,
deepCopyDate,
......@@ -396,6 +404,7 @@
},
data() {
return {
allVehicleList: [],//全部车型
animate: false,
firstTime: "",//排期表-第一个字段名称
marqueeList: [],
......@@ -427,6 +436,7 @@
endTime:undefined,
status: undefined,//车辆状态
useType:undefined,//用途
modelId:undefined,//车型
},
inline: true,
mar: null,//滚屏
......@@ -463,6 +473,7 @@
},
created() {
this.getList();
this.getAllVehicleType();
let currentMonth = getCurrentMonth();
this.currentMonth = parseInt(currentMonth);
if(this.currentMonth < 12){
......@@ -493,6 +504,18 @@
},
},
methods: {
/**
* 获取全部车型
* */
getAllVehicleType() {
getAllVehicleList().then(response => {
let listRs = undefined;
if (!this.$utils.isEmpty(response.data)) {
listRs = response.data;
}
this.allVehicleList = listRs;
});
},
/**
* 旅游订单详情弹框关闭
* */
......@@ -545,18 +568,20 @@
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
}
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "房车游",upkeepName:'房车游'};
// 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;
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ a9b6fcac
......@@ -296,18 +296,20 @@
this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(cc.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
}
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "房车游",upkeepName:'房车游'};
// 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(cc.bookType == 8) {
//禁用
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