|
@@ -264,6 +264,18 @@ export default {
|
|
const ri = lessons.findIndex(f => f._id === _id);
|
|
const ri = lessons.findIndex(f => f._id === _id);
|
|
r = { ...r, ...info };
|
|
r = { ...r, ...info };
|
|
lessons[ri] = r;
|
|
lessons[ri] = r;
|
|
|
|
+ let test = lessons.filter(f => f.date === r.date && f.subid && f._id !== r._id);
|
|
|
|
+ console.log(test);
|
|
|
|
+ let sameDay = lessons.find(f => f.date === r.date && f.subid && f._id !== r._id);
|
|
|
|
+ console.log(sameDay);
|
|
|
|
+ if (sameDay) {
|
|
|
|
+ const { teaid, teaname, reason } = data;
|
|
|
|
+ sameDay.teaid = teaid;
|
|
|
|
+ sameDay.teaname = teaname;
|
|
|
|
+ sameDay.reason = reason;
|
|
|
|
+ let sameDayIndex = lessons.findIndex(f => f.date === r.date && f.subid && f._id !== r._id);
|
|
|
|
+ lessons[sameDayIndex] = sameDay;
|
|
|
|
+ }
|
|
lobj.lessons = lessons;
|
|
lobj.lessons = lessons;
|
|
let msg = this.$message({ duration: 0, message: '正在修改课程信息,请稍后...' });
|
|
let msg = this.$message({ duration: 0, message: '正在修改课程信息,请稍后...' });
|
|
const res = await this.lessonUpdate(lobj);
|
|
const res = await this.lessonUpdate(lobj);
|
|
@@ -287,7 +299,6 @@ export default {
|
|
let { lessons } = lobj;
|
|
let { lessons } = lobj;
|
|
if (!lessons || !_.isArray(lessons)) continue;
|
|
if (!lessons || !_.isArray(lessons)) continue;
|
|
let ncList = lessons.filter(f => f.date === date && f.teaid === teaid);
|
|
let ncList = lessons.filter(f => f.date === date && f.teaid === teaid);
|
|
- console.log(ncList);
|
|
|
|
// 该班课表,该天,没有该教师了,继续下一个
|
|
// 该班课表,该天,没有该教师了,继续下一个
|
|
if (ncList.length <= 0) continue;
|
|
if (ncList.length <= 0) continue;
|
|
// 要是有,就改了,然后放到needUpdate中
|
|
// 要是有,就改了,然后放到needUpdate中
|