Merge branch 'zjl_com_name_20201113'

app/Http/Controllers/OrderController.php

@@ -443,6 +443,7 @@ Class OrderController extends Controller
         $map['status_extend']        = $request->input('status_extend', '');
         $map['status_extend']        = $request->input('status_extend', '');
         $map['is_manager_audit']     = $request->input('is_manager_audit', '');
         $map['is_manager_audit']     = $request->input('is_manager_audit', '');
         $map['order_remark']         = $request->input('order_remark', '');
         $map['order_remark']         = $request->input('order_remark', '');
+        $map['pur_time']             = $request->input('pur_time', '');
 
 
         $perm = new PermController;
         $perm = new PermController;
 
 

public/js/list.js

@@ -97,7 +97,8 @@
                     order_type_extend    = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
                     order_type_extend    = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
                     status_extend        = $('#status_extend').val() ? $('#status_extend').val() : '',
                     status_extend        = $('#status_extend').val() ? $('#status_extend').val() : '',
                     is_manager_audit     = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
                     is_manager_audit     = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
-                    order_remark         = $('#order_remark').val() ? $('#order_remark').val() : '';
+                    order_remark         = $('#order_remark').val() ? $('#order_remark').val() : '',
+                    pur_time             = $('input[name="pur_time"]').val();
                    
                    
                     if (url == '/export') {
                     if (url == '/export') {
                         if (type == 1) { // 联营
                         if (type == 1) { // 联营
@@ -243,6 +244,10 @@
                         listUrl += '&order_remark=' + order_remark;
                         listUrl += '&order_remark=' + order_remark;
                     }
                     }
 
 
+                    if(pur_time){
+                        listUrl += '&pur_time='+pur_time;
+                    }
+
                     if (url == '/export') {
                     if (url == '/export') {
                         listUrl += '&order_goods_type='+type;
                         listUrl += '&order_goods_type='+type;
                     }
                     }

resources/views/orderlist/content.blade.php

@@ -234,6 +234,13 @@
                                         <input type="text" id="order_remark" name="order_remark" value="{{$condition['order_remark']}}" placeholder="请输入公司名称">
                                         <input type="text" id="order_remark" name="order_remark" value="{{$condition['order_remark']}}" placeholder="请输入公司名称">
                                     </dd>
                                     </dd>
                                 </dl>
                                 </dl>
+
+                                <dl>
+                                    <dt>采购时间：</dt>
+                                    <dd style="width: 120px;">
+                                        <input type="text" name="pur_time" value="{{ !empty($condition['pur_time']) ? $condition['pur_time'] : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM'})" placeholder="采购时间" autocomplete="off"  style="width: 140px;" />
+                                    </dd>
+                                </dl>
                                 @endif
                                 @endif
                                 
                                 
                                 @if (in_array('check_test_order', $userPerms))
                                 @if (in_array('check_test_order', $userPerms))