From 558fbd9d6fbb10a8cc674a10213c395ab8ee3d95 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 09:53:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/views/exam/paper/edit.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index cbe9c5f..9936316 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -9,9 +9,16 @@
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�" prop="deptId" required>
- <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="閮ㄩ棬">
+ <!-- <el-select v-model="form.deptId" collapse-tags @change="getSubject" 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
+ @change="getSubject"
+ v-model="form.deptId"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
</el-form-item>
<el-form-item label="璇剧洰锛�" prop="subjectId" required>
<el-select ref="subjectIdRef" v-model="form.subjectId" :disabled="! form.deptId" placeholder="璇剧洰" multiple collapse-tags>
@@ -143,14 +150,21 @@
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�">
- <el-select v-model="student.deptIds" clearable multiple>
+ <!-- <el-select v-model="student.deptIds" clearable multiple>
<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="student.deptIds"
+ :options="depts"
+ :props="{ emitPath: false, multiple: true, value: 'id', label: 'name', checkStrictly: true }"
+ ></el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="selectStudent">鏌ヨ</el-button>
</el-form-item>
</el-form>
+ <el-button type="primary" @click="selectAllBoolean ? selectAll() : unselectAll()">{{ selectAllBoolean ? '鍏ㄩ��' : '鍙栨秷鍏ㄩ��' }}</el-button>
<el-table ref="multipleTable" v-loading="student.listLoading" :data="tableData" border fit highlight-current-row
style="width: 100%" @selection-change="handleSelection" row-key="id">
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
@@ -181,6 +195,7 @@
components: { Pagination, QuestionShow },
data() {
return {
+ selectAllBoolean: true,
tags: [],
depts: [],
studentDialog: false,
@@ -311,7 +326,22 @@
this.student.listLoading = true;
this.getStudent();
},
-
+ selectAll () {
+ this.selectAllBoolean = false;
+ let param = { ...this.student };
+ param.pageSize = 999999;
+ examPaperApi.selectStudent(param).then(res => {
+ this.handleSelection(res.response.list);
+ res.response.list.forEach(item => {
+ this.$refs.multipleTable.toggleRowSelection(item, true);
+ })
+ this.getStudent();
+ });
+ },
+ unselectAll () {
+ this.selectAllBoolean = true;
+ this.$refs.multipleTable.clearSelection();
+ },
getStudent() {
this.student.listLoading = true;
examPaperApi.selectStudent(this.student).then(res => {
--
Gitblit v1.8.0