report-table mixins 修改

src/views/system/user/profile/components/round-select-resolvers/backTracking-resolver-mixins.js

@@ -7,11 +7,8 @@ export default {
       console.log('context',context)
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
-
-        // item.backTrackingApply = `${currentGroup.actualCount + currentGroup.groupApprovedCount} /${currentGroup.personCount}`
         item.rankInGroup = currentGroup.rankInGroup
         item.rankInGrade = currentGroup.rankInGrade
-
         item.backTrackingApply = `${currentGroup.actualCount} /${currentGroup.groupIndicator}`
       })
 

src/views/system/user/profile/components/round-select-resolvers/backTrackingDM-resolver-mixins.js

@@ -2,14 +2,14 @@ export default {
   methods: {
     backTrackingDMResolver(gen) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}
         item.supplyIndicator = currentGroup.nextGroupIndicator
         // 录取人数加指标/ 设置人数
-        item.backTrackingApply = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
-        item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
+        item.backTrackingApply = `${currentGroup.actualCount} /${currentGroup.groupIndicator}`
+        // item.backTrackingApply = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
+        // item.supplyRecord = `${currentGroup.groupApprovedCount + currentGroup.actualCount} /${currentGroup.personCount}`
       })
 
       return {

src/views/system/user/profile/components/round-select-resolvers/finalAdjust-resolver-mixins.js

@@ -2,7 +2,6 @@ export default {
   methods: {
     finalAdjustResolver(gen) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}

src/views/system/user/profile/components/round-select-resolvers/finalAdjustDM-resolver-mixins.js

@@ -2,7 +2,6 @@ export default {
   methods: {
     finalAdjustDMResolver(gen) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}

src/views/system/user/profile/components/round-select-resolvers/forceAdjust-resolver-mixins.js

@@ -2,7 +2,6 @@ export default {
   methods: {
     forceAdjustResolver(gen) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}

src/views/system/user/profile/components/round-select-resolvers/primary-resolver-mixins.js

@@ -2,7 +2,6 @@ export default {
   methods: {
     primaryResolver(gen, active) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}

src/views/system/user/profile/components/round-select-resolvers/primaryDM-resolver-mixins.js

@@ -2,7 +2,6 @@ export default {
   methods: {
     primaryDMResolver(gen, active, context) {
       const models = this.generation.activeModels.find(item => item.generation == gen).models
-      const generation = this.generation.activeModels.find(item => item.generation == gen).generation
 
       this.formatRows.forEach(item => {
         const currentGroup = models.find(group => group.groupId == item.groupId) || {}