总公司报表

src/api/statistics.js

 import fetch from 'utils/fetch';
 
-
+// 員工業績報表列表
 export function getDate(query) {
   return fetch({
     url: 'api/admin/staff_statistics/page',
@@ -8,7 +8,7 @@ export function getDate(query) {
     data: query
   });
 }
-
+// 員工業績報表導出
 export function exports(query) {
   return fetch({
     url: 'api/admin/staff_statistics/export',
@@ -17,3 +17,22 @@ export function exports(query) {
     responseType: 'blob'
   });
 }
+
+// 員工業績列表
+export function companyList(query) {
+  return fetch({
+    url: '/api/order/report/form/list',
+    method: 'post',
+    data: query
+  });
+}
+
+// 員工業績導出
+export function excel(query) {
+  return fetch({
+    url: '/api/order/report/form/excel',
+    method: 'post',
+    data: query,
+    responseType: 'blob'
+  });
+}
\ No newline at end of file

src/api/vehicle/departureLog/index.js

@@ -17,3 +17,10 @@ export function statistic(param) {
   })
 }
 
+export function findReserveType(param) {
+  return fetch({
+    url: '/departure/findReserveType ',
+    method: 'get',
+    params: param
+  })
+}

src/views/baseInfo/branchCompany/index.vue

@@ -382,7 +382,6 @@
       this.branchCompany_btn_del = this.elements['branchCompany:btn_del'];
       this.branchCompany_btn_add = this.elements['branchCompany:btn_add'];
       this.compnay_stock_update = this.elements['compnay:stock:update']
