diff --git a/src/views/drivingSchool/driveSchoolExamPass/api/pass.js b/src/views/drivingSchool/driveSchoolExamPass/api/pass.js
index f04427f..e582f17 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/api/pass.js
+++ b/src/views/drivingSchool/driveSchoolExamPass/api/pass.js
@@ -1,5 +1,14 @@
import request from '@/utils/request'
+// 获得提成记录分页
+export function getSchoolCommissionPage(params) {
+ return request({
+ url: '/drive/school-commission/page',
+ method: 'get',
+ params
+ })
+}
+
// 查询考试通过列表
export function listPass(query) {
return request({
diff --git a/src/views/drivingSchool/driveSchoolExamPass/index.vue b/src/views/drivingSchool/driveSchoolExamPass/index.vue
index 7a0e4b9..eeee6d5 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/index.vue
+++ b/src/views/drivingSchool/driveSchoolExamPass/index.vue
@@ -1,302 +1,116 @@
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
- 搜索
- 重置
+ 搜索
+ 重置
+
-
-
- 删除
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择字典生成
-
-
-
-
- 请选择字典生成
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择字典生成
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,12 +138,53 @@ export default {
},
data() {
return {
+ readonly:true,
// 弹出层标题
dialogTitle: "",
// 是否显示弹出层
dialogVisible: false,
+ activeNames: ['1','2'],
// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
formLoading: false,
+ statusOptions:[
+ {
+ value:'0',
+ label:'未完成'
+ },
+ {
+ value:'1',
+ label:'训练中'
+ },
+ {
+ value:'2',
+ label:'已完成'
+ }
+ ],
+ examStatusOptions:[
+ {
+ value:null,
+ label:'未送考'
+ },{
+ value:'1',
+ label:'已通过'
+ },{
+ value:'9',
+ label:'已送考'
+ },{
+ value:'0',
+ label:'未通过'
+ }
+ ],
+ financePassOption:[
+ {
+ value:false,
+ label:'未通过'
+ },
+ {
+ value:true,
+ label:'通过'
+ },
+ ],
// 表单参数
formData: {
courseId: undefined,
@@ -100,7 +197,7 @@ export default {
subject: undefined,
examNum: undefined,
status: undefined,
- ifPass: undefined,
+ examStatus: undefined,
examScore: undefined,
images: undefined,
examTime: undefined,
@@ -111,27 +208,28 @@ export default {
},
// 表单校验
formRules: {
- userId: [{ required: true, message: '用户（学员）ID不能为空', trigger: 'blur' }],
- userName: [{ required: true, message: '用户（学员）姓名不能为空', trigger: 'blur' }],
- userMobile: [{ required: true, message: '学员手机号不能为空', trigger: 'blur' }],
- coachId: [{ required: true, message: '教练ID不能为空', trigger: 'blur' }],
- examNum: [{ required: true, message: '考试次数（第一次考试为1，第二次为2...）不能为空', trigger: 'blur' }],
- status: [{ required: true, message: '当前状态（0-未开始;1-训练中；2-已完成）不能为空', trigger: 'blur' }],
- ifPass: [{ required: true, message: '考试是否合格（0未通过；1已通过;null 未考试）不能为空', trigger: 'blur' }],
- examScore: [{ required: true, message: '考试分数不能为空', trigger: 'blur' }],
- images: [{ required: true, message: '图片证明材料不能为空', trigger: 'blur' }],
- examTime: [{ required: true, message: '考试时间不能为空', trigger: 'blur' }],
- remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
- trainTime: [{ required: true, message: '本科目累计训练时长不能为空', trigger: 'blur' }],
- financePass: [{ required: true, message: '财务审核是否通过（0未通过；1通过；null待审核）不能为空', trigger: 'blur' }],
+ // userId: [{ required: true, message: '用户（学员）ID不能为空', trigger: 'blur' }],
+ // userName: [{ required: true, message: '用户（学员）姓名不能为空', trigger: 'blur' }],
+ // userMobile: [{ required: true, message: '学员手机号不能为空', trigger: 'blur' }],
+ // coachId: [{ required: true, message: '教练ID不能为空', trigger: 'blur' }],
+ // examNum: [{ required: true, message: '考试次数（第一次考试为1，第二次为2...）不能为空', trigger: 'blur' }],
+ // status: [{ required: true, message: '当前状态（0-未开始;1-训练中；2-已完成）不能为空', trigger: 'blur' }],
+ // examStatus: [{ required: true, message: '考试是否合格（0未通过；1已通过;null 未考试）不能为空', trigger: 'blur' }],
+ // examScore: [{ required: true, message: '考试分数不能为空', trigger: 'blur' }],
+ // images: [{ required: true, message: '图片证明材料不能为空', trigger: 'blur' }],
+ // examTime: [{ required: true, message: '考试时间不能为空', trigger: 'blur' }],
+ // remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+ // trainTime: [{ required: true, message: '本科目累计训练时长不能为空', trigger: 'blur' }],
+ financePass: [{ required: true, message: '财务审核是否通过不能为空', trigger: 'blur' }],
financeRemark: [{ required: true, message: '财务审核备注不能为空', trigger: 'blur' }],
},
};
},
methods: {
/** 打开弹窗 */
- async open(id) {
+ async open(id,readonly) {
this.dialogVisible = true;
+ this.readonly = readonly
this.reset();
// 修改时，设置数据
if (id) {
@@ -153,17 +251,9 @@ export default {
this.formLoading = true;
try {
const data = this.formData;
- // 修改的提交
- if (data.id) {
- await processApi.updateprocess(data);
- this.$modal.msgSuccess("修改成功");
- this.dialogVisible = false;
- this.$emit('success');
- return;
- }
// 添加的提交
- await processApi.createprocess(data);
- this.$modal.msgSuccess("新增成功");
+ await processApi.checkProcess(data);
+ this.$modal.msgSuccess("审核成功");
this.dialogVisible = false;
this.$emit('success');
} finally {
@@ -183,7 +273,7 @@ export default {
subject: undefined,
examNum: undefined,
status: undefined,
- ifPass: undefined,
+ examStatus: undefined,
examScore: undefined,
images: undefined,
examTime: undefined,
diff --git a/src/views/drivingSchool/process/index.vue b/src/views/drivingSchool/process/index.vue
index a87f125..51109ea 100644
--- a/src/views/drivingSchool/process/index.vue
+++ b/src/views/drivingSchool/process/index.vue
@@ -8,6 +8,9 @@
+
+
+
搜索
重置
@@ -17,51 +20,57 @@
- 新增
-
-
- 导出
+ 新增
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+ 未开始
+ 训练中
+ 已完成
+
+
+
+
+ 未送考
+ 已通过
+ 已送考
+ 未通过
+
+
-
{{ parseTime(scope.row.examTime) }}
-
-
-
-
-
+
+
- 修改
- 删除
+ 待审核
+ 通过
+ 未通过
+
+
+
+
+ 查看
+ 审核
+
-
+
@@ -99,6 +108,7 @@ export default {
pageSize: 10,
courseName: null,
coachName: null,
+ userName: null,
},
};
},
@@ -111,7 +121,7 @@ export default {
try {
this.loading = true;
const res = await processApi.getprocessPage(this.queryParams);
- this.list = res.data.list;
+ this.list = res.data.records;
this.total = res.data.total;
} finally {
this.loading = false;
@@ -128,8 +138,8 @@ export default {
this.handleQuery();
},
/** 添加/修改操作 */
- openForm(id) {
- this.$refs["formRef"].open(id);
+ openForm(id,readonly) {
+ this.$refs["formRef"].open(id,readonly);
},
/** 删除按钮操作 */
async handleDelete(row) {