Skip to content

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

修改旅游定单和车辆排班列表

parent 7770ef55
Show whitespace changes
Inline Side-by-side
Showing with 301 additions and 258 deletions
src/views/order/modal/tourOrderDetailModal.vue
View file @ b603274f
......@@ -203,10 +203,12 @@
this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime)
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if ( this.costDetail.children){
this.costDetail.children.forEach(function(a1) {
var detail = a1.detail==undefined?'':a1.detail
cost += a1.key + ":" +detail+" "
})
}
if (this.form.status == 2) {
this.form.ststusName = '取消';
}
......
src/views/vehicle/bookRecord/index.vue
View file @ b603274f
......@@ -18,21 +18,22 @@
<el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择">
<el-option :key="undefined" label="无" :value="undefined"></el-option>
<el-option v-for="val in bookTypeList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
<el-option v-for="val in bookTypeList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属大区">
<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-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="提车公司">
<el-select class="filter-item" v-model="listQuery.liftCompany" placeholder="请选择" @change="getAllBranchCompanyChange">
<el-select class="filter-item" v-model="listQuery.liftCompany" 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-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="预订月份" prop="selectedMonth4Query">
......@@ -53,7 +54,8 @@
style="width: 100%">
<el-table-column align="center" label="车牌号(车序)" width="150">
<template scope="scope">
<span>{{scope.row.numberPlate}}</span><span v-if="scope.row.code!=0">({{scope.row.code}})</span><span v-if="scope.row.code==0">(无)</span>
<span>{{scope.row.numberPlate}}</span><span v-if="scope.row.code!=0">({{scope.row.code}})</span><span
v-if="scope.row.code==0">(无)</span>
</template>
</el-table-column>
......@@ -193,17 +195,31 @@
<el-table-column align="center" label="操作" width="200" fixed="right">
<template scope="scope">
<!-- <el-button size="small" type="success" @click="handleBookInfo(scope.row)">预订信息</el-button> -->
<el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.status==3" @click="illegalInquiry(scope.row)">违章记录</el-button>
<el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" @click="handleProve(scope.row)">通过</el-button>
<el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleReject(scope.row)">驳回</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.status==3"
@click="illegalInquiry(scope.row)">违章记录
</el-button>
<el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small"
class="el-button el-button--text el-button--small" @click="handleProve(scope.row)">通过
</el-button>
<el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small"
class="el-button el-button--text el-button--small" style="color: red;"
@click="handleReject(scope.row)">驳回
</el-button>
<template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small" @click="handleLift(scope.row)">出车</el-button>
<el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small"
class="el-button el-button--text el-button--small" @click="handleLift(scope.row)">出车
</el-button>
</template>
<template v-if="scope.row.vehicleDepartureLogVo!=undefined">
<el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small" @click="handleRet(scope.row)">收车</el-button>
<el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1"
size="small" class="el-button el-button--text el-button--small" @click="handleRet(scope.row)">收车
</el-button>
</template>
<template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleUnbook(scope.row)">取消预定</el-button>
<el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small"
class="el-button el-button--text el-button--small" style="color: red;"
@click="handleUnbook(scope.row)">取消预定
</el-button>
</template>
</template>
</el-table-column>
......@@ -329,9 +345,11 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
<el-col :span="3" v-for="(item, index) in departurePicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px">
<el-col :span="3" v-for="(item, index) in departurePicList" :key="index" :offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px">
<el-card>
<img :src="item" class="image">
<img :src="item" class="image" :class="imgStyle" @mouseover="setImgStyle('show')"
@mouseout="setImgStyle('hide')">
</el-card>
</el-col>
</el-row>
......@@ -361,7 +379,8 @@
</el-col>
</el-row>
<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
<el-col :span="3" v-for="(item, index) in arrivalPicList" :key="index" :offset="index%6 > 0 ? 1 : 0" style="margin-bottom:10px">
<el-col :span="3" v-for="(item, index) in arrivalPicList" :key="index" :offset="index%6 > 0 ? 1 : 0"
style="margin-bottom:10px">
<el-card>
<img :src="item" class="image">
</el-card>
......@@ -374,11 +393,11 @@
<span>{{detailItem.reviewerNameApply}}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="通过操作">-->
<!-- <span></span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="通过操作">-->
<!-- <span></span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -545,7 +564,9 @@
<el-row>
<el-col>
<el-form-item label="违章罚款">
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额" style="width: 50%;margin-right:10px"></el-input>元
<el-input v-model="price" type="number" placeholder="请输入违章罚款金额"
style="width: 50%;margin-right:10px"></el-input>
元
</el-form-item>
</el-col>
</el-row>
......@@ -618,13 +639,14 @@
},
data() {
return {
rejectVisible:false,
rejectFrom:{
vehicleBookRecordId:'',
rejectRemark:''
},
rejectRules:{
rejectRemark:{
imgStyle: false,
rejectVisible: false,
rejectFrom: {
vehicleBookRecordId: '',
rejectRemark: ''
},
rejectRules: {
rejectRemark: {
type: "string",
required: true,
message: "请输入拒绝原因",
......@@ -632,13 +654,13 @@
}
},
BASE_API: process.env.BASE_API,
departureFormrules:{
checkMan:{
departureFormrules: {
checkMan: {
required: true,
message: '请输入验车人',
trigger: 'blur'
},
checkManTel:[
checkManTel: [
{
required: true,
message: '请输入验车人联系方式',
......@@ -649,14 +671,14 @@
message: '请输入正确的手机号'
}
],
mileage:{
type:"number",
mileage: {
type: "number",
required: true,
message: '请输入公里数',
trigger: 'blur'
}
},
departureForm:{
departureForm: {
vehicleId: null,
departureBranchCompanyId: null,//出发地分公司id
departureBranchCompanyName: '',//出发地分公司名称
......@@ -669,14 +691,14 @@
numberPlate: null,
expectArrivalBranchCompanyId: null,//目的地分公司id
expectArrivalBranchCompanyName: '',//目的地分公司名称
bookRecordId:null,
departurePic:'',
remark:null,
bookRecordId: null,
departurePic: '',
remark: null,
bookStartDate: null,
},
departurePicList:[],
arrivalPicList:[],
arrivalForm:{
departurePicList: [],
arrivalPicList: [],
arrivalForm: {
vehicleId: null,
numberPlate: null,
arrivalDate: null,
......@@ -685,17 +707,17 @@
mileage: null,
arrivalBranchCompanyId: null,
arrivalBranchCompanyName: '',
arrivalPic:'',
remark:'',
bookRecordId:null,
arrivalPic: '',
remark: '',
bookRecordId: null,
},
arrivalFormrules:{
recycleMan:{
arrivalFormrules: {
recycleMan: {
required: true,
message: '请输入收车人',
trigger: 'blur'
},
recycleManTel:[
recycleManTel: [
{
required: true,
message: '请输入收车人联系方式',
......@@ -706,108 +728,106 @@
message: '请输入正确的手机号'
}
],
mileage:{
type:"number",
mileage: {
type: "number",
required: true,
message: '请输入收车公里数',
trigger: 'blur'
}
},
statusList:[
statusList: [
{
code:'1',
val:'申请中'
code: '1',
val: '申请中'
},
{
code:'3',
val:'待出行'
code: '3',
val: '待出行'
},
{
code:'4',
val:'驳回'
code: '4',
val: '驳回'
},
{
code:'5',
val:'出行中'
code: '5',
val: '出行中'
},
{
code:'6',
val:'取消预订'
code: '6',
val: '取消预订'
},
{
code:'7',
val:'已完成'
code: '7',
val: '已完成'
},
],
bookTypeList:[
bookTypeList: [
{
id:'1',
name:'租车'
id: '1',
name: '租车'
},
{
id:'2',
name:'用户租赁'
id: '2',
name: '用户租赁'
},
{
id:'3',
name:'维修'
id: '3',
name: '维修'
},
{
id:'4',
name:'展览'
id: '4',
name: '展览'
},
{
id:'5',
name:'旅游'
id: '5',
name: '旅游'
},
{
id:'6',
name:'保养'
id: '6',
name: '保养'
},
{
id:'7',
name:'预约中'
id: '7',
name: '预约中'
},
{
id:'8',
name:'禁用'
id: '8',
name: '禁用'
},
{
id:'9',
name:'客户用车'
id: '9',
name: '客户用车'
},
{
id:'10',
name:'其他'
id: '10',
name: '其他'
}
],
detailId:'',
illegalVisible:false,
detailId: '',
illegalVisible: false,
price: undefined,//违章罚款金额
fileList2:[],//违章截图
detailItem:{},
dialogDetailVisible:false,
fileList2: [],//违章截图
detailItem: {},
dialogDetailVisible: false,
baranchQuery: {
zoneId:null
zoneId: null
},
allZoneArr:[],//全部片区
allBranchCompany:[],
allZoneArr: [],//全部片区
allBranchCompany: [],
state2: '',//搜索-分公司名称
rules4Query: {
},
rules4Query: {},
list: null,
total: null,
listLoading: true,
listQuery: {
page: 1,
limit: 20,
zoneId:undefined,
zoneId: undefined,
liftCompany: undefined,
numberPlate: undefined,
selectedMonth: undefined,
status: undefined,
bookType:undefined
bookType: undefined
},
inline: true,
dialogFormVisible: false,
......@@ -945,7 +965,7 @@
return {Authorization: getToken()};
},
//获取大区列表
getAllZoneList(){
getAllZoneList() {
return getAllZone();
},
selectedMonth4Query: {
......@@ -970,12 +990,12 @@
* */
okHandler() {
let arr = [];
this.fileList2.map(function(item){
this.fileList2.map(function (item) {
arr.push(item.url);
});
let params = {
illegalPic:arr.join(","),
illegalAmount:this.price,
illegalPic: arr.join(","),
illegalAmount: this.price,
id: this.detailId,
};
saveOrderViolation(params).then(response => {
......@@ -1009,7 +1029,7 @@
/**
* 删除违章图片
* */
handleRemove(file, fileList1){
handleRemove(file, fileList1) {
this.fileList2 = fileList1;
},
/**
......@@ -1023,7 +1043,7 @@
/**
* 删除出车图片
* */
handleDepartureRemove(file, fileList2){
handleDepartureRemove(file, fileList2) {
this.departurePicList = fileList2;
},
/**
......@@ -1037,21 +1057,21 @@
/**
* 删除违章图片
* */
handleArrivalRemove(file, fileList3){
handleArrivalRemove(file, fileList3) {
this.arrivalPicList = fileList3;
},
/**
* 操作-违章查询按钮，显示违章弹框
*/
illegalInquiry(row){
illegalInquiry(row) {
var t = this;
this.fileList2 = [];
this.price = '';
if(row.vehicleDepartureLogVo.illegalPic){
if (row.vehicleDepartureLogVo.illegalPic) {
let arr = row.vehicleDepartureLogVo.illegalPic.split(",");
let fileList2 = [];
let p = {};
arr.map(function(item){
arr.map(function (item) {
p = {
url: item
};
......@@ -1059,7 +1079,7 @@
});
t.fileList2 = fileList2;
}
if(row.vehicleDepartureLogVo.illegalAmount){
if (row.vehicleDepartureLogVo.illegalAmount) {
t.price = parseFloat(row.vehicleDepartureLogVo.illegalAmount);
}
this.detailId = row.vehicleDepartureLogVo.id;
......@@ -1071,33 +1091,33 @@
cancel() {
this.illegalVisible = false;
},
handleDetail(row){
handleDetail(row) {
var t = this
this.detailItem = row;
if(row.vehicleDepartureLogVo!= undefined){
if(row.vehicleDepartureLogVo.departurePic!= undefined&&row.vehicleDepartureLogVo.departurePic!=''){
if (row.vehicleDepartureLogVo != undefined) {
if (row.vehicleDepartureLogVo.departurePic != undefined && row.vehicleDepartureLogVo.departurePic != '') {
let arr = row.vehicleDepartureLogVo.departurePic.split(",");
let departurePicList = [];
let p = {};
arr.map(function(item){
arr.map(function (item) {
departurePicList.push(item);
});
t.departurePicList = departurePicList;
}else{
} else {
t.departurePicList = [];
}
if(row.vehicleDepartureLogVo.arrivalPic!= undefined&&row.vehicleDepartureLogVo.arrivalPic!=''){
if (row.vehicleDepartureLogVo.arrivalPic != undefined && row.vehicleDepartureLogVo.arrivalPic != '') {
let Arr = row.vehicleDepartureLogVo.arrivalPic.split(",");
let arrivalPicList = [];
let p = {};
Arr.map(function(item){
Arr.map(function (item) {
arrivalPicList.push(item);
});
t.arrivalPicList = arrivalPicList;
}else{
} else {
t.arrivalPicList = [];
}
}else{
} else {
t.departurePicList = [];
t.arrivalPicList = [];
}
......@@ -1123,7 +1143,7 @@
name: "全部"
};
selectArry.push(iitem);
this.allCompaniesArr.map(function(item){
this.allCompaniesArr.map(function (item) {
item.value = item.name;
selectArry.push(item);
});
......@@ -1140,14 +1160,14 @@
/**
* 分公司搜索
* */
handleSelect2(item){
handleSelect2(item) {
this.listQuery.subordinateBranch = item.id;
console.log(item);
},
/**
* 提车分公司
* */
handleSelect1(item){
handleSelect1(item) {
this.form4Lift.liftCompany = item.id;
console.log(item);
},
......@@ -1166,7 +1186,7 @@
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
if(Number(this.departureForm.mileage)>999999){
if (Number(this.departureForm.mileage) > 999999) {
this.$notify({
title: '警告',
message: '公里数不能大于999999',
......@@ -1176,10 +1196,10 @@
return false;
}
var arr = [];
this.departurePicList.map(function(item){
this.departurePicList.map(function (item) {
arr.push(item.url);
});
this.departureForm.departurePic=arr.join(",");
this.departureForm.departurePic = arr.join(",");
departureVehicle(this.departureForm).then(response => {
if (response.status == 200) {
this.dialogForm4LiftVisible = false;
......@@ -1238,9 +1258,9 @@
},
getList() {
this.listLoading = true;
for(var key in this.listQuery){
if(this.listQuery[key]==''){
this.listQuery[key]=undefined
for (var key in this.listQuery) {
if (this.listQuery[key] == '') {
this.listQuery[key] = undefined
}
}
page(this.listQuery)
......@@ -1255,17 +1275,17 @@
this.bookRecordStatus['4'].val = '驳回'
this.bookRecordStatus['5'].val = '出行中'
this.bookRecordStatus['7'].val = '已完成'
if(data) {
if (data) {
if (!this.$utils.isInteger(data.status)) {
return '未知';
}
if(data.status == 2 && (data.vehicleDepartureLogVo == undefined || data.vehicleDepartureLogVo == null)) {
if (data.status == 2 && (data.vehicleDepartureLogVo == undefined || data.vehicleDepartureLogVo == null)) {
return this.bookRecordStatus['3'].val;
}
if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 0) {
if (data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 0) {
return this.bookRecordStatus['5'].val;
}
if(data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 1) {
if (data.status == 2 && data.vehicleDepartureLogVo != undefined && data.vehicleDepartureLogVo != null && data.vehicleDepartureLogVo.state == 1) {
return this.bookRecordStatus['7'].val;
}
return this.bookRecordStatus[data.status + ''].val;
......@@ -1334,7 +1354,7 @@
type: 'success',
duration: 2000
});
if(this.dialogDetailVisible){
if (this.dialogDetailVisible) {
this.dialogDetailVisible = false
}
}
......@@ -1356,13 +1376,13 @@
duration: 2000
});
this.getList();
if(this.rejectVisible){
if (this.rejectVisible) {
this.rejectVisible = false
}
if(this.dialogDetailVisible){
if (this.dialogDetailVisible) {
this.dialogDetailVisible = false
}
}else{
} else {
this.$notify({
title: '失败',
message: response.message,
......@@ -1388,28 +1408,28 @@
handleLift(row) {
this.cleanDepartureForm();
this.departurePicList = [];
if(row.bookType==1){
if (row.bookType == 1) {
this.departureForm.use = '租车'
}else if(row.bookType==2){
} else if (row.bookType == 2) {
this.departureForm.use = '用户租赁'
}else if(row.bookType==3){
} else if (row.bookType == 3) {
this.departureForm.use = '维修'
}else if(row.bookType==4){
} else if (row.bookType == 4) {
this.departureForm.use = '展览'
}else if(row.bookType==5){
} else if (row.bookType == 5) {
this.departureForm.use = '旅游'
}else if(row.bookType==6){
} else if (row.bookType == 6) {
this.departureForm.use = '保养'
}else if(row.bookType==7){
} else if (row.bookType == 7) {
this.departureForm.use = '预约中'
}else if(row.bookType==8){
} else if (row.bookType == 8) {
this.departureForm.use = '禁用'
}else if(row.bookType==9){
} else if (row.bookType == 9) {
this.departureForm.use = '客户用车'
}else if(row.bookType==10){
} else if (row.bookType == 10) {
this.departureForm.use = '其他'
}
this.departureForm.bookRecordId=row.id
this.departureForm.bookRecordId = row.id
this.departureForm.vehicleId = row.vehicleId
this.departureForm.numberPlate = row.numberPlate
this.departureForm.departureDate = Date();
......@@ -1446,7 +1466,7 @@
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
if(Number(this.arrivalForm.mileage)>999999){
if (Number(this.arrivalForm.mileage) > 999999) {
this.$notify({
title: '警告',
message: '公里数不能大于999999',
......@@ -1456,10 +1476,10 @@
return false;
}
var arr = [];
this.arrivalPicList.map(function(item){
this.arrivalPicList.map(function (item) {
arr.push(item.url);
});
this.arrivalForm.arrivalPic=arr.join(",");
this.arrivalForm.arrivalPic = arr.join(",");
arrivalVehicle(this.arrivalForm).then(response => {
if (response.status == 200) {
this.dialogForm4RetVisible = false;
......@@ -1492,12 +1512,12 @@
type: 'warning'
}).then(() => {
var obj = {
vehicleBookRecordId:row.id
vehicleBookRecordId: row.id
};
unbook(obj)
.then(response => {
if(response.code==1){
if (response.code == 1) {
this.$notify({
title: '成功',
message: '操作成功',
......@@ -1505,7 +1525,7 @@
duration: 2000
});
this.getList();
}else{
} else {
this.$notify({
title: '失败',
message: response.message,
......@@ -1513,13 +1533,19 @@
duration: 2000
});
}
}).catch(response=>{
}).catch(response => {
console.log(response)
}
);
});
},
setImgStyle(el) {
if (el.eq('show')) {
this.imgStyle=true;
} else if (el.eq('hide')) {
this.imgStyle=false;
}
},
/**
* 清空出车弹框数据
*/
......@@ -1537,13 +1563,13 @@
numberPlate: null,
expectArrivalBranchCompanyId: null,//目的地分公司id
expectArrivalBranchCompanyName: '',//目的地分公司名称
bookRecordId:null,
departurePic:'',
remark:null,
bookRecordId: null,
departurePic: '',
remark: null,
bookStartDate: null,
};
},
cleanArrivalForm(){
cleanArrivalForm() {
this.arrivalForm = {
vehicleId: null,
numberPlate: null,
......@@ -1553,9 +1579,9 @@
mileage: null,
arrivalBranchCompanyId: null,
arrivalBranchCompanyName: '',
arrivalPic:'',
remark:'',
bookRecordId:null
arrivalPic: '',
remark: '',
bookRecordId: null
}
},
}
......@@ -1563,18 +1589,33 @@
</script>
<style scoped>
.order-details .el-form-item{
.order-details .el-form-item {
margin-bottom: 0px !important;
}
.order-details hr {
height: 1px;
background-color: #ccc;
border: none;
}
.image {
width: 100%;
height: 110px;
display: block;
}
.el-card__body,.el-card{padding: 0px !important;width: 150px;text-align: center;}
.imgStyle {
width: 100%;
height: 550px;
display: block;
position:relative;
bottom:55px;
}
.el-card__body, .el-card {
padding: 0px !important;
width: 150px;
text-align: center;
}
</style>
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