2

app/Service/PaymentReceiptService.php

@@ -257,13 +257,16 @@ class PaymentReceiptService extends Service
             ->toArray();
         $customer['account_title'] = $basic_map[$customer['account']] ?? "";
         $customer['pay_way_title'] = $basic_map[$customer['pay_way']] ?? "";
-        $customer['state_title'] = PaymentReceipt::$name[$customer['state']] ?? "";
         $customer['type_title'] = PaymentReceipt::$model_type[$customer['type']] ?? "";
         $customer['data_type_title'] = PaymentReceipt::$data_type[$customer['data_type']] ?? "";
         $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         $customer['payment_receipt_date'] = $customer['payment_receipt_date'] ? date("Y-m-d",$customer['payment_receipt_date']): '';
 
+        //订单状态数据组织
+        $state_array = $this->getStateMake([$customer]);
+        $customer['state_title'] = $this->makeState($customer,$state_array);
+
         $file = PaymentReceiptInfo::where('del_time',0)
             ->whereIn('type',[PaymentReceiptInfo::type_one,PaymentReceiptInfo::type_two])
             ->where('payment_receipt_id',$data['id'])
@@ -687,11 +690,14 @@ class PaymentReceiptService extends Service
             $map[$value['payment_receipt_id']][] = $value['data_order_no'];
         }
 
+        //订单状态数据组织
+        $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]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
-            $data['data'][$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
+            $data['data'][$key]['state_title'] = $this->makeState($data['data'][$key], $state_array);
             $data['data'][$key]['type_title'] = PaymentReceipt::$model_type[$value['type']] ?? '';
             $data['data'][$key]['data_type_title'] = PaymentReceipt::$data_type[$value['data_type']] ?? '';
             $data['data'][$key]['account_title'] = $basic_map[$value['account']] ?? '';
@@ -702,6 +708,31 @@ class PaymentReceiptService extends Service
         return $data;
     }
 
+    public function getStateMake($data){
+        if(empty($data)) return [];
+
+        $order_no = [];
+        foreach ($data as $value){
+            if($value['state'] != PaymentReceipt::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 . "审核";
+        }elseif($value['state'] == PaymentReceipt::STATE_ZERO){
+            $state = "待" . $value['crt_name'] . "提交";
+        }else{
+            $state = PaymentReceipt::$name[$value['state']] ?? '';
+        }
+
+        return $state;
+    }
+
     //详情里
     public function getPaymentReceiptDataList($data,$type){
         $data['data_order_no'] = $data['order_number'];