Skip to content

朱继来 / 后台订单管理

Go to a project
Commit d9f9b8da by 朱继来
Options

推送人员过滤

parent e946a449
Inline Side-by-side
Showing with 14 additions and 17 deletions
app/Http/Controllers/OrderController.php
...@@ -1017,10 +1017,10 @@ Class OrderController extends Controller ...@@ -1017,10 +1017,10 @@ Class OrderController extends Controller
$info['online_sales_chief'] = $perm->getUserByCondition(33, 66, 0); // 线上销售-33 线上销售总监-66 $info['online_sales_chief'] = $perm->getUserByCondition(33, 66, 0); // 线上销售-33 线上销售总监-66
$info['online_sales_mgr'] = $perm->getDepartmentUser(33, 63); // 线上销售-33 销售经理-63 $info['online_sales_mgr'] = $perm->getDepartmentUser(33, 63); // 线上销售-33 销售经理-63
$info['online_sales_kefu_1'] = $perm->getUserByCondition(34, '', 0); // 线上一组 $info['online_sales_kefu_1'] = $perm->getUserByCondition(34, 62, 0); // 线上一组销售
$info['online_sales_kefu_2'] = $perm->getUserByCondition(35, '', 0); // 线上二组 $info['online_sales_kefu_2'] = $perm->getUserByCondition(35, 62, 0); // 线上二组销售
$info['online_sales_kefu_3'] = $perm->getUserByCondition(36, '', 0); // 线上三组 $info['online_sales_kefu_3'] = $perm->getUserByCondition(36, 62, 0); // 线上三组销售
$info['online_sales_kefu_4'] = $perm->getUserByCondition(37, '', 0); // 线上四组 $info['online_sales_kefu_4'] = $perm->getUserByCondition(37, 62, 0); // 线上四组销售
$info['offline_sales_chief'] = $perm->getUserByCondition(40, 90, 0); // 线下销售-39 线下销售总监-90 $info['offline_sales_chief'] = $perm->getUserByCondition(40, 90, 0); // 线下销售-39 线下销售总监-90
$info['offline_sales_all'] = $perm->getDepartmentUser(40, 62); // 线下销售各组人员 $info['offline_sales_all'] = $perm->getDepartmentUser(40, 62); // 线下销售各组人员
...@@ -2101,10 +2101,7 @@ Class OrderController extends Controller ...@@ -2101,10 +2101,7 @@ Class OrderController extends Controller
$send_mail_array = array_unique($send_mail_array); $send_mail_array = array_unique($send_mail_array);
if(empty($send_mail_array[0])){ if(empty($send_mail_array[0])) return ['errcode'=>-1,'errmsg'=>'没有填写采购人员,请至少填写一个采购人员'];
echo json_encode(['errcode'=>-1,'errmsg'=>'没有填写采购人员,请至少填写一个采购人员']);
exit;
}
$data['toUser'] = $send_mail_array; // 收件人 $data['toUser'] = $send_mail_array; // 收件人
......
resources/views/orderlist/content.blade.php
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<th class="pl30">业务员</th> <th class="pl30">业务员</th>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<th class="pl30">订单来源</th> <th class="pl30">订单来源</th>
<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>
...@@ -314,15 +314,15 @@ ...@@ -314,15 +314,15 @@
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
<td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td> <td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td>
<td class="show-list"> <!-- <td class="show-list">
<?php <?php
if (in_array($v['status'], [-1, 1])) { // if (in_array($v['status'], [-1, 1])) {
echo '不需同步'; // echo '不需同步';
} else { // } else {
echo $v['erp_order_id'] != '' && $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>'; // echo $v['erp_order_id'] != '' && $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>';
} // }
?> ?>
</td> </td> -->
<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
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
@endif @endif
@if (!empty($order_extend->erp_sn)) @if (!empty($order_extend->erp_sn))
<a class="btn btn-primary send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a> <a class="btn btn-warning send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>
@endif @endif
<a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a> <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>
......
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