From 8b75a44ce59b28160e41de8529d97bbdd334435c Mon Sep 17 00:00:00 2001
From: Lihx <Lihx@etoak.com>
Date: Sun, 6 Jul 2025 19:48:32 +0800
Subject: [PATCH] 0706

---
 .../drivingSchool/BusinessRecord/api/index.js |  20 +
 .../BusinessRecord/form/ExportDialog.vue      | 562 ++++++++++++++++++
 .../drivingSchool/BusinessRecord/index.vue    |  54 +-
 .../drivingSchool/DriveSchoolPay/index.vue    |  51 +-
 .../drivingSchool/drivingSchoolCar/api/car.js |   8 +
 5 files changed, 689 insertions(+), 6 deletions(-)
 create mode 100644 src/views/drivingSchool/BusinessRecord/form/ExportDialog.vue

diff --git a/src/views/drivingSchool/BusinessRecord/api/index.js b/src/views/drivingSchool/BusinessRecord/api/index.js
index 4ec5431..4c9e91a 100644
--- a/src/views/drivingSchool/BusinessRecord/api/index.js
+++ b/src/views/drivingSchool/BusinessRecord/api/index.js
@@ -10,3 +10,23 @@ export function getBusinessManager(params) {
   })
 }
 
+
+// 获取分页数据
+export function getBusinessRecordExportData(params) {
+  return request({
+    url: '/base/dl-drive-school-coach/getBusinessRecordExportData',
+    method: 'get',
+    params
+  });
+}
+
+// 导出Excel
+export function exportBusinessRecordExcel(params) {
+  return request({
+    url: '/base/dl-drive-school-coach/businessRecordExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 重要：处理二进制响应
+  });
+}
+
diff --git a/src/views/drivingSchool/BusinessRecord/form/ExportDialog.vue b/src/views/drivingSchool/BusinessRecord/form/ExportDialog.vue
new file mode 100644
index 0000000..38a8075
--- /dev/null
+++ b/src/views/drivingSchool/BusinessRecord/form/ExportDialog.vue
@@ -0,0 +1,562 @@
+<template>
+  <el-dialog
+      title="业务经理招生记录导出"
+      :visible.sync="visible"
+      width="95%"
+      append-to-body
+      class="export-dialog"
+      @close="handleClose"
+  >
+    <!-- 筛选条件 -->
+    <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        label-width="80px"
+        class="filter-form"
+    >
+      <el-form-item label="教练选择" prop="coachId">
+        <el-select v-model="queryParams.coachId" placeholder="请选择教练" @change="handleCoachChange()">
+          <el-option v-for="dict in coachList"
+                     :key="dict.userId" :label="dict.name" :value="dict.userId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学员姓名" prop="name">
+        <el-input
+            v-model="queryParams.name"
+            placeholder="请输入学员姓名"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+            v-model="queryParams.phone"
+            placeholder="请输入学员/业务经理手机号"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="学员身份证号" prop="idCard" label-width="120px">
+        <el-input
+            v-model="queryParams.idCard"
+            placeholder="请输入学员身份证号"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="订单状态" prop="paymentStatus">
+        <el-select
+          v-model="queryParams.paymentStatus"
+          placeholder="请选择订单状态"
+          clearable
+        >
+          <el-option label="待支付" value="0" />
+          <el-option label="已取消" value="1" />
+          <el-option label="已支付(已报名)" value="2" />
+          <el-option label="待面签" value="3" />
+          <el-option label="已面签" value="4" />
+          <el-option label="已完成" value="5" />
+          <el-option label="申请退款" value="6" />
+          <el-option label="退款中" value="7" />
+          <el-option label="退款成功" value="8" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="课程选择" prop="courseName">
+        <el-select v-model="queryParams.courseId" placeholder="请选择课程" @change="handleChange()">
+          <el-option v-for="dict in courseList"
+                     :key="dict.id" :label="dict.name" :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="课程类型" prop="courseType">
+        <el-input
+            v-model="queryParams.courseType"
+            placeholder="请输入课程类型"
+            clearable
+        />
+      </el-form-item>
+
+      <el-form-item label="是否面签" prop="isSign">
+        <el-select
+          v-model="queryParams.isSign"
+          placeholder="请选择面签状态"
+          clearable
+        >
+          <el-option label="否" value="0" />
+          <el-option label="是" value="1" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="报名时间" label-width="120px">
+        <el-date-picker
+          v-model="queryParams.timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          @change="handlePayFeesDateChange">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+            type="primary"
+            icon="el-icon-search"
+            @click="handleSearch"
+            :loading="loading"
+        >
+          搜索
+        </el-button>
+        <el-button
+            icon="el-icon-refresh"
+            @click="resetQuery"
+        >
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 数据表格 -->
+    <el-table
+        :data="tableData"
+        v-loading="loading"
+        border
+        stripe
+        height="400"
+        style="width: 100%; margin-top: 20px;"
+    >
+      <el-table-column label="学员姓名" align="center" prop="name" />
+      <el-table-column label="学员手机号" align="center" prop="phone" />
+      <el-table-column label="学员身份证号" align="center" prop="idCard" width="180"/>
+      <el-table-column label="学员年龄" align="center" prop="age"  />
+      <el-table-column label="性别" align="center" prop="sex" :formatter="formatSex" width="60"/>
+      <el-table-column label="来源" align="center" prop="channel" />
+      <el-table-column label="课程名称" align="center" prop="courseName" />
+      <el-table-column label="所选教练" align="center" prop="coachUserName" />
+      <el-table-column label="支付金额" align="center" prop="reserveMoney" />
+      <el-table-column label="尾款" align="center" prop="restMoney" />
+      <el-table-column label="支付状态" align="center" prop="paymentStatus" :formatter="formatPaymentStatus" />
+      <el-table-column label="支付方式" align="center" prop="payType" :formatter="formatPayType" />
+      <el-table-column label="是否面签" align="center" prop="isSign" :formatter="formatIsSign" width="80"/>
+      <el-table-column label="面签时间" align="center" prop="signTime" :formatter="formatCreateTime" width="80"/>
+      <el-table-column label="业务经理名称" align="center" prop="businessName" />
+      <el-table-column label="业务经理手机号" align="center" prop="businessPhone" width="130"/>
+      <el-table-column label="报名时间" align="center" prop="createTime" :formatter="formatCreateTime" />
+      <el-table-column label="补贴金额" align="center" prop="subsidy" />
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNo"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        style="margin-top: 20px;"
+    />
+
+    <!-- 底部操作按钮 -->
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-dropdown split-button type="primary" @click="handleDefaultExport" :loading="exportLoading">
+        导出数据
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="exportAllData">导出全部数据</el-dropdown-item>
+          <el-dropdown-item @click.native="exportCurrentPage">导出当前页</el-dropdown-item>
+          <el-dropdown-item @click.native="exportCustomRange">导出自定义范围</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <!-- 自定义范围对话框 -->
+    <el-dialog
+        title="导出自定义范围"
+        :visible.sync="rangeDialogVisible"
+        width="500px"
+        append-to-body
+    >
+      <el-form label-width="120px">
+        <el-form-item label="起始页码">
+          <el-input-number v-model="exportRange.startPage" :min="1" :max="maxPage"></el-input-number>
+        </el-form-item>
+        <el-form-item label="结束页码">
+          <el-input-number v-model="exportRange.endPage" :min="exportRange.startPage" :max="maxPage"></el-input-number>
+        </el-form-item>
+        <el-form-item label="每页条数">
+          <el-input-number v-model="exportRange.pageSize" :min="1" :max="1000"></el-input-number>
+        </el-form-item>
+        <el-form-item label="预计导出条数">
+          {{ calculateExportCount() }}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="rangeDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmExportRange" :loading="exportLoading">确认导出</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+import * as SchoolProcessApi from "../../process/api/index";
+import { listDriveSchoolCourse } from "@/views/drivingSchool/schoolCourse/api/driveSchoolCourse";
+import {listBusiness} from "@/views/drivingSchool/drivingSchoolCar/api/car";
+import * as api from "../api/index"
+import {exportBusinessRecordExcel, getBusinessManager, getBusinessRecordExportData} from "../api/index";
+export default {
+  name: "ExportDialog",
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      exportLoading: false,
+      rangeDialogVisible: false,
+      tableData: [],
+      total: 0,
+
+      queryParams: {
+        coachId: null,
+        coachName: null,
+        phone: null,
+        idCard: null,
+        name: null,
+        courseName: null,
+        courseType: null,
+        startTimeStr: null,
+        endTimeStr: null,
+        paymentStatus: null,
+        isSign: null,
+        timeRange:null,
+        pageNo: 1,
+        pageSize: 10
+      },
+      exportRange: {
+        startPage: 1,
+        endPage: 1,
+        pageSize: 10
+      },
+
+      coachList: [],
+      courseList: [],
+      signList: [
+        {
+          value: 0,
+          label: '未面签'
+        },
+        {
+          value: 1,
+          label: '已面签'
+        }
+      ],
+      cashierConfirmList: [
+        {
+          value: '0',
+          label: '未到账'
+        },
+        {
+          value: '1',
+          label: '已到账'
+        },
+        {
+          value: null,
+          label: '待确认'
+        }
+      ],
+    };
+  },
+  computed: {
+    maxPage() {
+      return Math.ceil(this.total / this.queryParams.pageSize);
+    }
+  },
+  methods: {
+    // 打开弹窗
+    async open() {
+      this.visible = true;
+      await this.getList();
+      // 查询课程
+      const courseRes = await listDriveSchoolCourse({pageNo: 1, pageSize: 9999})
+      this.courseList = courseRes.data.records
+      // 获取教练信息
+      const coachRes = await listBusiness()
+      console.log('coachRes', coachRes)
+      this.coachList = coachRes.data
+    },
+    // 关闭弹窗时重置状态
+    handleClose() {
+      this.rangeDialogVisible = false;
+      this.exportRange = {
+        startPage: 1,
+        endPage: 1,
+        pageSize: 10
+      };
+      // 重置主查询参数
+      this.resetQuery();
+    },
+    // 获取数据列表
+    async getList() {
+      try {
+        this.loading = true;
+        const res = await api.getBusinessRecordExportData({
+          ...this.queryParams,
+          // 转换参数名以匹配后端
+          pageNo: this.queryParams.pageNo,
+          pageSize: this.queryParams.pageSize
+        });
+        this.tableData = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    // 搜索
+    handleSearch() {
+      this.queryParams.pageNo = 1;
+      if(this.queryParams.startTimeStr != null){
+        this.queryParams.startTimeStr = this.queryParams.startTimeStr + ' 00:00:01';
+        this.queryParams.endTimeStr = this.queryParams.endTimeStr + ' 23:59:59';
+      }
+      this.getList();
+    },
+    // 重置
+    resetQuery() {
+      this.$refs.queryForm.resetFields();
+
+      this.queryParams = {
+        coachId: null,
+        coachName: null,
+        phone: null,
+        idCard: null,
+        name: null,
+        courseName: null,
+        courseType: null,
+        startTimeStr: null,
+        endTimeStr: null,
+        paymentStatus: null,
+        isSign: null,
+        timeRange:null,
+        pageNo: 1,
+        pageSize: 10
+      };
+
+      this.handleSearch();
+    },
+    // 时间选择器数据处理
+
+    handlePayFeesDateChange(val) {
+      if (val && val.length === 2) {
+        this.queryParams.startTimeStr = val[0];
+        this.queryParams.endTimeStr = val[1];
+        // 清空其他时间范围
+      } else {
+        this.queryParams.startTimeStr = null;
+        this.queryParams.endTimeStr = null;
+      }
+    },
+
+    handleCoachChange() {
+      const selected = this.coachList.find(item => item.userId === this.queryParams.coachId);
+      if (selected) {
+        this.queryParams.coachName = selected.name;
+      } else {
+        this.queryParams.coachName = '';
+      }
+    },
+    handleChange() {
+      const selected = this.courseList.find(item => item.id === this.queryParams.courseId);
+      if (selected) {
+        this.queryParams.courseName = selected.name;
+        this.queryParams.courseType = selected.type;
+      } else {
+        this.formData.courseName = '';
+      }
+    },
+    // 分页大小变化
+    handleSizeChange(val) {
+      this.queryParams.pageSize = val;
+      this.getList();
+    },
+    // 当前页变化
+    handleCurrentChange(val) {
+      this.queryParams.pageNo = val;
+      this.getList();
+    },
+    formatDate(row, column, cellValue) {
+      return this.formatTimestampToDate(cellValue);
+    },
+    formatTimestampToDate(timestamp) {
+      if (!timestamp) return '';
+      const date = new Date(timestamp);
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+
+      return `${year}-${month}-${day}`;
+    },
+
+    formatSex(row, column, value) {
+      const map = {
+        0: '男',
+        1: '女'
+      };
+      return map[value] ?? '未知';
+    },
+    formatPaymentStatus(row, column, value) {
+      const map = {
+        0: '待支付',
+        1: '已取消',
+        2: '已支付',
+        3: '待面签',
+        4: '已面签',
+        5: '已完成',
+        6: '申请退款',
+        7: '退款中',
+        8: '退款成功'
+      };
+      return map[value] ?? '未知状态';
+    },
+
+    formatPayType(row, column, value) {
+      const map = {
+        1: '定金',
+        2: '全款'
+      };
+      return map[value] ?? '未知类型';
+    },
+
+    formatIsSign(row, column, value) {
+      return value === 1 ? '是' : '否';
+    },
+    formatCreateTime(row, column, value) {
+      if (!value) return '';
+      const date = new Date(value);
+      const pad = (n) => (n < 10 ? '0' + n : n);
+      const Y = date.getFullYear();
+      const M = pad(date.getMonth() + 1);
+      const D = pad(date.getDate());
+      const h = pad(date.getHours());
+      const m = pad(date.getMinutes());
+      const s = pad(date.getSeconds());
+      return `${Y}-${M}-${D} ${h}:${m}:${s}`;
+    },
+
+    // 默认导出行为（当前页）
+    handleDefaultExport() {
+      this.exportAllData();
+    },
+
+    // 导出当前页
+    exportCurrentPage() {
+      this.$confirm(`确定要导出当前第 ${this.queryParams.pageNo} 页的数据吗？`, '提示', {
+        type: 'info'
+      }).then(async () => {
+        try {
+          this.exportLoading = true;
+          const data = await api.exportBusinessRecordExcel({
+            ...this.queryParams,
+            exportType: 'current'
+          });
+          this.$download.excel(data, `业务经理招生记录_第${this.queryParams.pageNo}页.xls`);
+          this.$message.success('当前页数据导出成功');
+        } catch (error) {
+          console.error('导出失败:', error);
+          this.$message.error('导出失败');
+        } finally {
+          this.exportLoading = false;
+        }
+      });
+    },
+
+    // 导出全部数据
+    exportAllData() {
+      this.$confirm(`确定要导出全部 ${this.total} 条数据吗？`, '警告', {
+        type: 'warning'
+      }).then(async () => {
+        try {
+          this.exportLoading = true;
+          const data = await api.exportBusinessRecordExcel({
+            ...this.queryParams,
+            pageNo: undefined,
+            pageSize: undefined,
+            exportType: 'all'
+          });
+          this.$download.excel(data, '业务经理招生记录_全部数据.xls');
+          this.$message.success('全部数据导出成功');
+        } catch (error) {
+          console.error('导出失败:', error);
+          this.$message.error('导出失败');
+        } finally {
+          this.exportLoading = false;
+        }
+      });
+    },
+
+    // 打开自定义范围对话框
+    exportCustomRange() {
+      this.exportRange = {
+        startPage: 1,
+        endPage: this.maxPage,
+        pageSize: this.queryParams.pageSize
+      };
+      this.rangeDialogVisible = true;
+    },
+
+    // 计算预计导出条数
+    calculateExportCount() {
+      const pageCount = this.exportRange.endPage - this.exportRange.startPage + 1;
+      return pageCount * this.exportRange.pageSize;
+    },
+
+    // 确认导出自定义范围
+    confirmExportRange() {
+      const count = this.calculateExportCount();
+      this.$confirm(`确定要导出从第 ${this.exportRange.startPage} 页到第 ${this.exportRange.endPage} 页，共 ${count} 条数据吗？`, '提示', {
+        type: 'info'
+      }).then(async () => {
+        try {
+          this.exportLoading = true;
+          this.rangeDialogVisible = false;
+
+          const data = await api.exportBusinessRecordExcel({
+            ...this.queryParams,
+            pageNo: this.exportRange.startPage,
+            pageSize: this.exportRange.pageSize,
+            startPage: this.exportRange.startPage,
+            endPage: this.exportRange.endPage,
+            exportType: 'range'
+          });
+
+          this.$download.excel(data, `业务经理招生记录_${this.exportRange.startPage}-${this.exportRange.endPage}页.xls`);
+          this.$message.success(`成功导出 ${count} 条数据`);
+        } catch (error) {
+          console.error('导出失败:', error);
+          this.$message.error('导出失败');
+        } finally {
+          this.exportLoading = false;
+        }
+      });
+    },
+
+  }
+};
+</script>
+
+<style scoped>
+.export-dialog {
+  min-height: 600px;
+}
+.filter-form {
+  margin-bottom: 20px;
+}
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+/* 下拉按钮样式调整 */
+.el-dropdown {
+  margin-left: 10px;
+}
+</style>
+
diff --git a/src/views/drivingSchool/BusinessRecord/index.vue b/src/views/drivingSchool/BusinessRecord/index.vue
index 4c4fd6e..536baa9 100644
--- a/src/views/drivingSchool/BusinessRecord/index.vue
+++ b/src/views/drivingSchool/BusinessRecord/index.vue
@@ -2,11 +2,14 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="学员姓名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入学员姓名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item label="学员身份证号" prop="studentIdCard" label-width="110px">
+        <el-input v-model="queryParams.studentIdCard" placeholder="请输入学员身份证号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入学员/业务经理手机号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="业务经理" prop="businessName">
         <el-input v-model="queryParams.businessName" placeholder="请输入业务经理姓名" clearable @keyup.enter.native="handleQuery"/>
@@ -41,6 +44,19 @@
           <el-option label="是" value="1" />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="报名时间">
+        <el-date-picker
+          v-model="queryParams.timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          @change="handleDateChange">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -52,6 +68,9 @@
 <!--      <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)" >新增</el-button>
       </el-col>-->
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" >业务经理招生记录导出</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -70,8 +89,9 @@
       <el-table-column label="支付状态" align="center" prop="paymentStatus" :formatter="formatPaymentStatus" />
       <el-table-column label="支付方式" align="center" prop="payType" :formatter="formatPayType" />
       <el-table-column label="是否面签" align="center" prop="isSign" :formatter="formatIsSign" />
