From 46e8bdfaae05cc814badcdce7a9c7a43e86f868b Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Mon, 18 May 2026 15:51:45 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E4=BF=AE=E5=BE=A9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=A0=B1=E8=A1=A8=E7=AF=A9=E9=81=B8=20UI=20=E9=82=8F=E8=BC=AF?=
 =?UTF-8?q?=E8=88=87=E9=81=B8=E9=A0=85=E9=81=B8=E5=8F=96=E7=8B=80=E6=85=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 調整商品報表篩選區塊順序，將「公司篩選」移至「商品篩選」前方，符合依公司過濾商品的操作邏輯。
2. 修復 <x-searchable-select> 在透過 slot 傳入選項時，無法正確綁定 selected 狀態的問題，手動於 <option> 標籤中補上選取狀態判斷。
---
 .../admin/analysis/product-reports.blade.php  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/views/admin/analysis/product-reports.blade.php b/resources/views/admin/analysis/product-reports.blade.php
index ffe5477..be6918e 100644
--- a/resources/views/admin/analysis/product-reports.blade.php
+++ b/resources/views/admin/analysis/product-reports.blade.php
@@ -138,29 +138,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>