diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index c3d28a1df..b0f252cea 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -135,7 +135,6 @@ class MarketPercentageController extends ThinkController ->field("tab_market_altogether.*,market_percentage") ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid") ->join("left join sys_auth_group auth on access.group_id=auth.id") - ->page($p, $row) ->order("pay_time DESC") ->select(); } else { @@ -143,6 +142,7 @@ class MarketPercentageController extends ThinkController ->field("tab_market_altogether.*,market_percentage") ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid") ->join("left join sys_auth_group auth on access.group_id=auth.id") + ->page($p, $row) ->order("pay_time DESC") ->select(); } @@ -308,7 +308,7 @@ class MarketPercentageController extends ThinkController 'extend_commission' => '应发金额', 'wait_commission' => '待发金额']; - data2csv($data,'市场结算管理',$title); + data2csv($data,'市场业绩提成',$title); } $arraypage = $p; @@ -341,11 +341,11 @@ class MarketPercentageController extends ThinkController if ($_REQUEST['export']) { $data = $data - ->page($p, $row) ->order("pay_time DESC") ->select(); } else { $data = $data + ->page($p, $row) ->order("pay_time DESC") ->select(); } @@ -595,7 +595,7 @@ class MarketPercentageController extends ThinkController 'extend_commission' => '已发放总提成', 'wait_commission'=>'剩余未发放总提成']; - data2csv($data,'个人总提成列表',$title); + data2csv($data,'提成汇总结算单',$title); } $count = M("market_altogether","tab_") diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index 9ed35f668..2de461c7f 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -33,7 +33,7 @@