Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a19b8bf5 by 朱继来
Options

1. 添加ptag搜索; 

2. 调整搜索栏样式;
parent 1ab16540
Inline Side-by-side
Showing with 97 additions and 48 deletions
app/Http/Controllers/OrderController.php
......@@ -275,6 +275,7 @@ Class OrderController extends Controller
$map['order_type_a'] = $request->input('order_type_a', '');
$map['order_source_pf'] = $request->input('order_source_pf', '');
$map['order_source_adtag'] = $request->input('order_source_adtag', '');
$map['order_source_ptag'] = $request->input('order_source_ptag', '');
$map['erp_order_id'] = $request->input('erp_order_id', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', '');
......@@ -450,6 +451,7 @@ Class OrderController extends Controller
$map['order_type_a'] = $request->input('order_type_a', '');
$map['order_source_pf'] = $request->input('order_source_pf', '');
$map['order_source_adtag'] = $request->input('order_source_adtag', '');
$map['order_source_ptag'] = $request->input('order_source_ptag', '');
$map['erp_order_id'] = $request->input('erp_order_id', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', '');
$map['order_invoice_status'] = $request->input('order_invoice_status', '');
......@@ -583,10 +585,22 @@ Class OrderController extends Controller
}
}
})
// ->where(function ($query) use ($map) {
// // adtags来源
// if (!empty($map['order_source_adtag'])) {
// $query->whereRaw('FIND_IN_SET("adtag='.$map['order_source_adtag'].'", o.order_source)');
// }
// })
->where(function ($query) use ($map) {
// adtags来源
if (!empty($map['order_source_adtag'])) {
$query->whereRaw('FIND_IN_SET("adtag='.$map['order_source_adtag'].'", o.order_source)');
$query->where('o.order_source', 'like', '%adtag='.$map['order_source_adtag'].'%');
}
})
->where(function ($query) use ($map) {
// ptag来源
if (!empty($map['order_source_ptag'])) {
$query->where('o.order_source', 'like', '%ptag='.$map['order_source_ptag'].'%');
}
})
->where(function ($query) use ($map) {
......
public/js/order.js
......@@ -78,6 +78,7 @@
order_send = $('#order_send').data('default'),
order_source_pf = $('#order_source_pf').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
test_order = $('input[name=test_order]'),
erp_order_id = $('#erp_order_id').data('default'),
listUrl = '/list';
......@@ -128,6 +129,10 @@
listUrl += '&order_source_adtag=' + order_source_adtag;
}
if (order_source_ptag) {
listUrl += '&order_source_ptag=' + order_source_ptag;
}
if (erp_order_id) {
listUrl += '&erp_order_id=' + erp_order_id;
}
......@@ -136,7 +141,7 @@
listUrl += '&test_order=' + 1;
}
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !erp_order_id && !test_order.is(':checked')) {
if (!order_contain && !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 && !test_order.is(':checked')) {
listUrl = '/list';
}
......@@ -156,16 +161,17 @@
order_send = $('#order_send').data('default'),
order_source_pf = $('#order_source_pf').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
erp_order_id = $('#erp_order_id').data('default'),
test_order = $('input[name=test_order]');
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !erp_order_id && !test_order.is(':checked')) {
if (!order_contain && !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 && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !erp_order_id) {
if (!order_contain && !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) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -189,7 +195,7 @@
test_order = '';
}
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_pay_type='+order_pay_type+'&order_status='+order_status+'&shipping_name='+shipping_name+'&order_send='+order_send+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&erp_order_id='+erp_order_id+'&test_order='+test_order+'&order_goods_type='+1;
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_pay_type='+order_pay_type+'&order_status='+order_status+'&shipping_name='+shipping_name+'&order_send='+order_send+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&erp_order_id='+erp_order_id+'&test_order='+test_order+'&order_goods_type='+1;
})
// 选择查看测试订单
......
public/js/self_order.js
......@@ -17,6 +17,7 @@
order_payment_mode = $('#order_payment_mode').data('default'),
order_invoice_status = $('#order_invoice_status').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
test_order = $('input[name=test_order]'),
listUrl = '/self_order';
......@@ -62,11 +63,15 @@
listUrl += '&order_source_adtag=' + order_source_adtag;
}
if (order_source_ptag) {
listUrl += '&order_source_ptag=' + order_source_ptag;
}
if (test_order.is(':checked')) {
listUrl += '&test_order=' + 1;
}
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !test_order.is(':checked')) {
listUrl = '/self_order';
}
......@@ -85,15 +90,16 @@
order_payment_mode = $('#order_payment_mode').data('default'),
order_invoice_status = $('#order_invoice_status').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
test_order = $('input[name=test_order]');
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !order_invoice_status && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -113,7 +119,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+'&order_invoice_status='+order_invoice_status+'&order_send='+order_send+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&test_order='+test_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+'&order_invoice_status='+order_invoice_status+'&order_send='+order_send+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&test_order='+test_order+'&order_goods_type='+2;
})
// 选择查看测试订单
......
resources/views/erpOrder/content.blade.php
......@@ -7,6 +7,9 @@
<div class="tabs-box">
<div class="row-fluid search-box">
<div class="span12">
<table style="width:100%">
<tr>
<td width="93%">
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -31,7 +34,7 @@
</dl>
<dl>
<dt>订单状态：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_status']}}" id="order_status" name="order_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -49,7 +52,7 @@
</dl>
<dl>
<dt>订单来源：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source']}}" id="order_source" name="order_source">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -61,7 +64,7 @@
</dl>
<dl>
<dt>推送业务员：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -72,12 +75,17 @@
</div>
</dd>
</dl>
</td>
<td width="7%">
<dl>
<dt>
<button type="submit" class="nbtn searchErpOrder">搜索</button>
</dt>
</dl>
</td>
</tr>
</table>
</div>
</div>
</div>
......
resources/views/orderlist/content.blade.php
......@@ -7,7 +7,9 @@
<div class="tabs-box">
<div class="row-fluid search-box">
<div class="span12">
<!-- <form action="{{URL('list')}}" method="get"> -->
<table style="width:100%">
<tr>
<td width="85%">
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -30,23 +32,14 @@
<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>
<!-- <dl>
<dt>订单类型：</dt>
<dd>
<div class="droplist" data-default="{{$condition['order_type_a']}}" id="order_type_a" name="order_type_a" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">网站</li>
<li data-val="2">ERP</li>
</ul>
</div>
</dd>
</dl> -->
<style>
.bs-select-all{float: left; width: 42% !important;}
.bs-deselect-all{float: right; width: 50% !important;}
</style>
<dl>
<dt>订单状态：</dt>
<dd>
<select id="order_status" name="order_status" class="selectpicker" title="全部" multiple>
<select id="order_status" name="order_status" class="form-control selectpicker" title="全部" multiple>
<option class="order_status" value="-1">已取消</option>
<option class="order_status" value="1">待审核</option>
<option class="order_status" value="2">待付款</option>
......@@ -60,7 +53,7 @@
</dl>
<dl>
<dt>付款类型：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_pay_type']}}" id="order_pay_type" name="order_pay_type" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -73,7 +66,7 @@
</dl>
<dl>
<dt>配送方式：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['shipping_name']}}" id="shipping_name" name="shipping_name" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -85,7 +78,7 @@
</dl>
<dl>
<dt>推送业务员：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -111,7 +104,7 @@
</dl> -->
<dl>
<dt>订单来源：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source_pf']}}" id="order_source_pf" name="order_source_pf">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -128,8 +121,14 @@
</dd>
</dl>
<dl>
<dt>同步状态：</dt>
<dt>ptag来源：</dt>
<dd>
<input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
</dd>
</dl>
<dl>
<dt>同步状态：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['erp_order_id']}}" id="erp_order_id" name="erp_order_id">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -146,17 +145,24 @@
</dd>
</dl>
@endif
</td>
<td width="15%">
<dl>
<dt>
<button type="submit" class="nbtn searchOrder">搜索</button>
<button class="nbtn searchOrder">搜索</button>
</dt>
</dl>
<!-- </form> -->
@if (in_array('export', $userPerms))
<div class="order-export">
<a href="javascript:;" class="btn btn-primary exportExcel">导出Excel</a>
</div>
<dt>
<button class="nbtn exportExcel" style="background: #23c6c8 !important;">导出</button>
</dt>
@endif
</dl>
</td>
</tr>
</table>
</div>
</div>
</div>
......
resources/views/selfOrder/content.blade.php
......@@ -9,7 +9,7 @@
<div class="span12">
<table style="width:100%">
<tr>
<td width="93%">
<td width="85%">
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -34,7 +34,7 @@
</dl>
<dl>
<dt>订单状态：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_status']}}" id="order_status" name="order_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -49,7 +49,7 @@
</dl>
<dl>
<dt>客服：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -62,7 +62,7 @@
</dl>
<dl>
<dt>订单来源：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source_pf']}}" id="order_source_pf" name="order_source_pf">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -74,7 +74,7 @@
</dl>
<dl>
<dt>支付方式：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_payment_mode']}}" id="order_payment_mode" name="order_payment_mode">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -87,7 +87,7 @@
</dl>
<dl>
<dt>发票类型：</dt>
<dd>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_invoice_status']}}" id="order_invoice_status" name="order_invoice_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
......@@ -104,6 +104,12 @@
<input type="text" name="order_source_adtag" value="{{$condition['order_source_adtag']}}" placeholder="请输入内容">
</dd>
</dl>
<dl>
<dt>ptag来源：</dt>
<dd>
<input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
</dd>
</dl>
@if (in_array('self_check_test_order', $userPerms))
<dl>
......@@ -115,15 +121,15 @@
@endif
</td>
<td width="7%">
<td width="15%">
<dl>
<dt>
<button class="nbtn btn-sm search_self_order">搜索</button>
<button class="nbtn search_self_order">搜索</button>
</dt>
@if (in_array('self_order_export', $userPerms))
<dt class="order-export">
<button class="nbtn btn-sm self_export" style="background: #23c6c8 !important;">导出</button>
<button class="nbtn self_export" style="background: #23c6c8 !important;">导出</button>
</dt>
@endif
</dl>
......@@ -300,8 +306,11 @@
</table>
</div>
<div class="row-fluid pagination">
<span>
<span style="float: left; width: 55%;">
共{{$count ? $count : 0}}单，
{{$paid_order_count}}单已付款（包含预付款），
下单用户数为{{$user_count}}人，
付款用户数为{{$paid_user_count}}人，
应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}， ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}，
实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，
${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}
......
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