diff --git a/src/api/collegeinformation.js b/src/api/collegeinformation.js index eff0672..d737da3 100644 --- a/src/api/collegeinformation.js +++ b/src/api/collegeinformation.js @@ -1,5 +1,11 @@ import axios from "@/utils/http/index" +export function getTeacherSelectList(params) { + return axios({ + url: 'api/Teacher/GetTeacherSelectList', + params + }) +} /** * 获取学院列表 diff --git a/src/components/teacherselect.vue b/src/components/teacherselect.vue index 8ced772..1d8760c 100644 --- a/src/components/teacherselect.vue +++ b/src/components/teacherselect.vue @@ -5,14 +5,17 @@ - - - + + + + + + + 搜索 @@ -30,7 +35,7 @@ - + @@ -167,9 +172,16 @@ value-format="YYYY-MM-DD" /> - - + + + + + + + + :activwshow="activwshow" :message="formItem.CounselorsNumber"> @@ -250,7 +262,7 @@ import E from 'wangeditor'; import { getDefaultTime } from "@/utils/common.js" import teacherSelect from "@/components/teacherselect.vue"; -import { getclassinfoData, getCourseinfoData, delClassinfo, delCourseinfo, getStudentlevel, postClassInfoAddinfo, postClassInfoeditinfo, getClassInfodetail, postCourseInfoAddinfo, postCourseInfoeditinfo, getCourseInfodetail } from "@/api/collegeinformation.js"; +import { getTeacherSelectList,getclassinfoData, getCourseinfoData, delClassinfo, delCourseinfo, getStudentlevel, postClassInfoAddinfo, postClassInfoeditinfo, getClassInfodetail, postCourseInfoAddinfo, postCourseInfoeditinfo, getCourseInfodetail } from "@/api/collegeinformation.js"; export default { name: "classandcourse", components: { @@ -262,6 +274,7 @@ export default { }, data() { return { + NewClassList: [], activwshow: 0, teachershow: false, showteacherselect: false, @@ -273,6 +286,7 @@ export default { queryParams: { clname: '', + isValid: '1', coursename: '', type: 0, }, @@ -324,9 +338,6 @@ export default { { required: true, message: '请输入班级名称', trigger: 'blur' }, //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } ], - TeacherName: [ - { required: true, message: '请选择教师', trigger: 'blur' }, - ], TrainingStartTime: [ { required: true, message: '请选择培训开始时间', trigger: 'blur' }, ], @@ -378,10 +389,21 @@ export default { }, numberval(data) { // 传值赋值 - // debugger; - this.formItem.TeacherName = data.Name;//教师 - this.formItem.TeacherNumber = data.Number;//教师工号 - this.teachershow = false; + let teacherNames = []; + let teacherNumbers = []; + + data.forEach(teacher => { + teacherNames.push(teacher.Name); + teacherNumbers.push(teacher.Number); + }); + + teacherNames = teacherNames.join(','), + teacherNumbers = teacherNumbers.join(',') + + this.formItem.TeacherName = teacherNames;//教师 + this.formItem.TeacherNumber = teacherNumbers;//教师工号 + + //this.teachershow = false; }, classmajorList() { this.getlevemajorList(this.formItem.collegeId, "c"); @@ -488,7 +510,7 @@ export default { this.isedit1 = true; this.drawerform1 = true; this.getlevecolegelist();//获取学院 - this.getclinfodetail(info.ClassInfoId,info.HeadTeacherNum); + this.getclinfodetail(info.ClassInfoId,info.CounselorsNumber); this.drawerformtitle1 = '编辑班级信息'; @@ -569,9 +591,9 @@ export default { TrainingStartTime:data.TrainingStartTime, TrainingEndTime:data.TrainingEndTime, TeacherName:HeadTeacherNum, - HeadTeacherNum:data.HeadTeacherNum + HeadTeacherNum:data.HeadTeacherNum, + counselorsNumber:data.CounselorsNumber == undefined ? '' : data.CounselorsNumber.replace(/"([^"]*)"/, '$1').split(',') }; - }) .catch((err) => { this.$message({ @@ -597,7 +619,8 @@ export default { TeacherName:this.formItem.TeacherName, ClassRemark:this.formItem.ClassRemark, ClassinfoGrade: '1',//this.formItem.ClassinfoGrade - HeadTeacherNum: this.formItem.TeacherNumber + HeadTeacherNum:'', + counselorsNumber:this.formItem.CounselorsNumber == undefined ? '' : this.formItem.counselorsNumber.join(',') }; postClassInfoAddinfo(datas).then((res) => { @@ -659,6 +682,16 @@ export default { message: '输入的辅导员工号不正确', type: 'error' }); + } else if (data == 11) { + this.$message({ + message: '培训开始日期为空或输入不正确', + type: 'error' + }); + } else if (data == 12) { + this.$message({ + message: '培训结束日期为空或输入不正确', + type: 'error' + }); } else { this.$message({ message: '新增失败', @@ -699,7 +732,9 @@ export default { MajorId: 1, CounselorNum: '', - HeadTeacherNum: this.formItem.HeadTeacherNum + HeadTeacherNum: '', + + counselorsNumber: this.formItem.counselorsNumber.join(',') }; console.log(datas); @@ -761,6 +796,16 @@ export default { message: '班级ID错误', type: 'error' }); + } else if (data == 11) { + this.$message({ + message: '培训开始日期为空或输入不正确', + type: 'error' + }); + } else if (data == 12) { + this.$message({ + message: '培训结束日期为空或输入不正确', + type: 'error' + }); } else { this.$message({ message: '修改失败', @@ -1006,7 +1051,6 @@ export default { // console.log(err); }); }, - // 已完成 数据备份table中的信息 getclassinfoDatainfo(pageNum) { // debugger @@ -1017,8 +1061,8 @@ export default { pageSize: this.pageobj.pageSize, pageNum: pageNum, classname: this.queryParams.clname, + isValid: this.queryParams.isValid, majorname: '培训班', - }).then((res) => { let data = res; if (data.length > 0) { @@ -1069,8 +1113,12 @@ export default { }); }); }, - - + handleChange() { + if (this.formItem.counselorsNumber.length > 3) { + this.formItem.counselorsNumber.pop(); + this.$message.warning('最多只能选择3名教师'); + } + } }, // @@ -1088,6 +1136,14 @@ export default { } this.getclassinfoDatainfo(1);//获取班级 + + getTeacherSelectList({ + Name:'', + Number:'', + expertType:'0' + }).then((res) => { + this.NewClassList = res + }) }, activated() { }, diff --git a/src/views/courseStatistics/courseStatistics.vue b/src/views/courseStatistics/courseStatistics.vue index b8ecf60..a98b7b0 100644 --- a/src/views/courseStatistics/courseStatistics.vue +++ b/src/views/courseStatistics/courseStatistics.vue @@ -24,6 +24,8 @@ style="width:200px; margin:0px 10px 0px 0px "> + @@ -59,7 +61,7 @@ - + @@ -212,6 +214,9 @@ export default { term: semesterNum1 === "全部学期" ? "" : semesterNum1, }).then((res) => { let data = res; + if (data == null){ + data = [] + } if (data.length > 0) { this.pageobj.Total = data[0].total; } else { diff --git a/src/views/student-information/student-information.vue b/src/views/student-information/student-information.vue index 6113aec..115191d 100644 --- a/src/views/student-information/student-information.vue +++ b/src/views/student-information/student-information.vue @@ -28,6 +28,8 @@ + 搜索 @@ -100,11 +102,11 @@ :value="item.value" />
- 导入学生信息
-

@@ -133,13 +135,20 @@ + + + + + - + - + - - - - -

联系方式

- + - + @@ -164,26 +164,19 @@ - + + + + + - - - - - + --> - + + + + + + + + - 搜索 + 搜索
@@ -391,7 +398,7 @@ export default { Status: this.queryParams.status || "", SchoolId: this.schoolId || "", CollegeId: this.queryParams.collegeId || "", - + ExpertType: this.queryParams.expertType || 0 }).then((res) => { let data = res; if (data.length > 0) {