+      <el-table-column label="面签时间" align="center" prop="signTime" :formatter="formatCreateTime" />
       <el-table-column label="业务经理名称" align="center" prop="businessName" />
-      <el-table-column label="业务经理电话" align="center" prop="businessPhone" />
+      <el-table-column label="业务经理手机号" align="center" prop="businessPhone" />
       <el-table-column label="报名时间" align="center" prop="createTime" :formatter="formatCreateTime" />
       <el-table-column label="补贴金额" align="center" prop="subsidy" />
 <!--      <el-table-column label="操作" width="150" align="center" class-name="small-padding fixed-width">
@@ -86,15 +106,18 @@
                 @pagination="getList"/>
     <!-- 对话框(添加 / 修改) -->
 <!--    <DlDriveSchoolCoachForm ref="formRef" @success="getList" />-->
+    <ExportDialog ref="exportDialog" />
   </div>
 </template>
 
 <script>
 import * as DlDriveSchoolCoachApi from '@/views/drivingSchool/BusinessRecord/api';
+import ExportDialog from './form/ExportDialog.vue';
 
 export default {
   name: "DlDriveSchoolCoach",
   components: {
+    ExportDialog
     // DlDriveSchoolCoachForm,
   },
   data() {
@@ -128,6 +151,10 @@ export default {
         isSign: null,
         businessName: null,
         businessPhone: null,
+        timeRange:null,
+        startTimeStr: null,
+        endTimeStr: null,
+        studentIdCard: null
       },
     };
   },
