diff --git a/src/views/teach-log/teach-log.vue b/src/views/teach-log/teach-log.vue index a3bc9df..17d5f6f 100644 --- a/src/views/teach-log/teach-log.vue +++ b/src/views/teach-log/teach-log.vue @@ -146,7 +146,7 @@ - @@ -157,7 +157,7 @@ - @@ -317,7 +317,7 @@ --> - @@ -507,6 +507,15 @@ export default { ClassroomCode: [ { required: true, message: '教室不能为空', trigger: 'change' }, ], + ClassCode: [ + { required: true, message: '班级不能为空', trigger: 'change' }, + ], + Date: [ + { required: true, message: '日期不能为空', trigger: 'change' }, + ], + Time: [ + { required: true, message: '时间不能为空', trigger: 'change' }, + ], TeacherName: [ { required: true, message: '教师不能为空', trigger: 'change' }, ], @@ -624,6 +633,11 @@ export default { message: '导入失败', type: 'error' }); + } else if (data == 10){ + this.$message({ + message: '上课时间安排不合理,课程间隔需大于15分钟', + type: 'error' + }); } else { const datas = data.split(';'); const column = datas[1].match(/\d+/)[0]; @@ -1039,7 +1053,7 @@ export default { CollegeChange() { this.classformItem.MajorCode = ""; this.classformItem.MajorCodename = ""; - this.classformItem.ClassCode = ""; + this.formItem.ClassCode = ""; this.classformItem.ClassCodename = ""; this.classformItem.Gradename = ""; this.getNewMajorListinfo('c'); @@ -1064,7 +1078,7 @@ export default { return item.value === e; // 筛选出匹配数据 }); this.classformItem.MajorCodename = obj.name; - this.classformItem.ClassCode = ""; + this.formItem.ClassCode = ""; this.classformItem.ClassCodename = ""; this.classformItem.Gradename = ""; this.getNewClassListinfo(''); @@ -1088,7 +1102,7 @@ export default { return item.value === e; // 筛选出匹配数据 }); this.classformItem.Gradename = obj.value; - this.classformItem.ClassCode = ""; + this.formItem.ClassCode = ""; this.classformItem.ClassCodename = ""; this.getNewClassListinfo(this.classformItem.Gradename) }, @@ -1099,7 +1113,7 @@ export default { /* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源 return item.value === e; // 筛选出匹配数据 }); - this.classformItem.ClassCode = obj.value; + this.formItem.ClassCode = obj.value; this.classformItem.ClassCodename = obj.name; */ @@ -1247,9 +1261,9 @@ export default { console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(',')); - this.classformItem = { + /* this.formItem = { ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','), - } + } */ // Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`, this.IsOutSide = data.IsOutSide== true ? '2' : '1', @@ -1262,7 +1276,7 @@ export default { SchoolAreaCode: data.SchoolAreaCode, CollegeCode: data.CollegeCode, MajorCode: data.MajorCode, - ClassCode: data.ClassCode, + ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','), BuildingCode: data.BuildingCode, Date: data.Date, falseDate: data.falseDate, @@ -1339,7 +1353,7 @@ export default { // } let vm = this; let flag1 = vm.zhaunclasslist.findIndex( - (item) => item.ClassCode === vm.classformItem.ClassCode + (item) => item.ClassCode === vm.formItem.ClassCode ); if (flag1 !== -1) { //存在 @@ -1349,7 +1363,7 @@ export default { // debugger; vm.zhaunclasslist.push({ MajorCode: vm.classformItem.MajorCode, - ClassCode: vm.classformItem.ClassCode, + ClassCode: vm.formItem.ClassCode, ClassCodename: vm.classformItem.ClassCodename, MajorCodename: vm.classformItem.MajorCodename, }); @@ -1396,7 +1410,7 @@ export default { return false; } */ - this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',') + this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',') console.log(this.formItem.Date); console.log(this.formItem.Time); @@ -1406,7 +1420,7 @@ export default { SchoolAreaCode: 1, // 校区Code,必填 CollegeCode: 101, // 学院Code,单个Code值,必填 MajorCode: this.classformItem.MajorCode, //专业Code,可多个Code值 - ClassCode: this.classformItem.ClassCode.join(','), //班级Code,可多个Code值,必填 + ClassCode: this.formItem.ClassCode == '' ? '' : this.formItem.ClassCode.join(','), //班级Code,可多个Code值,必填 BuildingCode: '001', //楼Code ClassroomCode: vm.formItem.ClassroomCode, //教室Code Weeks: 1, //上课周次 例如,1,2, 代表第一周和第二周 @@ -1558,6 +1572,11 @@ export default { type: 'error' }); + } else if (data == 19) { + this.$message({ + message: '日期有误', + type: 'error' + }); } else { this.$message({ message: '新增失败', @@ -1593,7 +1612,7 @@ export default { return false; } - this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',') + this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',') let datas = { AcademicNumber: vm.formItem.AcademicNumber, //自动生成,不需填写 @@ -1601,7 +1620,7 @@ export default { SchoolAreaCode: vm.formItem.SchoolAreaCode, // 校区Code,必填 CollegeCode: vm.formItem.CollegeCode, // 学院Code,单个Code值,必填 MajorCode: this.classformItem.MajorCode, //专业Code,可多个Code值 - ClassCode: this.classformItem.ClassCode.join(','), //班级Code,可多个Code值,必填 + ClassCode: this.formItem.ClassCode.join(','), //班级Code,可多个Code值,必填 BuildingCode: vm.formItem.BuildingCode, //楼Code ClassroomCode: vm.formItem.ClassroomCode, //教室Code Weeks: vm.formItem.Weeks.toString(), //上课周次 例如,1,2, 代表第一周和第二周 @@ -1776,7 +1795,7 @@ export default { this.AddInitialization(); this.zhaunclasslist = []; this.$refs[formName].resetFields(); - this.classformItem.ClassCode = '' + this.formItem.ClassCode = '' }, editresetForm(formName) {