选课报名补录

src/views/system/user/profile/components/report-table.vue

@@ -28,7 +28,7 @@
       <template #signUp="{row}">
         <div  v-if="!row.allowSelect">
           <div v-if="row.selected" >
-            <span class="btn-red" v-if="!row.rejected" @click="singleCommit('')">取消报名</span>
+            <span class="btn-red" v-if="!row.rejected" @click="singleCommit('','取消报名')">取消报名</span>
             <span v-else>已拒绝</span>
           </div>
           <span v-else>{{ row.disabledReason || '无法报名' }}</span>
@@ -41,7 +41,6 @@
             <span class="f-red btn-red" v-if="row.selected" @click="toUnSelect(row)">取消报名</span>
             <span class="btn-green" v-else @click="toSelect(row)">报名</span>
           </div>
-
         </div>
       </template>
       <template #subjects="{row}">
@@ -103,7 +102,7 @@
     <div v-if="flagShow">
       <div class="mb5 mt10 text-right">
         <el-popover
-          v-if="activeModels.generation.models.filter(item => {return item.allowSelect}).length > 0"
+          v-if="activeModels.generation.models.filter(item => {return item.selected}).length == 0"
           placement="right"
           width="300"
           v-model="popoShow"
@@ -124,9 +123,9 @@
               <el-button type="danger" size="mini" @click="handleRejectRecommend">提交</el-button>
             </p>
           </div>
-          <el-button slot="reference" type="danger">不同意</el-button>
+          <el-button  slot="reference" type="danger">不同意</el-button>
         </el-popover>
-        <el-button v-if="activeModels.generation.models.filter(item => {return item.rejected}).length > 0" type="primary" @click="singleCommit('')">撤销拒绝报名</el-button>
+        <el-button v-if="activeModels.generation.models.filter(item => {return item.rejected}).length > 0" type="primary" @click="singleCommit('','撤销拒绝报名')">撤销拒绝报名</el-button>
       </div>
     </div>
     <esign-dialog ref="esignDialog"></esign-dialog>
@@ -210,6 +209,7 @@ export default {
       if (this.generation.active < this.generation.options.primaryDM.value) return ''
       let info = ''
       const activeModels = this.generation.models.find(item => item.generation == this.generation.active)
+      console.log(activeModels)
       // 当前代是否被录取？
       const approved = activeModels.models.filter(item => {
         return item.approved
@@ -383,7 +383,7 @@ export default {
       const generationModels = this.generation.activeModels.last()?.models || []
       return this.generation.roundGroups.map(rg => {
         const row = generationModels.find(item => item.groupId == rg.groupId) || {}
-        row.allowSelectTips = row.allowSelect ? '报名中' :  row.selected ? '已报名' : row.disabledReason || '无法报名'
+        row.allowSelectTips =  row.rejected ? '已拒绝' : row.allowSelect ? '报名中' :  row.selected ? '已报名' : row.disabledReason || '无法报名'
         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId))
         row.colleges = matchedMajors.map(m => ({ college: m.collegeName, major: m.majorCategoryName }))
         row.subjects = matchedMajors.map(m => m['majorCategoryName'])
@@ -424,8 +424,8 @@ export default {
       // AI 分析 跳转
       this.$refs.aiDialog.open(this.formatRows)
     },
-    singleCommit(row) {
-      const type =  row == '' ? '取消报名' : '提交报名'
+    singleCommit(row,tips) {
+      const type =  row == '' ? tips : '提交报名'
       // 补录及之后
       this.$confirm(`是否要${type}`, {
         confirmButtonText: '确定',