diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php index 0c8008f..cf6deb3 100755 --- a/app/Http/Controllers/Admin/OrdersController.php +++ b/app/Http/Controllers/Admin/OrdersController.php @@ -98,6 +98,9 @@ class OrdersController extends CommonController "manager", "bed" => function ($query) { $query->with(["room", "building", "area"]); + }, + "orderAgreements" => function ($query) { + $query->orderBy("id", "desc"); } ])->where('status', $status) ->where(function ($query) use ($building_id, $area_id) { diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php index 2d3b18d..4894d20 100755 --- a/resources/views/admin/orders/index.blade.php +++ b/resources/views/admin/orders/index.blade.php @@ -71,6 +71,7 @@ 开始服务日期 结束日期 状态 + 协议 总计 @if (empty($hushizhang) && empty($yuanfang)) @@ -96,6 +97,7 @@ {!! $row->status == \App\Models\Orders::STATUS_FINISHED ? $row->to_date : " {$row->to_date}" !!} {!! $row->getStatusLabelAttribute() !!} {!! $row->status == \App\Models\Orders::STATUS_FINISHED ? "" : "" !!} {{ $row->total }} + {{isset($row->orderAgreements)?$row->orderAgreements[0]->file_id:""}} @if (empty($hushizhang) && empty($yuanfang))