0708

src/views/drivingSchool/BusinessRecord/form/ExportDialog.vue

@@ -16,7 +16,7 @@
         label-width="80px"
         class="filter-form"
     >
-      <el-form-item label="教练选择" prop="coachId">
+      <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"

src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue

@@ -270,6 +270,7 @@ export default {
         signUpTimeRange: null,
         payFeesTimeRange: null,
         cashierConfirmTimeRange: null,
+        cashierConfirm: '',
         pageNo: 1,
         pageSize: 10
       },
@@ -291,19 +292,12 @@ export default {
           label: '已面签'
         }
       ],
+
       cashierConfirmList: [
-        {
-          value: '0',
-          label: '未到账'
-        },
-        {
-          value: '1',
-          label: '已到账'
-        },
-        {
-          value: null,
-          label: '待确认'
-        }
+        { value: '', label: '全部' },
+        { value: '0', label: '未到账' },
+        { value: '1', label: '已到账' },
+        { value: null, label: '待确认' }
       ],
       selectedTimeType: 'cashierConfirm',
       sourceList: [],
@@ -421,6 +415,7 @@ export default {
         signUpTimeRange: null,
         payFeesTimeRange: null,
         cashierConfirmTimeRange: null,
+        cashierConfirm: '',
         pageNo: 1,
         pageSize: 10
       };

src/views/drivingSchool/process/api/index.js

@@ -69,6 +69,16 @@ export function getSchoolProcessPage(params) {
   });
 }
 
+// 获取统计数据
+export function getSubjectPassCount(params) {
+  return request({
+    url: '/process/getSubjectPassCount',
+    method: 'get',
+    params
+  });
+}
+
+
 // 导出Excel
 export function exportSchoolProcessExcel(params) {
   return request({

src/views/drivingSchool/process/form/ExportDialog.vue

@@ -59,6 +59,14 @@
         />
       </el-form-item>
 
+      <el-form-item label="考试合格" prop="subjectOver">
+        <el-select v-model="queryParams.subjectOver" placeholder="请选择科目">
+          <el-option v-for="dict in subjectOverList"
+                     :key="dict.value" :label="dict.label" :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="缴费时间" label-width="120px">
         <el-date-picker
           v-model="queryParams.payFeesTimeRange"
@@ -88,6 +96,20 @@
       </el-form-item>
     </el-form>
 
+    <el-form
+      size="small"
+      :inline="true"
+      label-width="100px"
+      style="height: 30px"
+    >
+      <el-form-item label="科目二合格数量" label-width="150px">
+        <span style="font-weight: bold; font-size: 16px">{{ count.subject2PassCount }}</span>
+      </el-form-item>
+      <el-form-item label="科目三合格数量" label-width="150px">
+        <span style="font-weight: bold; font-size: 16px">{{ count.subject3PassCount }}</span>
+      </el-form-item>
+    </el-form>
+
     <!-- 数据表格 -->
     <el-table
         :data="tableData"
@@ -168,6 +190,7 @@
 import * as SchoolProcessApi from "../api/index";
 import { listDriveSchoolCourse } from "@/views/drivingSchool/schoolCourse/api/driveSchoolCourse";
 import {listCoach} from "@/views/drivingSchool/drivingSchoolCar/api/car";
+import * as SchoolOrderApi from '@/views/drivingSchool/DriveSchoolPay/api'
 export default {
   name: "ExportDialog",
   data() {
@@ -194,6 +217,7 @@ export default {
         subject2Status: null,
         subject3Status: null,
         subject4Status: null,
+        subjectOver: null,
         pageNo: 1,
         pageSize: 10
       },
@@ -205,6 +229,16 @@ export default {
 
       coachList: [],
       courseList: [],
+      subjectOverList: [
+        {
+          value: 2,
+          label: '科目二合格'
+        },
+        {
+          value: 3,
+          label: '科目三合格'
+        }
+      ],
       signList: [
         {
           value: 0,
@@ -230,6 +264,11 @@ export default {
         }
       ],
       selectedTimeType: 'cashierConfirm',
+
+      count: {
+        subject2PassCount: 0,
+        subject3PassCount: 0
+      },
     };
   },
   computed: {
@@ -272,10 +311,30 @@ export default {
         });
         this.tableData = res.data.records;
         this.total = res.data.total;
+        this.getSubjectPassCount(this.queryParams);
       } finally {
         this.loading = false;
       }
     },
+
+    async getSubjectPassCount(queryParams) {
+      console.log('queryParams', queryParams)
+      try {
+        // 构造查询参数，与列表查询一致
+
+        // 调用统计API
+        const countRes = await SchoolProcessApi.getSubjectPassCount(queryParams);
+
+        // 更新统计数据，处理可能的null值
+        this.count = {
+          subject2PassCount: countRes.data.subject2PassCount || 0,
+          subject3PassCount: countRes.data.subject3PassCount || 0
+        };
+      } catch (error) {
+        console.error('获取统计数据失败:', error);
+        this.$message.error('获取统计数据失败');
+      }
+    },
     // 搜索
     handleSearch() {
       this.queryParams.pageNo = 1;