|
@@ -598,18 +598,18 @@ export default {
|
|
tempPerformArr = []
|
|
tempPerformArr = []
|
|
songList.forEach(item => {
|
|
songList.forEach(item => {
|
|
if(item.type == "PERFORM") {
|
|
if(item.type == "PERFORM") {
|
|
- if(this.performNumSelectIds.includes(item.id)) {
|
|
|
|
- item.disabled = true
|
|
|
|
- } else {
|
|
|
|
- item.disabled = false
|
|
|
|
- }
|
|
|
|
|
|
+ // if(this.performNumSelectIds.includes(item.id)) {
|
|
|
|
+ // item.disabled = true
|
|
|
|
+ // } else {
|
|
|
|
+ // item.disabled = false
|
|
|
|
+ // }
|
|
tempPerformArr.push(item)
|
|
tempPerformArr.push(item)
|
|
} else if(item.type == "PRACTICE") {
|
|
} else if(item.type == "PRACTICE") {
|
|
- if(this.practiceSelectIds.includes(item.id)) {
|
|
|
|
- item.disabled = true
|
|
|
|
- } else {
|
|
|
|
- item.disabled = false
|
|
|
|
- }
|
|
|
|
|
|
+ // if(this.practiceSelectIds.includes(item.id)) {
|
|
|
|
+ // item.disabled = true
|
|
|
|
+ // } else {
|
|
|
|
+ // item.disabled = false
|
|
|
|
+ // }
|
|
tempPracticeArr.push(item)
|
|
tempPracticeArr.push(item)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -864,17 +864,28 @@ export default {
|
|
this.$toast('请选择练习曲')
|
|
this.$toast('请选择练习曲')
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
+ const tempIds = new Set(this.practiceSelectIds)
|
|
|
|
+ if(this.practiceSelectIds.length != tempIds.size) {
|
|
|
|
+ this.$toast("不能选择重复的练习曲")
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
if(this.practiceUpload.length != this.practiceNum) {
|
|
if(this.practiceUpload.length != this.practiceNum) {
|
|
this.$toast('请上传练习曲')
|
|
this.$toast('请上传练习曲')
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
if(this.performSongIdList) {
|
|
if(this.performSongIdList) {
|
|
if(this.performNumSelectIds.length != this.performNum) {
|
|
if(this.performNumSelectIds.length != this.performNum) {
|
|
this.$toast('请选择演奏曲')
|
|
this.$toast('请选择演奏曲')
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
+ const tempIds = new Set(this.performNumSelectIds)
|
|
|
|
+ if(this.performNumSelectIds.length != tempIds.size) {
|
|
|
|
+ this.$toast("不能选择重复的演奏曲")
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
if(this.performNumUpload.length != this.performNum) {
|
|
if(this.performNumUpload.length != this.performNum) {
|
|
this.$toast('请上传演奏曲')
|
|
this.$toast('请上传演奏曲')
|