xiatian 5 жил өмнө
parent
commit
4aa090240b

+ 13 - 6
src/modules/examwork/view/notice.vue

@@ -632,12 +632,12 @@ export default {
       this.searchForm();
     },
     examSelectChange(row) {
-      this.tempSelectedExam = row;
-      var selectedExams = this.selectedExam;
-      if (selectedExams.length > 10) {
+      if (this.getAfterAddCount(this.selectedExam, row) > 10) {
         this.warn("一次最多只能选择10个考试批次!");
         return;
       }
+      this.tempSelectedExam = row;
+      var selectedExams = this.selectedExam;
       row.forEach(element => {
         if (
           !selectedExams.some(se => se.id == element.id) &&
@@ -649,12 +649,12 @@ export default {
       this.selectedExam = selectedExams;
     },
     markSelectChange(row) {
-      this.tempSelectedMark = row;
-      var selectedMarks = this.selectedMark;
-      if (selectedMarks.length > 10) {
+      if (this.getAfterAddCount(this.selectedMark, row) > 10) {
         this.warn("一次最多只能选择10个阅卷工作!");
         return;
       }
+      this.tempSelectedMark = row;
+      var selectedMarks = this.selectedMark;
       row.forEach(element => {
         if (
           !selectedMarks.some(sm => sm.id == element.id) &&
@@ -665,6 +665,13 @@ export default {
       });
       this.selectedMark = selectedMarks;
     },
+    getAfterAddCount(selecteds, row) {
+      const selectedids = selecteds.map(x => x.id);
+      const temcount =
+        row.filter(key => selectedids.includes(key.id) === false).length +
+        selectedids.length;
+      return temcount;
+    },
     handleExamCurrentChange(val) {
       this.examCurrentPage = val;
       this.searchExamForm();