Sfoglia il codice sorgente

选科报名---报名状态--已录取

shilipojs 2 anni fa
parent
commit
7ffd0e4f75

+ 1 - 1
src/views/elective/select/components/elective-ai-table.vue

@@ -17,7 +17,7 @@
         <el-button @click="toReport('single',row)">查看</el-button>
       </template>
     </mx-table>
-    <elective-ai-report-dialog v-if="false" ref="aiReportDialog"></elective-ai-report-dialog>
+    <elective-ai-report-dialog v-if="true" ref="aiReportDialog" :reportInfo="generation.activeModel.models"></elective-ai-report-dialog>
   </div>
 </template>
 <script>

+ 1 - 0
src/views/elective/select/components/elective-tools-mixins.js

@@ -53,6 +53,7 @@ export default {
     },
     combineGroupStatus(group, model) {
       // 逻辑同elective-preference-command
+      if(group.approved || group.forceAdjusted) return '已录取'
       if (!group.allowSelect) return group.disabledReason || '无法报名'
       if (this.isModelRejected(model)) return '已拒绝'
       if (group.selected) return '已报名'