Merge branch 'tmp_meeting_needs' into test

src/views/audition/CourseEvaluation.vue

@@ -280,7 +280,7 @@ export default {
   },
   methods: {
     submitReview() {
-      if(!this.isAssignHomework && !this.enableAssignHomework) {
+      if(!this.isAssignHomework && this.enableAssignHomework) {
         this.$toast('请布置课后训练')
         return
       }
@@ -355,41 +355,51 @@ export default {
       if(this.isAssignHomework == 1) {
         return
       }
-      if (this.enableAssignHomework == 1) {
-        this.$dialog
-          .confirm({
-            message: "您课程所在周已经布置作业，是否继续布置?",
-            confirmButtonText: "布置作业",
-            confirmButtonColor: '#01C1B5'
-          })
-          .then(() => {
-            // on confirm
-            sessionStorage.setItem('courseEvaluationObj', JSON.stringify(obj))
-            this.$router.push({
-              path: "/arrangeWork",
-              query: {
-                courseId: this.courseId,
-                memberNum: this.memberStatus,
-                classGroupName: this.classGroupName,
-                ...this.$route.query
-              }
-            });
-          })
-          .catch(() => {
-            // on cancel
-          });
-      } else {
-        sessionStorage.setItem('courseEvaluationObj', JSON.stringify(obj))
-        this.$router.push({
-          path: "/arrangeWork",
-          query: {
-            courseId: this.courseId,
-            memberNum: this.memberStatus,
-            classGroupName: this.classGroupName,
-            ...this.$route.query
-          },
-        });
-      }
+      sessionStorage.setItem('courseEvaluationObj', JSON.stringify(obj))
+      this.$router.push({
+        path: "/arrangeWork",
+        query: {
+          courseId: this.courseId,
+          memberNum: this.memberStatus,
+          classGroupName: this.classGroupName,
+          ...this.$route.query
+        },
+      });
+      // if (this.enableAssignHomework == 1) {
+      //   this.$dialog
+      //     .confirm({
+      //       message: "您课程所在周已经布置作业，是否继续布置?",
+      //       confirmButtonText: "布置作业",
+      //       confirmButtonColor: '#01C1B5'
+      //     })
+      //     .then(() => {
+      //       // on confirm
+      //       sessionStorage.setItem('courseEvaluationObj', JSON.stringify(obj))
+      //       this.$router.push({
+      //         path: "/arrangeWork",
+      //         query: {
+      //           courseId: this.courseId,
+      //           memberNum: this.memberStatus,
+      //           classGroupName: this.classGroupName,
+      //           ...this.$route.query
+      //         }
+      //       });
+      //     })
+      //     .catch(() => {
+      //       // on cancel
+      //     });
+      // } else {
+      //   sessionStorage.setItem('courseEvaluationObj', JSON.stringify(obj))
+      //   this.$router.push({
+      //     path: "/arrangeWork",
+      //     query: {
+      //       courseId: this.courseId,
+      //       memberNum: this.memberStatus,
+      //       classGroupName: this.classGroupName,
+      //       ...this.$route.query
+      //     },
+      //   });
+      // }
     },
     onClose() {
       // 关闭弹窗