2

app/Service/SalesOrderService.php

@@ -1521,15 +1521,24 @@ class SalesOrderService extends Service
 
         $result = Construction::where('del_time',0)
             ->whereIn('sales_order_id',$sale_order_id)
-            ->select('order_number','sales_order_id')
+            ->select('order_number','sales_order_id','state','crt_id')
             ->get()->toArray();
-        $return = [];
+        $emp = Employee::whereIn('crt_id',array_unique(array_column($result,'crt_id')))
+            ->pluck('emp_name','id')
+            ->toArray();
+        $service = new ConstructionService();
+        //订单状态数据组织
+        $state_array = $service->getStateMake($result);
 
+        $return = [];
         foreach ($result as $value){
+            $value['crt_name'] = $emp[$value['crt_id']] ?? "";
+            $state_title = $service->makeState($value, $state_array);
+            $string = $value['order_number'] . ":" . $state_title;
             if(isset($return[$value['sales_order_id']])){
-                $return[$value['sales_order_id']] .= ',' . $value['order_number'];
+                $return[$value['sales_order_id']] .= ',' . $string;
             }else{
-                $return[$value['sales_order_id']] = $value['order_number'];
+                $return[$value['sales_order_id']] = $string;
             }
         }
 

config/header/37.php

@@ -108,7 +108,7 @@ return [
     ],
     [
         'key' => 'construction_no',
-        'value' => '施工单号',
+        'value' => '施工单',
     ],
 //    [
 //        'key' => 'pay_way_title',

config/header/43.php

@@ -124,6 +124,6 @@ return [
     ],
     [
         'key' => 'construction_no',
-        'value' => '施工单号',
+        'value' => '施工单',
     ],
 ];