Skip to content

C
confucius
Commit 3a720ea3 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent f38ab0df
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 186 deletions
src/components/teacher/changeClassForm.vue
View file @ 3a720ea3
...@@ -621,78 +621,19 @@ ...@@ -621,78 +621,19 @@
if (this.selected.length > 0) { if (this.selected.length > 0) {
this.msg.OldChangePlanItemList = []; this.msg.OldChangePlanItemList = [];
this.msg.NewChangePlanItemList = []; this.msg.NewChangePlanItemList = [];
let obj = { let newArray = JSON.parse(JSON.stringify(this.selected))
ClassPlanId: 0, newArray.forEach(x=>{
ClassDate: '', x.NewPlan.PlanTimeList = x.TimeList;
TeacherId: 0, delete x.NewPlan.TimeList
ClassRoomId: 0, this.msg.NewChangePlanItemList.push(x.NewPlan)
PlanTimeList: [] })
}
let newObj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
this.selected.forEach(x => { this.selected.forEach(x => {
obj.ClassPlanId = x.ClassPlanId; delete x.NewPlan
obj.ClassDate = x.ClassDate; x.PlanTimeList=x.TimeList
obj.TeacherId = x.TeacherId; delete x.TimeList
obj.ClassRoomId = x.ClassRoomId; this.msg.OldChangePlanItemList.push(x);
x.TimeList.forEach(y => {
let obj2 = {
ClassTimeId: 0,
StartTime: '',
EndTime: ''
}
obj2.StartTime = y.StartTime;
obj2.EndTime = y.EndTime;
obj2.ClassTimeId = y.ClassTimeId;
obj.PlanTimeList.push(obj2);
})
this.msg.OldChangePlanItemList.push(obj);
newObj.ClassPlanId = x.NewPlan.ClassPlanId;
newObj.ClassDate = x.NewPlan.ClassDate;
newObj.TeacherId = x.NewPlan.TeacherId;
newObj.ClassRoomId = x.NewPlan.ClassRoomId;
x.NewPlan.TimeList.forEach(z => {
let obj = {
ClassTimeId: 0,
StartTime: '',
EndTime: ''
}
obj.StartTime = z.StartTime;
obj.EndTime = z.EndTime;
obj.ClassTimeId = z.ClassTimeId;
newObj.PlanTimeList.push(obj);
})
this.msg.NewChangePlanItemList.push(newObj);
}) })
this.msg.AllChangePlanItem = {}; this.msg.AllChangePlanItem = {};
//日期相同 上课时间不能相同
// if(this.msg.OldChangePlanItemList.length>0&&this.msg.NewChangePlanItemList.length>0){
// for(let i=0;i<this.msg.OldChangePlanItemList.length;i++){
// for(let j=0;j<this.msg.NewChangePlanItemList.length;j++){
// if(this.msg.OldChangePlanItemList[i].ClassDate==this.msg.NewChangePlanItemList[j].ClassDate){
// for(let k=0;k<this.msg.OldChangePlanItemList[i].PlanTimeList.length;k++){
// for(let p=0;p<this.msg.NewChangePlanItemList[j].PlanTimeList.length;p++){
// if((this.msg.OldChangePlanItemList[i].PlanTimeList[k].StartTime==this.msg.NewChangePlanItemList[j].PlanTimeList[p].StartTime)&&
// (this.msg.OldChangePlanItemList[i].PlanTimeList[k].EndTime==this.msg.NewChangePlanItemList[j].PlanTimeList[p].EndTime)){
// this.$q.notify({
// type: 'negative',
// position: "top",
// message: `请改变第${p+1}节课目标时间`
// })
// return;
// }
// }
// }
// }
// }
// }
// }
} else { } else {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -722,54 +663,16 @@ ...@@ -722,54 +663,16 @@
} }
this.msg.OldChangePlanItemList = []; this.msg.OldChangePlanItemList = [];
this.msg.NewChangePlanItemList = []; this.msg.NewChangePlanItemList = [];
let obj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
let newObj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
this.selected.forEach(x => { this.selected.forEach(x => {
obj.ClassPlanId = x.ClassPlanId; delete x.NewPlan
obj.ClassDate = x.ClassDate; x.PlanTimeList=x.TimeList
obj.TeacherId = x.TeacherId; delete x.TimeList
obj.ClassRoomId = x.ClassRoomId; this.msg.OldChangePlanItemList.push(x);
x.TimeList.forEach(y => { })
let obj2 = { let Array = JSON.parse(JSON.stringify(this.selected));
ClassTimeId: 0, Array.forEach(x=>{
StartTime: '', x.TeacherId = this.msg.TeacherId
EndTime: '' this.msg.NewChangePlanItemList.push(x);
}
obj2.StartTime = y.StartTime;
obj2.EndTime = y.EndTime;
obj2.ClassTimeId = y.ClassTimeId;
obj.PlanTimeList.push(obj2);
})
this.msg.OldChangePlanItemList.push(obj);
newObj.ClassPlanId = x.NewPlan.ClassPlanId;
newObj.ClassDate = x.NewPlan.ClassDate;
newObj.TeacherId = this.msg.TeacherId;
newObj.ClassRoomId = x.NewPlan.ClassRoomId;
x.NewPlan.TimeList.forEach(z => {
let obj = {
ClassTimeId: 0,
StartTime: '',
EndTime: ''
}
obj.StartTime = z.StartTime;
obj.EndTime = z.EndTime;
obj.ClassTimeId = z.ClassTimeId;
newObj.PlanTimeList.push(obj);
})
this.msg.NewChangePlanItemList.push(newObj);
}) })
this.msg.AllChangePlanItem = {}; this.msg.AllChangePlanItem = {};
} else { } else {
...@@ -800,54 +703,16 @@ ...@@ -800,54 +703,16 @@
} }
this.msg.OldChangePlanItemList = []; this.msg.OldChangePlanItemList = [];
this.msg.NewChangePlanItemList = []; this.msg.NewChangePlanItemList = [];
let obj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
let newObj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
this.selected.forEach(x => { this.selected.forEach(x => {
obj.ClassPlanId = x.ClassPlanId; delete x.NewPlan
obj.ClassDate = x.ClassDate; x.PlanTimeList=x.TimeList
obj.TeacherId = x.TeacherId; delete x.TimeList
obj.ClassRoomId = x.ClassRoomId; this.msg.OldChangePlanItemList.push(x);
x.TimeList.forEach(y => { })
let obj2 = { let Array = JSON.parse(JSON.stringify(this.selected));
ClassTimeId: 0, Array.forEach(x=>{
StartTime: '', x.ClassRoomId = this.msg.ClassRoomId
EndTime: '' this.msg.NewChangePlanItemList.push(x);
}
obj2.StartTime = y.StartTime;
obj2.EndTime = y.EndTime;
obj2.ClassTimeId = y.ClassTimeId;
obj.PlanTimeList.push(obj2);
})
this.msg.OldChangePlanItemList.push(obj);
newObj.ClassPlanId = x.NewPlan.ClassPlanId;
newObj.ClassDate = x.NewPlan.ClassDate;
newObj.TeacherId = x.NewPlan.TeacherId;
newObj.ClassRoomId = this.msg.ClassRoomId;
x.NewPlan.TimeList.forEach(z => {
let obj = {
ClassTimeId: 0,
StartTime: '',
EndTime: ''
}
obj.StartTime = z.StartTime;
obj.EndTime = z.EndTime;
obj.ClassTimeId = z.ClassTimeId;
newObj.PlanTimeList.push(obj);
})
this.msg.NewChangePlanItemList.push(newObj);
}) })
this.msg.AllChangePlanItem = {}; this.msg.AllChangePlanItem = {};
} else { } else {
...@@ -870,30 +735,11 @@ ...@@ -870,30 +735,11 @@
if (this.selected.length > 0) { if (this.selected.length > 0) {
this.msg.OldChangePlanItemList = []; this.msg.OldChangePlanItemList = [];
this.msg.NewChangePlanItemList = []; this.msg.NewChangePlanItemList = [];
let obj = {
ClassPlanId: 0,
ClassDate: '',
TeacherId: 0,
ClassRoomId: 0,
PlanTimeList: []
}
this.selected.forEach(x => { this.selected.forEach(x => {
obj.ClassPlanId = x.ClassPlanId; delete x.NewPlan
obj.ClassDate = x.ClassDate; x.PlanTimeList=x.TimeList
obj.TeacherId = x.TeacherId; delete x.TimeList
obj.ClassRoomId = x.ClassRoomId; this.msg.OldChangePlanItemList.push(x);
x.TimeList.forEach(y => {
let obj2 = {
ClassTimeId: 0,
StartTime: '',
EndTime: ''
}
obj2.StartTime = y.StartTime;
obj2.EndTime = y.EndTime;
obj2.ClassTimeId = y.ClassTimeId;
obj.PlanTimeList.push(obj2);
})
this.msg.OldChangePlanItemList.push(obj);
}) })
this.msg.AllChangePlanItem = {}; this.msg.AllChangePlanItem = {};
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment