|
@@ -7,9 +7,19 @@
|
|
<el-input
|
|
<el-input
|
|
v-model.trim="searchForm.search"
|
|
v-model.trim="searchForm.search"
|
|
@keyup.enter.native="search"
|
|
@keyup.enter.native="search"
|
|
- placeholder="学生姓名 老师姓名"
|
|
|
|
|
|
+ placeholder="学生姓名"
|
|
></el-input>
|
|
></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item>
|
|
|
|
+ <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="(item,index) in teacherList"
|
|
|
|
+ :label="item.realName"
|
|
|
|
+ :value="item.id"
|
|
|
|
+ :key="index"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item prop="organId">
|
|
<el-form-item prop="organId">
|
|
<el-select
|
|
<el-select
|
|
class="multiple"
|
|
class="multiple"
|
|
@@ -145,7 +155,7 @@ import axios from "axios";
|
|
import { getToken } from "@/utils/auth";
|
|
import { getToken } from "@/utils/auth";
|
|
import pagination from "@/components/Pagination/index";
|
|
import pagination from "@/components/Pagination/index";
|
|
import load from "@/utils/loading";
|
|
import load from "@/utils/loading";
|
|
-import { getEmployeeOrgan } from "@/api/buildTeam";
|
|
|
|
|
|
+import { getEmployeeOrgan,getTeacher } from "@/api/buildTeam";
|
|
|
|
|
|
import { findStudentExtracurricularExercisesSituations } from "@/api/afterSchool";
|
|
import { findStudentExtracurricularExercisesSituations } from "@/api/afterSchool";
|
|
// findStudentExtracurricularExercisesSituations
|
|
// findStudentExtracurricularExercisesSituations
|
|
@@ -191,6 +201,11 @@ export default {
|
|
this.searchForm.timer = [];
|
|
this.searchForm.timer = [];
|
|
this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
|
|
this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
|
|
this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
|
|
this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
|
|
|
|
+ getTeacher().then(res => {
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ this.teacherList = res.data;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
|
|
getEmployeeOrgan().then(res => {
|
|
getEmployeeOrgan().then(res => {
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
@@ -206,9 +221,7 @@ export default {
|
|
methods: {
|
|
methods: {
|
|
init() {
|
|
init() {
|
|
if(this.$route.query.teacherId){
|
|
if(this.$route.query.teacherId){
|
|
- this.searchForm.teacherId = this.$route.query.teacherId
|
|
|
|
- }else{
|
|
|
|
- this.searchForm.teacherId = null
|
|
|
|
|
|
+ this.searchForm.teacherId = this.$route.query.teacherId*1
|
|
}
|
|
}
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
@@ -327,7 +340,6 @@ export default {
|
|
},
|
|
},
|
|
search() {
|
|
search() {
|
|
this.rules.page = 1;
|
|
this.rules.page = 1;
|
|
- this.searchForm.teacherId = null;
|
|
|
|
this.getList();
|
|
this.getList();
|
|
},
|
|
},
|
|
getNowDateAndMonday(time) {
|
|
getNowDateAndMonday(time) {
|