|
|
@@ -53,7 +53,7 @@ export default {
|
|
|
},
|
|
|
combineGroupStatus(group, model) {
|
|
|
// 逻辑同elective-preference-command
|
|
|
- if(group.approved || group.forceAdjusted) return '已录取'
|
|
|
+ if(this.isGroupEnrolled(group)) return '已录取'
|
|
|
if (!group.allowSelect) return group.disabledReason || '无法报名'
|
|
|
if (this.isModelRejected(model)) return '已拒绝'
|
|
|
if (group.selected) return '已报名'
|
shilipojs