Skip to content

C
cloud-platform-ui
Commit e3102550 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify 

# Conflicts:
#	src/views/appManagement/appVersion/index.vue
parents 38b6fb33 6b0d1afb
Hide whitespace changes
Inline Side-by-side
Showing with 610 additions and 237 deletions
src/api/activityManagement.js
View file @ e3102550
......@@ -33,4 +33,15 @@ export function editObj(data) {
method: 'put',
data: data
})
}
\ No newline at end of file
}
/**
* 获取活动数据
* @param query
*/
export function getActivityData(query) {
return fetch({
url: '/api/user/behavior/admin/customerBehaviorNotes/collect/' + query.activityId + '?startTime=' + query.startTime + '&endTime=' + query.endTime,
method: 'Get'
})
}
src/api/vehicle/vehicleInfo/index.js
View file @ e3102550
......@@ -76,7 +76,16 @@ export function getSysRegionByIds(ids) {
export function getSysRegionById(id) {
return fetch({
url: '/vehicle/sysRegion/getSysRegionById//' + id,
url: '/vehicle/sysRegion/getSysRegionById/' + id,
method: 'get'
});
}
//重新配车
export function editObj(param) {
return fetch({
url: '/api/order/baseOrder/bg/change-vehicle',
method: 'post',
data: param
});
}
src/views/activityManagement/activityList.vue
View file @ e3102550
......@@ -38,7 +38,7 @@
</el-table-column>
<el-table-column align="center" label="操作" width="200" fixed="right">
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="activity_btn_update" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleActivityData(scope.row)">活动数据</el-button>
</template>
</el-table-column>
......@@ -98,41 +98,40 @@
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleNewPeopelFilter" style="margin-left:20px">搜索</el-button>
</el-row>
</el-form>
<el-table :key='newPeopeltableKey' :data="list" border fit highlight-current-row style="width: 100%;">
<el-table :key='newPeopeltableKey' :data="newPeopelDataList" border fit highlight-current-row style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
<span>{{scope.row.behavior}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
<span>{{scope.row.p_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
<span>{{scope.row.p_avg_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
<span>{{scope.row.u_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
<span>{{scope.row.u_avg_count}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<!-- <div class="pagination-container">
<el-pagination @size-change="newPeopelDataSizeChange" @current-change="newPeopelDataCurrentChange"
:current-page.sync="newPeopelDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="newPeopelDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="newPeopelDataTotal"></el-pagination>
</div>
</div> -->
</el-dialog>
......@@ -146,41 +145,40 @@
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleShareDataFilter" style="margin-left:20px">搜索</el-button>
</el-row>
</el-form>
<el-table :key='shareDatatableKey' :data="list" border fit highlight-current-row style="width: 100%;">
<el-table :key='shareDatatableKey' :data="shareDataList" border fit highlight-current-row style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
<span>{{scope.row.behavior}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
<span>{{scope.row.p_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
<span>{{scope.row.p_avg_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
<span>{{scope.row.u_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
<span>{{scope.row.u_avg_count}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<!-- <div class="pagination-container">
<el-pagination @size-change="shareDataSizeChange" @current-change="shareDataCurrentChange"
:current-page.sync="shareDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="shareDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="shareDataTotal"></el-pagination>
</div>
</div> -->
</el-dialog>
</div>
</template>
......@@ -208,7 +206,8 @@
import {
activityList,
getObj,
editObj
editObj,
getActivityData
} from 'api/activityManagement';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
......@@ -256,12 +255,14 @@
newPeopelDataQuery:{
page: 1,
limit: 20,
activityId:'',
starTimeStr:'',
endTimeStr:''
},
shareDataQuery:{
page: 1,
limit: 20,
activityId:'',
starTimeStr:'',
endTimeStr:''
},
......@@ -312,9 +313,11 @@
}
}
},
activity_btn_update:false,
}
},
created() {
this.activity_btn_update = this.elements['activity:btn:update'];
this.getList();
},
computed: {
......@@ -378,21 +381,16 @@
type: 'warning',
duration: 2000
});
this.listLoading = false;
return false;
}
}
// activityList(this.listQuery).then(response => {
// let totalCountRs = undefined;
// let listRs = undefined;
// if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
// listRs = response.data.list;
// totalCountRs = response.data.total;
// }
// this.listLoading = false;
// this.newPeopelDataList = listRs;
// this.newPeopelDataTotal = totalCountRs;
// })
this.newPeopelDataQuery.startTime = this.newPeopelDataQuery.starTimeStr?new Date(this.newPeopelDataQuery.starTimeStr).getTime():''
this.newPeopelDataQuery.endTime = this.newPeopelDataQuery.endTimeStr?new Date(this.newPeopelDataQuery.endTimeStr).getTime():''
getActivityData(this.newPeopelDataQuery).then(response => {
let listRs = undefined;
listRs = response.data;
this.newPeopelDataList = listRs;
})
},
//邀请有礼-活动数据弹窗
......@@ -419,21 +417,16 @@
type: 'warning',
duration: 2000
});
this.listLoading = false;
return false;
}
}
// activityList(this.listQuery).then(response => {
// let totalCountRs = undefined;
// let listRs = undefined;
// if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
// listRs = response.data.list;
// totalCountRs = response.data.total;
// }
// this.listLoading = false;
// this.shareDataList = listRs;
// this.shareDataTotal = totalCountRs;
// })
this.shareDataQuery.startTime = this.shareDataQuery.starTimeStr?new Date(this.shareDataQuery.starTimeStr).getTime():''
this.shareDataQuery.endTime = this.shareDataQuery.endTimeStr?new Date(this.shareDataQuery.endTimeStr).getTime():''
getActivityData(this.shareDataQuery).then(response => {
let listRs = undefined;
listRs = response.data;
this.shareDataList = listRs;
})
},
handleUpdate(row){
......@@ -463,18 +456,22 @@
this.newPeopelDataQuery={
page: 1,
limit: 20,
activityId:row.id,
starTimeStr:'',
endTimeStr:''
}
this.getNewPeopelDataList();
this.newPeopelDataVisible = true;
}
if(row.type==2){
this.shareDataQuery={
page: 1,
limit: 20,
activityId:row.id,
starTimeStr:'',
endTimeStr:''
}
this.getShareDataList();
this.shareDataVisible = true;
}
},
......
src/views/appManagement/appVersion/index.vue
View file @ e3102550
......@@ -458,7 +458,7 @@
}
}
</script>
<style>
.v-modal{
......
src/views/applyManagements/carApplyList.vue
View file @ e3102550
......@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column align="center" label="操作" width="150" fixed="right">
<template scope="scope">
<el-button class="el-button el-button--text el-button--small" size="small" v-if="scope.row.status==0&&app" @click="clickHandler(scope.row)">处理</el-button>
<el-button class="el-button el-button--text el-button--small" size="small" v-if="scope.row.status==0&&app_btn_buy_vehicle_status_update" @click="clickHandler(scope.row)">处理</el-button>
</template>
</el-table-column>
</el-table>
......@@ -166,12 +166,12 @@
zoneId:null
},
allBranchCompany:[],
app:false,
app_btn_buy_vehicle_status_update:false,
}
},
created() {
this.getList();
this.app = this.elements['app'];
this.app_btn_buy_vehicle_status_update = this.elements['app:btn:buy_vehicle_status:update'];
},
computed: {
...mapGetters([
......
src/views/baseInfo/branchCompany/index.vue
View file @ e3102550
......@@ -134,7 +134,7 @@
</el-form-item>
<el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择" @change="getProvinceRegionsForm">
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
......@@ -466,6 +466,29 @@
}
});
},
/**
* 表单里面根据片区获取省份数据
* */
getProvinceRegionsForm(){
let that = this;
this.form.addrCity = undefined;
this.form.addrProvince = undefined;
this.form.addrTown = undefined;
if (!this.$utils.isInteger(this.form.zoneId)) {
return null;
}
this.allZoneArr.map(function(item){
if(item.id == that.form.zoneId){
getSysRegionByIds(item.provinceIds).then(response => {
let listRs = undefined;
if (!that.$utils.isEmpty(response.data)) {
listRs = response.data;
}
that.provinceRegions = listRs;
});
}
});
},
getValue(e){
this.listQuery.addrCity = undefined;
},
......@@ -529,8 +552,20 @@
this.dialogFormVisible = true;
},
handleUpdate(row) {
var that = this;
getObj(row.id)
.then(response => {
this.allZoneArr.map(function(item){
if(item.id == response.data.zoneId){
getSysRegionByIds(item.provinceIds).then(res => {
let listRs = undefined;
if (!that.$utils.isEmpty(res.data)) {
listRs = res.data;
}
that.provinceRegions = listRs;
});
}
});
this.form = response.data;
this.dialogFormVisible = true;
this.dialogStatus = 'update';
......
src/views/campsiteManage/modal/oneCampsiteModal.vue
View file @ e3102550
......@@ -64,6 +64,21 @@
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload>
</el-form-item>
<el-form-item label="海报背景" :style="{display:'block'}">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:on-success="handlePosterSuccess"
:on-progress="uploadPosterProcess"
list-type="picture">
<div slot="tip" class="el-upload__tip"> <span style="color: red;">建议尺寸：485*485px</span></div>
<el-progress v-show="imgPosterFlag == true" type="circle" :percentage="percent_poster" style="margin-top: 20px"></el-progress>
<img v-if="$utils.isString(form.posterBackground) && !$utils.isEmpty(form.posterBackground)&& !imgPosterFlag" :src="form.posterBackground" style="width:300px;max-height:300px;">
<i v-else-if="!imgPosterFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload>
</el-form-item>
<el-form-item label="轮播图" :style="{display:'block'}">
<el-upload
class="upload-demo"
......@@ -156,6 +171,8 @@
},
data() {
return {
imgPosterFlag:false,
percent_poster:0,
BASE_API: process.env.BASE_API,
defaultMsg: '这里是UE测试',
config: {
......@@ -189,6 +206,7 @@
configure: '',//配套&收费
campsiteTagListVos: [],//营地类型
carouse:[],//banner轮播
posterBackground:'',//海报背景
},
showCampsiteVisible: false,//编辑营地地址
rules: {
......@@ -316,6 +334,7 @@
address: this.campsiteObj.address,//详细地址
latitude: this.campsiteObj.latitude,
longitude: this.campsiteObj.longitude,
posterBackground:this.form.posterBackground,//海报背景
};
console.log(params);
this.isExistCampsiteShop("create", params);
......@@ -395,6 +414,7 @@
address: this.campsiteObj.address,//详细地址
latitude: this.campsiteObj.latitude,
longitude: this.campsiteObj.longitude,
posterBackground:this.form.posterBackground,//海报背景
};
console.log(params);
this.isExistCampsiteShop("update", params);
......@@ -599,6 +619,22 @@
this.fileList2.push({url:res.data});
this.form.carouse.push({imgUrl:res.data});
},
/**
* 海报背景上传
* **/
handlePosterSuccess(res, file){
this.percent_poster = 0;
this.imgPosterFlag = false;
this.form.posterBackground = res.data;
},
/**
* 海报背景图上传进度
* */
uploadPosterProcess(event, file, fileList) {
this.imgPosterFlag = true;
console.log(event.percent);
this.percent_poster = Math.floor(event.percent);
},
/**
* 清空旅游弹框数据
*/
......@@ -625,6 +661,7 @@
configure: '',//配套&收费
campsiteTagListVos: [],//营地类型
carouse:[],//banner轮播
posterBackground:''
};
this.showCampsiteVisible= false;//编辑营地地址
}
......
src/views/index/index.vue
View file @ e3102550
......@@ -524,7 +524,7 @@
if (res.status == 200) {
that.totalGmv = res.data.totalGmv
that.totalSecurityDeposit = res.data.totalSecurityDeposit
that.peichang = Number(res.data.totalCompensation)+Number(res.data.totalForfeit)+Number(res.data.totalPenalSum)+Number(res.data.totalPostpone)
that.peichang = Number(Number(res.data.totalCompensation)+Number(res.data.totalForfeit)+Number(res.data.totalPenalSum)+Number(res.data.totalPostpone)).toFixed(2)
} else {
this.$notify({
title: '失败',
......@@ -548,45 +548,68 @@
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if(!ii.bg){
//空白-可安排用车
// this.anpai = true;
// let arr = item.vehicleModel.keyword.split(",");
// item.vehicleModel.keyword = arr.join(" | ");
// this.currentItem = {item: item, iitem: iitem, ii: ii};
// this.anpai = true;
// let arr = item.vehicleModel.keyword.split(",");
// item.vehicleModel.keyword = arr.join(" | ");
// this.currentItem = {item: item, iitem: iitem, ii: ii};
} else {
if(ii.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(ii.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
} else if(ii.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(ii.bookType == 7){
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
} else if(ii.bookType == 1){
this.getOneVechi(ii.vehicleBookRecord.orderNo);
// this.rentOrder = true;
// this.rentOrderInfo = {};
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(ii.bookType == 9){
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(ii.bookType == 5) {
//房车游订单详情
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:'其他'};
if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"};
}else{
if(ii.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(ii.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
} else if(ii.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(ii.bookType == 7){
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
} 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.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(ii.bookType == 9){
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 @@
item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--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.bg = "bg-"+ iitem.bookType;
if(iitem.status == 1){
//审核中
pp.bg = "bg-7";
} else {
pp.bg = "bg-"+ iitem.bookType;
}
pp.vehicleBookRecord = iitem;
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){
pp.timeEtr = h;
}
......@@ -963,29 +991,34 @@
pp.h = h;
item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间
pp.timeStr = h;
}
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
pp.timeStr = h;
}
if(iitem.status == 1){
//审核中
pp.bg = "bg-7";
} else {
pp.bg = "bg-"+ iitem.bookType;
pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt){
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
pp.timeEtr = h;
if(h == "00"){
let cc = new Date(tt);
console.log(cc);
let te = cc.getTime()-24*60*60;
endTime = timestamp2Date(te).substring(0, 13) +":00:00";
console.log(endTime);
}
}
pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt && iitem.status == 2){
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
pp.timeEtr = h;
if(h == "00"){
let cc = new Date(tt);
console.log(cc);
let te = cc.getTime()-24*60*60;
endTime = timestamp2Date(te).substring(0, 13) +":00:00";
console.log(endTime);
}
pp.bg = "";
}
pp.bg = "";
}
});
children.push(pp);
}
});
children.push(pp);
}
ttemp.children = children
});
......
src/views/index/vehicleExhibitionModal.vue
View file @ e3102550
......@@ -21,7 +21,7 @@
<span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span>
</el-form-item>
<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 label="申请说明:">
<span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
......
src/views/order/modal/rentOrderDetailModal.vue
View file @ e3102550
......@@ -31,7 +31,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="配车:">
<span style="margin-right: 10px;">{{form.vehicleNumberPlat}}</span><el-button size="small" type="primary" icon="edit" v-if="form.status==4">重新配车</el-button>
<span style="margin-right: 10px;">{{form.vehicleNumberPlat}}</span><el-button size="small" type="primary" icon="edit" @click="resetCar">重新配车</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -94,6 +94,19 @@
</tr>
</table>
</el-form>
<div class="modal_modal" v-show="resetCarVisible"></div>
<!-- 重新配车 -->
<el-dialog title="重新配车" :visible.sync="resetCarVisible" :append-to-body='true' :modal="false">
<el-form :model="resetCarForm" ref="carForm" :rules="rules" label-width="90px">
<el-form-item label="车牌号:" prop="numberPlate">
<el-input v-model="resetCarForm.numberPlate" placeholder="请输入重配的车牌号"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelResetCar">取消</el-button>
<el-button type="primary" @click="update('carForm')">确定</el-button>
</div>
</el-dialog>
</el-dialog>
</template>
......@@ -103,6 +116,7 @@
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
import {editObj} from 'api/vehicle/vehicleInfo';
export default {
props: ["form", "rentCostDetail"],
name: 'rentOrderDetailModal',
......@@ -114,7 +128,22 @@
},
data() {
return {
dialogVisible: false
dialogVisible: false,
resetCarVisible:false,
resetCarForm:{
no:'',
numberPlate:'',//重新配车车牌号
},
rules: {
numberPlate: [
{
type: 'string',
required: true,
message: '请输入车牌号',
trigger: 'blur'
}
]
},
}
},
watch: {
......@@ -143,7 +172,52 @@
}
},
methods: {
resetCar(){
this.clearFrom();
this.resetCarVisible = true
this.resetCarForm.no = this.form.no
},
cancelResetCar(){
this.resetCarVisible = false
},
clearFrom(){
this.resetCarForm = {
no:'',
numberPlate:'',//重新配车车牌号
}
},
/**
* 重新配车
* */
update(formName) {
let that = this;
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
editObj(this.resetCarForm).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '修改成功',
type: 'success',
duration: 2000
});
this.resetCarVisible = false
this.form.vehicleNumberPlat = this.resetCarForm.numberPlate
} else {
this.$notify({
title: '失败',
message: response.message,
type: 'error',
duration: 2000
});
}
});
} else {
return false;
}
});
},
}
}
</script>
......@@ -177,4 +251,14 @@
.order-details .el-form-item{
margin-bottom: 10px !important;
}
.modal_modal{
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
opacity: .5;
background: #000;
z-index: 2000;
}
</style>
src/views/order/modal/tourOrderDetailModal.vue
View file @ e3102550
......@@ -66,13 +66,11 @@
<div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">出游人信息 成人{{form.orderTourDetail.adultNum}}人 儿童{{form.orderTourDetail.childNum}}人</span></div>
<table class="orderDetail">
<tr><th>姓名</th><th>电话</th><th>身份证号</th></tr>
<template v-if="form.orderTourDetail.userVoList.length>0">
<tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index">
<td>{{item.realname}}</td>
<td>{{item.username}}</td>
<td>{{item.idNumber}}</td>
<td v-if="item">{{item.realname}}</td>
<td v-if="item">{{item.username}}</td>
<td v-if="item">{{item.idNumber}}</td>
</tr>
</template>
</table>
</div>
</el-form>
......@@ -229,10 +227,11 @@
} else {
this.$notify({
title: '失败',
message: '操作失败！',
message: res.message,
type: 'error',
duration: 2000
});
this.$emit("tourOrderDetailDialogEvent", false);
}
});
}
......
src/views/order/rentVehicleInfo/index.vue
View file @ e3102550
......@@ -506,12 +506,13 @@
this.serviceCost = this.form.orderRentVehicleDetail.dayNum * 600
}
this.rentDialogVisible = true;
},
},
/**
* 租车订单详情弹框关闭
* */
rentOrderDetailDialogEvent(e){
this.rentDialogVisible = false;
this.rentDialogVisible = false;
this.getList()
},
/**
* 操作-违章查询按钮，显示违章弹框
......
src/views/order/tourOrderInfo/index.vue
View file @ e3102550
......@@ -330,6 +330,7 @@
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.startCompanyId = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allBranchCompany = response.data;
......
src/views/tourManage/modal/tourTime.vue
View file @ e3102550
......@@ -213,7 +213,7 @@
this.num = this.num*1;
if(this.num>0){
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.endTime = formatDate(t, 'yyyy-MM-dd');
});
......
src/views/userManagement/memberEnter.vue
View file @ e3102550
......@@ -298,7 +298,6 @@
}
},
created() {
debugger
this.memberEnter_btn_add=this.elements['memberEnter:btn_add'];//添加一条
this.memberEnter_btn_del=this.elements['memberEnter:btn_del'];//删除
this.memberEnter_btn_addIn=this.elements['memberEnter:btn_addIn'];//批量上传
......
src/views/vehicle/bookRecord/index.vue
View file @ e3102550
......@@ -1302,13 +1302,15 @@
this.departureForm.departureDate = Date();
this.departureForm.departureBranchCompanyId = row.liftCompany
this.departureForm.departureBranchCompanyName = row.liftCompanyName
if(row.vehicleDepartureLogVo!=undefined){
this.departureForm.user = row.vehicleDepartureLogVo.user?row.vehicleDepartureLogVo.user:''
this.departureForm.userTel = row.vehicleDepartureLogVo.userTel?row.vehicleDepartureLogVo.userTel:''
}else{
this.departureForm.user = ''
this.departureForm.userTel = ''
}
this.departureForm.user = row.vehicleUsername
this.departureForm.userTel = row.vehicleUserPhone
// if(row.vehicleDepartureLogVo!=undefined){
// this.departureForm.user = row.vehicleDepartureLogVo.user?row.vehicleDepartureLogVo.user:''
// this.departureForm.userTel = row.vehicleDepartureLogVo.userTel?row.vehicleDepartureLogVo.userTel:''
// }else{
// this.departureForm.user = ''
// this.departureForm.userTel = ''
// }
this.departureForm.expectArrivalBranchCompanyId = row.retCompany
this.departureForm.expectArrivalBranchCompanyName = row.retCompanyName
this.dialogForm4LiftVisible = true;
......
src/views/vehicle/vehicleInfo/index.vue
View file @ e3102550
......@@ -182,25 +182,30 @@
type="index"
align="center" label="序号" width="65">
</el-table-column>
<el-table-column width="120" align="center" label="车牌">
<el-table-column width="400" align="center" label="车辆编码">
<template scope="scope">
<span>{{scope.row.id}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="车牌">
<template scope="scope">
<span>{{scope.row.numberPlate}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="车辆状态">
<el-table-column width="200" align="center" label="车辆状态">
<template scope="scope">
<span>{{getVehicleStatus(scope.row.status)}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="车辆品牌">
<el-table-column width="200" align="center" label="车辆品牌">
<template scope="scope">
<span>{{getBrand(scope.row.brand)}}</span>
</template>
</el-table-column>
<el-table-column width="180" align="center" label="停靠分公司">
<el-table-column width="200" align="center" label="停靠分公司">
<template scope="scope">
<span>{{scope.row.parkBranchCompanyName}}</span>
</template>
......@@ -218,11 +223,11 @@
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<!-- <el-table-column align="center" label="备注">
<template scope="scope">
<span>{{scope.row.remark}}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column width="200" align="center" v-if="showMoreMoreCol" label="车架号">
......@@ -630,7 +635,7 @@
<el-input v-model="form4Apply.vehicleUsername" placeholder="请输入使用人"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="vehicleUserPhone">
<el-input v-model="form4Apply.vehicleUserPhone" placeholder="请输入使用人联系方式"></el-input>
<el-input type="number" v-model="form4Apply.vehicleUserPhone" placeholder="请输入使用人联系方式"></el-input>
</el-form-item>
<el-form-item label="用途" prop="bookType">
<el-select class="filter-item" v-model="form4Apply.bookType" placeholder="请选择用途">
......@@ -1046,6 +1051,9 @@
required: true,
message: '请输入使用人联系方式',
trigger: 'blur'
},{
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号'
}
],
bookType:[
......@@ -2108,4 +2116,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/views/vehicle/vehicleSchedulManage/disableModal.vue
View file @ e3102550
......@@ -22,7 +22,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消禁用</el-button>
<el-button @click="cancel()" v-if="bookRecord_btn_unbook">取消禁用</el-button>
</div>
</el-dialog>
</template>
......@@ -46,9 +46,16 @@
data() {
return {
jinyong:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
jinyong(newValue, oldValue){
......
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ e3102550
......@@ -4,7 +4,7 @@
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="车辆状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
......@@ -12,31 +12,37 @@
:value="val.code"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<el-form-item label="车牌">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-form-item label="当前停放公司" prop="parkBranchCompanyId">
<el-autocomplete
class="inline-input"
v-model="listQuery.parkBranchCompanyName"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelectPark"
></el-autocomplete>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="所属分公司" prop="subordinateBranch">
<el-select class="filter-item" v-model="listQuery.subordinateBranch" placeholder="请选择" @change="getAllBranchCompanyChange">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="时间">
<el-date-picker
v-model="listQuery.startTime"
......@@ -53,8 +59,8 @@
placeholder="选择日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
</el-col> -->
<!-- <el-col :span="6">
<el-form-item label="当前停放公司" prop="parkBranchCompanyId">
<el-autocomplete
class="inline-input"
......@@ -64,10 +70,9 @@
@select="handleSelectPark"
></el-autocomplete>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div>
<el-form label-width="100px" v-if="countTJ">
<el-row :gutter="20">
......@@ -488,41 +493,62 @@
item.vehicleModel.keyword = arr.join(" | ");
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else {
if(ii.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(ii.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
} else if(ii.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(ii.bookType == 7){
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车",upkeepName:'预定'};
} else if(ii.bookType == 1){
this.getOneVechi(ii.vehicleBookRecord.orderNo);
// this.rentOrder = true;
// this.rentOrderInfo = {};
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
}else if(ii.bookType == 9){
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(ii.bookType == 5) {
//房车游订单详情
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:'其他'};
if(ii.vehicleBookRecord.status == 1){//审核中的显示预约弹框
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "预定用车"};
} else{
if(ii.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(ii.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii,title: "维修",upkeepName:'维修'};
} else if(ii.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "展览用车",upkeepName:'展览'};
} 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.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
}else if(ii.bookType == 9){
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:'其他'};
}
}
}
},
/**
......@@ -791,6 +817,9 @@
},
handleFilter() {
this.listQuery.page = 1;
if(this.listQuery.numberPlate==''){
this.listQuery.numberPlate = null;
}
this.$refs.queryForm.validate(valid => {
if (valid) {
this.getList();
......@@ -899,13 +928,18 @@
item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--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.bg = "bg-"+ iitem.bookType;
if(iitem.status == 1){
//审核中
pp.bg = "bg-7";
} else {
pp.bg = "bg-"+ iitem.bookType;
}
pp.vehicleBookRecord = iitem;
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){
pp.timeEtr = h;
if(h == "00"){
......
src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue
View file @ e3102550
......@@ -21,18 +21,19 @@
<span>{{currentItem.ii.vehicleBookRecord.bookStartDate}}~{{currentItem.ii.vehicleBookRecord.bookEndDate}}</span>
</el-form-item>
<el-form-item label="用途:">
<span>{{currentItem.upkeepName}}</span>
<!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
<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 label="申请说明:">
<span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
</el-form-item>
</el-form>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2' class="dialog-footer">
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook' class="dialog-footer">
<el-button @click="cancel()">取消用车</el-button>
</div>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
<el-button type="primary" @click="agree()">同 意</el-button>
<el-button @click="notAgree()">不同意</el-button>
<el-button type="primary" @click="agree()" v-if="bookRecord_btn_prove">同 意</el-button>
<el-button @click="notAgree()" v-if="bookRecord_btn_reject">不同意</el-button>
</div>
</el-dialog>
</template>
......@@ -56,11 +57,22 @@
data() {
return {
zhanlan:false,
bookRecord_btn_prove:false,
bookRecord_btn_reject:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
console.log(this.currentItem);
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
zhanlan(newValue, oldValue){
if(!newValue){
......
src/views/vehicle/vehicleSchedulManage/vehicleMaintenanceModal.vue
View file @ e3102550
......@@ -27,12 +27,12 @@
<span>{{upkeepStr}}</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2">
<div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook">
<el-button @click="cancel()">取消用车</el-button>
</div>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
<el-button type="primary" @click="agree()">同 意</el-button>
<el-button @click="notAgree()">不同意</el-button>
<el-button type="primary" @click="agree()" v-if="bookRecord_btn_prove">同 意</el-button>
<el-button @click="notAgree()" v-if="bookRecord_btn_reject">不同意</el-button>
</div>
</el-dialog>
</template>
......@@ -57,10 +57,16 @@
data() {
return {
baoyang:false,
upkeepStr:''
upkeepStr:'',
bookRecord_btn_prove:false,
bookRecord_btn_reject:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
getUpkeepAll().then(response => {
var arr = this.currentItem.ii.vehicleBookRecord.upkeepIds.split(",");
var str = '';
......@@ -76,6 +82,11 @@
})
console.log(this.currentItem);
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
baoyang(newValue, oldValue){
if(!newValue){
......
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
View file @ e3102550
......@@ -48,10 +48,15 @@
<el-form-item label="用途" prop="bookType">
<!--bookType 2-租车、1-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
<el-select class="filter-item" v-model="form.bookType" placeholder="请选择用途">
<el-option label="租车" value="1"></el-option>
<el-option label="维修" value="3"></el-option>
<el-option label="展览" value="4"></el-option>
<el-option label="房车游" value="5"></el-option>
<el-option label="旅游" value="5"></el-option>
<el-option label="保养" value="6"></el-option>
<el-option label="禁用" value="8"></el-option>
<el-option label="客户用车" value="9"></el-option>
<el-option label="其他" value="10"></el-option>
<!--<el-option v-for="item in getAllUseType() " :key="item.code" :label="item.val"-->
<!--:value="item.code"></el-option>-->
......@@ -66,7 +71,7 @@
<el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input>
</el-form-item>
<el-form-item label="使用人联系方式" prop="vehicleUserPhone">
<el-input v-model="form.vehicleUserPhone" placeholder="请输入使用人联系方式"></el-input>
<el-input v-model="form.vehicleUserPhone" type="number" placeholder="请输入使用人联系方式"></el-input>
</el-form-item>
<el-form-item label="说明">
<el-input v-model="form.remark" :rows="3" placeholder="请输入说明"></el-input>
......@@ -74,7 +79,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="handelOk('form')">确 定</el-button>
<el-button type="primary" @click="handelOk('form')" v-if="vehicleInfo_btn_apply">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -121,6 +126,19 @@
props: ["currentItem"],
name: 'vehiclePlanModal',
data() {
var checkPhone = (rule, value, callback) => {
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
};
return {
pickerOptions0: {
disabledDate(time) {
......@@ -161,12 +179,7 @@
message: '请选择还车公司',
trigger: 'change'
},
vehicleUserPhone:{
type: 'string',
required: true,
message: '请输入使用人联系方式',
trigger: 'blur'
},
vehicleUserPhone:{validator: checkPhone, trigger: 'blur',required: true},
bookType:{
type: 'string',
required: true,
......@@ -177,11 +190,13 @@
required: true,
message: '请选择时间',
}
}
},
vehicleInfo_btn_apply: false,//申请预定
}
},
created() {
console.log(this.currentItem);
this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply'];
getAll()
.then(response => {
this.allCompaniesArr = response.data;
......@@ -193,6 +208,11 @@
this.upkeepList = response.data
})
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
anpai(newValue, oldValue){
if(!newValue){
......@@ -270,7 +290,7 @@
} else {
this.$notify({
title: '失败',
message: '操作失败！',
message: response.message,
type: 'error',
duration: 2000
});
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ e3102550
......@@ -23,7 +23,7 @@
<el-table-column width="150" align="center" label="用途">
<template scope="scope">
<!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==3?"维修":scope.row.bookType==8?"禁用":scope.row.bookType==9?"客户用车":scope.row.bookType==10?"其他":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==3?"维修":scope.row.bookType==8?"禁用":scope.row.bookType==9?"客户用车":scope.row.bookType==10?"其他":scope.row.bookType==4?"展览":scope.row.bookType==5?"旅游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="订单号">
......@@ -76,7 +76,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="handelOk('form')">确 定</el-button>
<el-button type="primary" @click="handelOk('form')" v-if="vehicleInfo_btn_apply">确 定</el-button>
</div>
</el-dialog>
......@@ -96,6 +96,7 @@
</div>
</template>
<script>
import {mapGetters} from 'vuex';
import vehicleMaintenanceModal from './vehicleMaintenanceModal';//车辆保养弹框
import vehicleExhibitionModal from './vehicleExhibitionModal';//车辆展览弹框
import vehiclePlanModal from './vehiclePlanModal';//安排用车
......@@ -178,10 +179,17 @@
required: true,
message: '请选择时间',
}
}
},
vehicleInfo_btn_apply:false,
}
},
created() {
this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply'];
},
computed: {
...mapGetters([
'elements',
]),
},
mounted() {
this.listQuery.selectedMonth = this.$route.query.selectedMonth;
......@@ -243,34 +251,71 @@
toShowDialog( cc, iitem){
let item = {};
let ii = {
vehicleBookRecord: cc
vehicleBookRecord: cc,
bookType:cc.bookType
};
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
item.numberPlate = this.listQuery.numberPlate;//车牌号
item.parkCompanyName = cc.parkCompanyName;//当前停靠公司
item.subordinateBranchName = cc.subordinateBranchName;//所属公司
if(cc.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(cc.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "展览用车"};
} else if(cc.bookType == 7){
if(ii.vehicleBookRecord.status == 1){
//审核中显示预定中
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "预定用车"};
} else if(cc.bookType == 1){
this.getOneVechi(cc.orderNo);
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(cc.bookType == 5) {
//房车游订单详情
this.tourRow = {no: cc.vehicleBookRecord.orderNo};
this.tourDialogVisible = true
} else if(cc.bookType == 8) {
//禁用
this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
} else{
if(cc.bookType == 6){
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(cc.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "维修",upkeepName:'维修'};
} else if(cc.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(cc.bookType == 7){
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "预定用车",upkeepName:'预定'};
} else if(cc.bookType == 1){
if(!cc.orderNo){
this.$notify({
title: '警告',
message: '订单号缺失',
type: 'warning',
duration: 2000
});
return false;
} else{
this.getOneVechi(cc.orderNo);
}
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(cc.bookType == 9){
this.zhanlan = true;
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
}
} else if(cc.bookType == 8) {
//禁用
this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
} else if(cc.bookType == 10){
this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "其他",upkeepName:'其他'};
}
}
},
/**
......
src/views/vehicle/vehicleWarningMsg/index.vue
View file @ e3102550
......@@ -15,6 +15,13 @@
:value="val.code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="颜色预警">
<el-select class="filter-item" v-model="listQuery.colorType" placeholder="请选择颜色预警">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in vehicleWarningMsgColorType " :key="val.code" :label="val.val"
:value="val.code"></el-option>
</el-select>
</el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" v-if="vehicleWarningMsg_btn_add" style="margin-left: 10px;"
@click="handleCreate"
......@@ -45,6 +52,13 @@
</template>
</el-table-column>
<el-table-column width="150" align="center" label="颜色预警">
<template scope="scope">
<span v-if="scope.row.colorType==1">红色预警</span>
<span v-if="scope.row.colorType==2">蓝色预警</span>
<span v-if="scope.row.colorType==3">黄色预警</span>
</template>
</el-table-column>
<el-table-column width="150" align="center" label="预警消息类型">
<template scope="scope">
......@@ -137,6 +151,18 @@
},
data() {
return {
vehicleWarningMsgColorType:[
{
code:1,
val:'红色预警'
},{
code:2,
val:'蓝色预警'
},{
code:3,
val:'黄色预警'
}
],
upkeepRow: {},//保养数据
form: {
msg: undefined,
......@@ -186,7 +212,8 @@
limit: 10,
numberPlate: undefined,
vehicleCode: undefined,
type: undefined
type: undefined,
colorType:undefined,
},
allCompanies: {},
allCompaniesArr: [],
......@@ -270,6 +297,7 @@
* */
upkeepDialogEvent(e){
this.upkeepDialogVisible = e;
this.getList();
},
handleCreate() {
this.resetTemp();
......
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