新增导出和地区编号搜索

src/api/tool/report.js

@@ -2,9 +2,17 @@ import request from '@/utils/request'
 
 // 查询驾校报表信息
 export function getList(query) {
-    return request({
-      url: '/order/info/school/list',
-      method: 'get',
-      params: query
-    })
-  }
+  return request({
+    url: '/order/info/school/list',
+    method: 'get',
+    params: query
+  })
+}
+//导出excel
+export function exportReport(query) {
+  return request({
+    url: '/order/info/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/driver/report/index.vue

@@ -8,37 +8,46 @@
                 </el-select>
             </el-form-item> -->
             <el-form-item label="开始时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker v-model="queryParams.startTime" type="date" placeholder="默认是当前月份第一天" format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyyMMdd">
+                <el-date-picker v-model="queryParams.startTime" type="date" placeholder="默认是当前月份第一天"
+                    format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd">
                 </el-date-picker>
 
             </el-form-item>
             <el-form-item label="结束时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天" format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyyMMdd">
+                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天"
+                    format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd">
                 </el-date-picker>
 
             </el-form-item>
-            <el-form-item label="驾校名称" prop="schoolName">
+            <el-form-item label="驾校名称" label-width="120px" prop="schoolName">
                 <el-input v-model="queryParams.schoolName" placeholder="请输入驾校名称" clearable size="small"
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否合作" prop="isShare">
-                <el-select  v-model="queryParams.isShare">
+            <el-form-item label="地区编号" label-width="120px" prop="schoolName">
+                <el-select v-model="queryParams.dqbh" placeholder="请输入驾校名称" clearable size="small"
+                    @keyup.enter.native="handleQuery">
+                    <el-option key="1" label="全部" value=""></el-option>
+                    <el-option key="2" label="福州" value="3501"></el-option>
+                    <el-option key="3" label="厦门" value="3502"></el-option>
+                    <el-option key="4" label="莆田" value="3503"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="是否合作" label-width="120px" prop="isShare">
+                <el-select v-model="queryParams.isShare">
                     <el-option value="" key="3" label="全部"></el-option>
                     <el-option value="1" key="1" label="是"></el-option>
                     <el-option value="0" key="2" label="否"></el-option>
-            
-               
+
+
                 </el-select>
             </el-form-item>
-            <el-form-item label="支付状态" prop="tradeType">
-                <el-select  v-model="queryParams.tradeType">
+            <el-form-item label="支付状态" label-width="120px" prop="tradeType">
+                <el-select v-model="queryParams.tradeType">
                     <el-option value="" key="4" label="全部"></el-option>
                     <el-option value="1" key="1" label="支付成功">支付成功</el-option>
                     <el-option value="2" key="2" label="支付失败">支付失败</el-option>
                     <el-option value="3" key="3" label="已退款"></el-option>
-            
+
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="支付类型" prop="payType">
@@ -65,6 +74,7 @@
             <el-form-item>
                 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
             </el-form-item>
         </el-form>
 
@@ -88,7 +98,8 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="驾校名" align="center" prop="schoolName">
                 <template slot-scope="scope">
-                    <router-link class="link-text" :to="'/tool/reportDetail?school='+scope.row.school+'&startTime='+(queryParams.startTime||defaultStartTime)+'&endTime='+(queryParams.endTime||defaultEndTime)+'&schoolName='+scope.row.schoolName+'&isShare='+queryParams.isShare+'&tradeType='+queryParams.tradeType">
+                    <router-link class="link-text"
+                        :to="'/tool/reportDetail?school=' + scope.row.school + '&startTime=' + (queryParams.startTime || defaultStartTime) + '&endTime=' + (queryParams.endTime || defaultEndTime) + '&schoolName=' + scope.row.schoolName + '&isShare=' + queryParams.isShare + '&tradeType=' + queryParams.tradeType">
                         {{ scope.row.schoolName }}
                     </router-link>
                 </template>
@@ -136,16 +147,16 @@
 </template>
 
 <script>
-import { getList, getError, refundOrder, delError, addError, updateError, exportError } from "@/api/tool/report";
+import { getList, getError, refundOrder, delError, addError, updateError, exportReport} from "@/api/tool/report";
 let date = new Date()
-let defaultStartTime =`${date.getFullYear()}${date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1}01`
-let defaultEndTime =`${date.getFullYear()}${date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1}${ new Date(date.getFullYear(),date.getMonth()+1,0).getDate()}`;
+let defaultStartTime = `${date.getFullYear()}${date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1}01`
+let defaultEndTime = `${date.getFullYear()}${date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1}${new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate()}`;
 export default {
     name: "Error",
     data() {
         return {
-            defaultStartTime:defaultStartTime,
-            defaultEndTime:defaultEndTime,
+            defaultStartTime: defaultStartTime,
+            defaultEndTime: defaultEndTime,
             // 遮罩层
             loading: true,
             // 选中数组
@@ -166,11 +177,11 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
-               
+                dqbh: "",
                 pageNum: 1,
                 pageSize: 10,
-                tradeType:'',
-                isShare:''
+                tradeType: '',
+                isShare: ''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -211,13 +222,14 @@ export default {
         // 表单重置
         reset() {
             this.queryParams = {
+                dqbh: "",
                 outTradeNo: "",
                 startTime: null,
                 endTime: null,
                 pageNum: 1,
                 pageSize: 10,
-                tradeType:'',
-                isShare:''
+                tradeType: '',
+                isShare: ''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -318,12 +330,12 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             const queryParams = this.queryParams;
-            this.$confirm('是否确认导出所有错题数据项?', "警告", {
+            this.$confirm('是否确认导出数据项?', "警告", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
             }).then(function () {
-                return exportError(queryParams);
+                return exportReport(queryParams);
             }).then(response => {
                 this.download(response.data);
             })