2

app/Service/ReturnExchangeOrderService.php

@@ -353,10 +353,16 @@ class ReturnExchangeOrderService extends Service
         $storehouse = Storehouse::whereIn('id',array_unique(array_column($data['data'],'storehouse_id')))
             ->pluck('title','id')
             ->toArray();
+
+        //订单状态数据组织
+        $state_array = $this->getStateMake($data['data']);
+
         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']] ?? '';
+            $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'] = ReturnExchangeOrder::$state[$value['state']] ?? '';
             $title = "" ;
             if($value['type'] == ReturnExchangeOrder::Order_type){
                 $title = $sales[$value['data_id']] ?? "";
@@ -372,6 +378,29 @@ class ReturnExchangeOrderService extends Service
         return $data;
     }
 
+    public function getStateMake($data){
+        if(empty($data)) return [];
+
+        $order_no = [];
+        foreach ($data as $value){
+            if($value['state'] != ReturnExchangeOrder::State_one) continue;
+            $order_no[] = $value['order_number'];
+        }
+
+        return (new OaService())->getOaTeamDetailList($order_no);
+    }
+
+    public function makeState($value, $state_array){
+        if(! empty($state_array[$value['order_number']])){
+            $emp_tmp = $state_array[$value['order_number']];
+            $state = "待" . $emp_tmp . "审核";
+        }else{
+            $state = ReturnExchangeOrder::$state[$value['state']] ?? '';
+        }
+
+        return $state;
+    }
+
     public function orderRule(&$data, $user, $is_check = true){
         if($this->isEmpty($data,'model_type')) return [false,'单据类型不能为空！'];
         if(! in_array($data['model_type'], ReturnExchangeOrder::$model_type)) return [false,'单据类型不存在'];

config/logging.php

@@ -113,6 +113,14 @@ return [
             'level' => 'debug',
             'days' => 7,
         ],
+
+        //接口日志记录
+        'apiLog' => [
+            'driver' => 'daily',
+            'path' => storage_path('logs/api_log.log'),
+            'level' => 'debug',
+            'days' => 7,
+        ],
     ],
 
 ];

config/morequery.php

@@ -15,6 +15,8 @@ return [
         ],
         "api/invoiceOrderList" => 36,
         "api/ReturnExchangeOrderList" => 35,
+        "api/ReturnExchangeOrderAdd" => 35,
+        "api/ReturnExchangeOrderEdit" => 35,
         "api/constructionList" => 34,
         "api/getSettingGetDetail2" => 34,
         "api/purchaseOrderList" => [
@@ -38,6 +40,8 @@ return [
         ],
         "wx/invoiceOrderList" => 36,
         "wx/ReturnExchangeOrderList" => 35,
+        "wx/ReturnExchangeOrderAdd" => 35,
+        "wx/ReturnExchangeOrderEdit" => 35,
         "wx/constructionList" => 34,
         "wx/getSettingGetDetail2" => 34,
         "wx/purchaseOrderList" => [