From 8f4505205bc0a07b34f10d87cb33d291b37bbe10 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 7 Jul 2020 11:09:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=E6=8F=90=E6=88=90=E4=BC=98=E6=97=B6=E9=97=B4=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/MarketPercentage/index.html | 10 ++++++++++ .../Admin/View/MarketPercentage/marketstaffsettle.html | 10 ++++++++++ .../View/MarketPercentage/personmarketstaffsettle.html | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/Application/Admin/View/MarketPercentage/index.html b/Application/Admin/View/MarketPercentage/index.html index b314f0908..bc8b7c544 100644 --- a/Application/Admin/View/MarketPercentage/index.html +++ b/Application/Admin/View/MarketPercentage/index.html @@ -196,6 +196,16 @@ }else{ url += '?' + query; } + + var start = $("#time_start").val(); + var end = $("#time_end").val(); + if(start !='' && end != ''){ + if (Date.parse(start) > Date.parse(end)){ + layer.msg('开始时间必须小于等于结束时间'); + return false; + } + } + window.location.href = url; }); $(".paixu").click(function(){ diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index 669c8590c..20dce716f 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -188,6 +188,16 @@ }else{ url += '?' + query; } + + var start = $("#time_start").val(); + var end = $("#time_end").val(); + if(start !='' && end != ''){ + if (Date.parse(start) > Date.parse(end)){ + layer.msg('开始时间必须小于等于结束时间'); + return false; + } + } + window.location.href = url; }); $(".paixu").click(function(){ diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html index 1edd0bb35..ce5842dbb 100644 --- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html @@ -204,6 +204,16 @@ }else{ url += '?' + query; } + + var start = $("#time_start").val(); + var end = $("#time_end").val(); + if(start !='' && end != ''){ + if (Date.parse(start) > Date.parse(end)){ + layer.msg('开始时间必须小于等于结束时间'); + return false; + } + } + window.location.href = url; }); $(".paixu").click(function(){ From 5ab96edd8f92f22b2429649fabe440712c572797 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 7 Jul 2020 11:32:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=E6=8F=90=E6=88=90bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketPercentageController.class.php | 11 ++++++++--- .../Admin/View/MarketPercentage/showbonuslist.html | 14 +++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 774ebf14f..ec288ddc1 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -426,6 +426,7 @@ class MarketPercentageController extends ThinkController $sum['extend_commission'] += $data[$key]['extend_commission']; } + $sum['wait_commission'] = '-------'; if ($_REQUEST['export']) { @@ -441,7 +442,7 @@ class MarketPercentageController extends ThinkController 'company_profit'=>'税后毛利', 'performance_commission' => '业绩提成', 'achievement_bonus' => '绩效考核奖金', - 'commission' => '当月总提成', + 'commission' => '当月合计', 'extend_commission' => '应发金额', 'wait_commission' => '待发金额']; @@ -454,6 +455,8 @@ class MarketPercentageController extends ThinkController $data[$key]['commission'] = "=ROUND(K{$line}+L{$line},2)"; } + $data = array_merge($data,[$sum]); + data2csv($data,'市场业绩提成',$title); } @@ -624,7 +627,7 @@ class MarketPercentageController extends ThinkController 'company_profit'=>'税后毛利', 'performance_commission' => '业绩提成', 'achievement_bonus' => '绩效考核奖金', - 'commission' => '总提成', + 'commission' => '当月总提成', 'extend_commission' => '本月发放', 'wait_commission' => '本月未发', 'is_send'=>'剩余金额发放状态']; @@ -870,7 +873,6 @@ class MarketPercentageController extends ThinkController $sum['pay_amount'] += $data[$key]['pay_amount']; $sum['extend_commission'] += $data[$key]['extend_commission']; $sum['wait_commission'] += $data[$key]['wait_commission']; - $sum['commission'] += $data[$key]['commission']; } @@ -885,9 +887,12 @@ class MarketPercentageController extends ThinkController 'nickname' => '账号', 'level' => '级别', 'pay_amount' => '总流水', + 'commission'=>'总提成', 'extend_commission' => '已发放总提成', 'wait_commission'=>'剩余未发放总提成']; + $data = array_merge($data,[$sum]); + data2csv($data,'提成汇总结算单',$title); } diff --git a/Application/Admin/View/MarketPercentage/showbonuslist.html b/Application/Admin/View/MarketPercentage/showbonuslist.html index e9c5f7614..741305c5d 100644 --- a/Application/Admin/View/MarketPercentage/showbonuslist.html +++ b/Application/Admin/View/MarketPercentage/showbonuslist.html @@ -39,13 +39,13 @@
- - - - - - - +
+
+ + 重算 + +
+