Merge branch 'dev_1.2.0' of http://git.qmth.com.cn/union-question/union-question-web into dev_1.2.0

src/modules/questions/views/PaperStorage.vue

@@ -6,7 +6,7 @@
       <el-form class="part-filter-form" :inline="true" :model="formSearch">
         <el-form-item label="课程名称">
           <el-select
-            v-model="formSearch.courseNo"
+            v-model="formSearch.courseId"
             filterable
             :remote-method="getCourses"
             remote
@@ -16,9 +16,9 @@
           >
             <el-option
               v-for="item in courseInfoSelect"
-              :key="item.courseNo"
+              :key="item.courseId"
               :label="item.courseInfo"
-              :value="item.courseNo"
+              :value="item.courseId"
             >
             </el-option>
           </el-select>
@@ -191,7 +191,7 @@ export default {
       isClear: 0,
       courseLoading: false,
       formSearch: {
-        courseNo: "",
+        courseId: "",
         courseName: "",
         creator: "",
         lastModifyName: "",
@@ -252,10 +252,10 @@ export default {
       var courseList = [];
       for (let course of this.courseList) {
         var courseInfo = course.name + "(" + course.code + ")";
-        var courseNo = course.code;
+        var courseId = course.id;
         var courseName = course.name;
         courseList.push({
-          courseNo: courseNo,
+          courseId: courseId,
           courseInfo: courseInfo,
           courseName: courseName,
         });
@@ -276,7 +276,7 @@ export default {
   methods: {
     resetForm() {
       this.formSearch = {
-        courseNo: "",
+        courseId: "",
         courseName: "",
         level: "",
         name: "",
@@ -313,16 +313,16 @@ export default {
       this.currentPage = 1;
       this.searchGenPaper();
     },
-    getCourseObj(courseNo) {
+    getCourseObj(courseId) {
       for (let course of this.courseList) {
-        if (course.code == courseNo) {
+        if (course.courseId == courseId) {
           return course;
         }
       }
       return "";
     },
     viewPaper(row) {
-      var course = this.getCourseObj(this.formSearch.courseNo);
+      var course = this.getCourseObj(this.formSearch.courseId);
       if (course) {
         this.formSearch.courseName = course.name;
       }
@@ -427,7 +427,7 @@ export default {
       if (this.isClear == 0 || !this.isClear) {
         this.removeItem();
         this.formSearch = {
-          courseNo: "",
+          courseId: "",
           courseName: "",
           level: "",
           name: "",

src/modules/questions/views/SelectQuestion.vue

@@ -240,9 +240,19 @@ export default {
                 type: "success",
                 message: "添加成功！",
               });
-              this.$router.push({
-                path: "/edit_paper/" + this.paperId + "/" + this.parentView,
-              });
+              if ("exam_paper_pending_trial" == this.parentView) {
+                this.$router.push({
+                  path:
+                    "/edit_paper_pending_trial/" +
+                    this.paperId +
+                    "/" +
+                    this.parentView,
+                });
+              } else {
+                this.$router.push({
+                  path: "/edit_paper/" + this.paperId + "/" + this.parentView,
+                });
+              }
             })
             .catch(() => {
               this.$notify({