diff --git a/src/views/build-information/build-information.vue b/src/views/build-information/build-information.vue index 592b739..019cb94 100644 --- a/src/views/build-information/build-information.vue +++ b/src/views/build-information/build-information.vue @@ -56,7 +56,7 @@
- diff --git a/src/views/collage-information/collage-information.vue b/src/views/collage-information/collage-information.vue index 4853693..8613a85 100644 --- a/src/views/collage-information/collage-information.vue +++ b/src/views/collage-information/collage-information.vue @@ -19,7 +19,7 @@
+ clearable style="width: 300px;"/> + placeholder="请选择教师" clearable @change="handleChange"> @@ -716,6 +716,14 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { // let content = this.phoneEditor.txt.text();//文字 + + var cn = '' + if(this.formItem.counselorsNumber == '' || this.formItem.counselorsNumber == null || this.formItem.counselorsNumber == undefined){ + cn = '' + }else{ + cn = this.formItem.counselorsNumber.join(',') + } + let datas = { ClassinfoId: this.formItem.ClassInfoId, Name: this.formItem.Name, @@ -733,7 +741,7 @@ export default { HeadTeacherNum: '', - counselorsNumber: this.formItem.counselorsNumber.join(',') + counselorsNumber: cn }; console.log(datas); diff --git a/src/views/student-information/student-information.vue b/src/views/student-information/student-information.vue index 115191d..3c18064 100644 --- a/src/views/student-information/student-information.vue +++ b/src/views/student-information/student-information.vue @@ -22,14 +22,14 @@ --> - + style="margin:0px 20px 0px 0px"> + style="margin:0px 20px 0px 0px"> 搜索 @@ -132,24 +132,24 @@

基本信息

- - + + - - + - - + + - - + +

联系方式

- - + + @@ -145,29 +145,36 @@
- - + - + - + - - + + + + + + + - + - + - +
- @@ -353,6 +360,7 @@ import { import { nanoid } from 'nanoid' import { getsplit } from "@/utils/common.js" import teacherSelect from "@/components/teacherselect.vue"; +import { getTeacherSelectList } from "@/api/collegeinformation.js"; import { getAddClassroonList, postaddinfo, posteditinfo, getNewMajorList, getNewClassList, getdefaultValues, getNewGradeList, getNewCollegeList, getAddWeekList, getAddSectionList, getStatusList, getTeacherNameList, getTermList, getCollegeList, getClassroomList, getWeekList, getSectionList, getTabledata, getSchoolAreaList, getBuildingList, delTeachingLog, getweektime, getedit } from "@/api/teachlog.js" export default { name: 'teach-log_index', @@ -516,7 +524,7 @@ export default { Time: [ { required: true, message: '时间不能为空', trigger: 'change' }, ], - TeacherName: [ + TeacherNumber: [ { required: true, message: '教师不能为空', trigger: 'change' }, ], Weeks: [ @@ -547,7 +555,9 @@ export default { NewCollegeList: [], //数组-----学院 NewMajorList: [], //数组-----专业 NewGradeList: [], //数组-----年级 - NewClassList: [], //数组-----班级 + NewClassLists: [], //数组-----班级 + + NewClassList: [], //教师-----班级 //添加---form参数 // Form: { // College: '', //添加---学院 @@ -635,7 +645,7 @@ export default { }); } else if (data == 10){ this.$message({ - message: '上课时间安排不合理，课程间隔需大于15分钟', + message: '上课时间安排不合理，课程间隔需大于10分钟', type: 'error' }); } else { @@ -905,7 +915,7 @@ export default { getAddClassroonListinfo(signal) { getAddClassroonList( { - rCode: this.formItem.BuildingCode || '', + rCode: '', signal: 'b', } ).then((res) => { @@ -1110,7 +1120,7 @@ export default { classSelectclasscode(e) { //弹框里选择班级 let obj = {}; - /* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源 + /* obj = this.NewClassLists.find((item) => { // 这里的userList就是上面遍历的数据源 return item.value === e; // 筛选出匹配数据 }); this.formItem.ClassCode = obj.value; @@ -1127,7 +1137,7 @@ export default { majorCode: 'e3649c', grade: '', }).then((res) => { - this.NewClassList = res + this.NewClassLists = res }).catch((err) => { // console.log('班级信息请求错误'); }) @@ -1253,7 +1263,6 @@ export default { geteditdeails(id) { //获取详情 getedit({ gtid: id }).then((res) => { - let data = res; // 时间 @@ -1296,6 +1305,8 @@ export default { CourceCode: data.CourceCode, CourceType: data.CourceType == "" ? "必修" : data.CourceType, IsByDate:data.IsByDate==true?'1':'2', + + TeacherNumber:data.TeacherNumber == undefined ? '' : data.TeacherNumber.replace(/"([^"]*)"/, '$1').split(',') // SchoolArea: '', //校区 // Term: '', //学期 // College: '', //学院 @@ -1394,6 +1405,12 @@ export default { this.formItem.TeacherNumber = '' this.formItem.TeacherTitle = '' }, + handleChanges(e) { + if (this.formItem.TeacherNumber.length > 3) { + this.formItem.TeacherNumber.pop(); + this.$message.warning('最多只能选择3名教师'); + } + }, submitForm(formName) { //新增提交 let vm = this; @@ -1413,6 +1430,17 @@ export default { this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',') console.log(this.formItem.Date); console.log(this.formItem.Time); + + const arrT = this.formItem.TeacherNumber + const objT = this.NewClassList + + const commonElements = arrT.map(number => + objT.find(obj => obj.Number === number) + ).filter(Boolean); + + const namesString = commonElements.map(obj => obj.Name).join(', '); + + this.formItem.TeacherTitle = commonElements[0].Title let datas = { AcademicNumber: '', //自动生成，不需填写 @@ -1432,8 +1460,8 @@ export default { Grade: "", //年级 IsValid: vm.formItem.IsValid, //是否有效 xnw:'1', - TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //任课教师工号 - TeacherName: vm.formItem.TeacherName, //教师姓名 + //TeacherNumber: this.IsOutSide == '1' ? vm.formItem.TeacherNumber : '', //任课教师工号 + //TeacherName: vm.formItem.TeacherName, //教师姓名 TeachingLogId: 0, IsOutSide: this.IsOutSide == '1' ? false : true, @@ -1442,7 +1470,9 @@ export default { Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`, IsByDate: this.formItem.IsByDate == '1' ? true : false, TimeInterval:0, - TeachingForm:0 + TeachingForm:0, + TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','), + TeacherName: namesString, //教师姓名 }; postaddinfo(datas).then((res) => { let data = res; @@ -1614,6 +1644,19 @@ export default { this.classformItem.MajorCode = new Array(this.formItem.ClassCode.length).fill('e3649c').join(',') + const arrT = this.formItem.TeacherNumber + const objT = this.NewClassList + + const commonElements = arrT.map(number => + objT.find(obj => obj.Number === number) + ).filter(Boolean); + + const namesString = commonElements.map(obj => obj.Name).join(', '); + + this.formItem.TeacherTitle = commonElements[0].Title + + + let datas = { AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写 YearTerm: vm.formItem.YearTerm, //学期，必填 @@ -1634,15 +1677,19 @@ export default { Grade: vm.formItem.Grade, //年级 IsValid: vm.formItem.IsValid, //是否有效 xnw:'1', - TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号 - TeacherName: vm.formItem.TeacherName, //教师姓名 + //TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号 + //TeacherName: vm.formItem.TeacherName, //教师姓名 TeachingLogId: vm.formItem.TeachingLogId, IsOutSide: this.IsOutSide == '1' ? false : true, - TeacherTitle: vm.formItem.TeacherTitle, + TeacherTitle: this.formItem.TeacherTitle, Date: this.formItem.Date, Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`, IsByDate: this.formItem.IsByDate == '1' ? true : false, + + + TeacherNumber:this.formItem.TeacherNumber == undefined ? '' : this.formItem.TeacherNumber.join(','), + TeacherName: namesString, //教师姓名 }; posteditinfo(datas).then((res) => { let data = res; @@ -1772,6 +1819,11 @@ export default { type: 'error' }); + } else if (data == 19) { + this.$message({ + message: '日期有误', + type: 'error' + }); } else { this.$message({ message: '修改失败', @@ -1807,6 +1859,14 @@ export default { mounted() { this.Initialization() this.getNewClassListinfo(''); + + getTeacherSelectList({ + Name:'', + Number:'', + expertType:'0' + }).then((res) => { + this.NewClassList = res + }) }, activated() { diff --git a/src/views/teacher-information/teacher-information.vue b/src/views/teacher-information/teacher-information.vue index 525d9cd..1cf646f 100644 --- a/src/views/teacher-information/teacher-information.vue +++ b/src/views/teacher-information/teacher-information.vue @@ -123,23 +123,24 @@

基本信息

- - + + - - + + + -

联系方式

- - + +