diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index ffaa123e2..d36693754 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -493,6 +493,7 @@ class MarketPercentageController extends ThinkController // $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):''; // $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):''; $_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):''; + ($_REQUEST['status']||$_REQUEST['status']=='0')?($map['status'] = $_REQUEST['status']):''; $admin_id = $_SESSION['onethink_admin']['user_auth']['uid']; $map['admin_id'] = $admin_id; @@ -895,6 +896,11 @@ class MarketPercentageController extends ThinkController $sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');; $sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');; + $_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):''; + $_REQUEST['time_end']?($end_time = date("Y-m-t",strtotime($_REQUEST['time_end']))):''; + $this->assign('start_time',$start_time); + $this->assign('end_time',$end_time); + if ($_REQUEST['export']) { $title = ['real_name' => '姓名', diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html index 529466816..64b1572ec 100644 --- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html @@ -74,6 +74,13 @@ +