Browse Source

fix studio display logic

ethan 6 years ago
parent
commit
cb461f3182
1 changed files with 7 additions and 4 deletions
  1. 7 4
      src/views/studio/index.vue

+ 7 - 4
src/views/studio/index.vue

@@ -22,7 +22,7 @@
22 22
       </el-table-column>
23 23
       <el-table-column align="center" label="工作室實收維護費" >
24 24
         <template slot-scope="scope">
25
-          <span>{{scope.row.maintenanceFee}}</span>
25
+          <span>{{scope.row.FixedServiceFees}}</span>
26 26
         </template>
27 27
       </el-table-column>
28 28
     </el-table>
@@ -50,8 +50,8 @@ export default {
50 50
       listLoading: true,
51 51
       bucket: '',
52 52
       listQuery: {
53
-        // startAt: moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0),
54
-        // endAt: moment().day(7).hour(11).minute(59).second(59)
53
+        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
54
+        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
55 55
       },
56 56
       temp: {},
57 57
       pickerOptions: {
@@ -102,6 +102,8 @@ export default {
102 102
               if(item.isBookie){
103 103
                   data.bookies.serviceFees = new Decimal(item.serviceFees)
104 104
                   data.bookies.count = new Decimal(item.count)
105
+                  data.bookies.FixedServiceFees = item.FixedServiceFees
106
+                  data.bookies.wagerServiceFees = new Decimal(item.wagerServiceFees)
105 107
               }else{
106 108
                   data.members.serviceFees = new Decimal(item.serviceFees)
107 109
                   data.members.count = new Decimal(item.count)
@@ -109,8 +111,9 @@ export default {
109 111
           })
110 112
           this.list.push({
111 113
           all: data.bookies.serviceFees.plus(data.members.serviceFees).minus(data.bookies.count.times(500)).times(0.2).valueOf(),
114
+          all: data.bookies.serviceFees.plus(data.members.serviceFees).plus(data.bookies.wagerServiceFees).times(0.2).valueOf(),
112 115
           // all: (data.bookies.serviceFees - (data.bookies.count * 500) + data.members.serviceFees) * 0.2,
113
-          maintenanceFee: data.bookies.count.times(500).valueOf()
116
+          FixedServiceFees: data.bookies.FixedServiceFees
114 117
           })
115 118
         }else{
116 119
           this.list = [];