Merge remote-tracking branch 'origin/master'

src/modules/questions/views/GenPaper.vue

@@ -457,6 +457,7 @@ export default {
         if (course.code == courseNo) {
           return course;
         }
+        return "";
       }
     },
     exportGenPaper(row) {
@@ -465,7 +466,10 @@ export default {
       );
     },
     editGenPaper(row) {
-      this.getCourseName(this.formSearch.courseNo);
+      var course = this.getCourseObj(this.formSearch.courseNo);
+      if (course) {
+        this.formSearch.courseName = course.name;
+      }
       sessionStorage.setItem("gen_paper", JSON.stringify(this.formSearch));
       sessionStorage.setItem("gen_paper_currentPage", this.currentPage);
       this.$router.push({