Merge branch 'tmp_meeting_needs'

src/views/activeProgram/program.vue

@@ -549,15 +549,21 @@ export default {
                     return;
                 }
             }
-
-            let onlineClassesStatus = !form.onlineClassesNums && form.onlineClassesNums <= 0 ? true : false;
-            let offlineClassesStatus = !form.offlineClassesNums && form.offlineClassesNums <= 0 ? true : false;
-
+            let onlineNums = form.onlineClassesNums
+            if(form.onlineClassesNums.length > 0) {
+                onlineNums = Number(form.onlineClassesNums)
+            }
+            let offlineNums = form.offlineClassesNums
+            if(form.offlineClassesNums.length > 0) {
+                offlineNums = Number(form.offlineClassesNums)
+            }
+            let onlineClassesStatus = onlineNums === "" ? true : false;
+            let offlineClassesStatus = offlineNums === "" ? true : false;
             if (statusList.hasOnline && onlineClassesStatus) {
                 this.$toast("请输入线上课次数");
                 return false;
             }
-            if (statusList.hasOffline && !statusList.hasOnline) {
+            if (statusList.hasOffline) {
                 if (offlineClassesStatus) {
                     this.$toast("请输入线下课次数");
                     return false;
@@ -587,6 +593,11 @@ export default {
                 return;
             }
             // 排课
+            const checkmMsg = this.checkTimeTable()
+            if (checkmMsg) {
+                this.$toast(checkmMsg)
+                return
+            }
             this.setTimeTable();
 
             form.studentIdList = this.checkboxSelectIds.join(",");
@@ -597,6 +608,7 @@ export default {
             let params = {
                 courseSchedules: this.timeTable
             }
+            // return
             if(this.courseTypeIsVip) {
                 params.vipGroupApplyBaseInfo = form
                 params.giveFlag = !this.typeStatus
@@ -804,7 +816,6 @@ export default {
                             startClassTimeStr: scheduleList[i].startTime,
                             endClassTimeStr: scheduleList[i].endTime,
                         };
-                        // console.log(scheduleList[i].type, online, offline)
                         if (scheduleList[i].type == "线上" && online > 0) {
                             tempArr.teachMode = "ONLINE";
                             this.timeTable.push(tempArr);