Commit 2bcdbf64 authored by youjie's avatar youjie

台湾提成规则调整

parent 3bdb65f0
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</td> </td>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="9">暂无数据</td> <td style="text-align:center" colspan="10">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
......
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,8 @@
<td>{{item.OriginalProfit?item.OriginalProfit:'-'}}</td> <td>{{item.OriginalProfit?item.OriginalProfit:'-'}}</td>
<td>{{item.CurrencyName}}</td> <td>{{item.CurrencyName}}</td>
<td>{{item.StandardProfit?item.StandardProfit:'-'}}</td> <td>{{item.StandardProfit?item.StandardProfit:'-'}}</td>
<td>{{item.ProfitRate?item.ProfitRate+'%':'-'}}</td> <td>{{item.ProfitRate?item.ProfitRate:'-'}}</td>
<td>{{(item.StandardProfit*item.ProfitRate).toFixed(2)}}</td> <td>{{item.ProfitRate2}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="14">暂无数据</td> <td style="text-align:center" colspan="15">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
...@@ -329,6 +329,10 @@ ...@@ -329,6 +329,10 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0 this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
this.TotalProfit = res.data.data.TotalProfit ? res.data.data.TotalProfit : 0 this.TotalProfit = res.data.data.TotalProfit ? res.data.data.TotalProfit : 0
res.data.data.pmodel.pageData.forEach(item => {
item.ProfitRate = item.ProfitRate/100
item.ProfitRate2 = (item.StandardProfit*item.ProfitRate).toFixed(2)
});
this.dataList = res.data.data.pmodel.pageData; this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count; this.total = res.data.data.pmodel.count;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment