| 
														
															@@ -16,7 +16,8 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <!-- 已录取 --> 
														 | 
														
														 | 
														
															             <!-- 已录取 --> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             <div v-if="step.isEnroll"> 
														 | 
														
														 | 
														
															             <div v-if="step.isEnroll"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div v-if="step.enrollByForce"> 
														 | 
														
														 | 
														
															               <div v-if="step.enrollByForce"> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                您被调剂至<span class="f-primary"> {{ step.enrollByForce.groupName }} </span>组合 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                <div>您被调剂至<span class="f-primary"> {{ step.enrollByForce.groupName }} </span>组合</div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                <div v-if="step.forceAdjustReason" class="f-warning">原因:{{ step.forceAdjustReason }}</div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               </div> 
														 | 
														
														 | 
														
															               </div> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															               <div v-else> 
														 | 
														
														 | 
														
															               <div v-else> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 <span>您在{{ step.prevName }}时选报了</span> 
														 | 
														
														 | 
														
															                 <span>您在{{ step.prevName }}时选报了</span> 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -100,14 +101,16 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         const nextName = allOpts.find(item => item.value == opt.value + 1).title 
														 | 
														
														 | 
														
															         const nextName = allOpts.find(item => item.value == opt.value + 1).title 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         const nextRecommend = genModel.models.find(item => item.nextRecommend) 
														 | 
														
														 | 
														
															         const nextRecommend = genModel.models.find(item => item.nextRecommend) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         const noNextApply = opt == this.generation.options.finalAdjustDM 
														 | 
														
														 | 
														
															         const noNextApply = opt == this.generation.options.finalAdjustDM 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        const enrollByForce = genModel.models.find(this.isGroupForceAdjusted) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return { 
														 | 
														
														 | 
														
															         return { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           selectedList: genModel.selectedList, 
														 | 
														
														 | 
														
															           selectedList: genModel.selectedList, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           isEnroll: genModel.models.some(this.isGroupEnrolled), 
														 | 
														
														 | 
														
															           isEnroll: genModel.models.some(this.isGroupEnrolled), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           enrollGroup: genModel.models.find(this.isGroupEnrolled), 
														 | 
														
														 | 
														
															           enrollGroup: genModel.models.find(this.isGroupEnrolled), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          enrollByForce: genModel.models.find(this.isGroupForceAdjusted), 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           enrollByApprove: genModel.models.find(this.isGroupApproved), 
														 | 
														
														 | 
														
															           enrollByApprove: genModel.models.find(this.isGroupApproved), 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           models: genModel.models, 
														 | 
														
														 | 
														
															           models: genModel.models, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           name: opt.title, 
														 | 
														
														 | 
														
															           name: opt.title, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+          forceAdjustReason: enrollByForce?.forceAdjustReason, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+          enrollByForce, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           noNextApply, 
														 | 
														
														 | 
														
															           noNextApply, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           prevName, 
														 | 
														
														 | 
														
															           prevName, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           nextName, 
														 | 
														
														 | 
														
															           nextName, 
														 |