Browse Source

add reward and punishment

Encore 6 years ago
parent
commit
eec12165b7
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/views/agnetManagement/gambleMemberManagement/index.vue

+ 3 - 1
src/views/agnetManagement/gambleMemberManagement/index.vue

186
           name: (this.data.secondLayer.GambleMember.name).slice(19),
186
           name: (this.data.secondLayer.GambleMember.name).slice(19),
187
           allUp: _.sumBy(response.data, 'totalUp'),
187
           allUp: _.sumBy(response.data, 'totalUp'),
188
           allDown: _.sumBy(response.data, 'totalDown'),
188
           allDown: _.sumBy(response.data, 'totalDown'),
189
+          allReward: _.sumBy(response.data, 'totalReward'),
190
+          allAdminPunishment: _.sumBy(response.data, 'adminPunishment'),
189
           allChips: _.sumBy(response.data, 'chips'),
191
           allChips: _.sumBy(response.data, 'chips'),
190
           allEarned: _.sumBy(response.data, item => {return item.effectiveTotal}),
192
           allEarned: _.sumBy(response.data, item => {return item.effectiveTotal}),
191
           allServiceFees: _.sumBy(response.data, item => {return Number(item.totalServiceFees) }).toFixed(1),
193
           allServiceFees: _.sumBy(response.data, item => {return Number(item.totalServiceFees) }).toFixed(1),
339
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
341
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
340
     },
342
     },
341
     all(scope) {
343
     all(scope) {
342
-      return (scope.row.allUp+scope.row.allDown-scope.row.allChips-scope.row.allServiceFees)*(-1)
344
+      return (scope.row.allUp+scope.row.allDown+Number(scope.row.allReward)+Number(scope.row.allAdminPunishment)-scope.row.allChips-scope.row.allServiceFees)*(-1)
343
     },
345
     },
344
     getSummaries(param) {
346
     getSummaries(param) {
345
         const { columns, data } = param;
347
         const { columns, data } = param;