Browse Source

滚动roi

sunhao 5 years ago
parent
commit
7ca888e8fc

+ 2 - 0
app/Http/Controllers/Admin/OrderController.php

@@ -1063,6 +1063,7 @@ class OrderController extends Controller
1063 1063
         $sellerMemo = $request->input('sellerMemo');
1064 1064
         $aftersale_fee = $request->input('aftersale_fee');
1065 1065
         $aftersale_reason = $request->input('aftersale_reason');
1066
+        $aftersale_time = $request->input('aftersale_time');
1066 1067
         $refund_price = $request->input('refund_price');
1067 1068
 
1068 1069
         $data = array();
@@ -1081,6 +1082,7 @@ class OrderController extends Controller
1081 1082
         if(isset($refund_note)) $data['refund_note'] = trim($refund_note);
1082 1083
         if(isset($aftersale_fee)) $data['aftersale_fee'] = trim($aftersale_fee);
1083 1084
         if(isset($aftersale_reason)) $data['aftersale_reason'] = trim($aftersale_reason);
1085
+        if(isset($aftersale_time)) $data['aftersale_time'] = trim($aftersale_time);
1084 1086
         if(isset($refund_price)){
1085 1087
             if(empty($refund_price)) $refund_price = null; 
1086 1088
             $data['refund_price'] = $refund_price;

+ 91 - 4
app/Http/Controllers/Admin/StatisticsController.php

@@ -1700,15 +1700,17 @@ class StatisticsController extends Controller
1700 1700
         }
1701 1701
 
1702 1702
         $teams = DB::table('teams')->lists('name', 'id');
1703
-        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost')->where(function($query) use($team_id, $stime, $etime){
1703
+        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime){
1704 1704
             if($team_id) $query->where('team_id', $team_id);
1705 1705
             if($stime) $query->where('createTime', '>=', $stime);
1706 1706
             if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
1707 1707
         })->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
1708 1708
         $result = json_decode(json_encode($result), true);
1709
+        $payArr = [1=>'微信支付', 2=>'付款码支付'];
1709 1710
         foreach($result as $k=>&$v){
1710 1711
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1711 1712
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
1713
+            $v['payment_type'] = $payArr[$v['payment_type']];
1712 1714
         }
1713 1715
 
1714 1716
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -1791,19 +1793,21 @@ class StatisticsController extends Controller
1791 1793
         $etime = $request->input('etime');
1792 1794
        
1793 1795
         $teams = DB::table('teams')->lists('name', 'id');
1794
-        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost')->where(function($query) use($team_id, $stime, $etime){
1796
+        $result = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type')->where(function($query) use($team_id, $stime, $etime){
1795 1797
             if($team_id) $query->where('team_id', $team_id);
1796 1798
             if($stime) $query->where('createTime', '>=', $stime);
1797 1799
             if($etime) $query->where('createTime', '<=', $etime. ' 23:59:59');
1798 1800
         })->where('is_del', 0)->orderBy('team_id', 'asc')->orderBy('createTime','desc')->get();
1799 1801
         $result = json_decode(json_encode($result), true);
1802
+        $payArr = [1=>'微信支付', 2=>'付款码支付'];
1800 1803
         foreach($result as $k=>&$v){
1801 1804
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1802 1805
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
1806
+            $v['payment_type'] = $paryArr[$v['payment_type']];
1803 1807
         }
1804 1808
 
1805
-        $indexKey = ['team_name','createTime','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost'];
1806
-        $title = ['团队', '时间', '订单编号', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本'];
1809
+        $indexKey = ['team_name','createTime','id','receivedAmount','aftersale_fee','refund_price','true_amount','cost','freight_cost', 'payment_type'];
1810
+        $title = ['团队', '时间', '订单编号', '成交金额', '售后', '退补差价', '实际金额', '供应商成本', '物流成本', '支付方式'];
1807 1811
         $filename = 'teamFinanceList_'.date('Y-m-d_H').'.xlsx';
1808 1812
         return Order::export_excel($result, $filename, $indexKey, $title);
1809 1813
     }
