Browse Source

+ elective student fields

hare8999@163.com 2 năm trước cách đây
mục cha
commit
1cff275e29

+ 3 - 1
doc/Mind/PrimaryElective.cs

@@ -107,7 +107,9 @@ namespace mxdemo.Mind
         public bool selected;  // 已报名
         // 5.13 如果是多志愿,按selectedRank区分一志愿、二志愿、三志愿...
         public int selectedRank; // 多志愿时的排序
-
+        // 5.20 +用来标识填报时拒填
+        public bool rejected; // 拒绝填报
+        public string rejectedReason; // 拒绝原因
 
         // 5.13 去除动态列,改为固定字段 +
         public int actualCount; // 阶段实际报名人数

+ 1 - 1
src/views/elective/generation/components/elective-generation-commands.vue

@@ -7,7 +7,7 @@
     </div>
     <div>
       <el-button v-if="showFastPush" type="primary" @click="flushIntoDM">提前进入{{ nextStepName }}</el-button>
-      <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">进入强制调剂</el-button>
+      <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">进入{{ nextStepName }}</el-button>
       <el-button v-else-if="showSend" type="primary" @click="pushGeneration">发送</el-button>
       <el-button v-if="showRankBalance" type="primary" @click="jumpRankBalance">排名均衡</el-button>
       <el-button v-if="showClassDispatch" type="primary" @click="terminateAndJumpDispatch">选科分班</el-button>