elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '3.22功能提交' (#210) from feature/add_item into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/210
master
郑永星 4 years ago
parent 7df5d12747 0332b591e8
commit cb48948abe
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File

10
Application/Admin/Controller/MarketPercentageController.class.php
Unescape Escape View File

@ -854,8 +854,8 @@ class MarketPercentageController extends ThinkController
$sum['should_performance_commission'] += $data[$key]['should_performance_commission'];
$sum['should_month_bonus_ratio'] += $data[$key]['should_month_bonus_ratio'];
$sum['wait_performance_commission'] += $data[$key]['wait_performance_commission'];
$sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission'];
// $sum['wait_performance_commission'] += $data[$key]['wait_performance_commission'];
// $sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission'];
}
// die();
@ -883,8 +883,10 @@ class MarketPercentageController extends ThinkController
// 'wait_commission' => '待发金额',
'should_performance_commission'=>'本月应发业绩提成',
'should_month_bonus_ratio'=>'本月应发绩效考核奖金',
'wait_performance_commission'=>'待发业绩提成',
'wait_achievement_commission'=>'待发绩效考核奖金',
'extend_commission' => '本月应发金额合计',
'wait_performance_commission'=>'本月待发业绩提成',
'wait_achievement_commission'=>'本月待发绩效考核奖金',
'wait_commission' => '本月待发金额合计',
'coefficient_check_detail' => '绩效确认',
'market_check_detail' => '市场部确认',
'finance_check_detail' => '财务部审批'];

26
Application/Admin/View/MarketPercentage/marketstaffsettle.html
Unescape Escape View File

@ -205,9 +205,11 @@
<!-- <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>
@ -238,14 +240,14 @@
<td>{$data['commission']|default='0.00'}</td>
<!-- <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>-->
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['should_performance_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['should_month_bonus_ratio']|default='0.00'}</a></td>
<td>{$data['should_performance_commission']|default='0.00'}</td>
<td>{$data['should_month_bonus_ratio']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
<!-- <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>-->
<td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_performance_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_achievement_commission']|default='0.00'}</a></td>
<td>{$data['wait_performance_commission']|default='0.00'}</td>
<td>{$data['wait_achievement_commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
<td><if condition="$data.coefficient_check eq 0"><span ></if>{$data['coefficient_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
<td><if condition="$data.market_check eq 0"><span ></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
<td><if condition="$data.finance_check eq 0"><span ></if>{$data['finance_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
@ -266,8 +268,12 @@
<td>{$sum['achievement_bonus']|default='0.00'}</td>
<td></td>
<td>{$sum['commission']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['should_performance_commission']|default='0.00'}</a></td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['should_month_bonus_ratio']|default='0.00'}</a></td>
<td>{$sum['should_performance_commission']|default='0.00'}</td>
<td>{$sum['should_month_bonus_ratio']|default='0.00'}</td>
<td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['extend_commission']|default='0.00'}</a></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>

Write Preview
Loading…
Cancel
Save