master
cody 1 year ago
parent a8252a112a
commit 4d64256097

@ -262,10 +262,13 @@ class OrdersController extends CommonController
} }
})->where('admin_id', $user->id)->pluck('area_id'); })->where('admin_id', $user->id)->pluck('area_id');
} }
$data = Area::where(function ($query) use ($areaId) { $data = Area::where(function ($query) use ($areaId,$building_id) {
if ($areaId) { if ($areaId) {
$query->whereIn('area.id', $areaId); $query->whereIn('area.id', $areaId);
} }
if($building_id){
$query->where('building_id', $building_id);
}
})->with(['project', })->with(['project',
"beds" => function ($query) use ($request) { "beds" => function ($query) use ($request) {
$query->has("onGoingOrder"); $query->has("onGoingOrder");

@ -19,8 +19,7 @@
<select class="form-control mr-1" name="building_id" <select class="form-control mr-1" name="building_id"
onchange="$(this).closest('form').submit()"> onchange="$(this).closest('form').submit()">
@foreach($buildings as $pp) @foreach($buildings as $pp)
<option <option value="">请选择</option>
value="" @if('' == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
<option <option
value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option> value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
@endforeach @endforeach

Loading…
Cancel
Save