Commit 7e57859b by 朱继来

Merge branch 'zjl_iteration_20190723' into development

parents a5743d39 29b417c0
Showing with 4 additions and 3 deletions
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
<dl> <dl>
<dt>客服:</dt> <dt>客服:</dt>
<dd> <dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7"> <select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<option value="">全部</option> <!-- <option value="">全部</option> -->
<option value="0">无推送</option> <option value="0">无推送</option>
<optgroup label="在职"> <optgroup label="在职">
@foreach ($sale_list as $v) @foreach ($sale_list as $v)
...@@ -441,7 +441,8 @@ ...@@ -441,7 +441,8 @@
$('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change"); $('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change");
$('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change"); $('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change");
$('#order_invoice_status').selectpicker('val', order_invoice_status); $('#order_invoice_status').selectpicker('val', order_invoice_status);
$('#order_send').selectpicker('val', order_send); // $('#order_send').selectpicker('val', order_send);
$('#order_send').selectpicker('val', order_send.split(',')).trigger("change");
// $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change"); // $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.order_pay_type').selectpicker('val', order_pay_type); $('.order_pay_type').selectpicker('val', order_pay_type);
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change"); $('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
......
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