瀏覽代碼

elective student - next apply opt

hare8999@163.com 2 年之前
父節點
當前提交
e3cd743f90
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7 2
      src/views/elective/select/components/elective-enroll-info.vue

+ 7 - 2
src/views/elective/select/components/elective-enroll-info.vue

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