分公司统计,车辆出行记录

src/views/financial/branchCompany.vue

@@ -36,7 +36,7 @@
 				v-loading="loadingTab"
 			>
 				<el-table-column
-					prop="date"
+					prop="dateStr"
 					label="时间"
 					align="center"
 					width="200"

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -80,7 +80,7 @@
 
 					<el-col :span="5">
 						<el-form-item label="用途">
-							<el-select v-model="listQuery.use" filterable placeholder="请选择车辆用途" @change="changeUse">
+							<el-select v-model="useData" filterable placeholder="请选择车辆用途" @change="changeUse">
 								<el-option label="全部" value>全部</el-option>
 								<el-option
 									v-for="item in useArr"
@@ -155,25 +155,26 @@
 			</el-table-column>
 			<el-table-column align="center" label="预约出/收车时间">
 				<template scope="scope">
-					<p>{{scope.row.bookStartDate}}</p>
-					<p>{{scope.row.bookEndDate}}</p>
+					<p>出:{{scope.row.bookStartDate}}</p>
+					<p>收:{{scope.row.bookEndDate}}</p>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="实际出/收车时间">
 				<template scope="scope">
-					<p>{{scope.row.actualStartDate}}</p>
-					<p>{{scope.row.actualEndDate}}</p>
+					<p>出:{{scope.row.departureTime}}</p>
+					<p>收:{{scope.row.arrivalTime}}</p>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="出/收车公司">
 				<template scope="scope">
-					<p>{{scope.row.departureName}}</p>
-					<p>{{scope.row.arrivalName}}</p>
+					<p>出:{{scope.row.departureName}}</p>
+					<p>收:{{scope.row.arrivalName}}</p>
 				</template>
 			</el-table-column>
-			<el-table-column align="center" label="出/收车人">
+			<el-table-column align="center" width="100px" label="出/收车人">
 				<template scope="scope">
-					<span>{{scope.row.departureTime}}</span>
+					<p>{{scope.row.checkMan}}</p>
+					<p>{{scope.row.recycleMan}}</p>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="出行天数/公里数">
@@ -195,7 +196,7 @@
 			</el-table-column>
 			<el-table-column align="center" label="备注">
 				<template scope="scope">
-					<span>{{scope.row.departureTime}}</span>
+					<span>{{scope.row.remark}}</span>
 				</template>
 			</el-table-column>
 
@@ -366,6 +367,7 @@ export default {
 			state1: '',
 			arrivalBranchCompanyId:null,
 			useArr:[],//用途
+			useData:null,
 			listQuery: {
 				page: 1,
 				limit: 20,
@@ -374,7 +376,7 @@ export default {
 				numberPlate: undefined,
 				departureId: undefined,
 				arrivalBranchCompanyId: null,
-				use:null
+				use:this.useData
 			},
 			dialogStatus: '',
 			textMap: {
@@ -414,8 +416,6 @@ export default {
 		})
 		findReserveType().then(data=>{
 			this.useArr = JSON.parse(data.data).type
-			console.log(this.useArr);
-			
 		})
 	},
 	computed: {
@@ -435,7 +435,11 @@ export default {
 			}
 		},
 		changeUse(val){
-			if(!val) this.listQuery.use = null
+			if(!val){
+				 this.listQuery.use = null
+			}else{
+				 this.listQuery.use = val
+			}
 		},
 		/**
 		 * 重置