财务明细加仓库筛选

app/Http/Controllers/Admin/StatisticsController.php

@@ -1978,6 +1978,7 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+        $warehouse = (int)$request->input('warehouse');
 
         $page = (int)$request->input('page');
         $pageSize = 20;
@@ -1987,8 +1988,9 @@ class StatisticsController extends Controller
 
         $offset = ($page-1) * $pageSize;
 
-        $count = Order::where(function($query) use($team_id, $stime, $etime){
+        $count = Order::where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime) $query->where('aftersale_time', '>=', $stime);
             if($etime) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
 
@@ -2002,8 +2004,9 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('aftersale_time', '>=', $stime);
             if($etime ) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
         })->where('is_del', 0)->where('aftersale_fee', '>', 0);
@@ -2012,11 +2015,18 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             //$v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['aftersale_time'];
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -2031,6 +2041,7 @@ class StatisticsController extends Controller
             'count'   =>   $count,
             'pages'   =>   $pages,
             'teamlist'   =>   $teamList,
+            'warehouse'   =>   $warehouse,
         ]);
     } 
 
@@ -2039,6 +2050,7 @@ class StatisticsController extends Controller
      */
     public function refundFinanceList(Request $request){
         $team_id = (int)$request->input('team_id');
+        $warehouse = (int)$request->input('warehouse');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
 
@@ -2050,8 +2062,9 @@ class StatisticsController extends Controller
 
         $offset = ($page-1) * $pageSize;
 
-        $count = Order::where(function($query) use($team_id, $stime, $etime){
+        $count = Order::where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime) $query->where('refund_time', '>=', $stime);
             if($etime) $query->where('refund_time', '<=', $etime);
 
@@ -2065,8 +2078,9 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
         })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
@@ -2075,6 +2089,12 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
@@ -2087,6 +2107,7 @@ class StatisticsController extends Controller
             }else{
                 $v['refund_type'] = '';
             }   
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -2101,6 +2122,7 @@ class StatisticsController extends Controller
             'count'   =>   $count,
             'pages'   =>   $pages,
             'teamlist'   =>   $teamList,
+            'warehouse'   =>   $warehouse,
         ]);
     } 
 
@@ -2111,6 +2133,7 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+        $warehouse = (int)$request->input('warehouse');
 
         $page = (int)$request->input('page');
         $pageSize = 20;
@@ -2120,8 +2143,9 @@ class StatisticsController extends Controller
 
         $offset = ($page-1) * $pageSize;
 
-        $count = Order::where(function($query) use($team_id, $stime, $etime){
+        $count = Order::where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime) $query->where('send_time', '>=', $stime);
             if($etime) $query->where('send_time', '<=', $etime);
 
@@ -2135,8 +2159,9 @@ class StatisticsController extends Controller
         }
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'cost', 'freight_cost', 'payment_type', 'send_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'cost', 'freight_cost', 'payment_type', 'send_time', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('send_time', '>=', $stime);
             if($etime ) $query->where('send_time', '<=', $etime);
         })->where('is_del', 0)->where('logistics_id', '>', '');
@@ -2145,10 +2170,17 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['send_time'];
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
         $teamList = DB::table('teams')->select('id', 'name')->get();
@@ -2163,6 +2195,7 @@ class StatisticsController extends Controller
             'count'   =>   $count,
             'pages'   =>   $pages,
             'teamlist'   =>   $teamList,
+            'warehouse'   =>   $warehouse,
         ]);
     } 
 
@@ -2173,10 +2206,12 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+        $warehouse = (int)$request->input('warehouse');
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'aftersale_fee', 'refund_price', 'cost', 'freight_cost', 'payment_type', 'aftersale_time', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('aftersale_time', '>=', $stime);
             if($etime ) $query->where('aftersale_time', '<=', $etime. ' 23:59:59');
         })->where('is_del', 0)->where('aftersale_fee', '>', 0);
@@ -2185,15 +2220,22 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             //$v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['aftersale_time'];
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
-        $indexKey = ['team_name','ctime','id','receivedAmount','aftersale_fee', 'payment_type'];      
-        $title = ['团队', '售后时间', '订单编号', '成交金额','售后金额', '支付方式'];
+        $indexKey = ['team_name','ctime','id','receivedAmount','aftersale_fee', 'payment_type', 'warehouse'];      
+        $title = ['团队', '售后时间', '订单编号', '成交金额','售后金额', '支付方式', '发货仓库'];
         $filename = 'shouhoumingxi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     } 
