| xqd
@@ -71,7 +71,11 @@ class RepairDeviceController extends BaseController
|
|
|
$item->project_name = $item->project ? $item->project->name : '';
|
|
|
$item->number = $item->inner_device ? $item->inner_device->number : '';
|
|
|
$item->spec_name = $item->inner_device ? ($item->inner_device->spec_name ? $item->inner_device->spec_name : '') : '';
|
|
|
- $item->device_name = $item->inner_device ? ($item->inner_device->device_name ? $item->inner_device->devices_name->name : '') : '';
|
|
|
+ $item->device_name = $item->inner_device ?
|
|
|
+ ($item->inner_device->device_name ?
|
|
|
+ $item->inner_device->device_name->name ? $item->inner_device->device_name->name : ''
|
|
|
+ : '')
|
|
|
+ : '';
|
|
|
$item->work_point_name = $item->work_point ? $item->work_point->name : '';
|
|
|
$item->status_label = $item->inner_device ? ($item->inner_device->option ? $item->inner_device->option->name :'' ) : '';
|
|
|
}
|