录取信息更新

src/views/system/user/profile/components/elective-enroll-info.vue

@@ -8,24 +8,26 @@
     </template>
     <template v-else>
       您在{{ appliedModel.option.title }}阶段填报的
-      <span v-for="group in appliedModel.selectedList" :key="group.groupId"
-            :class="{'f-primary':activeGroup(group),'f-red':!activeGroup(group)}">
+      <span v-for="group in appliedModel.selectedList" :key="group.groupId" :class="enrollGroupClass(group)">
         {{ group.groupName }}
       </span>
     </template>
-    <template v-if="enrolled">
+    <template v-if="approved">
       <span v-if="appliedModel.selectedList.length == 1">
         符合条件 已被录取
       </span>
       <span v-else-if="appliedModel.selectedList.length > 1">
-        其中{{ enrollStatus.enrolledGroup.groupName }}符合条件 已被录取
+        其中 <span class="bold">{{ enrollStatus.enrolledGroup.groupName }}</span> 符合条件 已被录取
       </span>
       <template v-else-if="appliedModel.nextModel.selectedList.length == 1">
         但系统按推荐组合 <span class="f-primary">{{ appliedModel.nextModel.selectedList.first().groupName }}</span> 进行了录取
       </template>
     </template>
     <template v-else>
-      <span v-if="appliedModel.selectedList.length">不符合条件</span>未被录取
+      <span v-if="appliedModel.selectedList.length">不符合条件</span> 未被录取
+    </template>
+    <template v-if="forceAdjusted">
+      学校将您调剂录取至<span class="f-warning">{{ enrollStatus.enrolledGroup.groupName }}</span>组合
     </template>
     <template v-if="enableSelect">
       现有以下标黄组合可以重新报名
@@ -41,6 +43,12 @@ export default {
     enrolled() {
       return !!this.enrollStatus?.enrolledGroup
     },
+    approved() {
+      return this.enrolled && this.enrollStatus.enrolledGroup.approved
+    },
+    forceAdjusted() {
+      return this.enrolled && this.enrollStatus.enrolledGroup.forceAdjusted
+    },
     appliedModel() {
       let appliedModel = this.enrollStatus?.enrolledModel || this.generation.activeModel.prevModel
       if (appliedModel.option.decisionMaking) appliedModel = appliedModel.prevModel
@@ -53,8 +61,13 @@ export default {
     }
   },
   methods: {
-    activeGroup(group) {
-      return this.enrolled && group.groupId == this.enrollStatus.enrolledGroup.groupId
+    enrollGroupClass(group) {
+      if (this.approved) {
+        if (group.groupId == this.enrollStatus.enrolledGroup.groupId) return 'f-primary'
+        return 'f-warning'
+      } else {
+        return 'f-red'
+      }
     }
   }
 }