From f0f200abf841d5d7fe5e2921e6ded8f0147e9c92 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 10 七月 2024 18:02:07 +0800
Subject: [PATCH] feat 用户列表增加部门条件 随机试卷列表增加部门，时间，科目条件 补考直接展示学生 试卷标题默认展示一个
---
src/views/exam/paper/list.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index 7e83170..3b10078 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -3,9 +3,15 @@
<el-form :model="queryParam" ref="queryForm" :inline="true">
<el-form-item label="閮ㄩ棬锛�">
- <el-select v-model="queryParam.level" clearable placeholder="閮ㄩ棬">
+ <!-- <el-select v-model="queryParam.level" clearable placeholder="閮ㄩ棬">
<el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
- </el-select>
+ </el-select> -->
+ <el-cascader
+ clearable
+ v-model="queryParam.level"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
</el-form-item>
<el-form-item label="璇剧洰锛�" >
<el-select v-model="queryParam.subjectId" clearable>
@@ -20,9 +26,10 @@
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectFormatter" width="120px" />
+ <el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectFormatter" />
<el-table-column prop="name" label="鍚嶇О" />
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px" />
+ <el-table-column prop="createDepartment" label="鍒涘缓閮ㄩ棬" />
<el-table-column label="鎿嶄綔" align="center" width="300px">
<template slot-scope="{row}">
<el-button size="mini" @click="$router.push({path:'/exam/paper/edit',query:{id:row.id}})" >缂栬緫</el-button>
@@ -41,7 +48,11 @@
width="550px">
<el-form :model="form" ref="form" :rules="rules">
<el-form-item label="鑰冪敓锛�" prop="menuIds" required>
- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader>
+ <!-- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader> -->
+ <!-- 鏀规垚涓嬫媺 -->
+ <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨">
+ <el-option v-for="item in options" :key="item.id" :label="item.realName" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鏃堕棿锛�" prop="limitDateTime" required v-if="examPaper.paperType === 4">
<el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
@@ -63,6 +74,7 @@
import Pagination from '@/components/Pagination'
import examPaperApi from '@/api/examPaper'
import departmentApi from '@/api/department'
+import userApi from '@/api/user'
export default {
components: { Pagination },
@@ -158,8 +170,9 @@
}
this.dialogVisible = true;
this.examPaper = item;
- departmentApi.getUserByExam(item.id).then(res => {
- this.options = res.response.map(x=>{return{value:x.department.id,label:x.department.name,children:x.userList.map(xx=>{return{value: xx.id,label: xx.realName}})}})
+ console.log('item.id', item.id);
+ userApi.getFailExamUser(item.id).then(res => {
+ this.options = res.response;
})
},
submitUpdate () {
--
Gitblit v1.8.0