parent
879549d34e
commit
424af4e849
@ -34,6 +34,12 @@ class FinanceLedgerPageData
|
||||
'sources' => ['title' => '数据来源', 'icon' => 'database'],
|
||||
];
|
||||
|
||||
public const TRANSACTION_VIEWS = [
|
||||
'all' => ['title' => '全部明细', 'account_short' => null],
|
||||
'zhu-junxiang-alipay' => ['title' => '朱俊祥支付宝', 'account_short' => '朱俊祥支付宝'],
|
||||
'zhu-junxiang-wechat' => ['title' => '朱俊祥微信', 'account_short' => '朱俊祥微信'],
|
||||
];
|
||||
|
||||
private const ACCOUNT_FILTER_EMPTY = '__empty__';
|
||||
|
||||
public function __construct(
|
||||
@ -47,12 +53,17 @@ class FinanceLedgerPageData
|
||||
$tab = (string) (request('tab') ?: $tab);
|
||||
$tab = array_key_exists($tab, self::TABS) ? $tab : 'accounts';
|
||||
$openingDate = (string) config('finance_ledger.opening_date', '2026-10-17');
|
||||
$transactionView = $this->transactionView();
|
||||
|
||||
$accounts = $this->accounts();
|
||||
$shops = $this->shops();
|
||||
$availableBreakdown = $this->availableBreakdown($shops);
|
||||
$flows = $this->flows();
|
||||
$transactions = $this->transactions();
|
||||
$transactions = $this->transactions($transactionView['account_short']);
|
||||
$transactionViewAccountExists = $transactionView['account_short'] === null
|
||||
|| $this->db()->table('fin_accounts')
|
||||
->where('account_short', $transactionView['account_short'])
|
||||
->exists();
|
||||
|
||||
return [
|
||||
'view' => 'business.pages.financial-ledger.ledger',
|
||||
@ -70,6 +81,10 @@ class FinanceLedgerPageData
|
||||
'ledgerFlowSummary' => $flows['summary'],
|
||||
'ledgerTransactions' => $transactions['rows'],
|
||||
'ledgerTransactionSummary' => $transactions['summary'],
|
||||
'ledgerTransactionView' => $transactionView['key'],
|
||||
'ledgerTransactionViews' => self::TRANSACTION_VIEWS,
|
||||
'ledgerTransactionViewAccount' => $transactionView['account_short'],
|
||||
'ledgerTransactionViewAccountExists' => $transactionViewAccountExists,
|
||||
'ledgerMapping' => $this->mapping(),
|
||||
'ledgerSourceSummary' => $this->sourceSummary(),
|
||||
'ledgerMeta' => $this->meta(),
|
||||
@ -551,10 +566,10 @@ class FinanceLedgerPageData
|
||||
];
|
||||
}
|
||||
|
||||
private function transactions(): array
|
||||
private function transactions(?string $accountShort = null): array
|
||||
{
|
||||
$query = $this->transactionQuery();
|
||||
$this->applyTransactionFilters($query);
|
||||
$this->applyTransactionFilters($query, $accountShort);
|
||||
|
||||
$headerColumns = $this->transactionHeaderColumns();
|
||||
$summary = $this->transactionSummaryMetrics($query);
|
||||
@ -573,12 +588,12 @@ class FinanceLedgerPageData
|
||||
public function transactionSummary(): array
|
||||
{
|
||||
$query = $this->transactionQuery();
|
||||
$this->applyTransactionFilters($query);
|
||||
$this->applyTransactionFilters($query, $this->transactionView()['account_short']);
|
||||
|
||||
return $this->transactionSummaryMetrics($query);
|
||||
}
|
||||
|
||||
private function applyTransactionFilters(Builder $query): void
|
||||
private function applyTransactionFilters(Builder $query, ?string $forcedAccountShort = null): void
|
||||
{
|
||||
$keyword = trim((string) request('txns_q', ''));
|
||||
if ($keyword !== '') {
|
||||
@ -589,10 +604,14 @@ class FinanceLedgerPageData
|
||||
->orWhere('m.account_short', 'like', '%' . $keyword . '%');
|
||||
});
|
||||
}
|
||||
$account = trim((string) request('txns_account', ''));
|
||||
if ($account !== '') {
|
||||
$effectiveAccount = $this->transactionHeaderColumns()['effective_account_short']['sort'];
|
||||
$query->whereRaw($effectiveAccount . ' LIKE ?', ['%' . $account . '%']);
|
||||
$effectiveAccount = $this->transactionHeaderColumns()['effective_account_short']['sort'];
|
||||
if ($forcedAccountShort !== null) {
|
||||
$query->whereRaw($effectiveAccount . ' = ?', [$forcedAccountShort]);
|
||||
} else {
|
||||
$account = trim((string) request('txns_account', ''));
|
||||
if ($account !== '') {
|
||||
$query->whereRaw($effectiveAccount . ' LIKE ?', ['%' . $account . '%']);
|
||||
}
|
||||
}
|
||||
$from = trim((string) request('txns_from', ''));
|
||||
if ($from !== '') {
|
||||
@ -607,7 +626,24 @@ class FinanceLedgerPageData
|
||||
$query->where('t.source', $source);
|
||||
}
|
||||
|
||||
$this->applyLedgerHeaderFilter($query, 'transactions', $this->transactionHeaderColumns());
|
||||
$headerColumns = $this->transactionHeaderColumns();
|
||||
if ($forcedAccountShort !== null) {
|
||||
unset($headerColumns['effective_account_short']);
|
||||
}
|
||||
$this->applyLedgerHeaderFilter($query, 'transactions', $headerColumns);
|
||||
}
|
||||
|
||||
private function transactionView(): array
|
||||
{
|
||||
$key = trim((string) request('txns_view', 'all'));
|
||||
if (! array_key_exists($key, self::TRANSACTION_VIEWS)) {
|
||||
$key = 'all';
|
||||
}
|
||||
|
||||
return [
|
||||
'key' => $key,
|
||||
...self::TRANSACTION_VIEWS[$key],
|
||||
];
|
||||
}
|
||||
|
||||
private function transactionSummaryMetrics(Builder $query): array
|
||||
|
||||
@ -62,6 +62,14 @@
|
||||
$date = static fn ($value): string => $value ? \Illuminate\Support\Carbon::parse($value)->format('Y-m-d') : '';
|
||||
$ledgerPageUrl = route('business.pages.show', ['section' => 'financial-operations', 'page' => 'ledger']);
|
||||
$tabUrl = static fn (string $tab): string => $ledgerPageUrl . '?' . http_build_query(['tab' => $tab]);
|
||||
$transactionView = $ledgerTransactionView ?? 'all';
|
||||
$transactionViews = $ledgerTransactionViews ?? [];
|
||||
$transactionViewAccount = $ledgerTransactionViewAccount ?? null;
|
||||
$transactionViewAccountExists = (bool) ($ledgerTransactionViewAccountExists ?? true);
|
||||
$transactionViewResetUrl = $ledgerPageUrl . '?' . http_build_query([
|
||||
'tab' => 'transactions',
|
||||
'txns_view' => $transactionView,
|
||||
]);
|
||||
$sourceLabels = ['dingtalk' => '钉钉审批', 'alipay-company' => '公司支付宝', 'shop' => '店铺提现', 'shop_bill' => '店铺账单提现', 'payable' => '供应商应付', 'store' => '店铺开店', 'workorder' => '聚工单', 'manual' => '手工录入'];
|
||||
$shopBalanceDate = $ledgerShopBalanceDate ?? null;
|
||||
$shopBalanceDates = $ledgerShopBalanceDates ?? [];
|
||||
@ -181,6 +189,16 @@
|
||||
.ledger-tab.is-active { color:#fff; background:var(--vip-content-accent-dark, #856632); }
|
||||
.ledger-tab:focus-visible { outline:2px solid var(--vip-content-accent-dark, #856632); outline-offset:2px; }
|
||||
.ledger-tab .material-icons-outlined { font-size:1.05rem; }
|
||||
.ledger-subtabbar { display:flex; gap:.2rem; margin:-.3rem 0 .75rem; padding:0 .1rem; border-bottom:1px solid var(--vip-border, #D8D2C7); overflow-x:auto; }
|
||||
.ledger-subtab { position:relative; display:inline-flex; flex:0 0 auto; align-items:center; justify-content:center; min-height:2.25rem; padding:0 .8rem; border:0; background:transparent; color:var(--vip-content-muted, #595959); font:inherit; font-weight:600; white-space:nowrap; cursor:pointer; transition:color 150ms ease, background-color 150ms ease; }
|
||||
.ledger-subtab::after { position:absolute; right:.35rem; bottom:-1px; left:.35rem; height:3px; background:transparent; content:''; }
|
||||
.ledger-subtab:hover { color:var(--vip-content-accent-dark, #856632); background:var(--vip-content-accent-soft, #F7F0DE); }
|
||||
.ledger-subtab.is-active { color:var(--vip-content-accent-dark, #856632); }
|
||||
.ledger-subtab.is-active::after { background:var(--vip-content-accent, #B9954F); }
|
||||
.ledger-subtab:focus-visible { outline:2px solid var(--vip-content-accent-dark, #856632); outline-offset:-2px; }
|
||||
.ledger-transaction-view-note { margin:0 0 .75rem; padding:.55rem .65rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.45rem; background:#fff; color:var(--vip-content-muted, #595959); font-size:.7rem; line-height:1.6; }
|
||||
.ledger-transaction-view-note.is-warning { border-color:#E2C88E; background:#fff8eb; color:var(--vip-warning, #935F07); }
|
||||
@media (prefers-reduced-motion: reduce) { .ledger-subtab { transition:none; } }
|
||||
.ledger-panel[hidden] { display:none !important; }
|
||||
.ledger-toolbar { display:flex; flex-wrap:wrap; align-items:flex-end; gap:.65rem; padding:.85rem 1rem; margin-bottom:.85rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.65rem; background:#fff; }
|
||||
.ledger-field { display:flex; flex-direction:column; gap:.3rem; min-width:10rem; }
|
||||
@ -998,15 +1016,30 @@
|
||||
</section>
|
||||
|
||||
{{-- 动账明细 --}}
|
||||
<section class="ledger-panel" id="ledger-panel-transactions" role="tabpanel" data-ledger-panel="transactions" data-transaction-account-url-template="{{ route('business.financial-ledger.transactions.account.update', ['id' => '__TRANSACTION__']) }}" data-transaction-column-storage-key="caiwu.financial-ledger.transactions.widths.v1.{{ auth()->id() }}.{{ company_id() }}" @if ($activeTab !== 'transactions') hidden @endif>
|
||||
<section class="ledger-panel" id="ledger-panel-transactions" role="tabpanel" data-ledger-panel="transactions" data-transaction-view="{{ $transactionView }}" data-transaction-account-url-template="{{ route('business.financial-ledger.transactions.account.update', ['id' => '__TRANSACTION__']) }}" data-transaction-column-storage-key="caiwu.financial-ledger.transactions.widths.v1.{{ auth()->id() }}.{{ company_id() }}" @if ($activeTab !== 'transactions') hidden @endif>
|
||||
<nav class="ledger-subtabbar" role="tablist" aria-label="动账明细分页">
|
||||
@foreach ($transactionViews as $viewKey => $view)
|
||||
<button type="button" class="ledger-subtab {{ $transactionView === $viewKey ? 'is-active' : '' }}" role="tab" aria-selected="{{ $transactionView === $viewKey ? 'true' : 'false' }}" data-ledger-transaction-view="{{ $viewKey }}" data-ledger-transaction-view-account="{{ $view['account_short'] ?? '' }}">{{ $view['title'] }}</button>
|
||||
@endforeach
|
||||
</nav>
|
||||
<div class="ledger-transaction-view-note {{ $transactionViewAccount !== null && !$transactionViewAccountExists ? 'is-warning' : '' }}" data-ledger-transaction-view-note role="status" aria-live="polite">
|
||||
@if ($transactionViewAccount === null)
|
||||
全部动账明细统一展示;选择账户专属页后只显示该账户的真实收支明细。
|
||||
@elseif (!$transactionViewAccountExists)
|
||||
账户总表中尚未建立“{{ $transactionViewAccount }}”,当前仅展示已归集到该账户简称的历史明细。先在账户总表补齐账户和期初后,才会进入每日资金流水及当前余额重算。
|
||||
@else
|
||||
当前按账户“{{ $transactionViewAccount }}”精确归集;新增、编辑或删除手工明细后会同步重算账户总表当前余额和每日资金流水。
|
||||
@endif
|
||||
</div>
|
||||
<form class="ledger-toolbar" method="GET" action="{{ $tabUrl('transactions') }}">
|
||||
<input type="hidden" name="tab" value="transactions">
|
||||
<input type="hidden" name="txns_view" value="{{ $transactionView }}">
|
||||
<div class="ledger-field" style="min-width:15rem"><label for="txns-q">关键词</label><input id="txns-q" name="txns_q" value="{{ request('txns_q') }}" placeholder="账户、明细、审批编号"></div>
|
||||
<div class="ledger-field ledger-field--account-filter">
|
||||
<label for="txns-account">账户简称</label>
|
||||
<div class="ledger-filter-combobox" data-ledger-account-filter data-limit="60">
|
||||
<input id="txns-account" name="txns_account" type="search" value="{{ request('txns_account') }}" placeholder="输入文字自动联想" autocomplete="off" role="combobox" aria-expanded="false" aria-controls="txns-account-menu" aria-autocomplete="list" aria-haspopup="listbox" data-ledger-account-filter-input>
|
||||
<button class="ledger-filter-combobox__toggle" type="button" aria-label="展开账户简称选项" tabindex="-1" data-ledger-account-filter-toggle>
|
||||
<input id="txns-account" name="txns_account" type="search" value="{{ $transactionViewAccount ?? request('txns_account') }}" placeholder="输入文字自动联想" autocomplete="off" role="combobox" aria-expanded="false" aria-controls="txns-account-menu" aria-autocomplete="list" aria-haspopup="listbox" data-ledger-account-filter-input @if ($transactionViewAccount !== null) readonly @endif>
|
||||
<button class="ledger-filter-combobox__toggle" type="button" aria-label="展开账户简称选项" tabindex="-1" data-ledger-account-filter-toggle @disabled($transactionViewAccount !== null)>
|
||||
<span class="material-icons-outlined" aria-hidden="true">expand_more</span>
|
||||
</button>
|
||||
<div class="ledger-filter-combobox__menu" id="txns-account-menu" role="listbox" aria-label="账户简称选项" data-ledger-account-filter-menu hidden></div>
|
||||
@ -1015,9 +1048,9 @@
|
||||
<div class="ledger-field"><label for="txns-source">来源</label><select id="txns-source" name="txns_source"><option value="">全部</option>@foreach ($sourceLabels as $key => $label)<option value="{{ $key }}" @selected(request('txns_source') === $key)>{{ $label }}</option>@endforeach</select></div>
|
||||
<div class="ledger-field"><label for="txns-from">日期起</label><input id="txns-from" type="date" name="txns_from" value="{{ request('txns_from') }}"></div>
|
||||
<div class="ledger-field"><label for="txns-to">日期止</label><input id="txns-to" type="date" name="txns_to" value="{{ request('txns_to') }}"></div>
|
||||
<div class="ledger-actions"><button class="ledger-btn primary" type="submit"><span class="material-icons-outlined">search</span>查询</button><a class="ledger-btn" href="{{ $tabUrl('transactions') }}"><span class="material-icons-outlined">refresh</span>重置</a></div>
|
||||
<div class="ledger-actions"><button class="ledger-btn primary" type="submit"><span class="material-icons-outlined">search</span>查询</button><a class="ledger-btn" href="{{ $transactionViewResetUrl }}"><span class="material-icons-outlined">refresh</span>重置</a></div>
|
||||
</form>
|
||||
<div class="ledger-summary"><div class="ledger-summary__item"><span>明细笔数</span><b data-ledger-transaction-summary-count>{{ number_format((int) ($ledgerTransactionSummary['count'] ?? 0)) }}</b></div><div class="ledger-summary__item"><span>收入合计</span><b data-ledger-transaction-summary-income>{{ $money($ledgerTransactionSummary['income'] ?? 0) }}</b></div><div class="ledger-summary__item"><span>支出合计</span><b data-ledger-transaction-summary-expense>{{ $money($ledgerTransactionSummary['expense'] ?? 0) }}</b></div><div class="ledger-summary__item"><span>净额</span><b data-ledger-transaction-summary-net>{{ $money(($ledgerTransactionSummary['income'] ?? 0) - ($ledgerTransactionSummary['expense'] ?? 0)) }}</b></div></div>
|
||||
<div class="ledger-summary" data-ledger-transaction-summary><div class="ledger-summary__item"><span>明细笔数</span><b data-ledger-transaction-summary-count>{{ number_format((int) ($ledgerTransactionSummary['count'] ?? 0)) }}</b></div><div class="ledger-summary__item"><span>收入合计</span><b data-ledger-transaction-summary-income>{{ $money($ledgerTransactionSummary['income'] ?? 0) }}</b></div><div class="ledger-summary__item"><span>支出合计</span><b data-ledger-transaction-summary-expense>{{ $money($ledgerTransactionSummary['expense'] ?? 0) }}</b></div><div class="ledger-summary__item"><span>净额</span><b data-ledger-transaction-summary-net>{{ $money(($ledgerTransactionSummary['income'] ?? 0) - ($ledgerTransactionSummary['expense'] ?? 0)) }}</b></div></div>
|
||||
<div class="ledger-note">账户简称按“映射表 → 来源原始值 → 未匹配”解析;手工录入使用账户总表简称,并自动计入每日资金流水,不回写上游。拖动表头右侧边界可调整列宽,双击边界恢复默认。</div>
|
||||
<div class="ledger-table-wrap">
|
||||
<table class="ledger-table" style="min-width:66rem"><thead><tr>
|
||||
@ -1034,11 +1067,11 @@
|
||||
])
|
||||
@endforeach
|
||||
</tr></thead>
|
||||
<tbody data-ledger-transaction-tbody>
|
||||
@if ($canEditTransactions)
|
||||
<tbody data-ledger-transaction-editor>
|
||||
<tr class="ledger-manual-trigger-row" data-ledger-manual-trigger-row>
|
||||
<td colspan="7">
|
||||
<button class="ledger-manual-trigger" type="button" data-ledger-manual-trigger @disabled($manualTransactionAccountOptions === [])>
|
||||
<button class="ledger-manual-trigger" type="button" data-ledger-manual-trigger @disabled($manualTransactionAccountOptions === [] || ($transactionViewAccount !== null && !$transactionViewAccountExists))>
|
||||
<span class="material-icons-outlined" aria-hidden="true">add</span>
|
||||
新增手工明细
|
||||
</button>
|
||||
@ -1058,7 +1091,7 @@
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<input id="ledger-manual-account" class="ledger-manual-input" form="ledger-manual-transaction-form" type="text" name="account_short" list="ledger-manual-account-options" maxlength="100" placeholder="输入账户简称" autocomplete="off" required data-ledger-manual-account>
|
||||
<input id="ledger-manual-account" class="ledger-manual-input" form="ledger-manual-transaction-form" type="text" name="account_short" list="ledger-manual-account-options" maxlength="100" value="{{ $transactionViewAccount }}" placeholder="输入账户简称" autocomplete="off" required data-ledger-manual-account @if ($transactionViewAccount !== null) readonly @endif>
|
||||
</td>
|
||||
<td><input class="ledger-manual-input" form="ledger-manual-transaction-form" type="text" name="detail" maxlength="4000" placeholder="填写明细" required></td>
|
||||
<td><span class="ledger-source-tag">手工录入</span></td>
|
||||
@ -1072,7 +1105,9 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@endif
|
||||
<tbody data-ledger-transaction-tbody>
|
||||
@forelse ($ledgerTransactions as $row)
|
||||
<tr class="ledger-transaction-row" data-ledger-transaction-row data-transaction-id="{{ $row->id }}" data-source="{{ $row->source }}"
|
||||
@if ($canEditTransactions && $row->source === 'manual')
|
||||
@ -1114,11 +1149,13 @@
|
||||
@endforelse
|
||||
</tbody>
|
||||
</table>
|
||||
@include('business.pages.financial-ledger.partials.pagination', [
|
||||
'rows' => $ledgerTransactions,
|
||||
'paginationKey' => 'transactions',
|
||||
'paginationLabel' => '动账明细分页',
|
||||
])
|
||||
<div data-ledger-transaction-pagination>
|
||||
@include('business.pages.financial-ledger.partials.pagination', [
|
||||
'rows' => $ledgerTransactions,
|
||||
'paginationKey' => 'transactions',
|
||||
'paginationLabel' => '动账明细分页',
|
||||
])
|
||||
</div>
|
||||
</div>
|
||||
<datalist id="ledger-manual-account-options">
|
||||
@foreach ($manualTransactionAccountOptions as $option)
|
||||
@ -1251,6 +1288,125 @@
|
||||
}));
|
||||
if (window.location.hash === '#mapping') showTab('mapping', false);
|
||||
|
||||
const transactionPanel = page.querySelector('#ledger-panel-transactions');
|
||||
const transactionViewTabs = Array.from(page.querySelectorAll('[data-ledger-transaction-view]'));
|
||||
let transactionViewRequest = null;
|
||||
const applyTransactionViewControls = (viewKey, accountShort) => {
|
||||
transactionViewTabs.forEach((tab) => {
|
||||
const active = tab.dataset.ledgerTransactionView === viewKey;
|
||||
tab.classList.toggle('is-active', active);
|
||||
tab.setAttribute('aria-selected', active ? 'true' : 'false');
|
||||
});
|
||||
if (!transactionPanel) return;
|
||||
transactionPanel.dataset.transactionView = viewKey;
|
||||
const viewInput = transactionPanel.querySelector('input[name="txns_view"]');
|
||||
if (viewInput) viewInput.value = viewKey;
|
||||
const accountFilter = transactionPanel.querySelector('[data-ledger-account-filter-input]');
|
||||
const accountToggle = transactionPanel.querySelector('[data-ledger-account-filter-toggle]');
|
||||
if (accountFilter) {
|
||||
accountFilter.value = accountShort || '';
|
||||
accountFilter.readOnly = Boolean(accountShort);
|
||||
accountFilter.title = accountShort ? '专属明细页固定按该账户筛选' : '';
|
||||
const combobox = accountFilter.closest('[data-ledger-account-filter]');
|
||||
const menu = combobox?.querySelector('[data-ledger-account-filter-menu]');
|
||||
if (accountShort) {
|
||||
accountFilter.blur();
|
||||
if (menu) menu.hidden = true;
|
||||
combobox?.classList.remove('is-open');
|
||||
accountFilter.setAttribute('aria-expanded', 'false');
|
||||
}
|
||||
}
|
||||
if (accountToggle) accountToggle.disabled = Boolean(accountShort);
|
||||
const manualAccount = transactionPanel.querySelector('[data-ledger-manual-account]');
|
||||
if (manualAccount) {
|
||||
manualAccount.value = accountShort || '';
|
||||
manualAccount.readOnly = Boolean(accountShort);
|
||||
manualAccount.defaultValue = accountShort || '';
|
||||
manualAccount.title = accountShort ? '专属明细页新增时会固定记入该账户' : '';
|
||||
}
|
||||
};
|
||||
const loadTransactionView = async (tab) => {
|
||||
if (!transactionPanel || !tab || tab.classList.contains('is-active')) return;
|
||||
const viewKey = tab.dataset.ledgerTransactionView || 'all';
|
||||
const accountShort = tab.dataset.ledgerTransactionViewAccount || '';
|
||||
const currentViewTab = transactionViewTabs.find((item) => item.classList.contains('is-active'));
|
||||
const currentAccount = currentViewTab?.dataset.ledgerTransactionViewAccount || '';
|
||||
const targetUrl = new URL(window.location.href);
|
||||
targetUrl.searchParams.set('tab', 'transactions');
|
||||
targetUrl.searchParams.delete('txns_page');
|
||||
if (currentAccount) targetUrl.searchParams.delete('txns_account');
|
||||
if (accountShort) targetUrl.searchParams.set('txns_account', accountShort);
|
||||
if (viewKey === 'all') targetUrl.searchParams.delete('txns_view');
|
||||
else targetUrl.searchParams.set('txns_view', viewKey);
|
||||
|
||||
transactionViewRequest?.abort();
|
||||
const request = new AbortController();
|
||||
transactionViewRequest = request;
|
||||
transactionPanel.setAttribute('aria-busy', 'true');
|
||||
notify('正在加载“' + tab.textContent.trim() + '”…', false, true);
|
||||
try {
|
||||
const response = await fetch(targetUrl.toString(), {
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Accept': 'text/html',
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
signal: request.signal,
|
||||
});
|
||||
if (!response.ok) throw new Error('明细页加载失败(HTTP ' + response.status + ')');
|
||||
|
||||
const nextDocument = new DOMParser().parseFromString(await response.text(), 'text/html');
|
||||
const nextPanel = nextDocument.querySelector('#ledger-panel-transactions');
|
||||
const nextBody = nextPanel?.querySelector('[data-ledger-transaction-tbody]');
|
||||
const nextPagination = nextPanel?.querySelector('[data-ledger-transaction-pagination]');
|
||||
const nextNote = nextPanel?.querySelector('[data-ledger-transaction-view-note]');
|
||||
const nextManualTrigger = nextPanel?.querySelector('[data-ledger-manual-trigger]');
|
||||
const currentBody = transactionPanel.querySelector('[data-ledger-transaction-tbody]');
|
||||
const currentPagination = transactionPanel.querySelector('[data-ledger-transaction-pagination]');
|
||||
const currentNote = transactionPanel.querySelector('[data-ledger-transaction-view-note]');
|
||||
const currentManualTrigger = transactionPanel.querySelector('[data-ledger-manual-trigger]');
|
||||
if (!nextBody || !nextPagination || !nextNote || !currentBody || !currentPagination || !currentNote) {
|
||||
throw new Error('明细页内容解析失败');
|
||||
}
|
||||
|
||||
nextPanel.querySelectorAll('[data-ledger-transaction-summary-count], [data-ledger-transaction-summary-income], [data-ledger-transaction-summary-expense], [data-ledger-transaction-summary-net]').forEach((nextValue) => {
|
||||
const selector = nextValue.hasAttribute('data-ledger-transaction-summary-count')
|
||||
? '[data-ledger-transaction-summary-count]'
|
||||
: nextValue.hasAttribute('data-ledger-transaction-summary-income')
|
||||
? '[data-ledger-transaction-summary-income]'
|
||||
: nextValue.hasAttribute('data-ledger-transaction-summary-expense')
|
||||
? '[data-ledger-transaction-summary-expense]'
|
||||
: '[data-ledger-transaction-summary-net]';
|
||||
const currentValue = transactionPanel.querySelector(selector);
|
||||
if (currentValue) currentValue.textContent = nextValue.textContent;
|
||||
});
|
||||
transactionPanel.querySelectorAll('[data-ledger-transaction-editor] .ledger-transaction-row.is-new')
|
||||
.forEach((row) => row.remove());
|
||||
currentBody.replaceWith(document.importNode(nextBody, true));
|
||||
currentPagination.replaceWith(document.importNode(nextPagination, true));
|
||||
currentNote.replaceWith(document.importNode(nextNote, true));
|
||||
if (currentManualTrigger && nextManualTrigger) {
|
||||
currentManualTrigger.disabled = nextManualTrigger.disabled;
|
||||
}
|
||||
applyTransactionViewControls(viewKey, accountShort);
|
||||
bindTransactionRowsAfterLoad();
|
||||
bindTransactionPaginationAfterLoad();
|
||||
if (window.history?.replaceState) {
|
||||
window.history.replaceState({}, '', targetUrl.toString());
|
||||
}
|
||||
notify('已切换到“' + tab.textContent.trim() + '”');
|
||||
} catch (error) {
|
||||
if (error.name !== 'AbortError') notify(error.message || '明细页加载失败', true);
|
||||
} finally {
|
||||
if (transactionViewRequest === request) {
|
||||
transactionPanel.removeAttribute('aria-busy');
|
||||
}
|
||||
}
|
||||
};
|
||||
transactionViewTabs.forEach((tab) => {
|
||||
tab.addEventListener('click', () => loadTransactionView(tab));
|
||||
});
|
||||
|
||||
const setupLedgerAccountFilter = () => {
|
||||
const combobox = page.querySelector('[data-ledger-account-filter]');
|
||||
const input = combobox?.querySelector('[data-ledger-account-filter-input]');
|
||||
@ -1360,9 +1516,15 @@
|
||||
setActive(next);
|
||||
};
|
||||
|
||||
input.addEventListener('focus', () => open());
|
||||
input.addEventListener('click', () => open());
|
||||
input.addEventListener('input', () => open(true));
|
||||
input.addEventListener('focus', () => {
|
||||
if (!input.readOnly) open();
|
||||
});
|
||||
input.addEventListener('click', () => {
|
||||
if (!input.readOnly) open();
|
||||
});
|
||||
input.addEventListener('input', () => {
|
||||
if (!input.readOnly) open(true);
|
||||
});
|
||||
input.addEventListener('keydown', (event) => {
|
||||
if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
|
||||
event.preventDefault();
|
||||
@ -1379,6 +1541,7 @@
|
||||
}
|
||||
});
|
||||
toggle?.addEventListener('click', () => {
|
||||
if (input.readOnly) return;
|
||||
if (isOpen()) close();
|
||||
else open();
|
||||
input.focus();
|
||||
@ -1744,58 +1907,58 @@
|
||||
manualEditExpense.disabled = Number(manualEditIncome.value) > 0;
|
||||
};
|
||||
|
||||
page.querySelectorAll('[data-ledger-manual-edit]').forEach((button) => {
|
||||
button.addEventListener('click', () => {
|
||||
const row = button.closest('[data-ledger-manual-row]');
|
||||
if (!row) return;
|
||||
transactionPanel?.addEventListener('click', (event) => {
|
||||
const button = event.target.closest('[data-ledger-manual-edit]');
|
||||
if (!button) return;
|
||||
const row = button.closest('[data-ledger-manual-row]');
|
||||
if (!row) return;
|
||||
|
||||
manualEditForm.reset();
|
||||
manualEditForm.action = row.dataset.updateUrl || '';
|
||||
if (manualEditError) manualEditError.hidden = true;
|
||||
if (manualEditDate) manualEditDate.value = row.dataset.txnDate || '';
|
||||
if (manualEditAccount) {
|
||||
manualEditAccount.value = row.dataset.accountShort || '';
|
||||
manualEditAccount.setCustomValidity('');
|
||||
}
|
||||
if (manualEditApproval) manualEditApproval.value = row.dataset.approvalNo || '';
|
||||
if (manualEditDetail) manualEditDetail.value = row.dataset.detail || '';
|
||||
if (manualEditIncome) manualEditIncome.value = Number(row.dataset.income) > 0 ? row.dataset.income : '';
|
||||
if (manualEditExpense) manualEditExpense.value = Number(row.dataset.expense) > 0 ? row.dataset.expense : '';
|
||||
syncManualEditDirection();
|
||||
manualEditDialog.showModal();
|
||||
manualEditDate?.focus();
|
||||
});
|
||||
manualEditForm.reset();
|
||||
manualEditForm.action = row.dataset.updateUrl || '';
|
||||
if (manualEditError) manualEditError.hidden = true;
|
||||
if (manualEditDate) manualEditDate.value = row.dataset.txnDate || '';
|
||||
if (manualEditAccount) {
|
||||
manualEditAccount.value = row.dataset.accountShort || '';
|
||||
manualEditAccount.setCustomValidity('');
|
||||
}
|
||||
if (manualEditApproval) manualEditApproval.value = row.dataset.approvalNo || '';
|
||||
if (manualEditDetail) manualEditDetail.value = row.dataset.detail || '';
|
||||
if (manualEditIncome) manualEditIncome.value = Number(row.dataset.income) > 0 ? row.dataset.income : '';
|
||||
if (manualEditExpense) manualEditExpense.value = Number(row.dataset.expense) > 0 ? row.dataset.expense : '';
|
||||
syncManualEditDirection();
|
||||
manualEditDialog.showModal();
|
||||
manualEditDate?.focus();
|
||||
});
|
||||
|
||||
page.querySelectorAll('[data-ledger-manual-delete]').forEach((button) => {
|
||||
button.addEventListener('click', async () => {
|
||||
const row = button.closest('[data-ledger-manual-row]');
|
||||
if (!row) return;
|
||||
const label = [row.dataset.txnDate, row.dataset.accountShort, row.dataset.detail].filter(Boolean).join(' · ');
|
||||
if (!window.confirm('确认删除这条手工明细?\n' + label + '\n删除后将重新计算资金流水。')) return;
|
||||
transactionPanel?.addEventListener('click', async (event) => {
|
||||
const button = event.target.closest('[data-ledger-manual-delete]');
|
||||
if (!button) return;
|
||||
const row = button.closest('[data-ledger-manual-row]');
|
||||
if (!row) return;
|
||||
const label = [row.dataset.txnDate, row.dataset.accountShort, row.dataset.detail].filter(Boolean).join(' · ');
|
||||
if (!window.confirm('确认删除这条手工明细?\n' + label + '\n删除后将重新计算资金流水。')) return;
|
||||
|
||||
button.disabled = true;
|
||||
try {
|
||||
const response = await fetch(row.dataset.deleteUrl, {
|
||||
method: 'DELETE',
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'X-CSRF-TOKEN': ledgerCsrfToken,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
});
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(payload.message || '手工明细删除失败');
|
||||
}
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
notify(error.message || '手工明细删除失败', true);
|
||||
} finally {
|
||||
button.disabled = false;
|
||||
button.disabled = true;
|
||||
try {
|
||||
const response = await fetch(row.dataset.deleteUrl, {
|
||||
method: 'DELETE',
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'X-CSRF-TOKEN': ledgerCsrfToken,
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
},
|
||||
});
|
||||
const payload = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(payload.message || '手工明细删除失败');
|
||||
}
|
||||
});
|
||||
window.location.reload();
|
||||
} catch (error) {
|
||||
notify(error.message || '手工明细删除失败', true);
|
||||
} finally {
|
||||
button.disabled = false;
|
||||
}
|
||||
});
|
||||
|
||||
manualEditAccount?.addEventListener('input', () => manualEditAccount.setCustomValidity(''));
|
||||
@ -1853,7 +2016,27 @@
|
||||
});
|
||||
}
|
||||
|
||||
page.querySelectorAll('[data-ledger-transaction-account]').forEach(bindTransactionAccountInput);
|
||||
function bindTransactionRowsAfterLoad() {
|
||||
transactionPanel?.querySelectorAll('[data-ledger-transaction-account]')
|
||||
.forEach(bindTransactionAccountInput);
|
||||
}
|
||||
function bindTransactionPaginationAfterLoad() {
|
||||
transactionPanel?.querySelectorAll('[data-ledger-page-select]').forEach((select) => {
|
||||
if (select.dataset.transactionViewBound === '1') return;
|
||||
select.dataset.transactionViewBound = '1';
|
||||
select.addEventListener('change', () => {
|
||||
const pageUrl = new URL(select.value, window.location.href);
|
||||
pageUrl.searchParams.set('tab', 'transactions');
|
||||
const viewInput = transactionPanel?.querySelector('input[name="txns_view"]');
|
||||
if (viewInput?.value && viewInput.value !== 'all') {
|
||||
pageUrl.searchParams.set('txns_view', viewInput.value);
|
||||
}
|
||||
window.location.assign(pageUrl.toString());
|
||||
});
|
||||
});
|
||||
}
|
||||
bindTransactionRowsAfterLoad();
|
||||
bindTransactionPaginationAfterLoad();
|
||||
|
||||
const accountTemplateDownload = page.querySelector('[data-account-template-download]');
|
||||
accountTemplateDownload?.addEventListener('click', () => {
|
||||
@ -2569,7 +2752,6 @@
|
||||
applyAccountColumnLayout();
|
||||
}
|
||||
|
||||
const transactionPanel = page.querySelector('#ledger-panel-transactions');
|
||||
const transactionTable = transactionPanel?.querySelector('.ledger-table');
|
||||
if (transactionPanel && transactionTable) {
|
||||
const transactionHeaders = Array.from(transactionTable.querySelectorAll('thead th'));
|
||||
@ -3001,7 +3183,7 @@
|
||||
bindAccountPagination();
|
||||
|
||||
page.querySelectorAll('[data-ledger-page-select]').forEach((select) => {
|
||||
if (select.closest('#ledger-panel-accounts')) return;
|
||||
if (select.closest('#ledger-panel-accounts') || select.closest('#ledger-panel-transactions')) return;
|
||||
select.addEventListener('change', () => {
|
||||
const panel = select.closest('[data-ledger-panel]');
|
||||
const pageUrl = new URL(select.value, window.location.href);
|
||||
|
||||
@ -111,6 +111,149 @@ class FinanceLedgerManualTransactionTest extends FeatureTestCase
|
||||
], $overrides);
|
||||
}
|
||||
|
||||
private function addZhuJunxiangAccounts(): void
|
||||
{
|
||||
$connection = DB::connection('business_mirror');
|
||||
$connection->table('fin_accounts')->insert([
|
||||
[
|
||||
'company_name' => '朱俊祥',
|
||||
'account_short' => '朱俊祥支付宝',
|
||||
'account_type' => '支付宝',
|
||||
'current_balance' => 100,
|
||||
],
|
||||
[
|
||||
'company_name' => '朱俊祥',
|
||||
'account_short' => '朱俊祥微信',
|
||||
'account_type' => '个人微信',
|
||||
'current_balance' => 50,
|
||||
],
|
||||
]);
|
||||
$connection->table('fin_account_opening')->insert([
|
||||
[
|
||||
'account_short' => '朱俊祥支付宝',
|
||||
'opening_date' => '2026-10-17',
|
||||
'opening_balance' => 100,
|
||||
],
|
||||
[
|
||||
'account_short' => '朱俊祥微信',
|
||||
'opening_date' => '2026-10-17',
|
||||
'opening_balance' => 50,
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
public function test_transaction_page_exposes_account_specific_subpages_with_exact_filters(): void
|
||||
{
|
||||
$this->addZhuJunxiangAccounts();
|
||||
$connection = DB::connection('business_mirror');
|
||||
$connection->table('fin_transactions')->insert([
|
||||
[
|
||||
'txn_date' => '2026-10-18',
|
||||
'account_short' => '朱俊祥支付宝',
|
||||
'detail' => '支付宝专属页收入',
|
||||
'income' => 12,
|
||||
'expense' => 0,
|
||||
'approval_no' => 'ZJX-ALI-1',
|
||||
'source' => 'workorder',
|
||||
'source_value' => '朱俊祥支付宝',
|
||||
'row_key' => 'zjx-alipay-view-1',
|
||||
],
|
||||
[
|
||||
'txn_date' => '2026-10-19',
|
||||
'account_short' => '朱俊祥微信',
|
||||
'detail' => '微信专属页支出',
|
||||
'income' => 0,
|
||||
'expense' => 8,
|
||||
'approval_no' => 'ZJX-WX-1',
|
||||
'source' => 'dingtalk',
|
||||
'source_value' => '朱俊祥微信',
|
||||
'row_key' => 'zjx-wechat-view-1',
|
||||
],
|
||||
[
|
||||
'txn_date' => '2026-10-20',
|
||||
'account_short' => '手工账户甲',
|
||||
'detail' => '不应出现在专属页',
|
||||
'income' => 1,
|
||||
'expense' => 0,
|
||||
'approval_no' => 'OTHER-1',
|
||||
'source' => 'manual',
|
||||
'source_value' => null,
|
||||
'row_key' => 'zjx-other-view-1',
|
||||
],
|
||||
]);
|
||||
|
||||
$this->loginAs()->get($this->pageUrl() . '&txns_view=zhu-junxiang-alipay')
|
||||
->assertOk()
|
||||
->assertSee('data-ledger-transaction-view="zhu-junxiang-alipay"', false)
|
||||
->assertSee('data-ledger-transaction-view="zhu-junxiang-wechat"', false)
|
||||
->assertSee('账户总表当前余额和每日资金流水')
|
||||
->assertSee('支付宝专属页收入')
|
||||
->assertDontSee('微信专属页支出')
|
||||
->assertDontSee('不应出现在专属页');
|
||||
|
||||
$this->loginAs()->get($this->pageUrl() . '&txns_view=zhu-junxiang-wechat')
|
||||
->assertOk()
|
||||
->assertSee('微信专属页支出')
|
||||
->assertDontSee('支付宝专属页收入')
|
||||
->assertDontSee('不应出现在专属页');
|
||||
}
|
||||
|
||||
public function test_account_specific_manual_transaction_updates_daily_flow_and_account_balance(): void
|
||||
{
|
||||
$this->addZhuJunxiangAccounts();
|
||||
|
||||
$this->loginAs()->postJson(
|
||||
$this->storeUrl() . '?txns_view=zhu-junxiang-wechat',
|
||||
$this->payload([
|
||||
'idempotency_key' => '553ca003-8a20-4762-b1c9-1442b7f7d0b1',
|
||||
'account_short' => '朱俊祥微信',
|
||||
'detail' => '朱俊祥微信专属页手工支出',
|
||||
'income' => 0,
|
||||
'expense' => 20,
|
||||
]),
|
||||
)
|
||||
->assertCreated()
|
||||
->assertJsonPath('summary.count', 1)
|
||||
->assertJsonPath('daily_flow.opening_balance', 50)
|
||||
->assertJsonPath('daily_flow.outflow', 20)
|
||||
->assertJsonPath('daily_flow.closing_balance', 30)
|
||||
->assertJsonPath('account.current_balance', 30);
|
||||
|
||||
$this->assertDatabaseHas('fin_daily_flows', [
|
||||
'flow_date' => '2026-10-18',
|
||||
'company_name' => '朱俊祥',
|
||||
'account_short' => '朱俊祥微信',
|
||||
'opening_balance' => 50,
|
||||
'outflow' => 20,
|
||||
'closing_balance' => 30,
|
||||
], 'business_mirror');
|
||||
$this->assertDatabaseHas('fin_accounts', [
|
||||
'account_short' => '朱俊祥微信',
|
||||
'current_balance' => 30,
|
||||
], 'business_mirror');
|
||||
}
|
||||
|
||||
public function test_account_specific_page_explains_when_the_account_master_is_missing(): void
|
||||
{
|
||||
DB::connection('business_mirror')->table('fin_transactions')->insert([
|
||||
'txn_date' => '2026-10-18',
|
||||
'account_short' => '朱俊祥微信',
|
||||
'detail' => '缺少账户总表时的微信明细',
|
||||
'income' => 12,
|
||||
'expense' => 0,
|
||||
'approval_no' => 'ZJX-WX-MISSING-1',
|
||||
'source' => 'workorder',
|
||||
'source_value' => '朱俊祥微信',
|
||||
'row_key' => 'zjx-wechat-missing-account-1',
|
||||
]);
|
||||
|
||||
$this->loginAs()->get($this->pageUrl() . '&txns_view=zhu-junxiang-wechat')
|
||||
->assertOk()
|
||||
->assertSee('账户总表中尚未建立“朱俊祥微信”')
|
||||
->assertSee('才会进入每日资金流水及当前余额重算')
|
||||
->assertSee('缺少账户总表时的微信明细');
|
||||
}
|
||||
|
||||
public function test_transaction_page_exposes_account_master_picker_and_inline_add_row(): void
|
||||
{
|
||||
$this->loginAs()->get($this->pageUrl())
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user