From b62c6c9ab29e933fd0333ac183ef837d00aba5d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/exam/paper/edit.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index a453700..b9c2e96 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -155,6 +155,7 @@
           </el-select> -->
           <el-cascader
           clearable
+          collapse-tags
           v-model="student.deptIds"
           :options="depts"
           :props="{ emitPath: false, multiple: true, value: 'id', label: 'name',  checkStrictly: true }"
@@ -287,6 +288,7 @@
       _this.subjectFilter = _this.subjects;
     });
     if (id && parseInt(id) !== 0) {
+      _this.selectAllBoolean = false;
       _this.formLoading = true;
       examPaperApi.select(id).then(re => {
         const { userIds, userNames } = re.response;
@@ -330,20 +332,20 @@
       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.selectAllBoolean = false;
         })
         this.getStudent();
       });
     },
     unselectAll () {
-      this.selectAllBoolean = true;
       this.$refs.multipleTable.clearSelection();
+      this.selectAllBoolean = true;
     },
     getStudent() {
       this.student.listLoading = true;

--
Gitblit v1.8.0