Commit d20643ba by 杨树贤

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

parents cbd70cd5 2fe6f165
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('tags/condition','是否精选',request()->get('tags/condition'),[1=>'是',0=>'否']) !!} {!! $statusPresenter->render('tags/condition','是否精选',request()->get('tags/condition'),[1=>'是',0=>'否']) !!}
</div> </div>
<div class="layui-inline"> {{-- <div class="layui-inline">--}}
@inject('statusPresenter','App\Presenters\StatusPresenter') {{-- @inject('statusPresenter','App\Presenters\StatusPresenter')--}}
{!! $statusPresenter->render('status/condition','是否过期',request()->get('status/condition'),[0=>'是',1=>'否']) !!} {{-- {!! $statusPresenter->render('status/condition','是否过期',request()->get('status/condition'),[0=>'是',1=>'否']) !!}--}}
</div> {{-- </div>--}}
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">起订量库存</label> <label class="layui-form-label">起订量库存</label>
...@@ -119,8 +119,6 @@ ...@@ -119,8 +119,6 @@
{!! $statusPresenter->render('encoded/condition','上传人',request()->get('encoded/condition'), {!! $statusPresenter->render('encoded/condition','上传人',request()->get('encoded/condition'),
$userCodes) !!} $userCodes) !!}
</div> </div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 600px"> <div class="layui-inline" style="width: 600px">
@inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter') @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment