|
|
@@ -36,7 +36,6 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
async handleCommit() {
|
|
|
- console.log(this.group)
|
|
|
if (this.enableCommit) {
|
|
|
this.$message.error(this.preferenceCount == 1 ? `只能填报1个志愿` : `最多只能填报${this.preferenceCount}个志愿`)
|
|
|
return
|
|
|
@@ -47,7 +46,11 @@ export default {
|
|
|
this.selectedList.push(this.group)
|
|
|
} else {
|
|
|
let confirmTip = `确认填报 ${this.group.groupName}`
|
|
|
- if (!this.group.isRecommend) confirmTip += '（非推荐）'
|
|
|
+ let extraDesc = ''
|
|
|
+ if (this.generation.current > this.generation.options.primary.value) {
|
|
|
+ extraDesc = this.group.isRecommend ? '（推荐）' : '（非推荐）'
|
|
|
+ }
|
|
|
+ confirmTip += extraDesc
|
|
|
await this.$confirm(confirmTip)
|
|
|
this.group.selected = true
|
|
|
this.selectedList.push(this.group)
|
