From 125c6cb003ad6c8ead1fae4b8cc03fccdb628dd1 Mon Sep 17 00:00:00 2001 From: shanshi <3316401569@qq.com> Date: Mon, 16 Nov 2026 17:43:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E9=A1=B5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=B4=A6=E6=88=B7=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 变更 - 不保留账户处理待办的返回按钮改为“返回账户汇总”,目标为账户资金汇总的账户汇总页。 - 账户异常待办使用相同返回文案和目标。 ## 验证 - FinanceLedgerAccountKeepTodoTest 全量通过。 - FinanceLedgerAccountStatusTest 全量通过。 - 本地实际页面验证两个按钮文案和点击跳转。 --- app/Http/Controllers/Business/FinanceLedger.php | 4 ++-- .../financial-ledger/unavailable-balance-tasks.blade.php | 2 +- .../financial-ledger/unretained-account-tasks.blade.php | 2 +- .../Feature/Business/FinanceLedgerAccountKeepTodoTest.php | 8 ++++++++ tests/Feature/Business/FinanceLedgerAccountStatusTest.php | 8 ++++++++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Business/FinanceLedger.php b/app/Http/Controllers/Business/FinanceLedger.php index 64a7d34b..e535ea1d 100644 --- a/app/Http/Controllers/Business/FinanceLedger.php +++ b/app/Http/Controllers/Business/FinanceLedger.php @@ -434,7 +434,7 @@ class FinanceLedger extends Controller 'backUrl' => route('business.pages.show', [ 'section' => 'financial-operations', 'page' => 'ledger', - ]) . '?tab=accounts', + ]) . '?tab=flows&flows_view=summary', 'canEdit' => FinanceLedgerAccess::canEditAccountStatus(user()), 'handlingMethods' => $handlingMethods, 'completionStatuses' => $completionStatuses, @@ -895,7 +895,7 @@ class FinanceLedger extends Controller 'backUrl' => route('business.pages.show', [ 'section' => 'financial-operations', 'page' => 'ledger', - ]) . '?tab=accounts', + ]) . '?tab=flows&flows_view=summary', 'canEdit' => FinanceLedgerAccess::canEditAccountStatus(user()), 'handlingMethods' => $handlingMethods, 'completionStatuses' => $completionStatuses, 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 262760c9..c63b6039 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 @@ -132,7 +132,7 @@ - 返回账户总表 + 返回账户汇总 diff --git a/resources/views/business/pages/financial-ledger/unretained-account-tasks.blade.php b/resources/views/business/pages/financial-ledger/unretained-account-tasks.blade.php index 0ea0f0df..d9290e58 100644 --- a/resources/views/business/pages/financial-ledger/unretained-account-tasks.blade.php +++ b/resources/views/business/pages/financial-ledger/unretained-account-tasks.blade.php @@ -162,7 +162,7 @@ - 返回账户总表 + 返回账户汇总 diff --git a/tests/Feature/Business/FinanceLedgerAccountKeepTodoTest.php b/tests/Feature/Business/FinanceLedgerAccountKeepTodoTest.php index 8711ddad..ca81255d 100644 --- a/tests/Feature/Business/FinanceLedgerAccountKeepTodoTest.php +++ b/tests/Feature/Business/FinanceLedgerAccountKeepTodoTest.php @@ -45,6 +45,11 @@ class FinanceLedgerAccountKeepTodoTest extends FeatureTestCase ], $parameters)); } + private function accountSummaryUrl(): string + { + return $this->ledgerUrl() . '?tab=flows&flows_view=summary'; + } + private function keepTodoUrl(): string { return route('business.financial-ledger.accounts.keep-todo', [ @@ -172,6 +177,9 @@ class FinanceLedgerAccountKeepTodoTest extends FeatureTestCase $response ->assertSee('不保留账户处理待办') ->assertSee('不与其他页面的待办事项合并') + ->assertSee('href="' . e($this->accountSummaryUrl()) . '"', false) + ->assertSee('返回账户汇总') + ->assertDontSee('返回账户总表') ->assertSee('data-keep-account="显式不保留账户"', false) ->assertSee('data-keep-account="规划不保留账户"', false) ->assertSee('法人名称') diff --git a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php index ea400581..f1dd49c7 100644 --- a/tests/Feature/Business/FinanceLedgerAccountStatusTest.php +++ b/tests/Feature/Business/FinanceLedgerAccountStatusTest.php @@ -46,6 +46,11 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase ]); } + private function accountSummaryUrl(): string + { + return $this->pageUrl() . '?tab=flows&flows_view=summary'; + } + private function accountTodoUrl(): string { return route('business.financial-ledger.accounts.todo', [ @@ -394,6 +399,9 @@ class FinanceLedgerAccountStatusTest extends FeatureTestCase ->assertOk() ->assertSee('账户异常待办') ->assertSee('不与其他页面的待办事项合并') + ->assertSee('href="' . e($this->accountSummaryUrl()) . '"', false) + ->assertSee('返回账户汇总') + ->assertDontSee('返回账户总表') ->assertSee('待办测试公司') ->assertSee('data-pending-account="待办测试账户"', false) ->assertSee('不可用金额合计')