fix: 修复列表筛选空参与树数据展示
将后端 status/audit_status 筛选从 has() 改为 filled(),避免空字符串导致列表被误筛空;修复预定 status=0 筛选失效;前端兼容财务分类树形返回与菜单/字典数组返回,解决新增成功但列表空。
This commit is contained in:
@@ -14,7 +14,7 @@ class InventoryCheckController extends Controller
|
||||
$query = InventoryCheck::query()
|
||||
->with(['warehouse', 'operator'])
|
||||
->when($request->warehouse_id, fn($q, $v) => $q->where('warehouse_id', $v))
|
||||
->when($request->has('status'), fn($q) => $q->where('status', $request->status));
|
||||
->when($request->filled('status'), fn($q) => $q->where('status', $request->status));
|
||||
|
||||
return $this->paginate($query->latest()->paginate($request->input('per_page', 15)));
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ class PurchaseOrderController extends Controller
|
||||
$query = PurchaseOrder::query()->with(['supplier','auditor']);
|
||||
$query->when($request->order_no, fn($q, $v) => $q->where('order_no', 'like', "%{$v}%"));
|
||||
$query->when($request->supplier_id, fn($q, $v) => $q->where('supplier_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));
|
||||
return $this->paginate($query->latest()->paginate($request->input('per_page', 15)));
|
||||
}
|
||||
public function store(Request $request): JsonResponse
|
||||
|
||||
@@ -13,7 +13,7 @@ class StockMovementController extends Controller
|
||||
$query = StockMovement::query()->with('warehouse');
|
||||
$query->when($request->warehouse_id, fn($q, $v) => $q->where('warehouse_id', $v));
|
||||
$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));
|
||||
return $this->paginate($query->latest()->paginate($request->input('per_page', 15)));
|
||||
}
|
||||
public function store(Request $request): JsonResponse
|
||||
|
||||
@@ -14,7 +14,7 @@ class TransferOrderController extends Controller
|
||||
$query = TransferOrder::query()
|
||||
->with(['fromWarehouse', 'toWarehouse', 'operator'])
|
||||
->when($request->transfer_no, fn($q, $v) => $q->where('transfer_no', 'like', "%{$v}%"))
|
||||
->when($request->has('status'), fn($q) => $q->where('status', $request->status))
|
||||
->when($request->filled('status'), fn($q) => $q->where('status', $request->status))
|
||||
->when($request->from_warehouse_id, fn($q, $v) => $q->where('from_warehouse_id', $v));
|
||||
|
||||
return $this->paginate($query->latest()->paginate($request->input('per_page', 15)));
|
||||
|
||||
Reference in New Issue
Block a user