| 
					
				 | 
			
			
				@@ -72,15 +72,19 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </mx-table> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <!-- 初录 多志愿拖拽 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <div v-if="this.generation.active == generation.options.primary.value || this.generation.active == generation.options.primaryDM.value"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      v-if="this.generation.active == generation.options.primary.value || this.generation.active == generation.options.primaryDM.value"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <p>您的选科志愿: <span v-for="(item,index) in activeModels.selectedList"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         {{ item.groupName }} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </p> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <test-drage ref="drage" :btnDisabled="this.generation.current != generation.options.primary.value" :selectedList="activeModels.selectedList" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <test-drage ref="drage" :btnDisabled="this.generation.current != generation.options.primary.value" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    :selectedList="activeModels.selectedList" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ></test-drage> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <el-button @click="commit" type="primary" v-if="this.generation.current == generation.options.primary.value">提交</el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <el-button @click="commit" type="primary" v-if="this.generation.current == generation.options.primary.value"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          提交 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </el-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <div v-if="generation.current > generation.active && generation.active > generation.options.primaryDM.value"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -128,24 +132,12 @@ import ChooseSubjectDialog from './choose-subject-dialog' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import SelectSubjectReportDialog from '@/views/system/user/profile/components/select-subject-report-dialog' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import EsignDialog from '@/views/system/user/profile/components/esign-dialog' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import ReportStep from './report-step' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import PrimaryResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/primary-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import PrimaryDMResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/primaryDM-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import BackTrackingResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/backTracking-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import BackTrackingDMResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/backTrackingDM-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import FinalAdjustResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/finalAdjust-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import FinalAdjustDMResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/finalAdjustDM-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import ForceAdjustResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  from '@/views/system/user/profile/components/round-select-resolvers/forceAdjust-resolver-mixins' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import OverUnderBadge from '@/views/elective/publish/components/steps/fauclty/over-under-badge' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { submitElectiveModels } from '@/api/webApi/elective/selected-subject' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+const resolverModules = require.context('./round-select-resolvers', false, /\.js$/) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+const resolvers = resolverModules.keys().map(key => resolverModules(key).default) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   props: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     generation: Object, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -168,16 +160,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  mixins: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    MxSelectTranslate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    PrimaryResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    PrimaryDMResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    BackTrackingResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    BackTrackingDMResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    FinalAdjustDMResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    FinalAdjustResolverMixins, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ForceAdjustResolverMixins 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  mixins: [MxSelectTranslate, ...resolvers], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       popoShow: false, 
			 |