Skip to content

C
cloud-platform-ui
Commit 1b2c0045 authored by jiaorz's avatar jiaorz
Browse files
Options

修改车辆排班管理搜索条件

parent 4fa3a2bd
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 188 deletions
src/views/vehicle/bookRecord/index.vue
View file @ 1b2c0045
...@@ -2,6 +2,26 @@ ...@@ -2,6 +2,26 @@
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container" ref="filter-container"> <div class="filter-container" ref="filter-container">
<el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery"> <el-form :rules="rules4Query" ref="queryForm" :inline="inline" :model="listQuery">
<el-row>
<el-col :span="5">
<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-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车辆编码">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车牌号">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="申请状态"> <el-form-item label="申请状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择申请状态">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
...@@ -15,20 +35,12 @@ ...@@ -15,20 +35,12 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车辆编码"> </el-col>
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input> </el-row>
</el-form-item> <el-row>
<el-form-item label="车牌号"> </el-col>
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input> <el-col :span="5">
</el-form-item> <el-form-item label="所属大区">
<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-select>
</el-form-item>
<!-- <el-form-item label="所属大区">
<el-select <el-select
class="filter-item" class="filter-item"
v-model="listQuery.zoneId" v-model="listQuery.zoneId"
...@@ -38,7 +50,9 @@ ...@@ -38,7 +50,9 @@
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <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-select>
</el-form-item>--> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="提车公司" prop="subordinateBranch"> <el-form-item label="提车公司" prop="subordinateBranch">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
...@@ -48,26 +62,30 @@ ...@@ -48,26 +62,30 @@
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<!--<el-form-item label="提车公司">--> </el-col>
<!--<el-select--> <el-col :span="5">
<!--class="filter-item"--> <el-form-item label="提车时间" prop="bookStartDate4Query">
<!--v-model="listQuery.liftCompany"-->
<!--placeholder="请选择"-->
<!--@change="getAllBranchCompanyChange"-->
<!--&gt;-->
<!--<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-form-item label="预订月份" prop="selectedMonth4Query">
<el-date-picker <el-date-picker
v-model="selectedMonth4Query" v-model="bookStartDate4Query"
type="month" type="month"
:editable="true" :editable="true"
format="yyyy-MM" format="yyyy-MM"
placeholder="请选择预订月份" placeholder="请选择预约提车时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="还车时间" prop="bookEndDate4Query">
<el-date-picker
v-model="bookEndDate4Query"
type="month"
:editable="true"
format="yyyy-MM"
placeholder="请选择预约还车时间"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button> <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
</el-form> </el-form>
...@@ -115,16 +133,12 @@ ...@@ -115,16 +133,12 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="预定取/还时间" width="200"> <el-table-column align="center" label="预定取/还时间" width="200">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
<br />
<span>{{scope.row.bookEndDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="实际取/还时间" width="200"> <el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
<br />
<span>{{scope.row.actualEndDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220"> <!-- <el-table-column align="center" label="预定时间" width="220">
...@@ -407,7 +421,7 @@ ...@@ -407,7 +421,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-left: 20px;" v-if="departurePicList.length>0"> <el-row style="margin-left: 20px;" v-if="departurePicList.length>0">
<!-- <el-col <el-col
:span="3" :span="3"
v-for="(item, index) in departurePicList" v-for="(item, index) in departurePicList"
:key="index" :key="index"
...@@ -415,13 +429,9 @@ ...@@ -415,13 +429,9 @@
style="margin-bottom:10px" style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" @click="lookPic(item)" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col>
</el-col> -->
<viewer :images="departurePicList">
<img v-for="src in departurePicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
...@@ -433,14 +443,7 @@ ...@@ -433,14 +443,7 @@
type="primary" type="primary"
style="padding: 7px 9px;" style="padding: 7px 9px;"
@click="resetReturn = true" @click="resetReturn = true"
v-if="detailItem.status == 2 && !detailItem.vehicleDepartureLogVo" v-show="detailItem.status == 2 || detailItem.status == 5"
>更换</el-button>
<el-button
size="mini"
type="primary"
style="padding: 7px 9px;"
@click="resetReturn = true"
v-if="detailItem.status == 2 && !!detailItem.vehicleDepartureLogVo && detailItem.vehicleDepartureLogVo.state == 0"
>更换</el-button> >更换</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -467,7 +470,7 @@ ...@@ -467,7 +470,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0"> <el-row style="margin-left: 20px;" v-if="arrivalPicList.length>0">
<!-- <el-col <el-col
:span="3" :span="3"
v-for="(item, index) in arrivalPicList" v-for="(item, index) in arrivalPicList"
:key="index" :key="index"
...@@ -475,12 +478,9 @@ ...@@ -475,12 +478,9 @@
style="margin-bottom:10px" style="margin-bottom:10px"
> >
<el-card> <el-card>
<img :src="item" class="image" @click="lookPic(item)" /> <img :src="item" class="image" />
</el-card> </el-card>
</el-col> --> </el-col>
<viewer :images="arrivalPicList">
<img v-for="src in arrivalPicList" :src="src" :key="src" style="width: 100px; height: 100px;margin-right:30px;">
</viewer>
</el-row> </el-row>
<hr /> <hr />
<el-row> <el-row>
...@@ -947,11 +947,13 @@ export default { ...@@ -947,11 +947,13 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: '', liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
bookType: undefined bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
}, },
inline: true, inline: true,
dialogFormVisible: false, dialogFormVisible: false,
...@@ -1079,56 +1081,56 @@ export default { ...@@ -1079,56 +1081,56 @@ export default {
} }
}, },
created() { created() {
let t = this let t = this;
getAll().then(response => { getAll().then(response => {
this.allCompaniesArr = response.data this.allCompaniesArr = response.data;
let query = localStorage.getItem('bookRecord') let query = localStorage.getItem("bookRecord");
if (query != 'null' && query) { if(query !="null" && query){
let queryJson = JSON.parse(query) let queryJson = JSON.parse(query);
if (queryJson.page) { if(queryJson.page){
t.listQuery.page = queryJson.page t.listQuery.page = queryJson.page;
} }
if (queryJson.limit) { if(queryJson.limit){
t.listQuery.limit = queryJson.limit t.listQuery.limit = queryJson.limit;
} }
if (queryJson.flag) { if(queryJson.flag){
t.listQuery.flag = queryJson.flag t.listQuery.flag = queryJson.flag;
} }
if (queryJson.zoneId) { if(queryJson.zoneId){
t.listQuery.zoneId = queryJson.zoneId t.listQuery.zoneId = queryJson.zoneId;
} }
if (queryJson.liftCompany) { if(queryJson.liftCompany){
t.listQuery.liftCompany = queryJson.liftCompany t.listQuery.liftCompany = queryJson.liftCompany;
} }
if (queryJson.liftCompanyName) { if(queryJson.liftCompanyName){
t.listQuery.liftCompanyName = queryJson.liftCompanyName t.listQuery.liftCompanyName = queryJson.liftCompanyName;
} }
if (queryJson.numberPlate) { if(queryJson.numberPlate){
t.listQuery.numberPlate = queryJson.numberPlate t.listQuery.numberPlate = queryJson.numberPlate;
} }
if (queryJson.selectedMonth) { if(queryJson.selectedMonth){
t.listQuery.selectedMonth = queryJson.selectedMonth t.listQuery.selectedMonth = queryJson.selectedMonth;
} }
if (queryJson.status) { if(queryJson.status){
t.listQuery.status = queryJson.status t.listQuery.status = queryJson.status;
} }
if (queryJson.bookType) { if(queryJson.bookType){
t.listQuery.bookType = queryJson.bookType t.listQuery.bookType = queryJson.bookType;
} }
// if(queryJson.liftCompany){ // if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) { // t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){ // if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name; // t.listQuery.liftCompanyName = item.name;
// } // }
// }); // });
// } // }
} }
this.getList() this.getList()
}) });
getAllCompany(codeAndBranchCompany => { getAllCompany(codeAndBranchCompany => {
//初始化公司列表 //初始化公司列表
this.allCompanies = codeAndBranchCompany this.allCompanies = codeAndBranchCompany
}) });
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'] this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove']
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'] this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject']
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'] this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook']
...@@ -1161,6 +1163,42 @@ export default { ...@@ -1161,6 +1163,42 @@ export default {
this.listQuery.selectedMonth = undefined this.listQuery.selectedMonth = undefined
} }
} }
},
bookStartDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookStartDate) &&
this.listQuery.bookStartDate !== ''
) {
return toEast8Date(this.listQuery.bookStartDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookStartDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookStartDate = undefined
}
}
},
bookEndDate4Query: {
get: function() {
if (
this.$utils.isString(this.listQuery.bookEndDate) &&
this.listQuery.bookEndDate !== ''
) {
return toEast8Date(this.listQuery.bookEndDate)
}
return undefined
},
set: function(date) {
if (this.$utils.isDate(date)) {
this.listQuery.bookEndDate = formatDate(date, 'yyyy-MM')
} else {
this.listQuery.bookEndDate = undefined
}
}
} }
}, },
methods: { methods: {
...@@ -1174,19 +1212,18 @@ export default { ...@@ -1174,19 +1212,18 @@ export default {
flag: false, flag: false,
zoneId: undefined, zoneId: undefined,
liftCompany: undefined, liftCompany: undefined,
liftCompanyName: '', liftCompanyName: "",
numberPlate: undefined, numberPlate: undefined,
selectedMonth: undefined, selectedMonth: undefined,
status: undefined, status: undefined,
bookType: undefined bookType: undefined,
bookStartDate: undefined,
bookEndDate: undefined
};
if(this.listQuery){
localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
} }
if (this.listQuery) { this.getList();
localStorage.setItem(
'bookRecord',
JSON.stringify(this.listQuery)
)
}
this.getList()
}, },
confirm() { confirm() {
if (this.returnForm.retCompany == '') { if (this.returnForm.retCompany == '') {
...@@ -1206,9 +1243,9 @@ export default { ...@@ -1206,9 +1243,9 @@ export default {
type: 'success', type: 'success',
duration: 2000 duration: 2000
}) })
this.resetReturn = false this.resetReturn = false;
this.dialogDetailVisible = false this.dialogDetailVisible = false;
this.getList() this.getList();
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
...@@ -1369,10 +1406,10 @@ export default { ...@@ -1369,10 +1406,10 @@ export default {
getProvinceRegions(item) { getProvinceRegions(item) {
this.listQuery.zoneId = item this.listQuery.zoneId = item
this.baranchQuery.zoneId = item this.baranchQuery.zoneId = item
// this.listQuery.liftCompany = undefined // this.listQuery.liftCompany = undefined
// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => { // getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
// this.allBranchCompany = response.data // this.allBranchCompany = response.data
// }) // })
}, },
getAllBranchCompanyChange(item) { getAllBranchCompanyChange(item) {
this.listQuery.liftCompany = item this.listQuery.liftCompany = item
...@@ -1404,12 +1441,11 @@ export default { ...@@ -1404,12 +1441,11 @@ export default {
* 提车分公司 * 提车分公司
* */ * */
handleSelect(item) { handleSelect(item) {
if (item.value == '全部') { if (item.value == "全部") {
this.listQuery.liftCompany = undefined this.listQuery.liftCompany = undefined;
} else { } else {
this.listQuery.liftCompany = item.id this.listQuery.liftCompany = item.id;
} }
console.log(item)
}, },
cancelDialog4Lift(formName) { cancelDialog4Lift(formName) {
this.dialogForm4LiftVisible = false this.dialogForm4LiftVisible = false
...@@ -1618,11 +1654,8 @@ export default { ...@@ -1618,11 +1654,8 @@ export default {
this.listQuery.page = 1 this.listQuery.page = 1
this.$refs.queryForm.validate(valid => { this.$refs.queryForm.validate(valid => {
if (valid) { if (valid) {
if (this.listQuery) { if(this.listQuery){
localStorage.setItem( localStorage.setItem("bookRecord", JSON.stringify(this.listQuery));
'bookRecord',
JSON.stringify(this.listQuery)
)
} }
this.getList() this.getList()
} else { } else {
......
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