@@ -147,16 +174,33 @@ export default {
         this.loading = false;
       }
     },
+    handleDateChange(val) {
+      if (val && val.length === 2) {
+        this.queryParams.startTimeStr = val[0];
+        this.queryParams.endTimeStr = val[1];
+      } else {
+        this.queryParams.startTimeStr = null;
+        this.queryParams.endTimeStr = null;
+      }
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
+      if(this.queryParams.startTimeStr != null){
+        this.queryParams.startTimeStr = this.queryParams.startTimeStr + ' 00:00:01';
+        this.queryParams.endTimeStr = this.queryParams.endTimeStr + ' 23:59:59';
+      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.timeRange = null
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    async handleExport() {
+      await this.$refs.exportDialog.open();
+    },
     /** 添加/修改操作 */
     openForm(id) {
       this.$refs["formRef"].open(id);
diff --git a/src/views/drivingSchool/DriveSchoolPay/index.vue b/src/views/drivingSchool/DriveSchoolPay/index.vue
index f72fabe..239b4c7 100644
--- a/src/views/drivingSchool/DriveSchoolPay/index.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/index.vue
@@ -11,6 +11,28 @@
       <el-form-item label="负责教练" prop="coachUserName">
         <el-input v-model="queryParams.coachUserName" placeholder="请输入主负责教练姓名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
+      <el-form-item label="是否面签" prop="isSign">
+        <el-select v-model="queryParams.isSign" placeholder="请选择面签情况">
+          <el-option
+            v-for="item in signList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="报名时间">
+        <el-date-picker
+          v-model="queryParams.timeRange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          @change="handleDateChange">
+        </el-date-picker>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -460,6 +482,9 @@ export default {
         courseName: null,
         coachUserName: null,
         isSign: null,
+        timeRange:null,
+        startTimeStr: null,
+        endTimeStr: null
       },
       // 控制合同查看对话框显示
       viewFlag: false,
@@ -477,7 +502,17 @@ export default {
         studentInfo: {}
       },
       sourceList: this.getDictDatas("drive_school_channel"),
-      sourceUser:null
+      sourceUser:null,
+      signList:[
+        {
+          label: '未面签',
+          value: 0
+        },
+        {
+          label: '已面签',
+          value: 1
+        }
+      ],
     };
   },
   created() {
@@ -505,13 +540,27 @@ export default {
         this.loading = false;
       }
     },
+    handleDateChange(val) {
+      if (val && val.length === 2) {
+        this.queryParams.startTimeStr = val[0];
+        this.queryParams.endTimeStr = val[1];
+      } else {
+        this.queryParams.startTimeStr = null;
+        this.queryParams.endTimeStr = null;
+      }
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
+      if(this.queryParams.startTimeStr != null){
+        this.queryParams.startTimeStr = this.queryParams.startTimeStr + ' 00:00:01';
+        this.queryParams.endTimeStr = this.queryParams.endTimeStr + ' 23:59:59';
+      }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.timeRange = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/drivingSchool/drivingSchoolCar/api/car.js b/src/views/drivingSchool/drivingSchoolCar/api/car.js
index 23a86a0..92ed694 100644
--- a/src/views/drivingSchool/drivingSchoolCar/api/car.js
+++ b/src/views/drivingSchool/drivingSchoolCar/api/car.js
@@ -16,6 +16,14 @@ export function listCoach(query) {
     params: query
   })
 }
+// 查询业务经理信息
+export function listBusiness(query) {
+  return request({
+    url: '/base/dl-drive-school-coach/businessList',
+    method: 'get',
+    params: query
+  })
+}
 // 查询车辆信息详细
 export function getCar(id) {
   return request({