|
|
@@ -23,8 +23,9 @@
|
|
|
v-model="sound"
|
|
|
style="width: 100%"
|
|
|
clearable
|
|
|
+ multiple
|
|
|
+ collapse-tags
|
|
|
filterable
|
|
|
- @change="change"
|
|
|
placeholder="请选择声部"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -77,7 +78,14 @@ export default {
|
|
|
props: ["studentList", "soundList", "activeType", 'activeListStudent', 'isOnlyChangeUser', 'classGroupId', 'type'],
|
|
|
computed: {
|
|
|
data() {
|
|
|
- return uniqBy([...this.studentList, ...this.activeListStudent], 'userId').map((item) => ({
|
|
|
+ return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
|
|
|
+ .filter(item => {
|
|
|
+ if (this.sound.length) {
|
|
|
+ return this.sound.includes(item.subjectId) || this.seleched.includes(item.userId)
|
|
|
+ }
|
|
|
+ return true
|
|
|
+ })
|
|
|
+ .map((item) => ({
|
|
|
value: item.userId,
|
|
|
key: item.userId,
|
|
|
name: item.name,
|
|
|
@@ -128,7 +136,6 @@ export default {
|
|
|
);
|
|
|
},
|
|
|
change(val) {
|
|
|
- this.seleched = []
|
|
|
this.$listeners.changeActiveChioseSound(val)
|
|
|
this.$listeners.searchStudent()
|
|
|
},
|
|
|
@@ -189,7 +196,7 @@ export default {
|
|
|
}
|
|
|
.hideReturn{
|
|
|
/deep/ .el-transfer__buttons button:first-child{
|
|
|
- display: none;
|
|
|
+ // display: none;
|
|
|
}
|
|
|
}
|
|
|
/deep/ .el-checkbox-group{
|
wolyshaw