选科报名调整

src/views/elective/select/components/elective-table-mixins.js

@@ -44,7 +44,7 @@ export default {
         },
         scoreSumGroup: {
           label: '组合成绩',
-          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup.scoreByGroup])
+          // hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup.scoreByGroup])
         },
         classCount: {
           label: '开设班级数'
@@ -61,14 +61,6 @@ export default {
       const enableSignUp = stepMatched && enableApply && !this.readonly && !enrolled
 
       return {
-        rankInGroup: {
-          label: '当前组合实时排名',
-          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup])
-        },
-        rankInGrade: {
-          label: '选科全校排名',
-          hidden: this.hasPermissions([consts.enum.electivePermission.rankInGrade])
-        },
         allowSelectTips: {
           label: '报名状态'
         },

src/views/elective/select/components/round-select-resolvers/primary-resolver-mixins.js

@@ -11,14 +11,33 @@ export default {
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.applyCount = `${currentGroup.actualCount} /${currentGroup.personCount}`
+        // item.rankInGroup = currentGroup.rankInGroup
+        // item.rankInGrade = currentGroup.rankInGrade
       })
 
+      if(activeModel.generation < 2) {
+        return {
+          applyCount:{
+            label:'选科人数比',
+            // hidden: this.hasPermissions([consts.enum.electivePermission.applyCount])
+          },
+          rankInGroup: {
+            label: '当前组合实时排名',
+            // hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup])
+          },
+          rankInGrade: {
+            label: '选科全校排名',
+            // hidden: this.hasPermissions([consts.enum.electivePermission.rankInGrade])
+          },
+        }
+      }
+
       if(activeModel.generation < 4){
         return {
           applyCount:{
             label:'选科人数比',
-            hidden: this.hasPermissions([consts.enum.electivePermission.applyCount])
-          }
+            // hidden: this.hasPermissions([consts.enum.electivePermission.applyCount])
+          },
         }
       }else {
         return {

src/views/elective/select/components/round-select-resolvers/primaryDM-resolver-mixins.js

@@ -6,7 +6,22 @@ export default {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.primarySituation = currentGroup.preferenceOverflow
       })
-
+      if(activeModel.generation <= 2) {
+        return {
+          primarySituation: {
+            label: '超/缺',
+            slot: 'underOver'
+          },
+          rankInGroup: {
+            label: '当前组合实时排名',
+            // hidden: this.hasPermissions([consts.enum.electivePermission.rankInGroup])
+          },
+          rankInGrade: {
+            label: '选科全校排名',
+            // hidden: this.hasPermissions([consts.enum.electivePermission.rankInGrade])
+          },
+        }
+      }
       if (activeModel.generation < 4) {
         return {
           primarySituation: {