总公司统计

src/views/financial/memberPerformance.vue

@@ -2,7 +2,7 @@
 	<div class="app-container calendar-list-container" v-loading="loading">
 		<el-row>
 			<el-form :inline="true">
-				<el-form-item label="统计类型" style="width:200px">
+				<el-form-item label="统计类型">
 					<el-radio-group v-model="listquery.type" @change="changeType">
 						<el-radio-button label="0">收入</el-radio-button>
 						<el-radio-button label="1">支出</el-radio-button>
@@ -12,6 +12,7 @@
 				<el-date-picker v-model="time" type="daterange" placeholder="请选择下单时间" @change="changeTime"></el-date-picker>
 
 				<el-select v-model="listquery.orderType" clearable placeholder="请选择订单类型" @change="changeStaff">
+					<el-option value='全部'></el-option>
 					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 
@@ -23,6 +24,7 @@
 					clearable
 					@change="changeCompany"
 				>
+					<el-option value='全部'></el-option>
 					<el-option v-for="item in allCompaniesArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 
@@ -33,9 +35,10 @@
 					@change="changeWay"
 					v-show="listquery.type == 0"
 				>
+					<el-option value='全部'></el-option>
 					<el-option v-for="item in payArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
-
+				<el-button type="primary" @click="clearSearch">清空搜索</el-button>
 				<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出报表</el-button>
 			</el-form>
 		</el-row>
@@ -73,7 +76,7 @@
 					<p>{{information.staffNum || 0}}</p>
 					<p>实际退还</p>
 				</li>
-			</ul> -->
+			</ul>-->
 		</div>
 
 		<el-table :data="tableData" border style="width: 100%" header-align="center" height="450">
@@ -167,6 +170,19 @@ export default {
 			this.listquery.page = val
 			this.getList()
 		},
+		//清空搜索
+		clearSearch() {
+			this.listquery = {
+				startDate: null,
+				endDate: null, //结束日期
+				orderType: null, //身份
+				page: 1,
+				limit: 10,
+				companyId: null, //业绩所属公司
+				paymentMethod: null, //支付方式
+				// type: this.listquery.type
+			}
+		},
 		//获取分公司
 		getCompany() {
 			getAll().then(data => {
@@ -210,6 +226,9 @@ export default {
 		//列表数据
 		getList() {
 			this.loading = true
+			// if (this.listquery.orderType == '全部') this.listquery.orderType = null
+			// if (this.listquery.companyId == '全部') this.listquery.companyId = null
+			// if (this.listquery.type == '全部') this.listquery.type = null
 			companyList(this.listquery).then(data => {
 				if (data.status == 200) {
 					if (this.listquery.type == 0) {

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -79,16 +79,16 @@
 					</el-col>
 
 					<el-col :span="5">
-						<!-- <el-form-item label="用途">
-							<el-select v-model="state1" filterable placeholder="请选择车辆用途">
+						<el-form-item label="用途">
+							<el-select v-model="listQuery.use" filterable placeholder="请选择车辆用途">
 								<el-option
-									v-for="item in allCompaniesArr"
+									v-for="item in useArr"
 									:key="item.id"
 									:label="item.name"
 									:value="item.id"
 								></el-option>
 							</el-select>
-						</el-form-item>-->
+						</el-form-item>
 					</el-col>
 
 					<el-col :span="5">
@@ -154,12 +154,14 @@
 			</el-table-column>
 			<el-table-column align="center" label="预约出/收车时间">
 				<template scope="scope">
-					<span>{{scope.row.departureTime}}</span>
+					<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">
-					<span>{{scope.row.departureTime}}</span>
+					<p>{{scope.row.actual_start_date}}</p>
+					<p>{{scope.row.actual_end_date}}</p>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="出/收车公司">
@@ -361,6 +363,7 @@ export default {
 			allZoneArr: [], //全部片区
 			state1: '',
 			arrivalBranchCompanyId:null,
+			useArr:[],//用途
 			listQuery: {
 				page: 1,
 				limit: 20,
@@ -368,7 +371,8 @@ export default {
 				endTime: undefined,
 				numberPlate: undefined,
 				departureId: undefined,
-				arrivalBranchCompanyId: null
+				arrivalBranchCompanyId: null,
+				use:null
 			},
 			dialogStatus: '',
 			textMap: {
@@ -406,6 +410,9 @@ export default {
 			}
 			t.handleFilter()
 		})
+		findReserveType().then(data=>{
+			console.log(data);
+		})
 	},
 	computed: {
 		...mapGetters(['elements']),
@@ -437,7 +444,8 @@ export default {
 				endTime: undefined,
 				numberPlate: undefined,
 				departureId: undefined,
-				arrivalBranchCompanyId: undefined
+				arrivalBranchCompanyId: undefined,
+				use:undefined
 			}
 			if (this.listQuery) {
 				localStorage.setItem(