Merge branch 'feature/market_percentage' of wmtx/platform into release

市场业绩提成bug修改

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);
         }
 

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(){

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(){

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(){

Application/Admin/View/MarketPercentage/showbonuslist.html

@@ -39,13 +39,13 @@
 
 
     <div class="cf top_nav_list">
-<!--        <div class="fl button_list">-->
-<!--            <div class="tools">-->
-<!--                <empty name="show_status">-->
-<!--                    <a class=" " href="{:U('add?model='.$model['id'])}"><span class="button_icon button_icon1"></span>新增</a>-->
-<!--                </empty>-->
-<!--            </div>-->
-<!--        </div>-->
+        <div class="fl button_list">
+            <div class="tools">
+                <empty name="show_status">
+                    <a class="recaculate" url="{:U('reCaculateBonus?pay_time='.$_GET['pay_time'])}"><span class="button_icon button_icon1"></span>重算</a>
+                </empty>
+            </div>
+        </div>
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list">
             <div class="input-list search-title-box">