diff --git a/app/Http/Controllers/Banking/MarketingTaobaoAlipayBills.php b/app/Http/Controllers/Banking/MarketingTaobaoAlipayBills.php index d0ee4ec2..6df26106 100644 --- a/app/Http/Controllers/Banking/MarketingTaobaoAlipayBills.php +++ b/app/Http/Controllers/Banking/MarketingTaobaoAlipayBills.php @@ -23,10 +23,44 @@ class MarketingTaobaoAlipayBills extends Controller */ public function index() { + $storeName = trim((string) request()->query('store_name')); + $fromDate = trim((string) request()->query('from')); + $toDate = trim((string) request()->query('to')); + + $query = MarketingTaobaoAlipayBill::query(); + + if ($storeName !== '') { + $query->where('store_name', $storeName); + } + if ($fromDate !== '' && preg_match('/^\d{4}-\d{2}-\d{2}$/', $fromDate)) { + $query->where('transaction_date', '>=', $fromDate); + } + if ($toDate !== '' && preg_match('/^\d{4}-\d{2}-\d{2}$/', $toDate)) { + $query->where('transaction_date', '<=', $toDate); + } + + $storeOptions = MarketingTaobaoAlipayBill::select('store_name') + ->whereNotNull('store_name') + ->distinct() + ->orderBy('store_name') + ->pluck('store_name') + ->toArray(); + return view('banking.marketing_taobao_alipay_bills.index', [ - 'bills' => MarketingTaobaoAlipayBill::orderBy('transaction_date', 'desc') + 'bills' => $query->orderBy('transaction_date', 'desc') ->orderBy('id', 'desc') - ->paginate(setting('default.list_limit', 25)), + ->paginate(setting('default.list_limit', 25)) + ->appends([ + 'store_name' => $storeName, + 'from' => $fromDate, + 'to' => $toDate, + ]), + 'filters' => [ + 'store_name' => $storeName, + 'from' => $fromDate, + 'to' => $toDate, + 'store_options' => $storeOptions, + ], ]); } diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index eb77911a..5496dc5a 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -148,11 +148,47 @@ class Pages extends Controller // 淘系支付宝 - 使用独立的流水账单表(8字段) if ($tab === 'taobao-alipay') { + $request = request(); + $storeName = trim((string) $request->query('store_name')); + $fromDate = trim((string) $request->query('from')); + $toDate = trim((string) $request->query('to')); + + $query = MarketingTaobaoAlipayBill::query(); + + if ($storeName !== '') { + $query->where('store_name', $storeName); + } + if ($fromDate !== '' && preg_match('/^\d{4}-\d{2}-\d{2}$/', $fromDate)) { + $query->where('transaction_date', '>=', $fromDate); + } + if ($toDate !== '' && preg_match('/^\d{4}-\d{2}-\d{2}$/', $toDate)) { + $query->where('transaction_date', '<=', $toDate); + } + + // 筛选项下拉用的店铺列表(去重) + $storeOptions = MarketingTaobaoAlipayBill::select('store_name') + ->whereNotNull('store_name') + ->distinct() + ->orderBy('store_name') + ->pluck('store_name') + ->toArray(); + return [ 'view' => 'banking.marketing_taobao_alipay_bills.partials.embedded-table', - 'bills' => MarketingTaobaoAlipayBill::orderBy('transaction_date', 'desc') + 'bills' => $query->orderBy('transaction_date', 'desc') ->orderBy('id', 'desc') - ->paginate(setting('default.list_limit', 25)), + ->paginate(setting('default.list_limit', 25)) + ->appends([ + 'store_name' => $storeName, + 'from' => $fromDate, + 'to' => $toDate, + ]), + 'filters' => [ + 'store_name' => $storeName, + 'from' => $fromDate, + 'to' => $toDate, + 'store_options' => $storeOptions, + ], ]; } diff --git a/resources/views/banking/marketing_taobao_alipay_bills/partials/embedded-table.blade.php b/resources/views/banking/marketing_taobao_alipay_bills/partials/embedded-table.blade.php index 14ab84b7..9db6a5cf 100644 --- a/resources/views/banking/marketing_taobao_alipay_bills/partials/embedded-table.blade.php +++ b/resources/views/banking/marketing_taobao_alipay_bills/partials/embedded-table.blade.php @@ -18,37 +18,7 @@ {{-- 操作工具栏 --}}