1

app/Model/ReturnExchangeOrder.php

@@ -19,6 +19,10 @@ class ReturnExchangeOrder extends Model
         self::Model_type_one,
         self::Model_type_two,
     ];
+    public static $model_type_name = [
+        self::Model_type_one => '退货单',
+        self::Model_type_two => '换货单',
+    ];
 
     const State_zero = 0;//未确认
     const State_one = 1;//已确认

app/Service/ConstructionService.php

@@ -456,7 +456,7 @@ 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();
         foreach ($data['data'] as $key => $value){
             $address = '';
             if(! empty($value['address1'])) {
@@ -473,6 +473,7 @@ 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']] ?? '';
         }
 
         return $data;

app/Service/ReturnExchangeOrderService.php

@@ -278,7 +278,7 @@ class ReturnExchangeOrderService extends Service
 
     public function getList($data,$user){
         $model = ReturnExchangeOrder::where('del_time',0)
-            ->select('id','order_number','sales_order_id','difference_amount','state','crt_time','crt_id','mark')
+            ->select('id','order_number','sales_order_id','difference_amount','state','crt_time','crt_id','mark','model_type')
             ->orderby('id', 'desc');
 
         //getALL传入后无视设置范围
@@ -314,11 +314,13 @@ class ReturnExchangeOrderService extends Service
         $emp_map = Employee::whereIn('id',$emp_id)
                     ->pluck('emp_name','id')
                     ->toArray();
-
+        $sales = SalesOrder::whereIn('id',array_unique(array_column($data['data'],'sales_order_id')))->pluck('order_number','id')->toArray();
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? '';
             $data['data'][$key]['state_title'] = ReturnExchangeOrder::$state[$value['state']] ?? '';
+            $data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
+            $data['data'][$key]['model_type_title'] = ReturnExchangeOrder::$model_type_name[$value['model_type']] ?? "";
         }
 
         return $data;