master
cody 1 year ago
parent b8565c6365
commit c4bb2468b2

@ -12,6 +12,7 @@ use App\Exports\OrdersExport;
use App\Models\AdminAreaLink; use App\Models\AdminAreaLink;
use App\Models\Area; use App\Models\Area;
use App\Models\Bed; use App\Models\Bed;
use App\Models\Building;
use App\Models\OrderItems; use App\Models\OrderItems;
use App\Models\Orders; use App\Models\Orders;
use App\Models\Project; use App\Models\Project;
@ -242,6 +243,7 @@ class OrdersController extends CommonController
public function artboard(Request $request) public function artboard(Request $request)
{ {
$projects = (new StatisticsController())->_checkProjects(); $projects = (new StatisticsController())->_checkProjects();
$building_id = $request->get('building_id');
$defaultProjectsId = ($projects[0]->id) ?? ''; $defaultProjectsId = ($projects[0]->id) ?? '';
$project_id = $request->get('project_id', $defaultProjectsId); $project_id = $request->get('project_id', $defaultProjectsId);
@ -289,7 +291,9 @@ class OrdersController extends CommonController
if ($data->first()) { if ($data->first()) {
$data = $data->toArray(); $data = $data->toArray();
} }
return view($this->bladePath . ".artboard", compact("data", "projects", "project_id")); // 获取楼栋
$buildings = Building::where('project_id',$project_id)->where('project_id', $project_id)->get();
return view($this->bladePath . ".artboard", compact("data", "projects", "project_id","buildings","building_id"));
} }

@ -16,6 +16,13 @@
value="{{$pp->id}}" @if($pp->id == $project_id) {{ "selected" }}@endif>{{$pp->name}}</option> value="{{$pp->id}}" @if($pp->id == $project_id) {{ "selected" }}@endif>{{$pp->name}}</option>
@endforeach @endforeach
</select> </select>
<select class="form-control mr-1" name="building_id"
onchange="$(this).closest('form').submit()">
@foreach($buildings as $pp)
<option
value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
@endforeach
</select>
</form> </form>
</div> </div>
<table class="table table-bordered" id="data-table"> <table class="table table-bordered" id="data-table">

Loading…
Cancel
Save