Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 3846a512 by 朱继来
Options

temp

parent 76d88558
Inline Side-by-side
Showing with 16 additions and 7 deletions
app/Http/Controllers/OrderController.php
......@@ -401,6 +401,7 @@ Class OrderController extends Controller
$map['order_type'] = $request->input('order_type', '');
$map['order_contain'] = $request->input('order_contain', '');
$map['order_sn'] = $request->input('order_sn', '');
$map['erp_sn'] = $request->input('erp_sn', '');
$map['goods_name'] = $request->input('goods_name', '');
$map['time_start'] = $request->input('time_start', '');
$map['time_end'] = $request->input('time_end', '');
......
public/js/order.js
......@@ -75,6 +75,7 @@
var order_type = $('#order_type').data('default'),
order_contain = $('input[name=order_contain]').val(),
order_sn = $('input[name=order_sn]').val(),
erp_sn = $('input[name=erp_sn]').val(),
goods_name = $('input[name=goods_name]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
......@@ -98,24 +99,24 @@
if (url == '/export') {
if (type == 1) { // 联营
if (test_order.length) {
if (!order_contain && !order_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked')) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !order_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
}
} else { // 自营
if (test_order.length) {
if (!order_contain && !order_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !order_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -135,6 +136,10 @@
listUrl += '&order_sn=' + order_sn;
}
if (erp_sn) {
listUrl += '&erp_sn=' + erp_sn;
}
if (goods_name) {
listUrl += '&goods_name=' + specialStr(goods_name);
}
......
resources/views/orderlist/content.blade.php
......@@ -36,9 +36,12 @@
<input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd>
</dl>
<style>
</style>
<dl>
<dt>ERP订单号：</dt>
<dd>
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd>
</dl>
<dl>
<dt>订单状态：</dt>
<dd>
......
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