Skip to content

朱继来 / 后台订单管理

Go to a project
Commit f177edeb by allen
Options

订单周迭代 变更

parent a7f0fb99
Inline Side-by-side
Showing with 120 additions and 17 deletions
app/Http/Controllers/OrderController.php
...@@ -402,6 +402,7 @@ Class OrderController extends Controller ...@@ -402,6 +402,7 @@ Class OrderController extends Controller
// 页面参数 // 页面参数
$map['order_type'] = $request->input('order_type', ''); $map['order_type'] = $request->input('order_type', '');
$map['select_time_val'] = $request->input('select_time_val', '');
$map['order_contain'] = $request->input('order_contain', ''); $map['order_contain'] = $request->input('order_contain', '');
$map['order_sn'] = $request->input('order_sn', ''); $map['order_sn'] = $request->input('order_sn', '');
$map['erp_sn'] = $request->input('erp_sn', ''); $map['erp_sn'] = $request->input('erp_sn', '');
...@@ -502,7 +503,7 @@ Class OrderController extends Controller ...@@ -502,7 +503,7 @@ Class OrderController extends Controller
public function getOrderInfo($request, $tid=1) public function getOrderInfo($request, $tid=1)
{ {
$info = $this->_search($request, $tid); $info = $this->_search($request, $tid);
$key = Config('perm_args.redis_search_sales')[$tid]; $key = Config('perm_args.redis_search_sales')[$tid];
$redis = Redis::connection('read'); $redis = Redis::connection('read');
$sale_list = $redis->get($key); $sale_list = $redis->get($key);
......
public/js/order.js
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
goods_name = $('input[name=goods_name]').val(), goods_name = $('input[name=goods_name]').val(),
time_start = $('input[name="time_start"]').val(), time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(), time_end = $('input[name="time_end"]').val(),
select_time_val = $('.select_time_val.active').attr('data-val'),
confirm_time_start = $('input[name="confirm_time_start"]').val(), confirm_time_start = $('input[name="confirm_time_start"]').val(),
confirm_time_end = $('input[name="confirm_time_end"]').val(), confirm_time_end = $('input[name="confirm_time_end"]').val(),
...@@ -108,7 +111,7 @@ ...@@ -108,7 +111,7 @@
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '', order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order = $('#is_new_order').val() ? $('#is_new_order').val() : ''; is_new_order = $('#is_new_order').val() ? $('#is_new_order').val() : '';
business_type = $('#business_type').val() ? $('#business_type').val() : ''; business_type = $('#business_type').val() ? $('#business_type').val() : '';
if (url == '/export') { if (url == '/export') {
if (type == 1) { // 联营 if (type == 1) { // 联营
if (test_order.length) { if (test_order.length) {
...@@ -169,6 +172,11 @@ ...@@ -169,6 +172,11 @@
listUrl += '&time_end='+time_end; listUrl += '&time_end='+time_end;
} }
if(select_time_val){
listUrl += '&select_time_val='+select_time_val;
}
if(confirm_time_start){ if(confirm_time_start){
confirm_time_start = Date.parse(confirm_time_start) / 1000; confirm_time_start = Date.parse(confirm_time_start) / 1000;
......
resources/views/detail/content.blade.php
...@@ -477,7 +477,7 @@ ...@@ -477,7 +477,7 @@
<th>自采标记</th> <th>自采标记</th>
<th hidden>批号</th> <th >批号</th>
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<th>生产跟踪</th> <th>生产跟踪</th>
...@@ -549,7 +549,7 @@ ...@@ -549,7 +549,7 @@
</td> </td>
<td hidden class="batch"> <td class="batch">
<?php echo !empty($v['batch'])?$v['batch']:''; ?> <?php echo !empty($v['batch'])?$v['batch']:''; ?>
</td> </td>
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
@endif @endif
<td> <td>
<button type="button" class="btn btn-success btn-xs remarks">填写备注</button> <button type="button" class="btn btn-success btn-xs remarks">编辑</button>
</td> </td>
@if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) @if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
...@@ -1095,9 +1095,7 @@ ...@@ -1095,9 +1095,7 @@
if($remarks.length >0 || user_id > 0 || $batch.length >0){ if($remarks.length >0 || user_id > 0 || $batch.length >0){
$.post('/api/update_order_items',{id:$id,remarks:$remarks,userId:user_id,batch:$batch},function(data){ $.post('/api/update_order_items',{id:$id,remarks:$remarks,userId:user_id,batch:$batch},function(data){
if(data.errcode == 1){ history.go(0);
history.go(0)
}
},'json') },'json')
}else{ }else{
......
resources/views/orderlist/content.blade.php
...@@ -37,15 +37,11 @@ ...@@ -37,15 +37,11 @@
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号"> <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd> </dd>
</dl> </dl>
<dl>
<dt>创建日期： </dt>
<dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
</dd>
<dd style="width:auto !important;">
<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> <!-- <dl>
<dt>审核日期： </dt> <dt>审核日期： </dt>
...@@ -93,6 +89,62 @@ ...@@ -93,6 +89,62 @@
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称"> <input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd> </dd>
</dl> </dl>
<?php
if(!empty($_REQUEST['time_start'])){
$time_str_start = 'time_start';
}else if(!empty($_REQUEST['confirm_time_start'])){
$time_str_start = 'confirm_time_start';
}else if(!empty($_REQUEST['pay_time_start'])){
$time_str_start = 'pay_time_start';
}else if(!empty($_REQUEST['shipping_time_start'])){
$time_str_start = 'shipping_time_start';
}else if(!empty($_REQUEST['finish_time_start'])){
$time_str_start = 'finish_time_start';
}else{
$time_str_start = 'time_start';
}
if(!empty($_REQUEST['time_end'])){
$time_str_end = 'time_end';
}else if(!empty($_REQUEST['confirm_time_end'])){
$time_str_end = 'confirm_time_end';
}else if(!empty($_REQUEST['pay_time_end'])){
$time_str_end = 'pay_time_end';
}else if(!empty($_REQUEST['shipping_time_end'])){
$time_str_end = 'shipping_time_end';
}else if(!empty($_REQUEST['finish_time_end'])){
$time_str_end = 'finish_time_end';
}else{
$time_str_end = 'time_end';
}
?>
<dl style="width:792px">
<dt>按时间筛选：</dt>
<dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['select_time_val']}}" id="select_time" name="select_time">
<ul class="dropdown-menu">
<li class="select_time_val" data-val="">创建日期:</li>
<li class="select_time_val" data-val="1">审核日期：</li>
<li class="select_time_val" data-val="2">收款日期：</li>
<li class="select_time_val" data-val="3">发货日期：</li>
<li class="select_time_val" data-val="4">订单完成: </li>
</ul>
</div>
</dd>
<dd style="width:auto !important;" id="start_time">
<input type="text" name="{{$time_str_start}}" value="{{ !empty($condition[$time_str_start]) ? date('Y/m/d', $condition[$time_str_start]) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
</dd>
<dd style="width:auto !important;" id = "end_time">
<input type="text" name="{{$time_str_end}}" value="{{ !empty($condition[$time_str_end]) ? date('Y/m/d', $condition[$time_str_end]) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd>
</dl>
<dl> <dl>
<dt>订单状态：</dt> <dt>订单状态：</dt>
<dd> <dd>
...@@ -105,6 +157,9 @@ ...@@ -105,6 +157,9 @@
</select> </select>
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>付款类型：</dt> <dt>付款类型：</dt>
<dd> <dd>
...@@ -477,4 +532,44 @@ ...@@ -477,4 +532,44 @@
// 展开菜单 // 展开菜单
$('#side-menu').children('li').eq(1).addClass('active'); $('#side-menu').children('li').eq(1).addClass('active');
$('#side-menu').children('li').eq(1).children('ul').children('li').eq(0).addClass('active'); $('#side-menu').children('li').eq(1).children('ul').children('li').eq(0).addClass('active');
$(function(){
$('#select_time').find('li').click(function(){
var $id = $(this).attr('data-val');
console.log($id);
if($id ==''){
//创建日期
$('#start_time').find('input').attr('name','time_start');
$('#end_time').find('input').attr('name','time_start');
}else if($id == 1){
//审核日期
$('#start_time').find('input').attr('name','confirm_time_start');
$('#end_time').find('input').attr('name','confirm_time_end');
}else if($id == 2){
//收款日期
$('#start_time').find('input').attr('name','pay_time_start');
$('#end_time').find('input').attr('name','pay_time_end');
}else if($id == 3){
//发货日期
$('#start_time').find('input').attr('name','shipping_time_start');
$('#end_time').find('input').attr('name','shipping_time_end');
}else if($id == 4){
//订单完成
$('#start_time').find('input').attr('name','finish_time_start');
$('#end_time').find('input').attr('name','finish_time_end');
}
})
})
</script> </script>
\ No newline at end of file
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