Commit ccff87e9 authored by youjie's avatar youjie

no message

parent c4c8e639
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
<th>地接奖金</th> <th>地接奖金</th>
<th>年终奖金</th> <th>年终奖金</th>
<th>扣除比例</th> <th>扣除比例</th>
<th>币种</th>
<th>修改人</th> <th>修改人</th>
<th>修改时间</th> <th>修改时间</th>
<th>操作</th> <th>操作</th>
...@@ -78,16 +79,19 @@ ...@@ -78,16 +79,19 @@
</el-popover> </el-popover>
</td> </td>
<td> <td>
<span>{{childItem.StartValue}}{{childItem.EndValue}} {{subItem.CurrencyName}}</span> </td> <span>{{childItem.StartValue}}{{childItem.EndValue}}</span> </td>
<td> <td>
<span>{{childItem.Rate}}% </span> </td> <span>{{childItem.Rate}}% </span> </td>
<td> <td>
<span>{{childItem.DiJieBonus}} {{subItem.CurrencyName}}</span> </td> <span>{{childItem.DiJieBonus}}
<!-- {{subItem.CurrencyName}} -->
</span> </td>
<td> <td>
<span>{{childItem.YearBonus}} {{subItem.CurrencyName}}</span> </td> <span>{{childItem.YearBonus}}</span> </td>
<td v-if="childIndex==0" :rowspan="subItem.DetailList.length"> <td v-if="childIndex==0" :rowspan="subItem.DetailList.length">
{{subItem.ProfitRate}}% {{subItem.ProfitRate}}%
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.DetailList.length">{{subItem.CurrencyName}}</td>
<td v-if="childIndex==0" <td v-if="childIndex==0"
:rowspan="subItem.DetailList.length">{{subItem.UpdateBy}}</td> :rowspan="subItem.DetailList.length">{{subItem.UpdateBy}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DetailList.length">{{subItem.UpdateDate}}</td> <td v-if="childIndex==0" :rowspan="subItem.DetailList.length">{{subItem.UpdateDate}}</td>
...@@ -109,11 +113,11 @@ ...@@ -109,11 +113,11 @@
</tr> </tr>
</template> </template>
<tr v-if="DataList.length==0"> <tr v-if="DataList.length==0">
<td colspan="10" align="center">暂无数据</td> <td colspan="14" align="center">暂无数据</td>
</tr> </tr>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="13"> <td colspan="14">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
......
...@@ -82,15 +82,15 @@ ...@@ -82,15 +82,15 @@
</td> </td>
<td>{{item.BranchCommission}}</td> <td>{{item.BranchCommission}}</td>
<td> <td>
<p>{{item.SumDiJieBonus}}</p> <p>{{item.SumDiJieBonus?item.SumDiJieBonus:'-'}}</p>
</td> </td>
<td> <td>
<p>{{item.SumDiJieBonus}}</p> <p>{{item.SumDiJieBonus?item.SumDiJieBonus:'-'}}</p>
</td> </td>
<td> <td>
<p>{{item.SumYearBonus}}</p> <p>{{item.SumYearBonus?item.SumYearBonus:'-'}}</p>
</td> </td>
<td> <td>
......
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