|
|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace App\Service;
|
|
|
|
|
|
+use App\Model\CustomerSupply;
|
|
|
use App\Model\Employee;
|
|
|
use App\Model\Order;
|
|
|
use App\Model\OrderDetails;
|
|
|
@@ -154,6 +155,8 @@ class OrderService extends Service
|
|
|
$customer = $customer->toArray();
|
|
|
$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['customer_title'] = $customer['customer_id'] ? CustomerSupply::where('id',$customer['customer_id'])->value('title') : "";
|
|
|
+ $customer['supply_title'] = $customer['supply_id'] ? CustomerSupply::where('id',$customer['supply_id'])->value('title') : "";
|
|
|
|
|
|
$details = $this->getDetail($data['id']);
|
|
|
$customer = array_merge($customer, $details);
|
