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/personalRandomTemplate/edit.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index b559b0d..6bd5423 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -14,6 +14,7 @@
</el-select> -->
<el-cascader
clearable
+ @change="getSubject"
v-model="form.deptId"
:options="depts"
:props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true }"
@@ -49,7 +50,7 @@
</el-col>
</el-row>
</el-form-item>
- <el-form-item :key="item.subjectId" :label="item.label" required v-for="(item, key) in form.questionTypeVMS"
+ <!-- <el-form-item :key="item.subjectId" :label="item.label" required v-for="(item, key) in form.questionTypeVMS"
v-if="form.paperType == 7">
<el-row>
<el-col :span="3">
@@ -72,7 +73,7 @@
<el-input v-model="form.questionTypeVMS[key].trueFalse" style="width: 80%" />
</el-col>
</el-row>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="鎬绘暟鍒嗭細" v-if="form.paperType==7" prop="name" required>-->
<!-- <el-input v-model="form.name"/>-->
<!-- </el-form-item>-->
@@ -167,8 +168,9 @@
<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" @select-all="selectAll">
+ style="width: 100%" @selection-change="handleSelection" row-key="id">
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
<el-table-column prop="realName" label="瀛﹀憳" />
</el-table>
@@ -198,6 +200,7 @@
data() {
return {
+ selectAllBoolean: true,
tags: [],
studentDialog: false,
student: {
@@ -349,16 +352,24 @@
})
},
handleSelection(val) {
- console.log('val', val);
this.student.multipleSelection = val;
},
- selectAll() {
+ 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();
+ },
confirmStudentSelect() {
this.form.userIds = this.student.multipleSelection.map((item) => item.id);
this.form.examineeList = this.student.multipleSelection.map((item) => {
--
Gitblit v1.8.0