2

app/Service/ReturnExchangeOrderService.php

@@ -202,7 +202,6 @@ class ReturnExchangeOrderService extends Service
         }
 
         $order['model_type_title'] = ReturnExchangeOrder::$model_type_name[$order['model_type']] ?? "";
-        $order['state_title'] = ReturnExchangeOrder::$state[$order['state']] ?? '';
 
         $order['product_one'] = $order['product_two'] = $order['depart'] = $order['employee'] = [];
         $info = ReturnExchangeOrderProductInfo::where('del_time',0)
@@ -227,6 +226,11 @@ class ReturnExchangeOrderService extends Service
 
         $order['crt_name'] = Employee::where('id',$order['crt_id'])->value('emp_name');
         $order['crt_time'] = $order['crt_time'] ? date("Y-m-d H:i:s",$order['crt_time']): '';
+
+        //订单状态数据组织
+        $state_array = $this->getStateMake([$order]);
+        $order['state_title'] = $this->makeState($order,$state_array);
+
         //可见范围
         $return = (new RangeService())->RangeDetail($data['id'],SeeRange::type_six);
         $order['depart'] = $return[0] ?? [];