elective master - generation push setting option.

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

@@ -10,7 +10,7 @@
       <el-button v-if="showForceAdjustSend" type="primary" @click="jumpForceAdjust">
         进入{{ generation.options.forceAdjust.title }}
       </el-button>
-      <el-button v-else-if="showSend" type="primary" @click="pushGeneration">发送</el-button>
+      <el-button v-else-if="showSend" type="primary" @click="pushGeneration">开启{{ nextStepName }}</el-button>
       <el-button v-if="showRankBalance" type="primary" @click="jumpRankBalance">排名均衡</el-button>
       <el-button v-if="showClassDispatch" type="primary" @click="terminateAndJumpDispatch">选科分班</el-button>
       <!--<el-button v-else type="primary" @click="jumpDispatch">选科分班</el-button>-->
@@ -30,8 +30,10 @@
 <script>
 import {
   applyElectiveDMAlgorithm,
-  flushIntoGenerationDM, jumpGenerationForceAdjust,
-  jumpGenerationRankBalance, pushGenerationSetting,
+  flushIntoGenerationDM,
+  jumpGenerationForceAdjust,
+  jumpGenerationRankBalance,
+  pushGenerationSetting,
   terminateGeneration
 } from '@/api/webApi/elective/generation'
 import config from '@/common/mx-config'

src/views/elective/generation/components/elective-generation-push-setting.vue

@@ -3,22 +3,28 @@
     <el-form-item prop="dateRange" label="时间">
       <mx-date-range-picker v-model="model.dateRange" emit-all-changes></mx-date-range-picker>
     </el-form-item>
-    <div class="fx-row fx-wrap">
-      <el-form-item prop="onlyRecommand" class="form-item-readonly">
-        <el-checkbox v-model="model.onlyRecommand">仅允许学生选择推荐组合</el-checkbox>
-      </el-form-item>
-      <el-form-item prop="onlyAgree" class="form-item-readonly">
-        <el-checkbox v-model="model.onlyAgree">只允许学生选择同意</el-checkbox>
-      </el-form-item>
-    </div>
-    <div class="fx-row fx-wrap">
-      <el-form-item prop="useRecommandWhileDisagree" class="form-item-readonly">
-        <el-checkbox v-model="model.useRecommandWhileDisagree">如果拒绝，按推荐报名处理</el-checkbox>
-      </el-form-item>
-      <el-form-item prop="useRecommandWhileNonaction" class="form-item-readonly">
-        <el-checkbox v-model="model.useRecommandWhileNonaction">如果不报名，按推荐报名处理</el-checkbox>
-      </el-form-item>
-    </div>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item prop="onlyRecommand" class="form-item-readonly">
+          <el-checkbox :checked="!model.onlyRecommand" @change="model.onlyRecommand=!$event">是否同意学生选择非推荐组合</el-checkbox>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="onlyAgree" class="form-item-readonly" label-width="0">
+          <el-checkbox :checked="!model.onlyAgree" @change="model.onlyAgree=!$event">是否同意学生拒绝填报</el-checkbox>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="useRecommandWhileDisagree" class="form-item-readonly">
+          <el-checkbox v-model="model.useRecommandWhileDisagree">学生拒绝后强行按推荐组合报名</el-checkbox>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="useRecommandWhileNonaction" class="form-item-readonly" label-width="0">
+          <el-checkbox v-model="model.useRecommandWhileNonaction">学生未填报，按推荐组合报名</el-checkbox>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>