elective student - permission update

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

@@ -61,6 +61,14 @@ 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

@@ -15,34 +15,24 @@ export default {
         // item.rankInGrade = currentGroup.rankInGrade
       })
 
-      if(activeModel.generation < 2) {
+      if (activeModel.generation < 2) {
         return {
-          applyCount:{
-            label:'选科人数比',
+          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){
+      if (activeModel.generation < 4) {
         return {
-          applyCount:{
-            label:'选科人数比',
-            // hidden: this.hasPermissions([consts.enum.electivePermission.applyCount])
-          },
-        }
-      }else {
-        return {
-
+          applyCount: {
+            label: '选科人数比',
+            hidden: !this.hasPermissions([consts.enum.electivePermission.applyCount])
+          }
         }
+      } else {
+        return {}
       }
 
     }

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

@@ -11,15 +11,7 @@ export default {
           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) {