@@ -1996,6 +2000,89 @@ class StatisticsController extends Controller
1996 2000
         $filename = 'districtRoi7day_'.date('Y-m-d_H').'.xlsx';
1997 2001
         return Order::export_excel($result, $filename, $indexKey, $title);
1998 2002
     }
2003
+
2004
+    /**
2005
+     * 地域roi7日
2006
+     */
2007
+    public function districtRoi7dayTotal(Request $request){
2008
+        $page = (int)$request->input('page');
2009
+        $pageSize = 20;
2010
+        if($page<=0){
2011
+            $page = 1;
2012
+        }
2013
+
2014
+        $offset = ($page-1) * $pageSize;
2015
+        $city = $request->input('city');
2016
+
2017
+        if($city !== null){
2018
+            $city = str_replace('市', '', $city);
2019
+        }
2020
+
2021
+        $count = DistrictRoi7::where(function($query) use($city){    
2022
+            if($city) $query->where('city', 'like', '%'.$city.'%');
2023
+        })->groupBy('city')->get();
2024
+
2025
+        $count = count($count);
2026
+        if ($count > 1) {
2027
+            // 总页数
2028
+            $pages = ceil($count/$pageSize);
2029
+        }else{
2030
+            // 总页数
2031
+            $pages = 1;
2032
+        }
2033
+
2034
+        $result = DistrictRoi7::select(DB::raw('city,sum(cost) as cost,sum(gzh_count) as gzh_count,sum(fan_count) as fan_count,sum(new_fan_order_count) as new_fan_order_count,sum(new_fan_order_amount) as new_fan_order_amount,sum(order_count) as order_count,sum(order_amount) as sum_order_amount, sum(order_amount)/sum(cost) as roi'))->where(function($query) use($city){    
2035
+            if($city) $query->where('city', 'like', '%'.$city.'%');
2036
+        })->groupBy('city')->orderBy('roi', 'desc')->offset($offset)->limit($pageSize)->get();
2037
+
2038
+        $result = json_decode(json_encode($result), true);
2039
+        foreach($result as $k=>&$v){
2040
+             //新粉roi
2041
+            $v['new_roi'] = $v['cost']>0 ? round($v['new_fan_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
2042
+            //累计roi
2043
+            $v['total_roi'] = $v['cost']>0 ? round($v['sum_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
2044
+            //数据格式化
2045
+            $v['order_amount'] = round($v['sum_order_amount'],2);
2046
+        }
2047
+
2048
+        return view('statistics/districtRoi7dayTotal', ['result' =>$result,
2049
+            'page'              =>$page,
2050
+            'count'             =>$count,
2051
+            'pages'             =>$pages,                                    
2052
+            'city'             =>$city,                                        
2053
+            ]);
2054
+
2055
+    }
2056
+
2057
+    /**
2058
+     * 地域roi7日
2059
+     */
2060
+    public function districtRoi7dayTotal_export(Request $request){
2061
+
2062
+        $city = $request->input('city');
2063
+        if($city !== null){
2064
+            $city = str_replace('市', '', $city);
2065
+        }
2066
+
2067
+        $result = DistrictRoi7::select(DB::raw('city,sum(cost) as cost,sum(gzh_count) as gzh_count,sum(fan_count) as fan_count,sum(new_fan_order_count) as new_fan_order_count,sum(new_fan_order_amount) as new_fan_order_amount,sum(order_count) as order_count,sum(order_amount) as sum_order_amount,sum(order_amount)/sum(cost) as roi'))->where(function($query) use($city){    
2068
+            if($city) $query->where('city', 'like', '%'.$city.'%');
2069
+        })->groupBy('city')->orderBy('roi', 'desc')->get();
2070
+
2071
+        $result = json_decode(json_encode($result), true);
2072
+        foreach($result as $k=>&$v){
2073
+             //新粉roi
2074
+            $v['new_roi'] = $v['cost']>0 ? round($v['new_fan_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
2075
+            //累计roi
2076
+            $v['total_roi'] = $v['cost']>0 ? round($v['sum_order_amount'] / $v['cost'], 4) * 100 .'%' : '';
2077
+            //数据格式化
2078
+            $v['order_amount'] = round($v['sum_order_amount'],2);
2079
+        }
2080
+
2081
+        $indexKey = ['city','cost','gzh_count','fan_count','new_fan_order_count','new_fan_order_amount','new_roi','order_count','order_amount','total_roi'];
2082
+        $title = ['城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '7日累计成单数', '7日累计收入', '7日累计ROI'];
2083
+        $filename = 'districtRoi7day_'.date('Y-m-d_H').'.xlsx';
2084
+        return Order::export_excel($result, $filename, $indexKey, $title);
2085
+    }
1999 2086
 }
2000 2087
   
2001 2088
 

+ 2 - 0
app/Http/routes.php

@@ -128,6 +128,8 @@ Route::group(['prefix' => 'admin'], function(){
128 128
         //地域roi7日
129 129
         Route::get('/statistics/districtRoi7day', 'Admin\StatisticsController@districtRoi7day');
130 130
         Route::get('/statistics/districtRoi7day_export', 'Admin\StatisticsController@districtRoi7day_export');
131
+        Route::get('/statistics/districtRoi7dayTotal', 'Admin\StatisticsController@districtRoi7dayTotal');
132
+        Route::get('/statistics/districtRoi7dayTotal_export', 'Admin\StatisticsController@districtRoi7dayTotal_export');
131 133
         //团队财务报表
132 134
         Route::get('/statistics/teamFinanceList', 'Admin\StatisticsController@teamFinanceList');
133 135
         Route::get('/statistics/teamFinanceList_export', 'Admin\StatisticsController@teamFinanceList_export');

+ 8 - 5
resources/views/admin/index.blade.php

@@ -110,19 +110,22 @@
110 110
                     <ul>                       
111 111
                         <li @if(!isset($res['statistics/orderDistrict'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/orderDistrict')}}" data-title="实时订单地域分布" href="javascript:void(0)">实时订单地域分布</a></li>                        
112 112
                     </ul>
113
+                   
113 114
                     <ul>                       
114
-                        <li @if(!isset($res['statistics/districtRoi'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/districtRoi')}}" data-title="地域ROI统计" href="javascript:void(0)">地域ROI统计</a></li>                        
115
-                    </ul>
116
-                    <ul>                       
117
-                        <li @if(!isset($res['statistics/districtRoi'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/districtRoi7day')}}" data-title="地域ROI7日统计" href="javascript:void(0)">地域ROI7日统计</a></li>                        
115
+                        <li @if(!isset($res['statistics/districtRoi'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/districtRoi7day')}}" data-title="滚动地域ROI" href="javascript:void(0)">滚动地域ROI</a></li>                        
118 116
                     </ul>
117
+                   
118
+                </dd>
119
+            </dl>
120
+            <dl id="menu-order">
121
+                <dt @if(!isset($res['statistics/financemanage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe606;</i> 财务报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
122
+                <dd>
119 123
                     <ul>                       
120 124
                         <li @if(!isset($res['statistics/teamFinanceList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceList')}}" data-title="团队订单财务明细" href="javascript:void(0)">团队订单财务明细</a></li>                        
121 125
                     </ul>
122 126
                     <ul>                       
123 127
                         <li @if(!isset($res['statistics/teamFinanceTotal'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/statistics/teamFinanceTotal')}}" data-title="团队订单财务汇总" href="javascript:void(0)">团队订单财务汇总</a></li>                        
124 128
                     </ul>
125
-                   
126 129
                 </dd>
127 130
             </dl>
128 131
                      

+ 30 - 0
resources/views/order/orderlist.blade.php

@@ -85,6 +85,7 @@
85 85
                     <th width="5%">发货备注</th>                                                        
86 86
                     <th width="5%">售后费用</th>                                                        
87 87
                     <th width="5%">售后原因</th>                                                        
88
+                    <th width="5%">售后时间</th>                                                      
88 89
                     <th width="5%">操作</th>                 
89 90
                 </tr>
90 91
                 </thead>
@@ -190,9 +191,15 @@
190 191
                                 <textarea id="aftersale_reason_2{{$a['id']}}" rows=4 style="display: none"  name='aftersale_reason' onblur="change_aftersale_reason({{$a['id']}})" >{{$a['aftersale_reason']}}</textarea>
191 192
                                 <span class="sort_icon" hidden  onClick='change_aftersale_reason_click("{{$a['id']}}","{{$a['aftersale_reason']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
192 193
                             </td>
194
+                            <td class ="change_logistics_id"> 
195
+                                <p id="aftersale_time_1{{$a['id']}}">{{$a['aftersale_time']}}</p> 
196
+                                <input id="aftersale_time_2{{$a['id']}}" style="display: none"  name='aftersale_time' onblur="change_aftersale_time({{$a['id']}})" value="{{$a['aftersale_time']}}"  onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class=" Wdate" />
197
+                                <span class="sort_icon" hidden  onClick='change_aftersale_time_click("{{$a['id']}}","{{$a['aftersale_time']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
198
+                            </td>
193 199
                             @else
194 200
                             <td>{{$a['aftersale_fee']}}</td>
195 201
                             <td>{{$a['aftersale_reason']}}</td>
202
+                            <td>{{$a['aftersale_time']}}</td>
196 203
                             @endif
197 204
                             <td>
198 205
                                 @if($a['enable_status'])
@@ -448,6 +455,29 @@
448 455
             });
449 456
         }
450 457
 
458
+        function change_aftersale_time_click(id, aftersale_time){
459
+            $("#aftersale_time_1"+id).hide();
460
+            $("#aftersale_time_2"+id).show();
461
+            $("#aftersale_time_2"+id).focus();
462
+        }
463
+
464
+        function change_aftersale_time(id){
465
+            var aftersale_time = $("#aftersale_time_2"+id).val();
466
+            if(!aftersale_time){
467
+                return false;
468
+            }
469
+            $.ajax({
470
+                url: '/admin/order/editLogisticsId?id='+id+'&aftersale_time='+aftersale_time,
471
+                type: 'get',
472
+                dateType: 'json',
473
+                success:function(msg){
474
+                    $("#aftersale_time_1"+id).html(aftersale_time);
475
+                    $("#aftersale_time_1"+id).show();
476
+                    $("#aftersale_time_2"+id).hide();
477
+                }
478
+            });
479
+        }
480
+
451 481
         function change_aftersale_reason_click(id, aftersale_reason){
452 482
             $("#aftersale_reason_1"+id).hide();
453 483
             $("#aftersale_reason_2"+id).show();

+ 20 - 0
resources/views/statistics/districtRoi.blade.php

@@ -4,6 +4,13 @@
4 4
     <div class="page-container">
5 5
         <div>
6 6
             <div>   
7
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="数据分类"/> 
8
+                <select style="width:10%;text-align:center" id='data_type' name="data_type">
9
+                    <option value="0" >7日roi明细</option>                   
10
+                    <option value="1">7日roi汇总</option>                                     
11
+                    <option value="2" selected>每日roi明细</option>                                     
12
+                  
13
+                </select>
7 14
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
8 15
                 <input id="city" type="text"  class="input-text" style="width:6%;text-align:center" name="city" value="{{$city?$city:''}}">                         
9 16
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
@@ -127,6 +134,19 @@
127 134
             var city = $('#city').val();
128 135
             location.href = '/admin/statistics/districtRoi_export?stime='+stime+'&etime='+etime+'&city='+city;
129 136
         }
137
+
138
+         $("#data_type").change(function(){
139
+            var date_type = $(this).val();
140
+            if(date_type == 0){
141
+                location.href='districtRoi7day';
142
+            }
143
+            else if(date_type == 1){
144
+                location.href='districtRoi7dayTotal';
145
+            }
146
+            else if(date_type == 2){
147
+                location.href='districtRoi';
148
+            }
149
+        })
130 150
        
131 151
         /*分页*/
132 152
             

+ 20 - 0
resources/views/statistics/districtRoi7day.blade.php

@@ -4,6 +4,13 @@
4 4
     <div class="page-container">
5 5
         <div>
6 6
             <div>   
7
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="数据分类"/> 
8
+                <select style="width:10%;text-align:center" id='data_type' name="data_type">
9
+                    <option value="0" selected >7日roi明细</option>                   
10
+                    <option value="1">7日roi汇总</option>                                     
11
+                    <option value="2">每日roi明细</option>                                     
12
+                  
13
+                </select> 
7 14
                 <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
8 15
                 <input id="city" type="text"  class="input-text" style="width:6%;text-align:center" name="city" value="{{$city?$city:''}}">                         
9 16
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="开始时间"/>
@@ -84,6 +91,19 @@
84 91
             var city = $('#city').val();
85 92
             location.href = '/admin/statistics/districtRoi7day_export?stime='+stime+'&etime='+etime+'&city='+city;
86 93
         }
94
+
95
+        $("#data_type").change(function(){
96
+            var date_type = $(this).val();
97
+            if(date_type == 0){
98
+                location.href='districtRoi7day';
99
+            }
100
+            else if(date_type == 1){
101
+                location.href='districtRoi7dayTotal';
102
+            }
103
+            else if(date_type == 2){
104
+                location.href='districtRoi';
105
+            }
106
+        })
87 107
        
88 108
         /*分页*/
89 109
             

+ 113 - 0
resources/views/statistics/districtRoi7dayTotal.blade.php

@@ -0,0 +1,113 @@
1
+@extends('admin/master')
2
+@section('content')
3
+    <body>
4
+    <div class="page-container">
5
+        <div>
6
+            <div>  
7
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="数据分类"/> 
8
+                <select style="width:10%;text-align:center" id='data_type' name="data_type">
9
+                    <option value="0"  >7日roi明细</option>                   
10
+                    <option value="1" selected>7日roi汇总</option>                                     
11
+                    <option value="2" >每日roi明细</option>                                     
12
+                  
13
+                </select>  
14
+                <input class="input-text" style="width:5%;text-align:center" type="text" value="所属城市"/>
15
+                <input id="city" type="text"  class="input-text" style="width:6%;text-align:center" name="city" value="{{$city?$city:''}}">                         
16
+                
17
+                <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>
18
+                <a class="btn btn-primary radius" onclick="statistics_export()" href="javascript:;"><i class="Hui-iconfont"></i> 导出数据</a>
19
+                
20
+            </div>
21
+        </div>
22
+        
23
+        <div class="mt-20">
24
+            <table class="table table-border table-bordered table-bg table-hover table-sort">
25
+                <thead>
26
+                <tr class="text-c">
27
+                    <th width="5%">城市</th>
28
+                    <th width="5%">投放成本</th>
29
+                    <th width="5%">加粉数</th>
30
+                    <th width="5%">新粉数量</th>
31
+                    <th width="5%">新粉成单数</th>
32
+                    <th width="5%">新粉收入</th>
33
+                    <th width="5%">新粉ROI</th>
34
+                    <th width="5%">7日累计成单数</th>
35
+                    <th width="5%">7日累计收入</th>
36
+                    <th width="5%">7日累计ROI</th>                                                
37
+                </tr>
38
+                </thead>
39
+                <tbody>
40
+                @if($result)
41
+                    @foreach($result as $a)
42
+                        <tr class="text-c" style=" text-align:center;">                                                                                                                   
43
+                            <td>{{$a['city']}}</td>                                                                                         
44
+                            <td>{{$a['cost']}}</td>                                                                                           
45
+                            <td>{{$a['gzh_count']}}</td>                                                                                           
46
+                            <td>{{$a['fan_count']}}</td>                                                                                           
47
+                            <td>{{$a['new_fan_order_count']}}</td>                                                                                         
48
+                            <td>{{$a['new_fan_order_amount']}}</td>                                                                                         
49
+                            <td>{{$a['new_roi']}}</td>                                                                                         
50
+                            <td>{{$a['order_count']}}</td>                                                                                         
51
+                            <td>{{$a['order_amount']}}</td>                                                                                         
52
+                            <td>{{$a['total_roi']}}</td>                                                                                         
53
+                        </tr>
54
+                    @endforeach
55
+                @endif
56
+                </tbody>
57
+            </table>
58
+        </div>
59
+        <div id="page" class="page_div"></div>
60
+    </div>
61
+    
62
+    <!--_footer 作为公共模版分离出去-->
63
+    <script type="text/javascript" src="/admin/lib/jquery/1.9.1/jquery.min.js"></script>
64
+    <script type="text/javascript" src="/admin/lib/layer/2.4/layer.js"></script>
65
+    <script type="text/javascript" src="/admin/static/h-ui/js/H-ui.min.js"></script>
66
+    <script type="text/javascript" src="/admin/static/h-ui.admin/js/H-ui.admin.js"></script>
67
+    <script type="text/javascript" src="/admin/lib/page/paging.js"></script>
68
+    <script type="text/javascript" src="/admin/lib/My97DatePicker/4.8/WdatePicker.js"></script>
69
+    <!--/_footer 作为公共模版分离出去-->
70
+    <!--/_footer 作为公共模版分离出去-->
71
+     <script type="text/javascript">
72
+        
73
+        function user_search(){
74
+
75
+            var city = $('#city').val();
76
+            //var page = {{$page}};
77
+            location.href = 'districtRoi7dayTotal?city='+city;
78
+        }
79
+        //导出
80
+        function statistics_export(){
81
+            var city = $('#city').val();
82
+            location.href = '/admin/statistics/districtRoi7dayTotal_export?city='+city;
83
+        }
84
+       
85
+         $("#data_type").change(function(){
86
+            var date_type = $(this).val();
87
+            if(date_type == 0){
88
+                location.href='districtRoi7day';
89
+            }
90
+            else if(date_type == 1){
91
+                location.href='districtRoi7dayTotal';
92
+            }
93
+            else if(date_type == 2){
94
+                location.href='districtRoi';
95
+            }
96
+        })
97
+        /*分页*/
98
+            
99
+        $("#page").paging({
100
+            pageNo:{{$page}},
101
+            totalPage: {{$pages}},
102
+            totalSize: {{$count}},
103
+            callback: function(num) {
104
+                var city = $('#city').val();
105
+                location.href='districtRoi7dayTotal?page='+num+'&city='+city;
106
+            }
107
+        })
108
+        
109
+    </script>
110
+   
111
+    </body>
112
+
113
+@endsection

+ 2 - 0
resources/views/statistics/teamFinanceList.blade.php

@@ -35,6 +35,7 @@
35 35
                     <th width="5%">实际金额</th>
36 36
                     <th width="5%">供应商成本</th>
37 37
                     <th width="5%">物流成本</th>                                                
38
+                    <th width="5%">支付方式</th>                                                
38 39
                 </tr>
39 40
                 </thead>
40 41
                 <tbody>
@@ -50,6 +51,7 @@
50 51
                             <td>{{$a['true_amount']}}</td>
51 52
                             <td>{{$a['cost']}}</td>
52 53
                             <td>{{$a['freight_cost']}}</td>
54
+                            <td>{{$a['payment_type']}}</td>
53 55
 
54 56
                         </tr>
55 57
                     @endforeach