0528

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

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+
+// 获得业务经理招生信息分页
+export function getBusinessManager(params) {
+  return request({
+    url: '/base/dl-drive-school-coach/getBusinessManager',
+    method: 'get',
+    params
+  })
+}
+

src/views/drivingSchool/BusinessRecord/index.vue

@@ -0,0 +1,192 @@
+<template>
+  <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>
+      <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"/>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)" >新增</el-button>
+      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+
+      <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" />
+      <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" />
+      <el-table-column label="业务经理名称" align="center" prop="businessName" />
+      <el-table-column label="业务经理电话" align="center" prop="businessPhone" />
+      <el-table-column label="报名时间" align="center" prop="createTime" :formatter="formatCreateTime" />
+<!--      <el-table-column label="操作" width="150" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>-->
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+<!--    <DlDriveSchoolCoachForm ref="formRef" @success="getList" />-->
+  </div>
+</template>
+
+<script>
+import * as DlDriveSchoolCoachApi from '@/views/drivingSchool/BusinessRecord/api';
+
+export default {
+  name: "DlDriveSchoolCoach",
+  components: {
+    // DlDriveSchoolCoachForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      viewFilePath:process.env.VUE_APP_FILE_API,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 驾校教练列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // coachTypeList: getDictDatas(DICT_TYPE.DRIVE_TYPE),
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        phone: null,
+        type: null
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      // console.log('coachTypeList',  this.coachTypeList)
+      try {
+        this.loading = true;
+        const res = await DlDriveSchoolCoachApi.getBusinessManager(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /* formatType(row) {
+      const type = this.coachTypeList.find(item => item.value === row.type);
+      return type ? type.label : row.type; // 如果找不到则显示原值
+    }, */
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除驾校教练编号为"' + id + '"的数据项?')
+      try {
+        // await DlDriveSchoolCoachApi.deleteDlDriveSchoolCoach(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {}
+    },
+    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] ?? '未知类型';
+    },
+
+    formatSex(row, column, value) {
+      const map = {
+        0: '男',
+        1: '女'
+      };
+      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}`;
+    }
+
+  }
+};
+</script>

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

@@ -18,7 +18,8 @@
         <el-form-item label="性别" prop="userSex">
           <el-radio-group v-model="formData.userSex">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
-                      :key="dict.value" :label="dict.value">{{ dict.label }}
+                      :key="dict.value" :label="dict.value"
+            >{{ dict.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -34,10 +35,21 @@
           <el-input v-model="formData.reserveMoney" placeholder="请输入订金金额"/>
         </el-form-item>
 
+        <el-form-item label="毕业时间" prop="gradTime">
+          <el-date-picker clearable v-model="formData.gradTime" type="date" value-format="timestamp"
+                          placeholder="请选择毕业时间"
+          />
+        </el-form-item>
+        <el-form-item label="拿证时间" prop="passTime">
+          <el-date-picker clearable v-model="formData.passTime" type="date" value-format="timestamp"
+                          placeholder="请选择拿证时间"
+          />
+        </el-form-item>
         <el-form-item label="是否终止" prop="ifEnd">
           <el-radio-group v-model="formData.ifEnd">
             <el-radio v-for="item in ifEndRadio"
-                      :key="item.value" :label="item.value">{{ item.label }}
+                      :key="item.value" :label="item.value"
+            >{{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -46,7 +58,8 @@
         </el-form-item>
         <el-form-item label="终止时间" prop="endTime">
           <el-date-picker clearable v-model="formData.endTime" type="date" value-format="timestamp"
-                          placeholder="选择终止时间"/>
+                          placeholder="选择终止时间"
+          />
         </el-form-item>
         <el-form-item label="订单状态" prop="paymentStatus">
           <el-select v-model="formData.paymentStatus" placeholder="请选择订单状态">
@@ -56,12 +69,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="是否已面签" prop="isSign">
-<!--          <el-select v-model="formData.isSign" placeholder="请选择是否已面签">-->
-<!--            <el-option label="请选择字典生成" :label="item.label" v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"/>-->
-<!--          </el-select>-->
+          <!--          <el-select v-model="formData.isSign" placeholder="请选择是否已面签">-->
+          <!--            <el-option label="请选择字典生成" :label="item.label" v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"/>-->
+          <!--          </el-select>-->
           <el-radio-group v-model="formData.isSign">
             <el-radio v-for="dict in isSignRadio"
-                      :key="dict.value" :label="dict.value">{{ dict.label }}
+                      :key="dict.value" :label="dict.value"
+            >{{ dict.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -85,15 +99,15 @@
 </template>
 
 <script>
-import * as SchoolCourseOrderApi from '@/views/drivingSchool/DriveSchoolPay/api';
+import * as SchoolCourseOrderApi from '@/views/drivingSchool/DriveSchoolPay/api'
 
 export default {
-  name: "SchoolCourseOrderForm",
+  name: 'SchoolCourseOrderForm',
   components: {},
   data() {
     return {
       // 弹出层标题
-      dialogTitle: "",
+      dialogTitle: '',
       // 是否显示弹出层
       dialogVisible: false,
       // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -118,71 +132,73 @@ export default {
         isSign: undefined,
         restMoney: undefined,
         payType: undefined,
+        passTime: undefined,
+        gradTime: undefined
       },
-      ifEndRadio:[
+      ifEndRadio: [
         {
-          label:'是',
-          value:true
+          label: '是',
+          value: true
         },
         {
-          label:'否',
-          value:false
-        },
+          label: '否',
+          value: false
+        }
       ],
-      isSignRadio:[
+      isSignRadio: [
         {
-          label:'是',
-          value:1
+          label: '是',
+          value: 1
         },
         {
-          label:'否',
-          value:0
-        },
+          label: '否',
+          value: 0
+        }
       ],
       // 表单校验
-      formRules: {},
-    };
+      formRules: {}
+    }
   },
   methods: {
     /** 打开弹窗 */
     async open(id) {
-      this.dialogVisible = true;
-      this.reset();
+      this.dialogVisible = true
+      this.reset()
       // 修改时，设置数据
       if (id) {
-        this.formLoading = true;
+        this.formLoading = true
         try {
-          const res = await SchoolCourseOrderApi.getSchoolCourseOrder(id);
-          this.formData = res.data;
-          this.title = "修改驾照报名订单";
+          const res = await SchoolCourseOrderApi.getSchoolCourseOrder(id)
+          this.formData = res.data
+          this.title = '修改驾照报名订单'
         } finally {
-          this.formLoading = false;
+          this.formLoading = false
         }
       }
-      this.title = "新增驾照报名订单";
+      this.title = '新增驾照报名订单'
     },
     /** 提交按钮 */
     async submitForm() {
       // 校验主表
-      await this.$refs["formRef"].validate();
-      this.formLoading = true;
+      await this.$refs['formRef'].validate()
+      this.formLoading = true
       try {
-        const data = this.formData;
+        const data = this.formData
         // 修改的提交
         if (data.id) {
-          await SchoolCourseOrderApi.updateSchoolCourseOrder(data);
-          this.$modal.msgSuccess("修改成功");
-          this.dialogVisible = false;
-          this.$emit('success');
-          return;
+          await SchoolCourseOrderApi.updateSchoolCourseOrder(data)
+          this.$modal.msgSuccess('修改成功')
+          this.dialogVisible = false
+          this.$emit('success')
+          return
         }
         // 添加的提交
-        await SchoolCourseOrderApi.createSchoolCourseOrder(data);
-        this.$modal.msgSuccess("新增成功");
-        this.dialogVisible = false;
-        this.$emit('success');
+        await SchoolCourseOrderApi.createSchoolCourseOrder(data)
+        this.$modal.msgSuccess('新增成功')
+        this.dialogVisible = false
+        this.$emit('success')
       } finally {
-        this.formLoading = false;
+        this.formLoading = false
       }
     },
     /** 表单重置 */
@@ -206,9 +222,11 @@ export default {
         isSign: undefined,
         restMoney: undefined,
         payType: undefined,
-      };
-      this.resetForm("formRef");
+        passTime: undefined,
+        gradTime: undefined
+      }
+      this.resetForm('formRef')
     }
   }
-};
+}
 </script>

src/views/drivingSchool/StudentScoreInput/form/scoreInputForm.vue

@@ -128,7 +128,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
+<!--            <el-row>
               <el-col span="12">
                 <el-form-item label="考试开始时间" prop="startTime">
                   <el-date-picker  clearable v-model="formData.startTime" type="date" value-format="timestamp" />
@@ -139,7 +139,7 @@
                   <el-date-picker  clearable v-model="formData.endTime" type="date" value-format="timestamp" />
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row>-->
           </el-collapse-item>
         </el-collapse>
 
@@ -308,6 +308,9 @@ export default {
       await this.$refs["formRef"].validate();
       this.formLoading = true;
       try {
+        this.formData.startTime = this.formData.examTime + 10 * 1000;
+        this.formData.endTime = this.formData.examTime + ((23 * 3600 + 59 * 60 + 59) * 1000);
+        this.formData.examTime = this.formData.examTime + 10;
         const data = this.formData;
         // 根据操作类型调用不同接口
         if (this.operationType === 'input') {

src/views/drivingSchool/schoolCoach/form/DlDriveSchoolCoachForm.vue

@@ -46,12 +46,6 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="提成" prop="commission" v-if="formData.type === 'ywjl'">
-          <el-input v-model="formData.commission" placeholder="请输入提成"/>
-        </el-form-item>
-        <el-form-item label="银行卡号" prop="bankCardId" v-if="formData.type === 'ywjl'">
-          <el-input v-model="formData.bankCardId" placeholder="请输入银行卡号"/>
-        </el-form-item>
         <el-form-item label="身份证" prop="idPhoto">
           <ImageUpload v-model="formData.idPhoto" />
         </el-form-item>
@@ -111,8 +105,6 @@ export default {
         lifePhoto: undefined,
         drivePhoto: undefined,
         otherPhoto: undefined,
-        commission:  undefined,
-        bankCardId: undefined,
       },
       // 表单校验
       formRules: {

src/views/drivingSchool/schoolCoach/index.vue

@@ -36,18 +36,10 @@
       </el-table-column>
       <el-table-column label="姓名" align="center" prop="name" width="120"/>
       <el-table-column label="教龄" align="center" prop="seniority" width="80"/>
-      <el-table-column label="人员类型" align="center" prop="type" width="120"/>
+<!--      <el-table-column label="人员类型" align="center" prop="type" width="120"/>-->
+      <el-table-column label="人员类型" align="center" prop="type" width="120" :formatter="formatType"/>
+      <el-table-column label="电话" align="center" prop="phone" width="120"/>
       <el-table-column label="个人简介" align="left" prop="instructorDesc" />
-      <el-table-column  align="left" width="180">
-        <template v-slot="scope">
-          <span v-if="scope.row.type === 'ywjl'">提成：{{ scope.row.commission }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column  align="left" width="260">
-        <template v-slot="scope">
-          <span v-if="scope.row.type === 'ywjl'">银行卡号：{{ scope.row.bankCardId }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" width="150" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改</el-button>
@@ -66,6 +58,7 @@
 <script>
 import * as DlDriveSchoolCoachApi from '@/views/drivingSchool/schoolCoach/api';
 import DlDriveSchoolCoachForm from '@/views/drivingSchool/schoolCoach/form/DlDriveSchoolCoachForm.vue';
+import {getDictDatas, DICT_TYPE} from '@/utils/dict'
 export default {
   name: "DlDriveSchoolCoach",
   components: {
@@ -90,6 +83,7 @@ export default {
       refreshTable: true,
       // 选中行
       currentRow: {},
+      coachTypeList: getDictDatas(DICT_TYPE.DRIVE_TYPE),
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -106,6 +100,7 @@ export default {
   methods: {
     /** 查询列表 */
     async getList() {
+      console.log('coachTypeList',  this.coachTypeList)
       try {
         this.loading = true;
         const res = await DlDriveSchoolCoachApi.getDlDriveSchoolCoachPage(this.queryParams);
@@ -129,6 +124,10 @@ export default {
     openForm(id) {
       this.$refs["formRef"].open(id);
     },
+    formatType(row) {
+      const type = this.coachTypeList.find(item => item.value === row.type);
+      return type ? type.label : row.type; // 如果找不到则显示原值
+    },
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;

src/views/drivingSchool/schoolCourse/form/DlDriveSchoolCourseForm.vue

@@ -109,7 +109,7 @@
           </el-col>
         </el-row>
 
-        <el-row>
+<!--        <el-row>
           <el-col>
             <el-form-item label="限制年龄段" prop="ageGroup">
               <el-select v-model="formData.ageGroup" placeholder="请选择年龄段">
@@ -122,7 +122,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row>-->
 
         <el-row>
           <el-col>

src/views/drivingSchool/schoolCourse/index.vue

@@ -44,11 +44,11 @@
           {{ scope.row.ifDisplay === '0' ? '开启' : '未开启' }}
         </template>
       </el-table-column>
-      <el-table-column label="限制年龄段" align="center" prop="ageGroup" >
+<!--      <el-table-column label="限制年龄段" align="center" prop="ageGroup" >
         <template #default="scope">
           {{ formatDictLabel(scope.row.ageGroup) }}
         </template>
-      </el-table-column>
+      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改</el-button>

src/views/drivingSchool/student/form/DlDriveSchoolStudentForm.vue

@@ -61,8 +61,15 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="来源" prop="channel">
+              <el-input v-model="formData.channel" placeholder="请输入学员来源"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+<!--        <el-row>
           <el-col :span="12">
             <el-form-item label="拿证时间" prop="passTime">
               <el-date-picker clearable
@@ -83,7 +90,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row>-->
 
         <el-row>
           <el-col :span="24">
@@ -149,6 +156,7 @@ export default {
         lifePhoto: undefined,
         otherPhoto: undefined,
         examinationReport: undefined,
+        channel:undefined,
       },
       // 表单校验
       formRules: {
@@ -216,6 +224,7 @@ export default {
         lifePhoto: undefined,
         otherPhoto: undefined,
         examinationReport:undefined,
+        channel:undefined,
       };
       this.resetForm("formRef");
     }

src/views/drivingSchool/student/index.vue

@@ -5,6 +5,16 @@
       <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="source">
+        <el-select v-model="queryParams.source" placeholder="请选择渠道" clearable>
+          <el-option
+            v-for="source in this.channelList"
+            :key="source.value"
+            :label="source.label"
+            :value="source.value"
+          />
+        </el-select>
+      </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>
@@ -31,6 +41,8 @@
       <el-table-column label="家庭住址" align="center" prop="address"/>
       <el-table-column label="人员类型" align="center" prop="type"/>
       <el-table-column label="学员编号" align="center" prop="drivingStudentCode"/>
+      <el-table-column label="渠道" align="center" prop="source" :formatter="formatChannel"/>
+      <el-table-column label="来源" align="center" prop="channel"/>
       <el-table-column label="教练" align="center" prop="coachName"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -53,6 +65,7 @@
 <script>
 import * as DlDriveSchoolStudentApi from '@/views/drivingSchool/student/studentApi';
 import DlDriveSchoolStudentForm from '@/views/drivingSchool/student/form/DlDriveSchoolStudentForm.vue';
+import {getDictDatas, DICT_TYPE} from '@/utils/dict'
 
 export default {
   name: "DlDriveSchoolStudent",
@@ -88,6 +101,7 @@ export default {
         lifePhoto: null,
         otherPhoto: null,
       },
+      channelList:getDictDatas("drive_school_channel")
     };
   },
   created() {
@@ -101,6 +115,7 @@ export default {
         const res = await DlDriveSchoolStudentApi.getDlDriveSchoolStudentPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
+        console.log('channelList', this.channelList)
       } finally {
         this.loading = false;
       }
@@ -130,6 +145,10 @@ export default {
       } catch {
       }
     },
+    formatChannel(row) {
+      const channel = this.channelList.find(item => item.value === row.source);
+      return channel ? channel.label : row.source; // 如果找不到则显示原值
+    },
     /** 导出按钮操作 */
     async handleExport() {
       await this.$modal.confirm('是否确认导出所有驾校学员数据项?');