fix

app/Http/Controllers/OrderController.php

@@ -2060,10 +2060,9 @@ Class OrderController extends Controller
     */
     */
     public function send_mail(Request $request)
     public function send_mail(Request $request)
     {
     {
-        $id = $request->input('id');
-        $cc_email = $request->input('cc_email', '');
-
-        $info = $this->orderDetail($request, $id);
+        $id       = $request->input('id');
+        $cc_email = $request->input('cc_email', ''); // 额外抄送人
+        $info     = $this->orderDetail($request, $id);
 
 
         //循环订单详情
         //循环订单详情
         foreach ($info['order_items_info'] as $key => $value) {         
         foreach ($info['order_items_info'] as $key => $value) {         
@@ -2114,11 +2113,21 @@ Class OrderController extends Controller
         $data['toUser'] = $send_mail_array; // 收件人
         $data['toUser'] = $send_mail_array; // 收件人
         
         
         $cc_send_mail_array = Config('config.cc_email'); // 固定抄送人
         $cc_send_mail_array = Config('config.cc_email'); // 固定抄送人
+
+        $perm = new PermController;
+        $manager_email = $perm->getManager($request); // 获取上级主管邮箱
+
+        if ($manager_email) {
+            $cc_send_mail_array = array_merge($cc_send_mail_array, $manager_email); // 合并上级主管邮箱
+        }
+               
         $cc_send_mail_array[] = $request->user->email; // 默认抄送给自己
         $cc_send_mail_array[] = $request->user->email; // 默认抄送给自己
 
 
+        $cc_send_mail_array = array_unique($cc_send_mail_array); // 去重
+
         $cc_email_arr = [];
         $cc_email_arr = [];
 
 
-        if ($cc_email) { // 后台选择的抄送人
+        if ($cc_email) { // 后台选择的额外抄送人
             $CmsModel = new CmsModel();   
             $CmsModel = new CmsModel();   
 
 
             foreach ($cc_email as $v) {
             foreach ($cc_email as $v) {

app/Http/Controllers/PermController.php

@@ -146,7 +146,7 @@
 				$roleId = isset($role->roleId) ? $role->roleId : 0;
 				$roleId = isset($role->roleId) ? $role->roleId : 0;
 
 
 				// $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` REGEXP $roleId");
 				// $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` REGEXP $roleId");
-				$user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`");
+				$user = DB::select("SELECT `userId` FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`");
 
 
 				if ($user) {
 				if ($user) {
 					foreach ($user as $v) {
 					foreach ($user as $v) {
@@ -155,7 +155,7 @@
 
 
 					if ($userId) {
 					if ($userId) {
 						foreach ($userId as $id) {
 						foreach ($userId as $id) {
-							$userInfo = DB::table('user_info')->where('userId', $id)->select('userId', 'name', 'status')->first();
+							$userInfo = DB::table('user_info')->where('userId', $id)->select('userId', 'name', 'email', 'status')->first();
 
 
 							// 判断用户是否已离职 4为离职状态
 							// 判断用户是否已离职 4为离职状态
 							// if ($userInfo->status != 4) {
 							// if ($userInfo->status != 4) {
@@ -342,4 +342,30 @@
 			return $data;
 			return $data;
 		}
 		}
 
 
+		// 获取角色对应的主管邮箱
+		public function getManager($request) 
+		{
+			$role = $this->getUserRole($request); // 当前用户角色
+
+			$manager_key = array_search($role, Config('perm_args.manager_to_kefu')); // 获取对应的主管key
+
+			if (!$manager_key) return false;
+
+			$role_name = array_search($manager_key, Config('perm_args.roles')); // 获取主管对应的角色名称
+
+			if (!$role_name) return false;
+
+			$res = $this->getRoleUsers($request, $role_name); // 获取角色对应的用户
+
+			$email = [];
+
+			if ($res) {
+				foreach ($res as $v) {
+					$email[] = $v->email;
+				}
+			}
+
+			return $email;
+		}
+
 	}
 	}
\ No newline at end of file

public/css/order.css

@@ -319,4 +319,6 @@ input[type="color"],
 .bs-deselect-all{float: right; width: 50% !important;}
 .bs-deselect-all{float: right; width: 50% !important;}
 .bootstrap-select .btn{padding: 4px 12px;}
 .bootstrap-select .btn{padding: 4px 12px;}
 
 
-.list-item-table .caption th { background: #fff; }
+.list-item-table .caption th { background: #fff; }
\ No newline at end of file
+
+.input-radio input { margin-left: -15px !important; }
\ No newline at end of file

resources/views/detail/content.blade.php

@@ -449,6 +449,10 @@
                             <th>商品名</th>
                             <th>商品名</th>
                         @endif
                         @endif
 
 
+                        @if ($order_info['order_goods_type'] == 1)
+                            <th>供应商</th>
+                        @endif
+
                         <th>制造商</th>
                         <th>制造商</th>
                         
                         
                         <!-- ERP或京东订单 -->
                         <!-- ERP或京东订单 -->
@@ -515,6 +519,10 @@
                                 <td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
                                 <td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
                             @endif
                             @endif
 
 
+                            @if ($order_info['order_goods_type'] == 1)
+                                <td>{{$v['supplier_name']}}</td>
+                            @endif
+
                             <td>{{$v['brand_name']}}</td>
                             <td>{{$v['brand_name']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
                             <td>