@ -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) {
@ -71,6 +71,7 @@
<th>开始服务日期</th>
<th>结束日期</th>
<th>状态</th>
<th>协议</th>
<th>总计</th>
@if (empty($hushizhang) && empty($yuanfang))
@ -96,6 +97,7 @@
<td>{!! $row->status == \App\Models\Orders::STATUS_FINISHED ? $row->to_date : "<label class='badge badge-danger'>未结</label> {$row->to_date}" !!}</td>
<td>{!! $row->getStatusLabelAttribute() !!} </td>
<td>{!! $row->status == \App\Models\Orders::STATUS_FINISHED ? "" : "<label class='badge badge-danger'>预计</label>" !!} {{ $row->total }} </td>
<td>{{isset($row->orderAgreements)?$row->orderAgreements[0]->file_id:""}}</td>
<td>
<a class="btn btn-sm btn-primary"