@@ -2205,10 +2247,12 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+        $warehouse = (int)$request->input('warehouse');
 
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'refund_price', 'payment_type', 'refund_time', 'refund_note', 'refund_type', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('refund_time', '>=', $stime);
             if($etime ) $query->where('refund_time', '<=', $etime);
         })->where('is_del', 0)->where('refund_time', '>', '')->where('is_refund', 1);
@@ -2217,6 +2261,12 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
@@ -2229,10 +2279,11 @@ class StatisticsController extends Controller
             }else{
                 $v['refund_type'] = '';
             } 
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
-        $indexKey = ['team_name','ctime','id','receivedAmount', 'payment_type','refund_price', 'refund_type'];      
-        $title = ['团队', '退补时间', '订单编号', '成交金额', '支付方式', '退补差价', '退补支付方式'];
+        $indexKey = ['team_name','ctime','id','receivedAmount', 'payment_type','refund_price', 'refund_type', 'warehouse'];      
+        $title = ['团队', '退补时间', '订单编号', '成交金额', '支付方式', '退补差价', '退补支付方式', '发货仓库'];
         $filename = 'tuibumingxi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     } 
@@ -2244,10 +2295,12 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $stime = $request->input('stime');
         $etime = $request->input('etime');
+        $warehouse = (int)$request->input('warehouse');
         
         $teams = DB::table('teams')->lists('name', 'id');
-        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'cost', 'freight_cost', 'payment_type', 'send_time')->where(function($query) use($team_id, $stime, $etime){
+        $resultQuery = Order::select('team_id', 'createTime', 'id', 'receivedAmount', 'cost', 'freight_cost', 'payment_type', 'send_time', 'warehouse')->where(function($query) use($team_id, $stime, $etime, $warehouse){
             if($team_id) $query->where('team_id', $team_id);
+            if($warehouse) $query->where('warehouse', $warehouse);
             if($stime ) $query->where('send_time', '>=', $stime);
             if($etime ) $query->where('send_time', '<=', $etime);
         })->where('is_del', 0)->where('logistics_id', '>', '');
@@ -2256,14 +2309,21 @@ class StatisticsController extends Controller
         
         $result = json_decode(json_encode($result), true);
         $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $wareArr = array(
+            0 => '其他',
+            1 => 'A仓',
+            2 => 'B仓',
+            3 => 'C仓',
+        );
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;            
             $v['payment_type'] = $payArr[$v['payment_type']];
             $v['ctime'] = $v['send_time'];
+            $v['warehouse'] = $wareArr[$v['warehouse']];
         }
 
-        $indexKey = ['team_name','ctime','id','receivedAmount', 'cost', 'freight_cost', 'payment_type'];      
-        $title = ['团队', '发货时间', '订单编号', '成交金额','货品成本', '物流成本', '支付方式'];
+        $indexKey = ['team_name','ctime','id','receivedAmount', 'cost', 'freight_cost', 'payment_type', 'warehouse'];      
+        $title = ['团队', '发货时间', '订单编号', '成交金额','货品成本', '物流成本', '支付方式', '发货仓库'];
         $filename = 'fahuomingxi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     } 

resources/views/statistics/aftersaleFinanceList.blade.php

@@ -15,6 +15,14 @@
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>
                 <input id="etime"type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="etime" value="{{$etime?$etime:''}}">
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
+                <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
+                    <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
+                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
+                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
+                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
+                    
+                </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>
                 <a class="btn btn-primary radius" onclick="statistics_export()" href="javascript:;"><i class="Hui-iconfont"></i> 导出数据</a>
@@ -34,6 +42,7 @@
                     <!--th width="5%">供应商成本</th>
                     <th width="5%">物流成本</th-->                                                
                     <th width="5%">支付方式</th>                                                
+                    <th width="5%">发货仓库</th>                                                
                 </tr>
                 </thead>
                 <tbody>
@@ -48,6 +57,7 @@
                             <!--td>{{$a['cost']}}</td>
                             <td>{{$a['freight_cost']}}</td-->
                             <td>{{$a['payment_type']}}</td>
+                            <td>{{$a['warehouse']}}</td>
 
                         </tr>
                     @endforeach
@@ -72,15 +82,17 @@
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
+            var warehouse = $('#warehouse').val();
             //var page = {{$page}};
-            location.href = 'aftersaleFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            location.href = 'aftersaleFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
         //导出
         function statistics_export(){
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
-            location.href = '/admin/statistics/aftersaleFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            var warehouse = $('#warehouse').val();
+            location.href = '/admin/statistics/aftersaleFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
        
         /*分页*/
@@ -93,7 +105,8 @@
                 var stime = $('#stime').val();
                 var etime = $('#etime').val();
                 var team_id = $('#team_id').val();
-                location.href='aftersaleFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id;
+                var warehouse = $('#warehouse').val();
+                location.href='aftersaleFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
             }
         })
         

