Commit c36047c0 by 朱继来

Merge branch 'zjl_adjust_20180717' into development

parents b40b81c7 64ef7570
...@@ -69,9 +69,20 @@ ...@@ -69,9 +69,20 @@
<dt>推送业务员:</dt> <dt>推送业务员:</dt>
<dd style="width: 115px;"> <dd style="width: 115px;">
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true"> <select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true">
<optgroup label="在职">
@foreach ($sale_list as $v) @foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option> <option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach @endforeach
</optgroup>
</select> </select>
<!-- <div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" > <!-- <div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
......
...@@ -80,10 +80,21 @@ ...@@ -80,10 +80,21 @@
<dl> <dl>
<dt>推送业务员:</dt> <dt>推送业务员:</dt>
<dd style="width: 115px;"> <dd style="width: 115px;">
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true"> <select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7">
<optgroup label="在职">
@foreach ($sale_list as $v) @foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option> <option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach @endforeach
</optgroup>
</select> </select>
</dd> </dd>
</dl> </dl>
......
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