Commit aac62864 authored by libin's avatar libin

出车记录添加出车公司查询

parent a37ae453
......@@ -10,22 +10,42 @@
type="date"
:editable="false"
format="yyyy-MM-dd"
prop = "time"
prop="time"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<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 >
<el-form-item>
<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-row>
<el-row>
<el-col :span="5">
<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-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出车分公司">
<el-select class="filter-item" v-model="listQuery.departureId" 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="5">
<el-form-item>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
......@@ -126,25 +146,25 @@
</template>
</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>
</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.checkManTel}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="开始公里数" v-if="showMoreMoreCol" >
<el-table-column width="100" align="center" label="开始公里数" v-if="showMoreMoreCol">
<template scope="scope">
<span>{{scope.row.mileageStart}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" label="结束公里数" v-if="showMoreMoreCol" >
<el-table-column width="100" align="center" label="结束公里数" v-if="showMoreMoreCol">
<template scope="scope">
<span>{{scope.row.mileageEnd}}</span>
</template>
......@@ -187,11 +207,22 @@
page,
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
} from 'utils/dateUtils';
export default {
name: 'vehicleDepartureLog',
data() {
......@@ -212,7 +243,7 @@
arrivalTime: null,
mileageStart: null,
mileageEnd: null,
state: null
state: null,
},
rules: {
name: [
......@@ -226,11 +257,18 @@
list: null,
total: null,
listLoading: true,
allBranchCompany:[],
baranchQuery: {
zoneId:null
},
allZoneArr:[],//全部片区
listQuery: {
page: 1,
limit: 20,
time: "",
numberPlate: undefined
zoneId:undefined,
numberPlate: undefined,
departureId:undefined,
},
dialogStatus: '',
textMap: {
......@@ -257,7 +295,11 @@
computed: {
...mapGetters([
'elements'
])
]),
//获取大区列表
getAllZoneList() {
return getAllZone();
},
},
methods: {
handleFilter() {
......@@ -269,9 +311,9 @@
this.statisticVisiable = true;
}
},
dateToString: function(date){
dateToString: function (date) {
var year = date.getFullYear();
var month =(date.getMonth() + 1).toString();
var month = (date.getMonth() + 1).toString();
var day = (date.getDate()).toString();
if (month.length == 1) {
month = "0" + month;
......@@ -287,7 +329,7 @@
if (!this.listQuery.numberPlate) {
this.statisticVisiable = false;
}
if(this.listQuery.time){
if (this.listQuery.time) {
this.listQuery.time = this.dateToString(this.listQuery.time);
}
page(this.listQuery)
......@@ -304,7 +346,20 @@
handleCurrentChange(val) {
this.listQuery.page = val;
this.getList();
}
},
//监听change事件
getProvinceRegions(item) {
this.listQuery.zoneId = item
this.baranchQuery.zoneId = item
this.listQuery.departureId = undefined;
getAllBranchCompanyByZoneId(this.baranchQuery)
.then(response => {
this.allBranchCompany = response.data;
})
},
getAllBranchCompanyChange(item) {
this.listQuery.departureId = item
},
}
}
</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