解决冲突

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,60 +688,68 @@
           this.saveCourseLoading = true;
           saveClass(this.objOption).then(res => {
             if (res.Code == 1) {
-              //有上课计划
-              if (res.Data && res.Data.ClassPlanList && res.Data.ClassPlanList.length > 0) {
-                if (this.objOption.ClassDateList.length < 2) {
-                  this.BtnStr = "正在检查排班是否存在冲突";
-                  var newMsg = {
-                    ClassId: res.Data.ClassId,
-                    PlanList: res.Data.ClassPlanList,
-                  }
-                  var NewClassId = res.Data.ClassId;
-                  batchSaveClassPlan(newMsg).then(res => {
-                    this.saveCourseLoading = false
-                    if (res.Code == 1) {
-                      if (res.Data) {
-                        this.$q.notify({
-                          icon: 'iconfont icon-chenggong',
-                          color: 'accent',
-                          timeout: 2000,
-                          message: '数据保存成功！但存在上课冲突数据,请调整。',
-                          position: 'top'
-                        })
-                        this.$emit('getClassFlict', NewClassId);
-                      } else {
-                        this.$q.notify({
-                          icon: 'iconfont icon-chenggong',
-                          color: 'accent',
-                          timeout: 2000,
-                          message: '数据保存成功！',
-                          position: 'top'
-                        })
-                      }
-                      this.$emit("success")
-                      this.closeCourseForm()
-                    }
-                  })
-                }
-              } else {
-                this.saveCourseLoading = false
-                this.$q.notify({
-                  icon: 'iconfont icon-chenggong',
-                  color: 'accent',
-                  timeout: 2000,
-                  message: '数据保存成功！',
-                  position: 'top'
-                })
-                this.$emit("success")
-                this.closeCourseForm()
-              }
+              var newClassId = res.Data.ClassId
+              var PlanList = res.Data.ClassPlanList;
+              // //有上课计划
+              // if (res.Data && res.Data.ClassPlanList && res.Data.ClassPlanList.length > 0 && this.objOption
+              //   .ClassDateList.length < 2) {
+              //   this.checkPlan(newClassId, PlanList)
+              // } else {
+              //   this.refreshForm();
+              // }
+              this.refreshForm();
+            } else {
+              this.$q.notify({
+                type: 'negative',
+                position: "top",
+                message: `操作失败!`
+              })
             }
           }).catch(() => {
-            this.BtnStr="立即提交"
+            this.BtnStr = "立即提交"
             this.saveCourseLoading = false
           })
         }
       },
+      //检查上课计划是否冲突
+      checkPlan(ClassId, ClassPlanList) {
+        this.BtnStr = "正在检查排班是否存在冲突";
+        var newMsg = {
+          ClassId: ClassId,
+          PlanList: ClassPlanList,
+        }
+        var NewClassId = ClassId;
+        batchSaveClassPlan(newMsg).then(res => {
+          this.saveCourseLoading = false
+          if (res.Code == 1) {
+            if (res.Data) {
+              this.$q.notify({
+                icon: 'iconfont icon-chenggong',
+                color: 'accent',
+                timeout: 2000,
+                message: '数据保存成功！但存在上课冲突数据,请调整。',
+                position: 'top'
+              })
+              this.$emit('getClassFlict', NewClassId);
+            } else {
+              this.refreshForm()
+            }
+          }
+        });
+      },
+      //刷新表单
+      refreshForm() {
+        this.saveCourseLoading = false
+        this.$q.notify({
+          icon: 'iconfont icon-chenggong',
+          color: 'accent',
+          timeout: 2000,
+          message: '数据保存成功！',
+          position: 'top'
+        })
+        this.$emit("success");
+        this.closeCourseForm();
+      },
       //获取课程
       getCourseList() {
         queryCourseDropdownList({

src/components/enterprise/material/allAddSC.vue

@@ -545,7 +545,7 @@
                 if (this.type == 5) {//视频上传
                     // 文件类型进行判断
                     const isLt10M = files.size / 1024 / 1024 < 10;
-                    console.log(files)
+             
                     if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(files.type) == -1) {
                         this.$q.notify({
                             type: 'negative',

src/components/enterprise/material/allmaterial.vue

@@ -121,7 +121,7 @@
         }
       },
       created() {
-        console.log('进去所有页面')
+        
       },
       methods: {
         changePage(e){

src/components/enterprise/material/audiomaterial.vue

@@ -91,7 +91,7 @@
                 const isAudio = file.type === "audio/mp3" || file.type === "audio/mpeg";
                 const isLt2M = file.size / 1024 / 1024 < 2;
                 const isTime60S = this.getTimes(file) >= 60 ? true : false;
-                console.log(isTime60S)
+               
                  // 获取时长
                  ;
                 if (!isAudio) {
@@ -118,7 +118,7 @@
                             UploadSelfFile("course", file, res => {
                                 if (res.Code == 1) {
                                     this.addMsg.img = res.FileUrl;
-                                    console.log(res.FileUrl)
+                                     
                                 }
                             });
                         }

src/components/enterprise/material/videomaterial.vue

@@ -92,7 +92,7 @@
                 UploadSelfFile("course", file, res => {
                     if (res.Code == 1) {
                         this.addMsg.img = res.FileUrl;
-                        console.log(res.FileUrl)
+              
                     }
                 });
             },

src/components/enterprise/selectMaterial.vue

@@ -196,7 +196,7 @@
           this.$emit('close')
         },
         getList(){//获取数据
-            console.log('获取数据')
+             
         },
         resetSearch(){
             this.msg.pageIndex = 1;

src/components/system/dict-select-emp.vue

@@ -34,15 +34,7 @@ export default {
             msg: {}
         }
     },
-    // watch: {
-    //     dict: {
-    //         handler(val) {
-    //             this.msg = val
-    //             console.log(this.msg)
-    //         },
-    //         deep: true
-    //     }
-    // },
+ 
     created() {
         try {
             if (!this.multiple) {
@@ -56,9 +48,9 @@ export default {
 
             }
             this.msg = this.dict
-            console.log(this.msg)
+            
         } catch (error) {
-            console.log('错误', error)
+           
         }
 
     },

src/pages/enterprise/addWelcome.vue

@@ -282,7 +282,7 @@
 
             selectxcx(){//图文
                 this.isshowapplet=true;
-                console.log(232323)
+             
                 if(this.$refs.popupproxy){
                     this.$refs.popupproxy.hide()
                 }

src/pages/system/noticeSysSet.vue

@@ -124,7 +124,7 @@
       },
       changeStatus(x){
         x.EditorStatus=!x.EditorStatus
-        console.log(x)
+       
         this.$forceUpdate()
       },
       init(){