Merge branch 'feat/analysis-report' into dev

This commit is contained in:
sky121113 2026-05-18 16:21:38 +08:00
commit fb1bf68cc5

View File

@ -136,29 +136,29 @@
</div>
</div>
<!-- Product Selection -->
<div class="w-full sm:w-48 relative focus-within:z-[30]">
<x-searchable-select name="product_id" id="product_id" :placeholder="__('All Products (ALL)')" :selected="$selectedProductId"
@change="selectedProductId = ($event.target.value && $event.target.value.trim() !== '') ? $event.target.value.trim() : 'ALL'; fetchData()">
@foreach($products as $p)
<option value="{{ $p->id }}" data-title="{{ $p->name }}{{ $p->barcode ? ' (' . $p->barcode . ')' : '' }}">
{{ $p->name }}{{ $p->barcode ? ' (' . $p->barcode . ')' : '' }}
</option>
@endforeach
</x-searchable-select>
</div>
<!-- Company Selection (Super Admin only) -->
@if(auth()->user()->isSystemAdmin())
<div class="w-full sm:w-48 relative focus-within:z-[30]">
<x-searchable-select name="company_id" id="company_id" :placeholder="__('All Companies')" :selected="$selectedCompanyId"
@change="companyChanged($event.target.value)">
@foreach($companies as $c)
<option value="{{ $c->id }}" data-title="{{ $c->name }}">{{ $c->name }}</option>
<option value="{{ $c->id }}" {{ (string)$selectedCompanyId === (string)$c->id ? 'selected' : '' }} data-title="{{ $c->name }}">{{ $c->name }}</option>
@endforeach
</x-searchable-select>
</div>
@endif
<!-- Product Selection -->
<div class="w-full sm:w-48 relative focus-within:z-[30]">
<x-searchable-select name="product_id" id="product_id" :placeholder="__('All Products (ALL)')" :selected="$selectedProductId"
@change="selectedProductId = ($event.target.value && $event.target.value.trim() !== '') ? $event.target.value.trim() : 'ALL'; fetchData()">
@foreach($products as $p)
<option value="{{ $p->id }}" {{ (string)$selectedProductId === (string)$p->id ? 'selected' : '' }} data-title="{{ $p->name }}{{ $p->barcode ? ' (' . $p->barcode . ')' : '' }}">
{{ $p->name }}{{ $p->barcode ? ' (' . $p->barcode . ')' : '' }}
</option>
@endforeach
</x-searchable-select>
</div>
</div>
</div>