Merge branch 'hcy_pcb_20181221-r' into development

resources/views/Pcb/PcbOrderList.blade.php

@@ -40,8 +40,8 @@
                             <div class="layui-input-inline payment-status" style="width: 800px !important;">
                             <div class="layui-input-inline payment-status" style="width: 800px !important;">
                                 <input type="hidden" name="status" value="">
                                 <input type="hidden" name="status" value="">
                                 @if(!empty($status) && is_array($status))
                                 @if(!empty($status) && is_array($status))
-                                    @foreach($status as $k=>$v)
-                                        <input type="checkbox" lay-filter="*"  @if(in_array($k,explode(',',@$_GET['status']))){{ "checked" }} @endif data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
+                                    @foreach($status as $k1=>$v1)
+                                        <input type="checkbox" lay-filter="*"  @if(in_array($k1,explode(',',@$_GET['status']))){{ "checked" }} @endif data-type="status" value="{{$k1}}" title="{{$v1 or '未知'}}" >
                                     @endforeach
                                     @endforeach
                                 @endif
                                 @endif
                             </div>
                             </div>
@@ -54,7 +54,7 @@
                             <input type="hidden" name="order_type" value="">
                             <input type="hidden" name="order_type" value="">
                             @if(!empty($order_type) && is_array($order_type))
                             @if(!empty($order_type) && is_array($order_type))
                                 @foreach($order_type as $k=>$v)
                                 @foreach($order_type as $k=>$v)
-                                    <input type="checkbox" lay-filter="*" data-type="status" @if(in_array($k,explode(',',@$_GET['order_type']))) {{ "checked" }} @endif value="{{$k}}" title="{{$v or '未知'}}" >
+                                    <input type="checkbox" lay-filter="*" data-type="order_type" @if(in_array($k,explode(',',@$_GET['order_type']))) {{ "checked" }} @endif value="{{$k}}" title="{{$v or '未知'}}" >
                                 @endforeach
                                 @endforeach
                             @endif
                             @endif
                         </div>
                         </div>

resources/views/Pcb/PcbPurchaseList.blade.php

@@ -48,7 +48,7 @@
                             <input type="hidden" name="order_type" value="">
                             <input type="hidden" name="order_type" value="">
                             @if(!empty($order_type) && is_array($order_type))
                             @if(!empty($order_type) && is_array($order_type))
                                 @foreach($order_type as $k=>$v)
                                 @foreach($order_type as $k=>$v)
-                                    <input type="checkbox" lay-filter="*" data-type="status" @if(in_array($k,explode(',',@$_GET['order_type']))) {{ "checked" }} @endif value="{{$k}}" title="{{$v or '未知'}}" >
+                                    <input type="checkbox" lay-filter="*" data-type="order_type" @if(in_array($k,explode(',',@$_GET['order_type']))) {{ "checked" }} @endif value="{{$k}}" title="{{$v or '未知'}}" >
                                 @endforeach
                                 @endforeach
                             @endif
                             @endif
                         </div>
                         </div>