Browse Source

update ratio

ethan 6 years ago
parent
commit
093ac7464c
2 changed files with 21 additions and 4 deletions
  1. 2 1
      src/api/agnetManagement.js
  2. 19 3
      src/views/agnetManagement/index.vue

+ 2 - 1
src/api/agnetManagement.js

20
     method: 'post',
20
     method: 'post',
21
     data: {
21
     data: {
22
       name: `101俱樂部_推推_代理商_0001_${data.name}`,
22
       name: `101俱樂部_推推_代理商_0001_${data.name}`,
23
-      feeRatio: data.feeRatio
23
+      feeRatio: data.feeRatio,
24
+      feeRatio2: data.feeRatio2
24
     }
25
     }
25
   })
26
   })
26
 }
27
 }

+ 19 - 3
src/views/agnetManagement/index.vue

31
               <span :style="moneyColor(scope.row.all)">{{scope.row.all}}</span>
31
               <span :style="moneyColor(scope.row.all)">{{scope.row.all}}</span>
32
             </template>
32
             </template>
33
         </el-table-column>
33
         </el-table-column>
34
+        <el-table-column label="抽水%" align="center">
35
+          <template slot-scope="scope">
36
+            {{scope.row.feeRatio2}}
37
+          </template>
38
+        </el-table-column>    
39
+        <el-table-column label="代理商上繳金額" prop="all" align="center">
40
+            <template slot-scope="scope">
41
+              <span :style="moneyColor(scope.row.all2)">{{scope.row.all2}}</span>
42
+            </template>
43
+        </el-table-column>
34
         <el-table-column label="上繳工作室金額70%" prop="all70" align="center">
44
         <el-table-column label="上繳工作室金額70%" prop="all70" align="center">
35
           <template slot-scope="scope">
45
           <template slot-scope="scope">
36
             <span :style="moneyColor(scope.row.all70)">{{scope.row.all70}}</span>
46
             <span :style="moneyColor(scope.row.all70)">{{scope.row.all70}}</span>
61
           <el-form-item label="名稱" prop="name">
71
           <el-form-item label="名稱" prop="name">
62
             <el-input v-model="createFormData.name"></el-input>
72
             <el-input v-model="createFormData.name"></el-input>
63
           </el-form-item>
73
           </el-form-item>
64
-          <el-form-item label="抽水 %" prop="feeRatio">
74
+          <el-form-item label="抽水 % (代理商內)" prop="feeRatio">
65
             <el-input v-model="createFormData.feeRatio"></el-input>
75
             <el-input v-model="createFormData.feeRatio"></el-input>
66
           </el-form-item>
76
           </el-form-item>
77
+          <el-form-item label="抽水 % (只在列表顯示)" prop="feeRatio2">
78
+            <el-input v-model="createFormData.feeRatio2"></el-input>
79
+          </el-form-item>
67
         </el-form>          
80
         </el-form>          
68
         <div slot="footer" class="dialog-footer">
81
         <div slot="footer" class="dialog-footer">
69
           <el-button @click="handleDialogClose">取 消</el-button>
82
           <el-button @click="handleDialogClose">取 消</el-button>
114
       createFormData: {
127
       createFormData: {
115
         name: '',
128
         name: '',
116
         feeRatio: '',
129
         feeRatio: '',
130
+        feeRatio2: '',
117
       }
131
       }
118
     }
132
     }
119
   },
133
   },
137
       fetchList(this.listQuery).then(async response => {
151
       fetchList(this.listQuery).then(async response => {
138
 
152
 
139
         // response.data.rows.map(agent => {
153
         // response.data.rows.map(agent => {
140
-          console.log('eeeee', response.data.rows)
141
         for(const agent of response.data.rows) {
154
         for(const agent of response.data.rows) {
142
           let combine = []
155
           let combine = []
143
           this.list = []   
156
           this.list = []   
144
           if(this.visible.firstLayer === true) {
157
           if(this.visible.firstLayer === true) {
145
             fetchGroupAll(agent, this.listQuery).then(response => {
158
             fetchGroupAll(agent, this.listQuery).then(response => {
146
-              console.log('response' , response.data.all)
159
+              console.log('response' , response.data)
147
               this.list.push({
160
               this.list.push({
148
                 // id: agent.GambleMember.id,
161
                 // id: agent.GambleMember.id,
149
                 // GambleMember: {
162
                 // GambleMember: {
154
                 name: agent.GambleMember.name.slice(19),
167
                 name: agent.GambleMember.name.slice(19),
155
                 createdAt: agent.GambleMember.createdAt,
168
                 createdAt: agent.GambleMember.createdAt,
156
                 feeRatio: response.data.feeRatio,
169
                 feeRatio: response.data.feeRatio,
170
+                feeRatio2: response.data.feeRatio2,
157
                 all: response.data.all,
171
                 all: response.data.all,
172
+                all2: response.data.all2,
158
                 all70: response.data.all70,
173
                 all70: response.data.all70,
159
                 fredPunishment: response.data.fredPunishment
174
                 fredPunishment: response.data.fredPunishment
160
               })
175
               })
161
             })
176
             })
162
           }
177
           }
178
+          
163
           // fetchMemberList(agent, this.listQuery).then(response => {
179
           // fetchMemberList(agent, this.listQuery).then(response => {
164
           //   response.data.rows.map(member => {
180
           //   response.data.rows.map(member => {
165
           //     let row = {
181
           //     let row = {