fix: 修复列表筛选空参与树数据展示

将后端 status/audit_status 筛选从 has() 改为 filled()，避免空字符串导致列表被误筛空；修复预定 status=0 筛选失效；前端兼容财务分类树形返回与菜单/字典数组返回，解决新增成功但列表空。
2026-03-15 00:06:11 +08:00
parent a29faa3b47
commit c778639f05
38 changed files with 99 additions and 40 deletions
@@ -13,7 +13,7 @@ class FinanceCategoryController extends Controller
    {
        $query = FinanceCategory::query();
        $query->when($request->type, fn($q, $v) => $q->where('type', $v));
-        $query->when($request->has('status'), fn($q) => $q->where('status', $request->status));
+        $query->when($request->filled('status'), fn($q) => $q->where('status', $request->status));

        $categories = $query->orderBy('sort')->get();

@@ -14,7 +14,7 @@ class FinanceRecordController extends Controller
        $query = FinanceRecord::query()->with(['category']);
        $query->when($request->type, fn($q, $v) => $q->where('type', $v));
        $query->when($request->category_id, fn($q, $v) => $q->where('category_id', $v));
-        $query->when($request->has('audit_status'), fn($q) => $q->where('audit_status', $request->audit_status));
+        $query->when($request->filled('audit_status'), fn($q) => $q->where('audit_status', $request->audit_status));
        $query->when($request->start_date, fn($q, $v) => $q->where('record_date', '>=', $v));
        $query->when($request->end_date, fn($q, $v) => $q->where('record_date', '<=', $v));

@@ -14,7 +14,7 @@ class InvoiceController extends Controller
        $query = Invoice::query()->with(['customer']);
        $query->when($request->invoice_no, fn($q, $v) => $q->where('invoice_no', 'like', "%{$v}%"));
        $query->when($request->customer_id, fn($q, $v) => $q->where('customer_id', $v));
-        $query->when($request->has('status'), fn($q) => $q->where('status', $request->status));
+        $query->when($request->filled('status'), fn($q) => $q->where('status', $request->status));
        $query->when($request->type, fn($q, $v) => $q->where('type', $v));

        return $this->paginate($query->latest()->paginate($request->input('per_page', 15)));
@@ -13,7 +13,7 @@ class PrepaidCardController extends Controller
    {
        $query = PrepaidCard::query();
        $query->when($request->name, fn($q, $v) => $q->where('name', 'like', "%{$v}%"));
-        $query->when($request->has('status'), fn($q) => $q->where('status', $request->status));
+        $query->when($request->filled('status'), fn($q) => $q->where('status', $request->status));

        return $this->paginate($query->orderBy('sort')->paginate($request->input('per_page', 15)));
    }