Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 4d5f9429 by 朱继来
Options

Merge branch 'zjl_iteration_20181127' into development

parents 5e998af1 508e5e76
Inline Side-by-side
Showing with 10 additions and 10 deletions
public/js/self_order.js
......@@ -21,7 +21,7 @@
order_source_ptag = $('input[name="order_source_ptag"]').val(),
test_order = $('input[name=test_order]'),
is_new = $('#is_new').data('default'),
is_new_order = $('#is_new_order').data('default'),
// is_new_order = $('#is_new_order').data('default'),
listUrl = '/self_order';
listUrl += '?order_type=' + order_type;
......@@ -78,9 +78,9 @@
listUrl += '&is_new=' + is_new;
}
if (is_new_order !== '') {
listUrl += '&is_new_order=' + is_new_order;
}
// if (is_new_order !== '') {
// listUrl += '&is_new_order=' + is_new_order;
// }
if (test_order.is(':checked')) {
listUrl += '&test_order=' + 1;
......@@ -109,16 +109,16 @@
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
is_new = $('#is_new').data('default'),
is_new_order = $('#is_new_order').data('default'),
// is_new_order = $('#is_new_order').data('default'),
test_order = $('input[name=test_order]');
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !is_new_order && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !is_new_order) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -138,7 +138,7 @@
test_order = '';
}
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_payment_mode='+order_payment_mode+'&order_status='+order_status+'&sale_type='+sale_type+'&order_invoice_status='+order_invoice_status+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&test_order='+test_order+'&is_new='+is_new+'&is_new_order='+is_new_order+'&order_goods_type='+2;
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_payment_mode='+order_payment_mode+'&order_status='+order_status+'&sale_type='+sale_type+'&order_invoice_status='+order_invoice_status+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&test_order='+test_order+'&is_new='+is_new+'&order_goods_type='+2;
})
// 选择查看测试订单
......
resources/views/selfOrder/content.blade.php
......@@ -148,7 +148,7 @@
</div>
</dd>
</dl>
<dl>
<!-- <dl>
<dt>新订单：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['is_new_order']}}" id="is_new_order" name="is_new_order">
......@@ -159,7 +159,7 @@
</ul>
</div>
</dd>
</dl>
</dl> -->
@if (in_array('self_check_test_order', $userPerms))
<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