Merge branch 'zjl_add_perm_20180521' into development

config/perm.php

@@ -2,7 +2,7 @@
 	return [
 		// 菜单权限
 		'联营订单' => [
-			'平台订单' => ['orderlist_check', 'export', 'cancel_order', 'check_account', 'order_send', 'update_address', 'update_invoice', 'check_test_order', 'check_order', 'download_contract',],
+			'平台订单' => ['orderlist_check', 'export', 'cancel_order', 'check_account', 'order_send', 'update_address', 'update_invoice', 'check_test_order', 'check_order', 'download_contract', 'send_salesman'],
 
 			'ERP订单'  => ['erp_order_check'],
 		],

resources/views/orderlist/content.blade.php

@@ -272,8 +272,8 @@
     	                                    <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                         @endif
                                         
-                                        <!-- 管理员和经理显示 && sale_id为空 && 订单状态为待审核 -->
-                                        @if (in_array($role, [1, 2]) && $v['status'] == 1)
+                                        <!-- 管理员和经理或有推送权限显示 && 订单状态为待审核 -->
+                                        @if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)) && $v['status'] == 1)
                                             <a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a>
                                         @endif