1

app/Service/ConstructionService.php

@@ -553,7 +553,11 @@ class ConstructionService extends Service
         $customer = Customer::whereIn('id',array_unique(array_column($data['data'],'customer_id')))
             ->pluck('title','id')
             ->toArray();
-        $sales = SalesOrder::whereIn('id',array_unique(array_column($data['data'],'sales_order_id')))->pluck('order_number','id')->toArray();
+        $sales = SalesOrder::whereIn('id',array_unique(array_column($data['data'],'sales_order_id')))->select('order_number','id','handover_time')->get()->toArray();
+        $sales_map = [];
+        foreach ($sales as $value){
+            $sales_map[$value['id']] = $value;
+        }
         $storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
             ->pluck('title','id')
             ->toArray();
@@ -582,7 +586,10 @@ class ConstructionService extends Service
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['customer_contact_title'] = $emp[$value['customer_contact_id']] ?? '';
             $data['data'][$key]['state_title'] = Construction::$name[$value['state']] ?? '';
-            $data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
+            $tmp_sales = $sales_map[$value['sales_order_id']] ?? [];
+            $tmp_sales_time = $tmp_sales['handover_time'] ? date("Y-m-d") : "";
+            $data['data'][$key]['sales_order_number'] = $tmp_sales['order_number'];
+            $data['data'][$key]['handover_time'] = $tmp_sales_time;
             $data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
             $data['data'][$key]['dispatch_company'] = $dispatch[$value['sales_order_id']] ?? '';
         }

config/header/34.php

@@ -19,6 +19,10 @@ return [
         'value' => '关联合同',
     ],
     [
+        'key' => 'handover_time',
+        'value' => '交车日期',
+    ],
+    [
         'key' => 'install_method_title',
         'value' => '安装方式',
     ],
@@ -31,8 +35,8 @@ return [
         'value' => '备注',
     ],
     [
-        'key' => '紧急程度',
-        'value' => 'urgency_title',
+        'key' => 'urgency_title',
+        'value' => '紧急程度',
     ],
     [
         'key' => 'construction_period',