improve rejected higher priority than selected in group

src/views/elective/select/components/elective-preference-command.vue

@@ -1,7 +1,7 @@
 <template>
   <span v-if="!group.allowSelect">{{ group.disabledReason || '无法报名' }}</span>
-  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">取消报名</span>
   <span v-else-if="isRejected">已拒绝</span>
+  <span v-else-if="group.selected" class="f-red btn-red" @click="handleCancel">取消报名</span>
   <span v-else-if="enableCommit" class="f-warning">被锁定</span>
   <span v-else class="btn-green" @click="handleCommit">报名</span>
 </template>

src/views/elective/select/components/elective-preference-reject.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mb5 mt10 text-right">
+  <div class="mb5 mt10 text-right" v-if="recommendGroup">
     <el-popover v-if="!this.isSelected" ref="pop" placement="right" width="300" trigger="click">
       <div>
         <el-input type="textarea" :rows="4" placeholder="请输入原因" v-model="recommendGroup.rejectedReason"></el-input>
@@ -33,7 +33,7 @@ export default {
       return this.generation.activeModel.selectedList
     },
     recommendGroup() {
-      return this.generation.activeModel.models.find(g => g.isRecommend) || {}
+      return this.generation.activeModel.models.find(g => g.isRecommend)
     },
     isSelected() {
       return this.selectedList.some(this.isGroupSelected)

src/views/elective/select/components/elective-tools-mixins.js

@@ -54,8 +54,8 @@ export default {
     combineGroupStatus(group, model) {
       // 逻辑同elective-preference-command
       if (!group.allowSelect) return group.disabledReason || '无法报名'
-      if (group.selected) return '已报名'
       if (this.isModelRejected(model)) return '已拒绝'
+      if (group.selected) return '已报名'
       return '报名中'
     }
   }