From d58b0ea479045a138266379bc1f944fcb43c2c8a Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Mon, 26 Oct 2026 19:49:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=89=E8=A3=85=E8=B4=B9=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=BB=9F=E4=B8=80=E6=8C=89=E4=B8=87=E5=85=83=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=20(#642)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../installation-fee-summary.blade.php | 30 +++++++++++-------- tests/Feature/Business/ManagementCrudTest.php | 5 ++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/resources/views/business/pages/partials/installation-fee-summary.blade.php b/resources/views/business/pages/partials/installation-fee-summary.blade.php index a69bfaa1..32e526e7 100644 --- a/resources/views/business/pages/partials/installation-fee-summary.blade.php +++ b/resources/views/business/pages/partials/installation-fee-summary.blade.php @@ -483,7 +483,7 @@
- 当前筛选合计(元) + 当前筛选合计(万元) ¥0.00
@@ -525,7 +525,7 @@ 平台 - 结算明细金额 + 结算明细金额(万元) @@ -539,7 +539,7 @@ 店铺名称 安装公司 收款渠道 - 结算明细金额 + 结算明细金额(万元) @@ -621,13 +621,6 @@ updateCount(); } - function yuan(value) { - return '¥' + Number(value || 0).toLocaleString('zh-CN', { - minimumFractionDigits: 2, - maximumFractionDigits: 2 - }); - } - function amount(value) { return Number(value || 0).toLocaleString('zh-CN', { minimumFractionDigits: 2, @@ -639,6 +632,14 @@ return amount(Number(value || 0) / 10000); } + function rawYuan(value) { + return '¥' + amount(value); + } + + function wanYuan(value) { + return '¥' + wanAmount(value); + } + function captionRange(value) { var matchFrom = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value.from); var matchTo = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value.to); @@ -775,7 +776,8 @@ }); var amount = document.createElement('td'); amount.className = 'is-number'; - amount.textContent = yuan(row.amount); + amount.textContent = wanYuan(row.amount); + amount.title = rawYuan(row.amount); tr.appendChild(amount); rowsEl.appendChild(tr); }); @@ -799,12 +801,14 @@ tr.appendChild(platformCell); var amount = document.createElement('td'); amount.className = 'is-number'; - amount.textContent = yuan(byPlatform[name]); + amount.textContent = wanYuan(byPlatform[name]); + amount.title = rawYuan(byPlatform[name]); tr.appendChild(amount); platformRowsEl.appendChild(tr); }); - currentTotal.textContent = yuan(total); + currentTotal.textContent = wanYuan(total); + currentTotal.title = rawYuan(total); updateCount(); emptyEl.hidden = rows.length > 0; emptyEl.textContent = allRows.length diff --git a/tests/Feature/Business/ManagementCrudTest.php b/tests/Feature/Business/ManagementCrudTest.php index 25d8c9cc..1d134a32 100644 --- a/tests/Feature/Business/ManagementCrudTest.php +++ b/tests/Feature/Business/ManagementCrudTest.php @@ -288,6 +288,8 @@ class ManagementCrudTest extends FeatureTestCase ->assertSee('data-installation-fee-trend', false) ->assertSee('data-installation-fee-package', false) ->assertSee('data-installation-fee-non-package', false) + ->assertSeeText('当前筛选合计(万元)') + ->assertSeeText('结算明细金额(万元)') ->assertSee('data-installation-fee-tab="platform"', false) ->assertSee('data-installation-fee-tab="detail"', false) ->assertSee('data-installation-fee-panel="platform"', false) @@ -311,6 +313,9 @@ class ManagementCrudTest extends FeatureTestCase ->assertSee('function captionRange(value)', false) ->assertSee('function setCardValue(total, rows, value, data)', false) ->assertSee('function wanAmount(value)', false) + ->assertSee('function wanYuan(value)', false) + ->assertSee('amount.textContent = wanYuan(row.amount)', false) + ->assertSee('currentTotal.textContent = wanYuan(total)', false) ->assertSee('function activateTab(name, focusTab)', false) ->assertSee("panel.style.display = selected ? 'block' : 'none'", false) ->assertSee("tabsEl.addEventListener('click'", false)