|
@@ -538,8 +538,8 @@ class DeviceWorkService extends Service
|
|
|
$customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('title');
|
|
$customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('title');
|
|
|
$customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
|
|
$customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
|
|
|
$item = Item::where('id', $customer['item_id'])->first();
|
|
$item = Item::where('id', $customer['item_id'])->first();
|
|
|
- $customer['item_title'] = $item->title;
|
|
|
|
|
- $customer['item_code'] = $item->code;
|
|
|
|
|
|
|
+ $customer['item_title'] = $item->title ?? '';
|
|
|
|
|
+ $customer['item_code'] = $item->code ?? '';
|
|
|
$map = ArchiveService::fillIsArchive($customer['order_time'], $user);
|
|
$map = ArchiveService::fillIsArchive($customer['order_time'], $user);
|
|
|
$customer['is_archive'] = $map[$customer['order_time']] ?? false;
|
|
$customer['is_archive'] = $map[$customer['order_time']] ?? false;
|
|
|
$customer['order_time'] = $customer['order_time'] ? date("Y-m-d",$customer['order_time']): '';
|
|
$customer['order_time'] = $customer['order_time'] ? date("Y-m-d",$customer['order_time']): '';
|