diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 64644ff6d..fdd4be162 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -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' => '财务部审批']; diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index 496bb2cc0..2c575d913 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -205,9 +205,11 @@