| 
														
															@@ -201,7 +201,8 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         temp: { 
														 | 
														
														 | 
														
															         temp: { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           label: '选择专业', 
														 | 
														
														 | 
														
															           label: '选择专业', 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           width: '140', 
														 | 
														
														 | 
														
															           width: '140', 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          slot: 'temp' 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+          slot: 'temp', 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+          hidden: this.readonly 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         }, 
														 | 
														
														 | 
														
															         }, 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         subjects: { 
														 | 
														
														 | 
														
															         subjects: { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           label: '自选专业', 
														 | 
														
														 | 
														
															           label: '自选专业', 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -249,17 +250,6 @@ export default { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															       return this.generation.roundGroups.map(rg => { 
														 | 
														
														 | 
														
															       return this.generation.roundGroups.map(rg => { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         const row = generationModels.find(item => item.groupId == rg.groupId) || {} 
														 | 
														
														 | 
														
															         const row = generationModels.find(item => item.groupId == rg.groupId) || {} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名' 
														 | 
														
														 | 
														
															         row.allowSelectTips = row.allowSelect ? '报名中' : row.disabledReason || '无法报名' 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        row.subjects = this.optionalMajors.filter(college => { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        }).map(item => item.majorCategoryName) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        row.colleges = this.optionalMajors.filter(college => { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          if (college.matchedGroupIds.indexOf(row.groupId) != -1) return college.majorCategoryName 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        }).map(item => { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          return { 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            college: item.collegeName, 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            major: item.majorCategoryName 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-          } 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        }) 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId)) 
														 | 
														
														 | 
														
															         const matchedMajors = this.optionalMajors.filter(college => college.matchedGroupIds.includes(row.groupId)) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return { 
														 | 
														
														 | 
														
															         return { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															           groupId: row.groupId, 
														 | 
														
														 | 
														
															           groupId: row.groupId, 
														 |