添加新筛选属性

app/Http/Controllers/OrderController.php

@@ -397,7 +397,7 @@ Class OrderController extends Controller
         $info = $this->getPageInfo($request);
 
         $map = array();
-
+        
         // 页面参数
         $map['order_type']           = $request->input('order_type', '');
         $map['order_contain']        = $request->input('order_contain', '');
@@ -406,6 +406,14 @@ Class OrderController extends Controller
         $map['goods_name']           = $request->input('goods_name', '');
         $map['time_start']           = $request->input('time_start', '');
         $map['time_end']             = $request->input('time_end', '');
+        $map['confirm_time_start']   = $request->input('confirm_time_start', '');//开始审核时间
+        $map['confirm_time_end']     = $request->input('confirm_time_end', '');//结束审核时间
+        $map['pay_time_start']       = $request->input('pay_time_start', '');//收款开始时间
+        $map['pay_time_end']         = $request->input('pay_time_end', '');//收款结束时间
+        $map['shipping_time_start']  = $request->input('shipping_time_start', '');//发货开始时间
+        $map['shipping_time_end']    = $request->input('shipping_time_end', '');//发货结束时间
+        $map['finish_time_start']    = $request->input('finish_time_start', '');//订单完成开始时间
+        $map['finish_time_end']      = $request->input('finish_time_end', '');//订单完成结束时间
         $map['order_status']         = $request->input('order_status', '');
         $map['sale_type']            = $request->input('sale_type', '');
         $map['shipping_name']        = $request->input('shipping_name', '');

public/js/order.js

@@ -79,6 +79,19 @@
                     goods_name           = $('input[name=goods_name]').val(),
                     time_start           = $('input[name="time_start"]').val(),
                     time_end             = $('input[name="time_end"]').val(),
+                    
+                    confirm_time_start   = $('input[name="confirm_time_start"]').val(),
+                    confirm_time_end     = $('input[name="confirm_time_end"]').val(),
+                    
+                    pay_time_start       = $('input[name="pay_time_start"]').val(),
+                    pay_time_end         = $('input[name="pay_time_end"]').val(),
+                    
+                    shipping_time_start  = $('input[name="shipping_time_start"]').val(),
+                    shipping_time_end    = $('input[name="shipping_time_end"]').val(),
+
+                    finish_time_start  = $('input[name="finish_time_start"]').val(),
+                    finish_time_end    = $('input[name="finish_time_end"]').val(),
+                    
                     // order_type_a      = $('#order_type_a').data('default'),
                     order_pay_type       = $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
                     order_status         = $('#order_status').val() ? $('#order_status').val() : '',
@@ -156,6 +169,54 @@
                         listUrl += '&time_end='+time_end;
                     }
 
+                    if(confirm_time_start){
+                        confirm_time_start = Date.parse(confirm_time_start) / 1000;
+
+                        listUrl += '&confirm_time_start='+confirm_time_start;
+                    }
+
+                    if(confirm_time_end){
+                        confirm_time_end = Date.parse(confirm_time_end) / 1000 + (24*60*60-1);
+
+                        listUrl += '&confirm_time_end='+confirm_time_end;
+                    }
+
+                    if(pay_time_start){
+                        pay_time_start = Date.parse(pay_time_start) / 1000;
+
+                        listUrl += '&pay_time_start='+pay_time_start;
+                    }
+
+                    if(pay_time_end){
+                        pay_time_end = Date.parse(pay_time_end) / 1000 + (24*60*60-1);
+
+                        listUrl += '&pay_time_end='+pay_time_end;
+                    }
+
+                    if(shipping_time_start){
+                        shipping_time_start = Date.parse(shipping_time_start) / 1000;
+                        listUrl += '&shipping_time_start='+shipping_time_start;
+                    }
+
+                    if(shipping_time_end){
+                        shipping_time_end = Date.parse(shipping_time_end) / 1000 + (24*60*60-1);
+                        listUrl += '&shipping_time_end='+shipping_time_end;
+                    }
+
+                    if(finish_time_start){
+                        finish_time_start = Date.parse(finish_time_start) / 1000;
+
+                        listUrl += '&finish_time_start='+finish_time_start;
+                    }
+
+                    if(finish_time_end){
+                        finish_time_end = Date.parse(finish_time_end) / 1000 + (24*60*60-1);
+
+                        listUrl += '&finish_time_end='+finish_time_end;
+                    }
+                   
+                    
+
                     // if (order_type_a) {
                     //     listUrl += '&order_type_a=' + order_type_a;
                     // }

resources/views/orderlist/content.blade.php

@@ -46,6 +46,47 @@
                                         <input type="text" name="time_end"  value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
                                     </dd>
                                 </dl> 
+                                
+                                <dl>
+                                    <dt>审核日期： </dt>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="confirm_time_start" value="{{ !empty($condition['confirm_time_start']) ? date('Y/m/d', $condition['confirm_time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
+                                    </dd>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="confirm_time_end"  value="{{ !empty($condition['confirm_time_end']) ? date('Y/m/d', $condition['confirm_time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
+                                    </dd>
+                                </dl> 
+
+                                <dl>
+                                    <dt>收款日期： </dt>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="pay_time_start" value="{{ !empty($condition['pay_time_start']) ? date('Y/m/d', $condition['pay_time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
+                                    </dd>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="pay_time_end"  value="{{ !empty($condition['pay_time_end']) ? date('Y/m/d', $condition['pay_time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
+                                    </dd>
+                                </dl> 
+
+                                <dl>
+                                    <dt>发货日期： </dt>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="shipping_time_start" value="{{ !empty($condition['shipping_time_start']) ? date('Y/m/d', $condition['shipping_time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
+                                    </dd>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="shipping_time_end"  value="{{ !empty($condition['shipping_time_end']) ? date('Y/m/d', $condition['shipping_time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
+                                    </dd>
+                                </dl>
+
+                                <dl>
+                                    <dt>订单完成： </dt>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="finish_time_start" value="{{ !empty($condition['finish_time_start']) ? date('Y/m/d', $condition['finish_time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
+                                    </dd>
+                                    <dd style="width:auto !important;">
+                                        <input type="text" name="finish_time_end"  value="{{ !empty($condition['finish_time_end']) ? date('Y/m/d', $condition['finish_time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
+                                    </dd>
+                                </dl>
+
                                 <dl>
                                     <dt>型号名称：</dt>
                                     <dd>