页面修改

src/components/course/class-form.vue

@@ -640,8 +640,8 @@
               })
               return
             }
-            for(let j = 0; j < this.DefaultPlanTimeList[i].TimeList.length;j++ ){
-              if(this.DefaultPlanTimeList[i].TimeList[j].StartTime==''){
+            for (let j = 0; j < this.DefaultPlanTimeList[i].TimeList.length; j++) {
+              if (this.DefaultPlanTimeList[i].TimeList[j].StartTime == '') {
                 this.$q.notify({
                   type: 'negative',
                   position: "top",
@@ -649,7 +649,7 @@
                 })
                 return
               }
-              if(this.DefaultPlanTimeList[i].TimeList[j].EndTime==''){
+              if (this.DefaultPlanTimeList[i].TimeList[j].EndTime == '') {
                 this.$q.notify({
                   type: 'negative',
                   position: "top",
@@ -657,7 +657,7 @@
                 })
                 return
               }
-              if(this.DefaultPlanTimeList[i].TimeList[j].TimeHour==''){
+              if (this.DefaultPlanTimeList[i].TimeList[j].TimeHour == '') {
                 this.$q.notify({
                   type: 'negative',
                   position: "top",
@@ -688,15 +688,30 @@
           this.saveCourseLoading = true;
           saveClass(this.objOption).then(res => {
             if (res.Code == 1) {
+              var newClassId = res.Data.ClassId
+              var PlanList = res.Data.ClassPlanList;
               //有上课计划
-              if (res.Data && res.Data.ClassPlanList && res.Data.ClassPlanList.length > 0) {
-                if (this.objOption.ClassDateList.length < 2) {
+              if (res.Data && res.Data.ClassPlanList && res.Data.ClassPlanList.length > 0 && this.objOption
+                .ClassDateList.length < 2) {
+                this.checkPlan(newClassId, PlanList)
+              } else {
+                this.refreshForm();
+              }
+            }
+          }).catch(() => {
+            this.BtnStr = "立即提交"
+            this.saveCourseLoading = false
+          })
+        }
+      },
+      //检查上课计划是否冲突
+      checkPlan(ClassId, ClassPlanList) {
         this.BtnStr = "正在检查排班是否存在冲突";
         var newMsg = {
-                    ClassId: res.Data.ClassId,
-                    PlanList: res.Data.ClassPlanList,
+          ClassId: ClassId,
+          PlanList: ClassPlanList,
         }
-                  var NewClassId = res.Data.ClassId;
+        var NewClassId = ClassId;
         batchSaveClassPlan(newMsg).then(res => {
           this.saveCourseLoading = false
           if (res.Code == 1) {
@@ -710,20 +725,13 @@
               })
               this.$emit('getClassFlict', NewClassId);
             } else {
-                        this.$q.notify({
-                          icon: 'iconfont icon-chenggong',
-                          color: 'accent',
-                          timeout: 2000,
-                          message: '数据保存成功！',
-                          position: 'top'
-                        })
+              this.refreshForm()
             }
-                      this.$emit("success")
-                      this.closeCourseForm()
-                    }
-                  })
           }
-              } else {
+        });
+      },
+      //刷新表单
+      refreshForm() {
         this.saveCourseLoading = false
         this.$q.notify({
           icon: 'iconfont icon-chenggong',
@@ -732,15 +740,8 @@
           message: '数据保存成功！',
           position: 'top'
         })
-                this.$emit("success")
-                this.closeCourseForm()
-              }
-            }
-          }).catch(() => {
-            this.BtnStr="立即提交"
-            this.saveCourseLoading = false
-          })
-        }
+        this.$emit("success");
+        this.closeCourseForm();
       },
       //获取课程
       getCourseList() {