From ced9d51845a1a3b45c1884aea257787161f31b04 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 7 Jul 2020 16:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=B1=87=E6=80=BB=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=AD=A3=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E5=8F=91=E6=94=BE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketPercentageController.class.php | 6 ++++++ .../personmarketstaffsettle.html | 7 +++++++ .../View/MarketPercentage/showbonuslist.html | 16 ++++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) 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 @@ +
+ +
diff --git a/Application/Admin/View/MarketPercentage/showbonuslist.html b/Application/Admin/View/MarketPercentage/showbonuslist.html index d1755c60f..c467fc756 100644 --- a/Application/Admin/View/MarketPercentage/showbonuslist.html +++ b/Application/Admin/View/MarketPercentage/showbonuslist.html @@ -132,18 +132,18 @@ {$data.real_name} {$data.nickname} {$data.level} - {$data.pay_amount} - {$data.commission} - {$data['extend_commission']} - {$data['wait_commission']} + {$data.pay_amount} + {$data.commission} + {$data['extend_commission']} + {$data['wait_commission']} {$data['remark']} 合计 - {$sum['pay_amount']|default="0.00"} - {$sum['commission']|default="0.00"} - {$sum['extend_commission']|default='0.00'} - {$sum['wait_commission']|default='0.00'} + {$sum['pay_amount']|default="0.00"} + {$sum['commission']|default="0.00"} + {$sum['extend_commission']|default='0.00'} + {$sum['wait_commission']|default='0.00'}