Commit 32ec2a74 authored by guoyou's avatar guoyou

车辆出行记录恢复

parent 96d86c5e
......@@ -5,27 +5,16 @@
<el-row>
<el-col :span="5">
<el-form-item label="车辆编码" prop="code">
<el-input
type="number"
style="width: 200px;"
v-model.number="listQuery.code"
placeholder="请输入车辆编码"
></el-input>
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
placeholder="请输入车辆编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="车牌号" prop="code">
<el-input
@keyup.enter.native="handleFilter"
style="width: 200px;"
class="filter-item"
placeholder="车牌号"
v-model="listQuery.numberPlate"
></el-input>
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
v-model="listQuery.numberPlate"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出车日期" prop="startTime">
<el-date-picker
......@@ -34,11 +23,10 @@
:editable="false"
format="yyyy-MM-dd"
prop="startTime"
placeholder="请选择出车日期"
></el-date-picker>
placeholder="请选择出车日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="还车日期" prop="endTime">
<el-date-picker
......@@ -47,15 +35,14 @@
:editable="false"
format="yyyy-MM-dd"
prop="endTime"
placeholder="请选择还车日期"
></el-date-picker>
placeholder="请选择还车日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="出车公司" prop="departureId">
<el-form-item label="分公司" prop="departureId">
<el-autocomplete
class="inline-input"
v-model="state1"
......@@ -65,32 +52,6 @@
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="收车公司">
<el-autocomplete
class="inline-input"
v-model="arrivalBranchCompanyId"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="putCompanyChange"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="用途">
<el-select v-model="listQuery.use" filterable placeholder="请选择车辆用途">
<el-option
v-for="item in useArr"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
......@@ -100,50 +61,38 @@
</el-row>
</el-form>
</div>
<div v-show="statisticVisiable">
<el-row style="text-align: center;margin-top: 10px;margin-bottom: 10px">
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureCount}}</span>
<br />
<br />
<br><br>
<span class="statistic_title">出行次数</span>
</el-col>
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureDay}}</span>
<br />
<br />
<br><br>
<span class="statistic_title">出行天数</span>
</el-col>
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureMileage}}</span>
<br />
<br />
<br><br>
<span class="statistic_title">公里</span>
</el-col>
</el-row>
</div>
<el-button
class="filter-item"
type="primary"
:icon=" showMoreMoreCol ? 'caret-left' : 'caret-right' "
v-waves
@click="showMoreMoreCol=!showMoreMoreCol"
>更多列</el-button>
<el-table
:key="tableKey"
:data="list"
v-loading.body="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<el-table-column type="index" label="编号" width="65"></el-table-column>
<!-- <el-table-column align="center" label="编号" width="65">
-->
<!--<template scope="scope">-->
<el-button class="filter-item" type="primary" :icon=" showMoreMoreCol ? 'caret-left' : 'caret-right' " v-waves
@click="showMoreMoreCol=!showMoreMoreCol">
更多列
</el-button>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%">
<el-table-column
type="index"
label="编号"
width="65">
</el-table-column>
<!-- <el-table-column align="center" label="编号" width="65">
--> <!--<template scope="scope">-->
<!--<span>{{scope.row.id}}</span>-->
<!--</template>-->
<!--</el-table-column>-->
......@@ -152,53 +101,12 @@
<span>{{scope.row.numberPlate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="预约出/收车时间">
<template scope="scope">
<p>{{scope.row.book_start_date}}</p>
<p>{{scope.row.book_end_date}}</p>
</template>
</el-table-column>
<el-table-column align="center" label="实际出/收车时间">
<template scope="scope">
<p>{{scope.row.actual_start_date}}</p>
<p>{{scope.row.actual_end_date}}</p>
</template>
</el-table-column>
<el-table-column align="center" label="出/收车公司">
<template scope="scope">
<p>{{scope.row.departureName}}</p>
<p>{{scope.row.arrivalName}}</p>
</template>
</el-table-column>
<el-table-column align="center" label="出/收车人">
<el-table-column width="200" align="center" label="出车时间">
<template scope="scope">
<span>{{scope.row.departureTime}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="出行天数/公里数">
<template scope="scope">
<p>{{scope.row.departureDay}}</p>
<p>{{scope.row.mileage}}</p>
</template>
</el-table-column>
<el-table-column align="center" label="客户/手机号">
<template scope="scope">
<p>{{scope.row.user}}</p>
<p>{{scope.row.userTel}}</p>
</template>
</el-table-column>
<el-table-column align="center" label="用途">
<template scope="scope">
<span>{{scope.row.use}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<template scope="scope">
<span>{{scope.row.departureTime}}</span>
</template>
</el-table-column>
<!-- <el-table-column width="100" align="center" label="使用人">
<el-table-column width="100" align="center" label="使用人">
<template scope="scope">
<span>{{scope.row.user}}</span>
</template>
......@@ -242,9 +150,9 @@
<template scope="scope">
<span>{{scope.row.use}}</span>
</template>
</el-table-column>-->
</el-table-column>
<!-- <el-table-column width="200" align="center" label="使用人电话" v-if="showMoreMoreCol">
<el-table-column width="200" align="center" label="使用人电话" v-if="showMoreMoreCol">
<template scope="scope">
<span>{{scope.row.userTel}}</span>
</template>
......@@ -256,6 +164,7 @@
</template>
</el-table-column>
<el-table-column width="100" align="center" label="开始公里数" v-if="showMoreMoreCol">
<template scope="scope">
<span>{{scope.row.mileageStart}}</span>
......@@ -265,19 +174,13 @@
<template scope="scope">
<span>{{scope.row.mileageEnd}}</span>
</template>
</el-table-column>-->
</el-table-column>
</el-table>
<div v-show="!listLoading" class="pagination-container">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
<!-- <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">-->
......@@ -295,32 +198,38 @@
</div>
</template>
<style>
.statistic_number {
.statistic_number {
font-size: x-large;
font-weight: bolder;
}
}
.statistic_title {
.statistic_title {
font-size: x-large;
}
}
</style>
<script>
import { mapGetters } from 'vuex'
import {
import {mapGetters} from 'vuex';
import {
page,
statistic,
findReserveType
} from '../../../api/vehicle/departureLog'
import { getAllCompany, getAll } from 'api/base_info/branch_company/'
import { getAllZone } from 'api/base_info/constant/'
import { getAllBranchCompanyByZoneId } from 'api/order/rentVehicle'
import {
statistic
} from '../../../api/vehicle/departureLog';
import {
getAllCompany,
getAll
} from 'api/base_info/branch_company/';
import {
getAllZone
} from 'api/base_info/constant/';
import {
getAllBranchCompanyByZoneId
} from 'api/order/rentVehicle';
import {
toEast8Date,
deepCopyDate,
newEast8Date,
getYMD_date
} from 'utils/dateUtils'
export default {
} from 'utils/dateUtils';
export default {
name: 'vehicleDepartureLog',
data() {
return {
......@@ -341,8 +250,8 @@ export default {
mileageStart: null,
mileageEnd: null,
state: null,
allCompaniesArr: [],
selectArry: []
allCompaniesArr:[],
selectArry: [],
},
rules: {
name: [
......@@ -356,23 +265,19 @@ export default {
list: null,
total: null,
listLoading: true,
allBranchCompany: [],
allBranchCompany:[],
baranchQuery: {
zoneId: null
zoneId:null
},
allZoneArr: [], //全部片区
state1: '',
arrivalBranchCompanyId:null,
useArr:[],//用途
allZoneArr:[],//全部片区
state1:'',
listQuery: {
page: 1,
limit: 20,
startTime: undefined,
endTime: undefined,
endTime:undefined,
numberPlate: undefined,
departureId: undefined,
arrivalBranchCompanyId: null,
use:null
departureId:undefined,
},
dialogStatus: '',
textMap: {
......@@ -390,180 +295,144 @@ export default {
}
},
created() {
let t = this
const numberPlate = this.$route.query.numberPlate
let t = this;
const numberPlate = this.$route.query.numberPlate;
if (numberPlate) {
this.listQuery.numberPlate = numberPlate
this.listQuery.numberPlate = numberPlate;
}
getAll().then(response => {
this.allCompaniesArr = response.data
let query = localStorage.getItem('vehicleDepartureLog')
if (query != 'null' && query && !numberPlate) {
this.listQuery = JSON.parse(query)
if (t.listQuery.departureId) {
t.allCompaniesArr.map(function(item) {
if (item.id == t.listQuery.departureId) {
t.state1 = item.name
getAll() .then(response => {
this.allCompaniesArr = response.data;
let query = localStorage.getItem("vehicleDepartureLog");
if(query !="null" && query && !numberPlate){
this.listQuery = JSON.parse(query);
if(t.listQuery.departureId){
t.allCompaniesArr.map(function (item) {
if(item.id == t.listQuery.departureId){
t.state1 = item.name;
}
})
});
}
}
t.handleFilter()
})
findReserveType().then(data=>{
console.log(data);
t.handleFilter();
})
},
computed: {
...mapGetters(['elements']),
...mapGetters([
'elements'
]),
//获取大区列表
getAllZoneList() {
return getAllZone()
}
return getAllZone();
},
methods: {
//收车公司筛选
putCompanyChange(val) {
console.log(val)
if (val) {
this.listQuery.arrivalBranchCompanyId = val.id
} else {
this.listQuery.arrivalBranchCompanyId = null
}
},
methods: {
/**
* 重置
* */
reloadPage() {
this.state1 = ''
this.arrivalBranchCompanyId = null
this.state1='';
this.listQuery = {
page: 1,
limit: 20,
startTime: undefined,
endTime: undefined,
endTime:undefined,
numberPlate: undefined,
departureId: undefined,
arrivalBranchCompanyId: undefined,
use:undefined
departureId:undefined,
};
if(this.listQuery){
localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
}
if (this.listQuery) {
localStorage.setItem(
'vehicleDepartureLog',
JSON.stringify(this.listQuery)
)
}
this.handleFilter()
this.handleFilter();
},
handleFilter() {
this.listQuery.page = 1
if (this.listQuery) {
localStorage.setItem(
'vehicleDepartureLog',
JSON.stringify(this.listQuery)
)
if(this.listQuery){
localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
}
this.getList()
this.getList();
if (this.listQuery.numberPlate) {
statistic({ numberPlate: this.listQuery.numberPlate }).then(
response => {
if (response.status == 200) {
this.statisticData = response.data
this.statisticVisiable = true
} else {
this.$message(response.message)
}
}
)
statistic({numberPlate: this.listQuery.numberPlate}).then(response => {
this.statisticData = response.data;
});
this.statisticVisiable = true;
}
},
dateToString: function(date) {
var year = date.getFullYear()
var month = (date.getMonth() + 1).toString()
var day = date.getDate().toString()
dateToString: function (date) {
var year = date.getFullYear();
var month = (date.getMonth() + 1).toString();
var day = (date.getDate()).toString();
if (month.length == 1) {
month = '0' + month
month = "0" + month;
}
if (day.length == 1) {
day = '0' + day
day = "0" + day;
}
var dateTime = year + '-' + month + '-' + day
return dateTime
var dateTime = year + "-" + month + "-" + day;
return dateTime;
},
getList() {
this.listLoading = true
this.listLoading = true;
if (!this.listQuery.numberPlate) {
this.statisticVisiable = false
this.statisticVisiable = false;
}
if (this.listQuery.startTime) {
this.listQuery.startTime = getYMD_date(
new Date(this.listQuery.startTime)
)
this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
}
if (this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date(
new Date(this.listQuery.endTime)
)
if(this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
}
if (!this.state1) {
this.listQuery.departureId = undefined
this.listQuery.departureId = undefined;
}
page(this.listQuery).then(response => {
this.list = response.data.list
this.total = response.data.total
this.listLoading = false
page(this.listQuery)
.then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.listLoading = false;
})
},
querySearch(queryString, cb) {
let selectArry = []
let selectArry = [];
let iitem = {
value: '全部',
name: '全部'
}
selectArry.push(iitem)
this.allCompaniesArr.map(function(item) {
item.value = item.name
selectArry.push(item)
})
this.selectArry = selectArry
var results = queryString
? selectArry.filter(this.createFilter(queryString))
: selectArry
value: "全部",
name: "全部"
};
selectArry.push(iitem);
this.allCompaniesArr.map(function (item) {
item.value = item.name;
selectArry.push(item);
});
this.selectArry = selectArry;
var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry;
// 调用 callback 返回建议列表的数据
cb(results)
cb(results);
},
createFilter(queryString) {
return restaurant => {
return restaurant.name.indexOf(queryString.toLowerCase()) != -1
}
return (restaurant) => {
return (restaurant.name.indexOf(queryString.toLowerCase()) != -1);
};
},
handleSelect(item) {
if (item.value == '全部') {
this.listQuery.departureId = undefined
if (item.value == "全部") {
this.listQuery.departureId = undefined;
} else {
this.listQuery.departureId = item.id
this.listQuery.departureId = item.id;
}
},
handleSizeChange(val) {
this.listQuery.limit = val
if (this.listQuery) {
localStorage.setItem(
'vehicleDepartureLog',
JSON.stringify(this.listQuery)
)
this.listQuery.limit = val;
if(this.listQuery){
localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
}
this.getList()
this.getList();
},
handleCurrentChange(val) {
this.listQuery.page = val
if (this.listQuery) {
localStorage.setItem(
'vehicleDepartureLog',
JSON.stringify(this.listQuery)
)
this.listQuery.page = val;
if(this.listQuery){
localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
}
this.getList()
this.getList();
},
}
}
}
</script>
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