Merge branch 'master' into ysx-供应商需求-20221009

resources/views/web/sku/SkuListCommon.blade.php

@@ -79,10 +79,10 @@
                     @inject('statusPresenter','App\Presenters\StatusPresenter')
                     {!! $statusPresenter->render('tags/condition','是否精选',request()->get('tags/condition'),[1=>'是',0=>'否']) !!}
                 </div>
-                <div class="layui-inline">
-                    @inject('statusPresenter','App\Presenters\StatusPresenter')
-                    {!! $statusPresenter->render('status/condition','是否过期',request()->get('status/condition'),[0=>'是',1=>'否']) !!}
-                </div>
+{{--                <div class="layui-inline">--}}
+{{--                    @inject('statusPresenter','App\Presenters\StatusPresenter')--}}
+{{--                    {!! $statusPresenter->render('status/condition','是否过期',request()->get('status/condition'),[0=>'是',1=>'否']) !!}--}}
+{{--                </div>--}}
 
                 <div class="layui-inline">
                     <label class="layui-form-label">起订量库存</label>
@@ -119,8 +119,6 @@
                     {!! $statusPresenter->render('encoded/condition','上传人',request()->get('encoded/condition'),
                      $userCodes) !!}
                 </div>
-            </div>
-            <div class="layui-row">
 
                 <div class="layui-inline" style="width: 600px">
                     @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')