选科补录报名--拒绝--回撤拒绝

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

@@ -26,8 +26,11 @@
         <!--        <el-button>查看</el-button>-->
       </template>
       <template #signUp="{row}">
-        <div class="f-red" v-if="!row.allowSelect">
-          <span v-if="row.selected">已报名</span>
+        <div  v-if="!row.allowSelect">
+          <div v-if="row.selected" >
+            <span class="btn-red" v-if="!row.rejected" @click="singleCommit('')">取消报名</span>
+            <span v-else>已拒绝</span>
+          </div>
           <span v-else>{{ row.disabledReason || '无法报名' }}</span>
         </div>
         <div v-else>
@@ -100,18 +103,15 @@
     <div v-if="flagShow">
       <div class="mb5 mt10 text-right">
         <el-popover
-          v-if="activeModels.generation.models.filter(item => {item.allowSelect}).length > 0"
+          v-if="activeModels.generation.models.filter(item => {return item.allowSelect}).length > 0"
           placement="right"
           width="300"
           v-model="popoShow"
           trigger="click"
         >
           <div>
-<<<<<<< HEAD
 <!--            确定拒绝<span class="f-primary">{{recommendGroup.groupName}}</span>组合么？-->
-=======
-            确定拒绝系统给您推荐的<span class="f-primary">{{ recommendGroup.groupName }}</span>组合么？
->>>>>>> af3b3695b30458144db5aca329945f14507a6a92
+<!--            确定拒绝系统给您推荐的<span class="f-primary">{{ recommendGroup.groupName }}</span>组合么？-->
             <el-input
               type="textarea"
               :rows="4"
@@ -126,7 +126,7 @@
           </div>
           <el-button slot="reference" type="danger">不同意</el-button>
         </el-popover>
-        <el-button v-else type="primary">撤销拒绝报名</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>
@@ -215,18 +215,18 @@ export default {
         return item.approved
       })
       if (approved.length) {
-        // // 查找在哪一阶段被录取 ？ 根据selected 和 approved 都为true
-        // const model =this.generation.activeModels.filter(model => {
-        //   const flag = model.models.some(item=> {
-        //     return item.selected && item.approved
-        //   })
-        //   if(flag) return model
-        // })
-        // console.log(model)
-        // const admissionAgent = Object.values(this.generation.options).find(item => item.value == model[0].generation - 1)
-        // console.log(Object.values(this.generation.options))
-        // // 已被录取
-        // info = `你在${admissionAgent.title}所选择的${approved[0].groupName}已被录取`
+        // 查找在哪一阶段被录取 ？ 根据selected 和 approved 都为true
+        const model =this.generation.activeModels.filter(model => {
+          const flag = model.models.some(item=> {
+            return item.selected && item.approved
+          })
+          if(flag) return model
+        })
+        console.log(model)
+        const admissionAgent = Object.values(this.generation.options).find(item => item.value == model[0].generation - 1)
+        console.log(Object.values(this.generation.options))
+        // 已被录取
+        info = `你在${admissionAgent.title}所选择的${approved[0].groupName}已被录取`
       } else {
         // 已报名未被录取的group 取当前models的前一个
         const prevModels = this.generation.models.find(item => item.generation == activeModels.generation - 1)
@@ -425,27 +425,27 @@ export default {
       this.$refs.aiDialog.open(this.formatRows)
     },
     singleCommit(row) {
+      const type =  row == '' ? '取消报名' : '提交报名'
       // 补录及之后
-      this.$confirm(`是否要提交报名`, {
+      this.$confirm(`是否要${type}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        row.selected = true
-        const arrRow = [row]
+        const arrRow = row == '' ?  []  : [row]
         submitElectiveModels({
-          models: [row]
+          models: arrRow
           // esign:this.base64Img
         }).then(res => {
           if (res.code == 200) {
-            this.$message.success('报名成功')
+            this.$message.success('操作成功')
             this.refreshData()
           }
         })
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消提交'
+          message: `已取消${type}`
         })
       })
     },
@@ -550,7 +550,7 @@ export default {
 </script>
 <style scoped>
 .cell .el-tag {
-  margin-right: 5px;
+  margin-right: 2px;
 }
 
 .group /deep/ .el-badge__content.is-fixed {