修改

src/views/plan/detail.vue

@@ -129,7 +129,7 @@ export default {
             i.start = JSON.parse(JSON.stringify(i.startdate));
             i.end = JSON.parse(JSON.stringify(i.enddate));
             i.title = JSON.parse(JSON.stringify(i.name));
-            delete i.startdate, delete i.enddate, delete i.name;
+            delete i.startdate, delete i.enddate;
             return i;
           });
           return item.batchnum;
@@ -144,9 +144,17 @@ export default {
     },
     //拖拽选择事件
     selectDate(object) {
-      this.$set(this.form, `start`, JSON.parse(JSON.stringify(object.startStr)));
-      this.$set(this.form, `end`, JSON.parse(JSON.stringify(object.endStr)));
+      let start = JSON.parse(JSON.stringify(object.startStr));
+      let end = JSON.parse(JSON.stringify(object.endStr));
+      this.$set(this.form, `start`, start);
+      this.$set(this.form, `end`, end);
+      let res = this.inVacation(start, end);
+      if (!res) {
+        this.$message.warning(`不能将计划安排在假期中!`);
+        return;
+      }
       this.drawer = true;
+      this.formIsNew = true;
     },
     //日历事件点击事件
     eventClick({ event }) {
@@ -232,7 +240,6 @@ export default {
     //添加/修改函数
     setEvent({ data: form, isNew }) {
       //TODO 需要根据班级类型把数据分开
-      console.log(isNew);
       let data = JSON.parse(JSON.stringify(form));
       let { start, end, term, type, number, color, id } = data;
       let object = {};
@@ -241,9 +248,11 @@ export default {
         let { batch, class: classes } = data;
         object = { start, end, term, type, number, color, batch, class: classes };
         object.title = `第${JSON.parse(JSON.stringify(term))}期第${JSON.parse(JSON.stringify(batch))}批次`;
+        object.name = JSON.parse(JSON.stringify(object.title));
       } else {
-        let { name } = data;
-        object = { start, end, term, type, number, color, name, title: name };
+        // let { name } = data;
+        // object = { start, end, term, type, number, color, name, title: name };
+        object = data;
       }
       if (isNew) {
         object.id = `eve${new Date().getTime()}`;
@@ -285,6 +294,7 @@ export default {
           i.color = `red`;
           i.editable = false;
           i.id ? '' : (i.id = `vac${new Date().getTime()}`);
+          i.rendering = 'background';
           return i;
         });
         this.$set(this, `events`, this.selectList.concat(arr));