-        debugger
     },
     computed: {
       ...mapGetters([

src/views/cunponManagements/conponList.vue

@@ -2,7 +2,7 @@
 	<div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
 		<div>
 			<div class="filter-container" ref="filter-container">
-				<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="60px">
+				<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
 					<el-row>
 						<el-form-item label="手机号">
 							<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
@@ -31,10 +31,6 @@
 								></el-option>
 							</el-select>
 						</el-form-item>
-						<!-- <el-col :span="4"></el-col>
-						<el-col :span="3"></el-col>
-						<el-col :span="4"></el-col>
-						<el-col :span="4"></el-col> -->
 						<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
 						<el-button class="filter-item" type="primary" @click="giveCunpon" style="float: right;">+ 发券</el-button>
 						<!-- <el-button class="filter-item" type="primary" style="float: right;">+ 批量发券</el-button> -->

src/views/cunponManagements/cunponManagement.vue

 <template>
 	<div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
-		<div>
-			<div class="filter-container" ref="filter-container">
-				<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="50px">
-					<el-row>
-						<el-form-item label="标题">
-							<el-input v-model.number="listQuery.title" placeholder="请输入标题"></el-input>
-						</el-form-item>
-						<el-form-item>
-							<el-select class="filter-item" v-model="listQuery.channel" placeholder="类型">
-								<el-option key label="全部" value></el-option>
-								<el-option
-									v-for="(item,index) in channelType"
-									:key="index"
-									:label="item.val"
-									:value="item.id"
-								></el-option>
-							</el-select>
-						</el-form-item>
-						<el-col :span="5"></el-col>
-						<el-col :span="5"></el-col>
-						<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
-						<el-button class="filter-item" type="primary" @click="addCunpon" style="float: right;">+ 添加优惠券</el-button>
-					</el-row>
-				</el-form>
-			</div>
-			<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
-				<el-table-column type="index" align="center" label="ID" width="100">
-					<template scope="scope">
-						<span>{{scope.row.id}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="优惠券标题">
-					<template scope="scope">
-						<span>{{scope.row.title}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="类型">
-					<template scope="scope">
-						<span v-if="scope.row.channel==0">全平台</span>
-						<span v-if="scope.row.channel==1">租车</span>
-						<span v-if="scope.row.channel==2">旅游</span>
-						<span v-if="scope.row.channel==3">营地</span>
-						<span v-if="scope.row.channel==4">会员</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="金额">
-					<template scope="scope">
-						<span>{{scope.row.usedAmount}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="已领取">
-					<template scope="scope">
-						<span>{{scope.row.takeCount}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="已使用">
-					<template scope="scope">
-						<span>{{scope.row.usedCount}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="创建时间">
-					<template scope="scope">
-						<span>{{scope.row.crtTimeStr}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column align="center" label="操作" width="150" fixed="right">
-					<template scope="scope">
-						<el-button
-							size="small"
-							class="el-button el-button--text el-button--small"
-							@click="handleUpdate(scope.row)"
-						>编辑</el-button>
-						<el-button
-							class="el-button el-button--text el-button--small"
-							style="color:red;"
-							size="small"
-							@click="deleteHandler(scope.row)"
-						>删除</el-button>
-					</template>
-				</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,40,50]"
-					:page-size="listQuery.limit"
-					layout="total, sizes, prev, pager, next, jumper"
-					:total="total"
-				></el-pagination>
-			</div>
+		<div class="filter-container" ref="filter-container">
+			<el-form ref="queryForm" :inline="inline" :model="listQuery">
+				<el-form-item label="标题">
+					<el-input v-model.number="listQuery.title" placeholder="请输入标题"></el-input>
+				</el-form-item>
+				<el-form-item label="类型">
+					<el-select class="filter-item" v-model="listQuery.channel" placeholder="类型">
+						<el-option key label="全部" value></el-option>
+						<el-option
+							v-for="(item,index) in channelType"
+							:key="index"
+							:label="item.val"
+							:value="item.id"
+						></el-option>
+					</el-select>
+				</el-form-item>
+				<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
+				<el-button class="filter-item" type="primary" @click="addCunpon" style="float: right;">+ 添加优惠券</el-button>
+			</el-form>
+		</div>
+		<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
+			<el-table-column type="index" align="center" label="ID" width="100">
+				<template scope="scope">
+					<span>{{scope.row.id}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="优惠券标题">
+				<template scope="scope">
+					<span>{{scope.row.title}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="类型">
+				<template scope="scope">
+					<span v-if="scope.row.channel==0">全平台</span>
+					<span v-if="scope.row.channel==1">租车</span>
+					<span v-if="scope.row.channel==2">旅游</span>
+					<span v-if="scope.row.channel==3">营地</span>
+					<span v-if="scope.row.channel==4">会员</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="金额">
+				<template scope="scope">
+					<span>{{scope.row.usedAmount}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="已领取">
+				<template scope="scope">
+					<span>{{scope.row.takeCount}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="已使用">
+				<template scope="scope">
+					<span>{{scope.row.usedCount}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="创建时间">
+				<template scope="scope">
+					<span>{{scope.row.crtTimeStr}}</span>
+				</template>
+			</el-table-column>
+			<el-table-column align="center" label="操作" width="150" fixed="right">
+				<template scope="scope">
+					<el-button
+						size="small"
+						class="el-button el-button--text el-button--small"
+						@click="handleUpdate(scope.row)"
+					>编辑</el-button>
+					<el-button
+						class="el-button el-button--text el-button--small"
+						style="color:red;"
+						size="small"
+						@click="deleteHandler(scope.row)"
+					>删除</el-button>
+				</template>
+			</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,40,50]"
+				:page-size="listQuery.limit"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="total"
+			></el-pagination>
 		</div>
 
 		<!-- 优惠券编辑 -->

src/views/purseManage/incomeOverview.vue

@@ -10,8 +10,6 @@
 						<el-form-item label="手机号">
 							<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
 						</el-form-item>
-						<el-col :span="5"></el-col>
-						<el-col :span="5"></el-col>
 						<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="clearFilter">清除搜索</el-button>
 					</el-row>

src/views/userManagement/userList/index.vue

 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
-      <el-form ref="queryForm" :inline="true" :model="listQuery">
+      <el-form ref="queryForm" :inline="true" :model="listQuery" label-width="100px">
         <el-row>
           <el-form-item label="手机号">
             <el-input v-model.number="listQuery.mobile" placeholder="请输入手机号"></el-input>