Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 29f35210 by 朱继来
Options

Merge branch 'zjl_活动名称_20221103' into development

parents 21444a26 54a68cdd
Inline Side-by-side
Showing with 26 additions and 5 deletions
app/Http/Controllers/OrderController.php
...@@ -349,6 +349,12 @@ function isLockCheck($order_id) ...@@ -349,6 +349,12 @@ function isLockCheck($order_id)
return $redis->get($key); return $redis->get($key);
} }
// 获取活动名称
function getTopicName($order_id)
{
return OrderExtendModel::where('order_id', $order_id)->value('topic_name');
}
Class OrderController extends Controller Class OrderController extends Controller
{ {
...@@ -481,6 +487,7 @@ Class OrderController extends Controller ...@@ -481,6 +487,7 @@ Class OrderController extends Controller
$map['order_remark'] = $request->input('order_remark', ''); $map['order_remark'] = $request->input('order_remark', '');
$map['pur_time'] = $request->input('pur_time', ''); $map['pur_time'] = $request->input('pur_time', '');
$map['delivery_place'] = $request->input('delivery_place', ''); $map['delivery_place'] = $request->input('delivery_place', '');
$map['topic_name'] = $request->input('topic_name', '');
$perm = new PermController; $perm = new PermController;
......
public/js/list.js
...@@ -98,18 +98,19 @@ ...@@ -98,18 +98,19 @@
order_type_extend = $('#order_type_extend').val() ? $('#order_type_extend').val() : '', order_type_extend = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
status_extend = $('#status_extend').val() ? $('#status_extend').val() : '', status_extend = $('#status_extend').val() ? $('#status_extend').val() : '',
is_manager_audit = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : ''; is_manager_audit = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
order_remark = $('#order_remark').val() ? $('#order_remark').val() : '', order_remark = $('#order_remark').val() ? $('#order_remark').val() : '',
topic_name = $('#topic_name').val() ? $('#topic_name').val() : '',
pur_time = $('input[name="pur_time"]').val(); pur_time = $('input[name="pur_time"]').val();
if (url == '/export') { if (url == '/export') {
if (type == 1) { // 联营 if (type == 1) { // 联营
if (test_order.length) { if (test_order.length) {
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 && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked') && !is_manager_audit) { 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 && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked') && !is_manager_audit && !topic_name) {
layer.msg('请选择筛选条件，再导出！'); layer.msg('请选择筛选条件，再导出！');
return false; return false;
} }
} else { } else {
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 && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !is_manager_audit) { 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 && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !is_manager_audit && !topic_name) {
layer.msg('请选择筛选条件，再导出！'); layer.msg('请选择筛选条件，再导出！');
return false; return false;
} }
...@@ -253,6 +254,10 @@ ...@@ -253,6 +254,10 @@
listUrl += '&pur_time='+pur_time; listUrl += '&pur_time='+pur_time;
} }
if (topic_name) {
listUrl += '&topic_name=' + topic_name;
}
if (url == '/export') { if (url == '/export') {
listUrl += '&order_goods_type='+type; listUrl += '&order_goods_type='+type;
} }
......
resources/views/orderlist/content.blade.php
...@@ -272,6 +272,13 @@ ...@@ -272,6 +272,13 @@
</dd> </dd>
</dl> </dl>
<dl>
<dt>活动名称：</dt>
<dd>
<input id="topic_name" type="text" name="topic_name" value="{{$condition['topic_name']}}" placeholder="请输入活动名称">
</dd>
</dl>
@if (in_array('check_test_order', $userPerms)) @if (in_array('check_test_order', $userPerms))
<dl> <dl>
<dt></dt> <dt></dt>
...@@ -320,7 +327,8 @@ ...@@ -320,7 +327,8 @@
<!-- <th class="pl30">同步状态</th> --> <!-- <th class="pl30">同步状态</th> -->
<th class="pl30">收货人</th> <th class="pl30">收货人</th>
@endif @endif
<th class="pl30">下单时间</th> <th class="pl30">活动名称</th>
<th class="pl30">下单时间</th>
<th class="pl30">操作</th> <th class="pl30">操作</th>
</tr> </tr>
</thead> </thead>
...@@ -402,7 +410,8 @@ ...@@ -402,7 +410,8 @@
<td class="show-list"><?php echo App\Http\Controllers\getOrderAddress($v['order_id']); ?></td> <td class="show-list"><?php echo App\Http\Controllers\getOrderAddress($v['order_id']); ?></td>
@endif @endif
<td>{{App\Http\Controllers\getTopicName($v['order_id'])}}</td>
<td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td> <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
<td> <td>
<style> <style>
......
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