resources/views/statistics/refundFinanceList.blade.php

@@ -15,6 +15,14 @@
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>
                 <input id="etime"type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="etime" value="{{$etime?$etime:''}}">
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
+                <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
+                    <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
+                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
+                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
+                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
+                    
+                </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>
                 <a class="btn btn-primary radius" onclick="statistics_export()" href="javascript:;"><i class="Hui-iconfont"></i> 导出数据</a>
@@ -33,6 +41,7 @@
                     <th width="5%">支付方式</th>                
                     <th width="5%">退补金额</th>                                                             
                     <th width="5%">退补支付方式</th>                                                
+                    <th width="5%">发货仓库</th>                                                
                 </tr>
                 </thead>
                 <tbody>
@@ -46,6 +55,7 @@
                             <td>{{$a['payment_type']}}</td>                    
                             <td>{{$a['refund_price']}}</td>                      
                             <td>{{$a['refund_type']}}</td>
+                            <td>{{$a['warehouse']}}</td>
 
                         </tr>
                     @endforeach
@@ -70,15 +80,17 @@
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
+            var warehouse = $('#warehouse').val();
             //var page = {{$page}};
-            location.href = 'refundFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            location.href = 'refundFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
         //导出
         function statistics_export(){
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
-            location.href = '/admin/statistics/refundFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            var warehouse = $('#warehouse').val();
+            location.href = '/admin/statistics/refundFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
        
         /*分页*/
@@ -91,7 +103,8 @@
                 var stime = $('#stime').val();
                 var etime = $('#etime').val();
                 var team_id = $('#team_id').val();
-                location.href='refundFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id;
+                var warehouse = $('#warehouse').val();
+                location.href='refundFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
             }
         })
         

resources/views/statistics/sendFinanceList.blade.php

@@ -15,6 +15,14 @@
                 <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="stime" value="{{$stime?$stime:''}}">
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="结束时间"/>
                 <input id="etime"type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:12%;text-align:center;margin-left: -5px" name="etime" value="{{$etime?$etime:''}}">
+                <input class="input-text" style="width:6%;text-align:center" type="text" value="所属仓库"/> 
+                <select style="width:10%;text-align:center" id='warehouse' name="warehouse">
+                    <option value="0" @if($warehouse==0) selected @endif>-- 选择仓库 --</option>
+                    <option value="1" @if($warehouse==1) selected @endif>A仓库</option>
+                    <option value="2" @if($warehouse==2) selected @endif>B仓库</option>
+                    <option value="3" @if($warehouse==3) selected @endif>C仓库</option>
+                    
+                </select> 
                               
                 <a class="btn btn-primary radius"  style="margin-left: 5px" onclick="user_search()" href="javascript:;">搜索</a>
                 <a class="btn btn-primary radius" onclick="statistics_export()" href="javascript:;"><i class="Hui-iconfont"></i> 导出数据</a>
@@ -34,6 +42,7 @@
                     <th width="5%">物流成本</th>                
                                                
                     <th width="5%">支付方式</th>                                                
+                    <th width="5%">发货仓库</th>                                                
                 </tr>
                 </thead>
                 <tbody>
@@ -48,6 +57,7 @@
                             <td>{{$a['freight_cost']}}</td>                      
 
                             <td>{{$a['payment_type']}}</td>
+                            <td>{{$a['warehouse']}}</td>
 
                         </tr>
                     @endforeach
@@ -72,15 +82,17 @@
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
+            var warehouse = $('#warehouse').val();
             //var page = {{$page}};
-            location.href = 'sendFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            location.href = 'sendFinanceList?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
         //导出
         function statistics_export(){
             var stime = $('#stime').val();
             var etime = $('#etime').val();
             var team_id = $('#team_id').val();
-            location.href = '/admin/statistics/sendFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id;
+            var warehouse = $('#warehouse').val();
+            location.href = '/admin/statistics/sendFinanceList_export?stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
         }
        
         /*分页*/
@@ -93,7 +105,8 @@
                 var stime = $('#stime').val();
                 var etime = $('#etime').val();
                 var team_id = $('#team_id').val();
-                location.href='sendFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id;
+                var warehouse = $('#warehouse').val();
+                location.href='sendFinanceList?page='+num+'&stime='+stime+'&etime='+etime+'&team_id='+team_id+'&warehouse='+warehouse;
             }
         })