|
@@ -27,8 +27,8 @@
|
|
<span class="f-warning bold ml3 mr3">{{ nextRecommend.groupName }}</span>
|
|
<span class="f-warning bold ml3 mr3">{{ nextRecommend.groupName }}</span>
|
|
<span>组合</span>
|
|
<span>组合</span>
|
|
</template>
|
|
</template>
|
|
- <template v-else-if="nextApplyModel">
|
|
|
|
- <span>,请参加{{ nextApplyModel.option.title }}</span>
|
|
|
|
|
|
+ <template v-else-if="nextApplyOpt">
|
|
|
|
+ <span>,请参加{{ nextApplyOpt.title }}</span>
|
|
</template>
|
|
</template>
|
|
<template v-else>
|
|
<template v-else>
|
|
<span>,学校会帮助您调剂报名</span>
|
|
<span>,学校会帮助您调剂报名</span>
|
|
@@ -57,6 +57,11 @@ export default {
|
|
while (appliedModel.option.decisionMaking) appliedModel = appliedModel.prevModel
|
|
while (appliedModel.option.decisionMaking) appliedModel = appliedModel.prevModel
|
|
return appliedModel
|
|
return appliedModel
|
|
},
|
|
},
|
|
|
|
+ nextApplyOpt() {
|
|
|
|
+ const opts = Object.values(this.generation.options)
|
|
|
|
+ .filter(opt => opt.value > this.generation.active && !opt.decisionMaking)
|
|
|
|
+ return opts.first()
|
|
|
|
+ },
|
|
nextApplyModel() {
|
|
nextApplyModel() {
|
|
let next = this.appliedModel.nextModel
|
|
let next = this.appliedModel.nextModel
|
|
while (next?.option?.decisionMaking) next = next.nextModel
|
|
while (next?.option?.decisionMaking) next = next.nextModel
|