选科报名提示信息修改

.env.development

@@ -2,9 +2,9 @@
 ENV = 'development'
 
 # 名学金榜学习系统/生产环境
-#VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
 #VUE_APP_BASE_API = 'http://192.168.0.106:1024/prod-api'
-VUE_APP_BASE_API = '/prod-api'
+#VUE_APP_BASE_API = '/prod-api'
 
 VUE_APP_MOBILE = "https://h5.mingxuejinbang.com"
 

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

@@ -3,7 +3,7 @@
     <div class="mb10 fx-row fx-end-base jc-between">
       <div class="fx-row fx-end-cen">
         <slot name="header-prefix"></slot>
-        <p v-if="!currentSupplyInfo.hidden" v-html="currentSupplyInfo.info"></p>
+        <p v-if="generation.active > 1" v-html="currentSupplyInfo"></p>
       </div>
       <div v-if="!readonly">
         <el-button v-if="aiButtonShow" type="primary" @click="toAiAnalysis">AI分析</el-button>
@@ -196,29 +196,41 @@ export default {
       }else {
         // 已报名未被录取的group 取当前models的前一个
         const prevModels =  this.generation.models.find(item => item.generation == activeModels.generation - 1)
-        // 拒绝的组合
-        const refuseGroup = prevModels.models.filter(item => {return item.selected})
-        // 获取报名的阶段
-        let tips = ''
-        console.log( Object.values(this.generation.options))
-        const prevGen = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation)
-        if(prevGen.decisionMaking){
-           tips = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation - 1).title
+
+        // 是否拒绝 ？
+        const isRefuse  = prevModels.models.filter(item => item.rejected)
+        if(isRefuse.length > 0) {
+          // 拒绝报名
+          let tips = ''
+          const prevGen = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation)
+          if(prevGen.decisionMaking){
+            tips = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation - 1).title
+          }else {
+            tips = prevGen.title
+          }
+          const isSupply = prevGen.decisionMaking ? '，现有以下标黄组合可以重新报名' : ''
+          info = `<p>同学，你好，你在${tips}拒绝填报志愿 ${isSupply} </p>`
         }else {
-           tips = prevGen.title
+          // 没被录取的组合
+          const refuseGroup = prevModels.models.filter(item => {return item.selected})
+          // 获取报名的阶段
+          let tips = ''
+          const prevGen = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation)
+          if(prevGen.decisionMaking){
+            tips = Object.values(this.generation.options).find(item =>  item.value  == prevModels.generation - 1).title
+          }else {
+            tips = prevGen.title
+          }
+          const isSupply = prevGen.decisionMaking ? '，现有以下标黄组合可以重新报名' : ''
+          if(refuseGroup.length > 0) {
+            info = `<p>同学，你好，你在${tips}所选择的 <span class="f-red">${refuseGroup.map(g => g.groupName).join(',').toString()}</span> 不符合条件${isSupply} </p>`
+          }else {
+            info = `<p>同学，你好，你在${tips}未填报志愿 ${isSupply} </p>`
+          }
         }
-        const isSupply = prevGen.decisionMaking ? '现有以下标黄组合可以重新报名' : ''
-        console.log(prevGen)
-
-        console.log(refuseGroup)
-        info = `<p>同学，你好，你在${tips}所选择的 <span class="f-red">${refuseGroup.map(g => g.groupName).join(',').toString()} </span>不符合报名条件${isSupply} </p>`
       }
       console.log(approved)
-      const isHidden = this.generation.active > 1
-      return {
-        hidden: !isHidden,
-        info:info
-      }
+      return info
     },
     flagShow() {
       return (this.generation.current == 3 && this.generation.active == 3) ||