diff --git a/app/Http/Controllers/Business/FinanceLedger.php b/app/Http/Controllers/Business/FinanceLedger.php index 2769a3de..9dc5a00e 100644 --- a/app/Http/Controllers/Business/FinanceLedger.php +++ b/app/Http/Controllers/Business/FinanceLedger.php @@ -222,6 +222,8 @@ class FinanceLedger extends Controller $query->where('account_todo.owner_name', 'like', '%' . $filters['pending_owner'] . '%'); } + $overdueDays = max(1, (int) config('finance_ledger.account_todo_overdue_days', 7)); + $overdueBefore = now()->subDays($overdueDays); $summaryQuery = clone $query; $summary = [ 'count' => (clone $query)->count(), @@ -230,6 +232,28 @@ class FinanceLedger extends Controller 'blocked' => round((float) (clone $summaryQuery)->sum('accounts.blocked_amount'), 2), 'daily_available' => round((float) (clone $summaryQuery)->sum('accounts.daily_available'), 2), ]; + $todoStatusExpression = 'COALESCE(' + . $connection->getQueryGrammar()->wrap('account_todo.completion_status') + . ", 'not_started')"; + $todoStatusCounts = (clone $summaryQuery) + ->selectRaw($todoStatusExpression . ' as todo_status, COUNT(*) as aggregate') + ->groupByRaw($todoStatusExpression) + ->pluck('aggregate', 'todo_status'); + foreach (['not_started', 'in_progress', 'incomplete', 'completed'] as $todoStatus) { + $summary[$todoStatus] = (int) ($todoStatusCounts[$todoStatus] ?? 0); + } + $summary['overdue'] = (clone $summaryQuery) + ->whereNotNull('account_todo.started_at') + ->where('account_todo.started_at', '<', $overdueBefore) + ->where(function ($notCompleted): void { + $notCompleted->whereNull('account_todo.completion_status') + ->orWhere('account_todo.completion_status', '<>', 'completed'); + }) + ->count(); + $summary['handled'] = $summary['in_progress'] + $summary['incomplete'] + $summary['completed']; + $summary['progress_percent'] = $summary['count'] > 0 + ? (int) round($summary['handled'] * 100 / $summary['count']) + : 0; $sortField = (string) $request->query('pending_sort', ''); $sortField = in_array($sortField, ['started_at', 'completed_at'], true) ? $sortField : ''; @@ -311,6 +335,7 @@ class FinanceLedger extends Controller 'accountTypeOptions' => $typeOptions, 'reasonOptions' => $reasonOptions, 'ownerOptions' => $ownerOptions, + 'overdueDays' => $overdueDays, ]); } diff --git a/config/finance_ledger.php b/config/finance_ledger.php index cf899277..66e4303d 100644 --- a/config/finance_ledger.php +++ b/config/finance_ledger.php @@ -18,6 +18,9 @@ return [ // 具备账户映射写权限的角色;超级管理员始终可写。 'mapping_editor_roles' => env('FINANCE_LEDGER_MAPPING_EDITOR_ROLES', '财务台账管理员'), + // 账户异常待办开始超过该天数仍未完成时进入逾期预警。 + 'account_todo_overdue_days' => (int) env('FINANCE_LEDGER_ACCOUNT_TODO_OVERDUE_DAYS', 7), + 'dingtalk_process_codes' => [ 'PROC-B290696F-EC2A-4F76-87BA-E0A12E10D09F' => '日常费用报销流程', 'PROC-C5159B8D-F412-4DF8-981D-64EBB8D03EB6' => '种菜报销流程', diff --git a/docs/财务台账开发说明.md b/docs/财务台账开发说明.md index 1c3bea18..7fb67821 100644 --- a/docs/财务台账开发说明.md +++ b/docs/财务台账开发说明.md @@ -66,6 +66,7 @@ docker compose -f docker-compose.local.yml exec -u www-data app \ - 账户总表支持导出空白 Excel 录入模板,包含页面列、状态和账户类型选项及填写说明 - 账户总表编辑模式支持直接新增公司和首个账户:公司不存在时同步写入公司台账,可维护注册地、企业类型、税务类型、公司状态、基本户信息和备注;账户简称必须唯一,可同时登记期初日期与期初余额 - 账户总表“可用金额合计”按全部账户的每日可用金额与全部店铺台账余额相加;点击卡片可查看银行可用、店铺可用和合计明细,金额统一按万元显示,统计不受当前筛选影响 +- 账户异常待办显示当前筛选范围的处理进度与逾期预警:“已跟进”包含进行中、未完成和已完成,开始超过 7 天仍未完成的任务计入逾期预警 - 写权限:账户映射、账户状态和账户类型修改仅系统管理员及配置的财务台账管理员角色;其他账号只读 - 调度:`finance-ledger:sync-rpt --days=7 --merge` 每天 02:30(Asia/Shanghai);店铺台账默认不自动回填 diff --git a/resources/views/business/pages/financial-ledger/unavailable-balance-tasks.blade.php b/resources/views/business/pages/financial-ledger/unavailable-balance-tasks.blade.php index 13c10f0b..1bf6faa9 100644 --- a/resources/views/business/pages/financial-ledger/unavailable-balance-tasks.blade.php +++ b/resources/views/business/pages/financial-ledger/unavailable-balance-tasks.blade.php @@ -19,6 +19,30 @@ .pending-balance-card.is-blocked { background:#fff5f5; } .pending-balance-card span { display:block; overflow:hidden; color:var(--vip-content-muted, #595959); font-size:.68rem; line-height:1.35; text-overflow:ellipsis; white-space:nowrap; } .pending-balance-card b { display:block; margin-top:.2rem; overflow:hidden; font-size:.92rem; font-variant-numeric:tabular-nums; line-height:1.35; text-overflow:ellipsis; white-space:nowrap; } + .pending-balance-tracking { display:grid; grid-template-columns:minmax(0, 1fr) 17rem; gap:1rem; padding:.9rem 1rem; margin-bottom:.9rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.65rem; background:#fff; } + .pending-balance-progress-panel { min-width:0; } + .pending-balance-progress-head { display:flex; align-items:flex-end; justify-content:space-between; gap:1rem; margin-bottom:.55rem; } + .pending-balance-progress-head strong { display:block; color:var(--vip-content-ink, #171717); font-size:1.05rem; line-height:1.25; } + .pending-balance-progress-head p { margin:.18rem 0 0; color:var(--vip-content-muted, #595959); font-size:.68rem; line-height:1.5; } + .pending-balance-progress-head b { flex:0 0 auto; color:var(--vip-content-accent-dark, #856632); font-size:1.1rem; font-variant-numeric:tabular-nums; } + .pending-balance-progress-track { height:.55rem; overflow:hidden; border-radius:999px; background:#e8e3da; } + .pending-balance-progress-track > span { display:block; height:100%; border-radius:inherit; background:var(--vip-content-accent, #B9954F); transition:width .2s ease; } + .pending-balance-progress-track > span.is-complete { background:var(--vip-success, #53793E); } + .pending-balance-progress-breakdown { display:flex; flex-wrap:wrap; gap:.35rem 1rem; margin-top:.55rem; color:var(--vip-content-muted, #595959); font-size:.66rem; } + .pending-balance-progress-breakdown span { display:inline-flex; align-items:center; gap:.3rem; } + .pending-balance-progress-breakdown span::before { content:""; width:.42rem; height:.42rem; border-radius:50%; background:#c9c3b8; } + .pending-balance-progress-breakdown .is-in-progress::before { background:var(--vip-content-accent, #B9954F); } + .pending-balance-progress-breakdown .is-incomplete::before { background:var(--vip-warning, #935F07); } + .pending-balance-progress-breakdown .is-completed::before { background:var(--vip-success, #53793E); } + .pending-balance-overdue { display:flex; align-items:center; gap:.65rem; min-width:0; padding-left:1rem; border-left:1px solid #e8e3da; } + .pending-balance-overdue__icon { display:inline-grid; flex:0 0 auto; place-items:center; width:2rem; height:2rem; border-radius:.45rem; background:#fff8eb; color:var(--vip-warning, #935F07); } + .pending-balance-overdue__copy { min-width:0; flex:1; } + .pending-balance-overdue__copy strong { display:block; color:var(--vip-content-ink, #171717); font-size:.74rem; } + .pending-balance-overdue__copy span { display:block; margin-top:.12rem; color:var(--vip-content-muted, #595959); font-size:.64rem; line-height:1.45; } + .pending-balance-overdue > b { flex:0 0 auto; color:var(--vip-warning, #935F07); font-size:1.2rem; font-variant-numeric:tabular-nums; } + .pending-balance-overdue.is-clear { border-left-color:#dbe7d4; } + .pending-balance-overdue.is-clear .pending-balance-overdue__icon { background:#f3f7ee; color:var(--vip-success, #53793E); } + .pending-balance-overdue.is-clear > b { color:var(--vip-success, #53793E); } .pending-balance-alert { display:flex; align-items:center; gap:.35rem; padding:.65rem .8rem; margin-bottom:.75rem; border:1px solid #bbf7d0; border-radius:.5rem; background:#f0fdf4; color:var(--vip-success, #53793E); font-size:.72rem; } .pending-balance-alert.is-error { border-color:rgba(184,0,0,.24); background:#fff5f5; color:var(--vip-danger, #B80000); } .pending-balance-toolbar { padding:.75rem 1rem; margin-bottom:.75rem; border:1px solid var(--vip-border, #D8D2C7); border-radius:.65rem; background:#fff; } @@ -83,6 +107,7 @@ .ledger-page-box__current { min-width:2.2rem; padding:0 .15rem; color:var(--vip-content-ink, #171717); font-size:.7rem; font-variant-numeric:tabular-nums; font-weight:700; text-align:center; white-space:nowrap; } .pending-balance-page__status { color:var(--vip-content-muted, #595959); font-size:.68rem; } @media (max-width:1100px) { .pending-balance-filter-grid { grid-template-columns:repeat(3, minmax(0, 1fr)); } } + @media (max-width:900px) { .pending-balance-tracking { grid-template-columns:1fr; } .pending-balance-overdue { padding:.8rem 0 0; border-top:1px solid #e8e3da; border-left:0; } } @media (max-width:700px) { .pending-balance-filter-grid { grid-template-columns:repeat(2, minmax(0, 1fr)); } } @media (max-width:560px) { .pending-balance-page { margin:1rem .75rem 1.5rem; } .pending-balance-filter-grid { grid-template-columns:1fr; } } @@ -106,6 +131,35 @@
每日可出金额合计{{ $money($summary['daily_available'] ?? 0) }}
+
+
+
+
+ 待办处理进度 +

按当前筛选范围统计 · 已跟进 {{ number_format((int) ($summary['handled'] ?? 0)) }} / {{ number_format((int) ($summary['count'] ?? 0)) }} 项

+
+ {{ (int) ($summary['progress_percent'] ?? 0) }}% +
+
+ +
+
+ 进行中 {{ number_format((int) ($summary['in_progress'] ?? 0)) }} + 未完成 {{ number_format((int) ($summary['incomplete'] ?? 0)) }} + 待开始 {{ number_format((int) ($summary['not_started'] ?? 0)) }} + 已完成 {{ number_format((int) ($summary['completed'] ?? 0)) }} +
+
+ +
+ @if (session('success'))
{{ session('success') }}
@endif diff --git a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php index e1f0bee6..506391b2 100644 --- a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php +++ b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php @@ -316,6 +316,9 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase public function test_unavailable_balance_tasks_page_is_separate_and_only_lists_blocked_accounts(): void { $connection = DB::connection('business_mirror'); + $recentStartedAt = now()->subDays(2)->format('Y-m-d H:i:s'); + $overdueStartedAt = now()->subDays(10)->format('Y-m-d H:i:s'); + $completedAt = now()->subHour()->format('Y-m-d H:i:s'); $accounts = [ [ 'company_name' => '待办测试公司', @@ -396,6 +399,13 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase ->assertSee('6222000000000099') ->assertSee('待办测试银行') ->assertSee('上海 / 待办测试支行') + ->assertSee('待办处理进度') + ->assertSee('按当前筛选范围统计') + ->assertSee('data-pending-progress-percent="0"', false) + ->assertSee('已跟进 0 / 2 项') + ->assertSee('逾期预警') + ->assertSee('开始超过 7 天仍未完成') + ->assertSee('data-pending-overdue-count="0"', false) ->assertSee('异常原因') ->assertSee('办理方式') ->assertSee('当前进度') @@ -431,8 +441,7 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase 'abnormal_reason' => '账户冻结', 'handling_method' => 'online', 'owner_name' => '待办负责人', - 'started_at' => '2026-10-21T09:00', - 'completed_at' => '2026-10-21T11:30', + 'started_at' => $recentStartedAt, 'current_progress' => '处理中', 'completion_status' => 'in_progress', ])->assertRedirect(); @@ -452,18 +461,31 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase 'abnormal_reason' => '网银证书过期', 'handling_method' => 'offline', 'owner_name' => '其他负责人', - 'started_at' => '2026-10-21 10:00:00', + 'started_at' => $overdueStartedAt, 'current_progress' => '待联系银行', 'completion_status' => 'not_started', 'updated_by' => 'Test User', ]); + $this->assertDatabaseHas('fin_account_todos', [ + 'account_short' => '待办测试账户', + 'started_at' => $recentStartedAt, + ], 'business_mirror'); + $this->assertDatabaseHas('fin_account_todos', [ + 'account_short' => '待办测试账户二', + 'started_at' => $overdueStartedAt, + ], 'business_mirror'); $this->loginAs()->get($this->unavailableBalancesUrl()) ->assertOk() ->assertSee('账户冻结') ->assertSee('待办负责人') ->assertSee('处理中') - ->assertSee('进行中'); + ->assertSee('进行中') + ->assertSee('data-pending-progress-percent="50"', false) + ->assertSee('已跟进 1 / 2 项') + ->assertSee('data-pending-overdue-count="1"', false) + ->assertSee('逾期预警') + ->assertSee('开始超过 7 天仍未完成'); $filteredUrl = $this->unavailableBalancesUrl() . '?' . http_build_query([ 'pending_short' => '待办测试账户', @@ -477,6 +499,9 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase ->assertOk() ->assertSee('data-pending-account="待办测试账户"', false) ->assertSee('data-pending-current-balance-total="100.00"', false) + ->assertSee('data-pending-progress-percent="100"', false) + ->assertSee('已跟进 1 / 1 项') + ->assertSee('data-pending-overdue-count="0"', false) ->assertDontSee('data-pending-account="待办测试账户二"', false); $connection->table('fin_accounts') @@ -491,7 +516,7 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase $this->unavailableBalancesUrl() . '?pending_sort=started_at&pending_direction=desc' )->assertOk()->assertSee('aria-sort="descending"', false); preg_match_all('/data-pending-account="([^"]+)"/u', $sortResponse->getContent(), $sortedAccounts); - $this->assertSame(['待办测试账户二', '待办测试账户'], array_values(array_intersect( + $this->assertSame(['待办测试账户', '待办测试账户二'], array_values(array_intersect( $sortedAccounts[1], ['待办测试账户', '待办测试账户二'], ))); @@ -501,8 +526,8 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase 'abnormal_reason' => '账户冻结', 'handling_method' => 'online', 'owner_name' => '待办负责人', - 'started_at' => '2026-10-21T09:00', - 'completed_at' => '2026-10-21T12:00', + 'started_at' => $recentStartedAt, + 'completed_at' => $completedAt, 'current_progress' => '已处理', 'completion_status' => 'completed', ])->assertRedirect();