|
@@ -13,14 +13,24 @@
|
|
|
>
|
|
|
<div class="part-box part-box-filter" style="padding-bottom: 5px">
|
|
|
<el-form ref="FilterForm" label-position="left" label-width="0" inline>
|
|
|
- <el-form-item label="班级:">
|
|
|
+ <el-form-item label="行政班:">
|
|
|
+ <el-select v-model="filter.className" placeholder="行政班" clearable>
|
|
|
+ <el-option
|
|
|
+ v-for="item in classes"
|
|
|
+ :key="item"
|
|
|
+ :value="item"
|
|
|
+ :label="item"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="教学班:">
|
|
|
<el-select
|
|
|
- v-model="filter.basicClazzName"
|
|
|
- placeholder="班级"
|
|
|
+ v-model="filter.teachClassName"
|
|
|
+ placeholder="教学班"
|
|
|
clearable
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in classes"
|
|
|
+ v-for="item in teacherClasses"
|
|
|
:key="item"
|
|
|
:value="item"
|
|
|
:label="item"
|
|
@@ -42,9 +52,16 @@
|
|
|
|
|
|
<el-table ref="TableList" :data="dataList">
|
|
|
<el-table-column type="index" label="序号" width="70"></el-table-column>
|
|
|
- <el-table-column prop="studentName" label="姓名"> </el-table-column>
|
|
|
- <el-table-column prop="studentCode" label="学号"> </el-table-column>
|
|
|
- <el-table-column prop="basicClazzName" label="班级" min-width="200">
|
|
|
+ <el-table-column prop="studentName" label="姓名" min-width="80">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="studentCode" label="学号" width="140">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="className"
|
|
|
+ label="行政班"
|
|
|
+ min-width="120"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column prop="teachClassName" label="教学班" min-width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
v-if="!showStudent"
|
|
@@ -101,10 +118,12 @@ export default {
|
|
|
size: this.GLOBAL.pageSize,
|
|
|
total: 0,
|
|
|
filter: {
|
|
|
- basicClazzName: "",
|
|
|
+ className: "",
|
|
|
+ teachClassName: "",
|
|
|
studentNameCode: "",
|
|
|
},
|
|
|
classes: [],
|
|
|
+ teacherClasses: [],
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
@@ -120,14 +139,23 @@ export default {
|
|
|
},
|
|
|
getClasses() {
|
|
|
this.classes = Array.from(
|
|
|
- new Set(this.studentList.map((item) => item.basicClazzName))
|
|
|
+ new Set(this.studentList.map((item) => item.className))
|
|
|
+ );
|
|
|
+ this.teacherClasses = Array.from(
|
|
|
+ new Set(this.studentList.map((item) => item.teachClassName))
|
|
|
);
|
|
|
},
|
|
|
getList() {
|
|
|
let datas = this.studentList;
|
|
|
- if (this.filter.basicClazzName) {
|
|
|
+ if (this.filter.className) {
|
|
|
+ datas = datas.filter(
|
|
|
+ (item) => item.className === this.filter.className
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this.filter.teachClassName) {
|
|
|
datas = datas.filter(
|
|
|
- (item) => item.basicClazzName === this.filter.basicClazzName
|
|
|
+ (item) => item.teachClassName === this.filter.teachClassName
|
|
|
);
|
|
|
}
|
|
|
if (this.filter.studentNameCode) {
|