1

app/Service/SalesOrderService.php

@@ -947,7 +947,7 @@ class SalesOrderService extends Service
             ->pluck('title','id')
             ->toArray();
 
-        $product = [];
+        $product = $employee_two = [];
         if(! empty($ergs['product'])){
             $sales_p_info = SalesOrderProductInfo::where('del_time',0)
                 ->whereIn('sales_order_id',array_column($data['data'],'id'))
@@ -967,6 +967,25 @@ class SalesOrderService extends Service
                 $product[$value['sales_order_id']][] = $value;
             }
         }
+        if(! empty($ergs['employee_two'])){
+            //单据中选择的负责人
+            $sales_order = SalesOrderInfo::where('del_time',0)
+                ->where('type',SalesOrderInfo::type_two)
+                ->select('sales_order_id','data_id')
+                ->get()->toArray();
+            $empList = Employee::whereIn('id', array_unique(array_column($sales_order,'data_id')))
+                ->pluck('emp_name','id')
+                ->toArray();
+            foreach ($sales_order as $value){
+                $str = $empList[$value['sales_order_id']] ?? "";
+                if(! $str) continue;
+                if(isset($employee_two[$value['sales_order_id']])){
+                    $employee_two[$value['sales_order_id']] .= ',' . $str;
+                }else{
+                    $employee_two[$value['sales_order_id']] = $str;
+                }
+            }
+        }
 
         $for_amount_list = (new PaymentReceiptService())->getPaymentReceiptDataCountList($data['data']);
         $getDifferentAmountALL = (new ReturnExchangeOrderService())->getDifferentAmountALL(array_column($data['data'],'id'));
@@ -1002,6 +1021,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['dispatch_time_second_time'] = $value['dispatch_time_second'] ? date('Y-m-d H:i:s',$value['dispatch_time_second']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
+            $data['data'][$key]['employee_two_title'] = $employee_two[$value['id']] ?? "";
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
             if($value['sales_order_type'] == SalesOrder::Order_type_one){
                 if($value['model_type'] == SalesOrder::Model_type_four){