2

app/Model/ReturnExchangeOrder.php

@@ -33,9 +33,9 @@ class ReturnExchangeOrder extends UseScopeBaseModel
     const State_one = 1;//待确认
     const State_two = 2;//已确认
     public static $state = [
-        self::State_zero => '未确认',
-        self::State_one => '待确认',
-        self::State_two => '已确认',
+        self::State_zero => '未提交',
+        self::State_one => '待审核',
+        self::State_two => '已审核',
     ];
 
     public static $prefix = [

app/Service/ReturnExchangeOrderService.php

@@ -363,7 +363,7 @@ class ReturnExchangeOrderService extends Service
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
             $crt_name = $emp_map[$value['crt_id']] ?? '';
             $data['data'][$key]['crt_name'] = $crt_name;
-            $data['data'][$key]['state_title'] = $this->makeState($value,$state_array);
+            $data['data'][$key]['state_title'] = $this->makeState($data['data'][$key],$state_array);
 //            $data['data'][$key]['state_title'] = ReturnExchangeOrder::$state[$value['state']] ?? '';
             $title = "" ;
             if($value['type'] == ReturnExchangeOrder::Order_type){
@@ -396,6 +396,8 @@ class ReturnExchangeOrderService extends Service
         if(! empty($state_array[$value['order_number']])){
             $emp_tmp = $state_array[$value['order_number']];
             $state = "待" . $emp_tmp . "审核";
+        }elseif($value['state'] == ReturnExchangeOrder::State_zero){
+            $state = "待" . $value['crt_name'] . "提交";
         }else{
             $state = ReturnExchangeOrder::$state[$value['state']] ?? '';
         }