zhangjie 1 năm trước cách đây
mục cha
commit
09c7e1da17

+ 1 - 0
src/modules/base/views/RoleManage.vue

@@ -185,6 +185,7 @@ export default {
     },
     toAdd() {
       this.curRole = {};
+      this.viewMode = false;
       this.$refs.ModifyRole.open();
     },
     toEdit(row) {

+ 11 - 2
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -610,7 +610,10 @@ export default {
         this.modalForm.classId = this.model2ClassIds.join();
         this.model2Students = selectedStudents
           .map((item) => item.children)
-          .flat();
+          .flat()
+          .map((item) => {
+            return { ...item, enable: true };
+          });
         if (this.IS_REBUILD) {
           this.modalForm.totalSubjects = this.model2Students.length;
         }
@@ -644,6 +647,7 @@ export default {
     },
     toViewStudent(row) {
       // console.log(row);
+      this.curRow = row;
       this.examStudentList = row.examTaskStudentObjectParamList;
       this.$refs.PreviewTaskStudent.open();
     },
@@ -652,10 +656,15 @@ export default {
       this.$refs.PreviewTaskStudent.open();
     },
     previewStudentClosed() {
-      const studentCount = this.curRow.examTaskStudentObjectParamList.filter(
+      const studentCount = this.examStudentList.filter(
         (item) => item.enable
       ).length;
 
+      if (this.IS_MODEL2 || this.IS_REBUILD) {
+        this.modalForm.totalSubjects = studentCount;
+        return;
+      }
+
       Object.assign(this.curRow, {
         ...this.getBackupCount(studentCount),
         studentCount,