From 76a940fe97fba1c43a2c172a315ea324f72ee4aa Mon Sep 17 00:00:00 2001 From: shanshi <3316401569@qq.com> Date: Tue, 20 Oct 2026 11:31:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=B4=A6=E6=88=B7=E7=BB=84=E5=90=88=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/FinanceLedgerPageData.php | 57 ++++++++++++++++ .../pages/financial-ledger/ledger.blade.php | 7 +- .../FinanceLedgerAccountStatusTest.php | 66 +++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-) diff --git a/modules/EcommerceFinance/View/FinanceLedgerPageData.php b/modules/EcommerceFinance/View/FinanceLedgerPageData.php index 3d4277ee..64bb5ff2 100644 --- a/modules/EcommerceFinance/View/FinanceLedgerPageData.php +++ b/modules/EcommerceFinance/View/FinanceLedgerPageData.php @@ -25,6 +25,8 @@ class FinanceLedgerPageData 'sources' => ['title' => '数据来源', 'icon' => 'database'], ]; + private const ACCOUNT_FILTER_EMPTY = '__empty__'; + public function page(?string $tab = null): array { $tab = (string) (request('tab') ?: $tab); @@ -53,6 +55,7 @@ class FinanceLedgerPageData 'ledgerSourceSummary' => $this->sourceSummary(), 'ledgerMeta' => $this->meta(), 'ledgerAccountOptions' => $this->accountOptions(), + 'ledgerAccountFilterOptions' => $this->accountFilterOptions(), 'ledgerAccountStatusOptions' => FinanceLedgerAccountStatus::OPTIONS, 'ledgerCanEditMapping' => FinanceLedgerAccess::canEditMapping(user()), 'ledgerCanEditAccountStatus' => FinanceLedgerAccess::canEditAccountStatus(user()), @@ -71,6 +74,48 @@ class FinanceLedgerPageData }); } + $accountShort = trim((string) request('accounts_short', '')); + if ($accountShort !== '') { + $query->where('account_short', 'like', '%' . $accountShort . '%'); + } + + $status = trim((string) request('accounts_status', '')); + if ($status !== '' && array_key_exists($status, FinanceLedgerAccountStatus::OPTIONS)) { + if ($status === FinanceLedgerAccountStatus::NORMAL) { + $nonNormalStatuses = array_values(array_diff( + array_keys(FinanceLedgerAccountStatus::OPTIONS), + [FinanceLedgerAccountStatus::NORMAL], + )); + $query->whereNotIn( + 'account_short', + $this->db()->table('fin_account_statuses') + ->select('account_short') + ->whereIn('status', $nonNormalStatuses), + ); + } else { + $query->whereIn( + 'account_short', + $this->db()->table('fin_account_statuses') + ->select('account_short') + ->where('status', $status), + ); + } + } + + foreach (['accounts_region' => 'region', 'accounts_type' => 'account_type'] as $parameter => $column) { + $value = trim((string) request($parameter, '')); + if ($value === '') { + continue; + } + if ($value === self::ACCOUNT_FILTER_EMPTY) { + $query->where(function (Builder $builder) use ($column): void { + $builder->whereNull($column)->orWhere($column, ''); + }); + } else { + $query->where($column, $value); + } + } + $summaryQuery = clone $query; $summary = [ 'count' => (clone $query)->count(), @@ -272,6 +317,18 @@ class FinanceLedgerPageData ->select('account_short')->distinct()->orderBy('account_short')->pluck('account_short')->all(); } + private function accountFilterOptions(): array + { + return [ + 'regions' => $this->db()->table('fin_accounts') + ->whereNotNull('region')->where('region', '<>', '') + ->distinct()->orderBy('region')->pluck('region')->all(), + 'types' => $this->db()->table('fin_accounts') + ->whereNotNull('account_type')->where('account_type', '<>', '') + ->distinct()->orderBy('account_type')->pluck('account_type')->all(), + ]; + } + private function db() { return DB::connection((string) config('upstream_mirrors.connection', 'business_mirror')); diff --git a/resources/views/business/pages/financial-ledger/ledger.blade.php b/resources/views/business/pages/financial-ledger/ledger.blade.php index f2a73524..9d2d1bff 100644 --- a/resources/views/business/pages/financial-ledger/ledger.blade.php +++ b/resources/views/business/pages/financial-ledger/ledger.blade.php @@ -5,6 +5,7 @@ $canEdit = (bool) ($ledgerCanEditMapping ?? false); $canEditAccountStatus = (bool) ($ledgerCanEditAccountStatus ?? false); $accountStatusOptions = $ledgerAccountStatusOptions ?? \App\Utilities\FinanceLedgerAccountStatus::OPTIONS; + $accountFilterOptions = $ledgerAccountFilterOptions ?? ['regions' => [], 'types' => []]; $money = static fn ($value): string => $value === null || $value === '' ? '' : number_format((float) $value, 2); $date = static fn ($value): string => $value ? \Illuminate\Support\Carbon::parse($value)->format('Y-m-d') : ''; $tabUrl = static fn (string $tab): string => route('business.pages.show', ['section' => 'financial-ledger', 'page' => 'ledger', 'tab' => $tab]); @@ -119,7 +120,11 @@