Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/class-form.vue

@@ -640,14 +640,32 @@
               })
               return
             }
-            if (this.DefaultPlanTimeList[i].DateList.length == 0) {
+            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",
-                message: `请选择第${i+1}行周几`
+                  message: `请填写第${i+1}行，第${j+1}个开始时间`
+                })
+                return
+              }
+              if(this.DefaultPlanTimeList[i].TimeList[j].EndTime==''){
+                this.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: `请填写第${i+1}行，第${j+1}个结束时间`
                 })
                 return
               }
+              if(this.DefaultPlanTimeList[i].TimeList[j].TimeHour==''){
+                this.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: `请填写第${i+1}行，第${j+1}个的课时`
+                })
+                return
+              }
+            }
           }
         }
         if (!this.$refs.ClassName.hasError && !this.$refs.ClassPersion.hasError) {
@@ -802,6 +820,7 @@
           TimeList: [{
             StartTime: "",
             EndTime: "",
+            TimeHour: ''
           }],
         }
         this.DefaultPlanTimeList.push(planObj);
@@ -826,6 +845,7 @@
         var obj = {
           StartTime: "",
           EndTime: "",
+          TimeHour: ''
         }
         item.TimeList.push(obj);
       },