Merge branch 'zjl_iteration_20190620'

app/Http/Controllers/AddOrderController.php

@@ -44,6 +44,7 @@ Class AddOrderController extends Controller
             'username'  => $username,
             'username'  => $username,
             'useremail' => $useremail,
             'useremail' => $useremail,
             'menus'     => $menus,
             'menus'     => $menus,
+            'role'      => $role,
         ];
         ];
 
 
         return $data;
         return $data;
@@ -460,18 +461,19 @@ Class AddOrderController extends Controller
     public function create(Request $request)
     public function create(Request $request)
     {
     {
         if ($request->isMethod('post')) {        
         if ($request->isMethod('post')) {        
-            $data['uid'] = $request->input('uid');
-            $data['sale_id'] = $request->input('sale_id');
+            $data['uid']        = $request->input('uid');
+            $data['sale_id']    = $request->input('sale_id');
             $data['address_id'] = $request->input('address_id');
             $data['address_id'] = $request->input('address_id');
-            $data['cart_id'] = implode(',', $request->input('cart_ids'));
-            $data['type'] = $request->input('type');
-            $data['remark'] = $request->input('remark');
+            $data['cart_id']    = implode(',', $request->input('cart_ids'));
+            $data['type']       = $request->input('type');
+            $data['remark']     = $request->input('remark');
 
 
             if ($data['type'] == 3) { // 自营线下订单
             if ($data['type'] == 3) { // 自营线下订单
-                $data['address_name'] = $request->input('address_name');
+                $data['address_name']   = $request->input('address_name');
                 $data['address_mobile'] = $request->input('address_mobile');
                 $data['address_mobile'] = $request->input('address_mobile');
             } else { // 联营、自营线上订单
             } else { // 联营、自营线上订单
-                $data['tax_id'] = $request->input('tax_id');
+                $data['role']           = $request->input('role', '');
+                $data['tax_id']         = $request->input('tax_id');
                 $data['user_coupon_id'] = $request->input('user_coupon_id');
                 $data['user_coupon_id'] = $request->input('user_coupon_id');
 
 
                 if ($data['type'] == 4) {
                 if ($data['type'] == 4) {

app/Http/Controllers/PermController.php

@@ -72,7 +72,7 @@
 
 
 						if ($department->name == '管理员') {
 						if ($department->name == '管理员') {
 							return 1;
 							return 1;
-						}else if ($department->name == '经理') {
+						} else if ($department->name == '经理') {
 							return 2;
 							return 2;
 						} else if ($department->name == '交易员') {
 						} else if ($department->name == '交易员') {
 							return 3;
 							return 3;

public/js/add_order.js

@@ -674,6 +674,7 @@
                             if (type == 4) { // 自营其他业务
                             if (type == 4) { // 自营其他业务
                                 var business_type = $('#business_type').val();
                                 var business_type = $('#business_type').val();
                                 datax.business_type = business_type;
                                 datax.business_type = business_type;
+                                datax.role = role; // 自营线上下单添加角色
                             } else {
                             } else {
                                 if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
                                 if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
                                     layer.msg('请选择发票信息');
                                     layer.msg('请选择发票信息');
@@ -699,6 +700,8 @@
                                 cart_info.push({'gid':gid, 'num':num});
                                 cart_info.push({'gid':gid, 'num':num});
                             })
                             })
 
 
+                            datax.role = role; // 自营线上下单添加角色
+
                             $.ajax({
                             $.ajax({
                                 type: "POST",
                                 type: "POST",
                                 url: '/ajax/checkStock',
                                 url: '/ajax/checkStock',
@@ -749,11 +752,7 @@
                                 },
                                 },
                             })
                             })
 
 
-                            layer.msg('订单生成中...', {
-                                icon: 16,
-                                time: 0,
-                                shade: 0.3
-                            });
+                            layer.msg('订单生成中...', {icon: 16, time: 0, shade: 0.3});
                         }                         
                         }                         
                     } else {
                     } else {
                         layer.msg('请先添加商品');
                         layer.msg('请先添加商品');

resources/views/addOnline/content.blade.php

@@ -397,8 +397,9 @@
 </form>
 </form>
 
 
 <script>  
 <script>  
-    var sale_id = "{{$sale_id}}";
-    var URL_api = "{{Config('website.api_domain')}}";
+    var sale_id = "{{ $sale_id }}";
+    var URL_api = "{{ Config('website.api_domain') }}";
+    var role    = "{{ $role }}";
 
 
 	$.lie.add_order.zyorder();
 	$.lie.add_order.zyorder();
 </script>
 </script>
\ No newline at end of file

resources/views/addOtherOrder/content.blade.php

@@ -404,6 +404,7 @@
 <script>  
 <script>  
     var sale_id = "{{$sale_id}}";
     var sale_id = "{{$sale_id}}";
     var URL_api = "{{Config('website.api_domain')}}";
     var URL_api = "{{Config('website.api_domain')}}";
+    var role    = "{{ $role }}";
 
 
 	$.lie.add_order.businessType();
 	$.lie.add_order.businessType();
 </script>
 </script>
\ No newline at end of file

resources/views/detail/content.blade.php

@@ -375,9 +375,9 @@
                         <td colspan="3">
                         <td colspan="3">
                             <table class="table table-bordered">
                             <table class="table table-bordered">
                                 <tr>
                                 <tr>
-                                    <th>收货人</th>
+                                    <th>收票人</th>
                                     <th>联系电话/手机</th>
                                     <th>联系电话/手机</th>
-                                    <th>收货地址</th>
+                                    <th>收票地址</th>
                                 </tr>
                                 </tr>
 
 
                                 <tr>
                                 <tr>