|
@@ -9,7 +9,7 @@
|
|
|
<el-tabs v-model="activeName" @tab-click="tabchange">
|
|
|
<el-tab-pane label="班级名单" name="first">
|
|
|
<el-col :span="24">
|
|
|
- <name-list :data="studentList" @updateStu="toUpdateStu" :gender="gender" @onConfirm="onConfirm"></name-list>
|
|
|
+ <name-list :data="studentList" @updateStu="toUpdateStu" :gender="gender" @onConfirm="onConfirm" :nojob="nojob"></name-list>
|
|
|
</el-col>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="班级分组" name="second">
|
|
@@ -113,6 +113,8 @@ export default {
|
|
|
|
|
|
// 班级名单,性别筛选
|
|
|
gender: '全部',
|
|
|
+ // 未设定职位
|
|
|
+ nojob: [],
|
|
|
};
|
|
|
},
|
|
|
async created() {
|
|
@@ -141,7 +143,6 @@ export default {
|
|
|
lessons.filter(f => f.subid),
|
|
|
'subid'
|
|
|
);
|
|
|
- console.log(lessons);
|
|
|
this.$set(this, `lesson`, lessons);
|
|
|
}
|
|
|
}
|
|
@@ -156,6 +157,22 @@ export default {
|
|
|
let data = res.data.filter(i => i.gender == gender);
|
|
|
this.$set(this, `studentList`, data);
|
|
|
}
|
|
|
+ let arr = [];
|
|
|
+ let newdata = _.uniqBy(
|
|
|
+ this.studentList.filter(i => i.job == '班长' || i.job == '学委' || i.job == '文艺委员' || i.job == '安全委员' || i.job == '宣传委员'),
|
|
|
+ 'job'
|
|
|
+ );
|
|
|
+ let bz = newdata.find(i => i.job == '班长');
|
|
|
+ if (!bz) arr.push({ name: '班长' });
|
|
|
+ let xe = newdata.find(i => i.job == '学委');
|
|
|
+ if (!xe) arr.push({ name: '学委' });
|
|
|
+ let wy = newdata.find(i => i.job == '文艺委员');
|
|
|
+ if (!wy) arr.push({ name: '文艺委员' });
|
|
|
+ let aq = newdata.find(i => i.job == '安全委员');
|
|
|
+ if (!aq) arr.push({ name: '安全委员' });
|
|
|
+ let xc = newdata.find(i => i.job == '宣传委员');
|
|
|
+ if (!xc) arr.push({ name: '宣传委员' });
|
|
|
+ this.$set(this, `nojob`, arr);
|
|
|
}
|
|
|
},
|
|
|
// 筛选
|