From 1377ae752334890624000002968620ac3ef4af3c Mon Sep 17 00:00:00 2001 From: qiuxiang Date: Fri, 20 Nov 2026 11:25:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B2=BE=E7=AE=80=E6=9C=9F=E6=9C=AB?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=8F=8C=E6=BA=90=E6=A0=B8=E5=AF=B9=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E6=97=B6=E9=97=B4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/PeriodBalanceReconciliation.vue | 56 +------------------ .../View/PeriodBalanceReconciliationTest.php | 2 + 2 files changed, 5 insertions(+), 53 deletions(-) diff --git a/resources/assets/js/components/business/PeriodBalanceReconciliation.vue b/resources/assets/js/components/business/PeriodBalanceReconciliation.vue index 79cd7fce..16a9c945 100644 --- a/resources/assets/js/components/business/PeriodBalanceReconciliation.vue +++ b/resources/assets/js/components/business/PeriodBalanceReconciliation.vue @@ -34,14 +34,7 @@ -
- +
{{ dateError }} 条件已修改,点击查询后生效 @@ -357,27 +350,6 @@ export default { endDateConfig() { return { ...dateConfig, minDate: this.dateRange.start || null }; }, - quickRanges() { - const end = this.report.available_dates.end || this.queryRange.end; - const anchor = this.parseDate(end); - const previousMonth = new Date(anchor.getFullYear(), anchor.getMonth() - 1, 1); - const previousEnd = new Date(anchor.getFullYear(), anchor.getMonth(), 0); - const sevenStart = new Date(anchor); - sevenStart.setDate(anchor.getDate() - 6); - - return [ - { key: '7d', label: '近 7 天', start: this.formatDate(sevenStart), end: this.formatDate(anchor) }, - { key: '30d', label: '近 30 天', start: this.formatDate(new Date(anchor.getFullYear(), anchor.getMonth(), 1)), end: this.formatDate(anchor) }, - { key: 'current', label: '本月', start: this.formatDate(new Date(anchor.getFullYear(), anchor.getMonth(), 1)), end: this.formatDate(anchor) }, - { key: 'last', label: '上月', start: this.formatDate(previousMonth), end: this.formatDate(previousEnd) }, - { - key: 'all', - label: '全部', - start: this.report.available_dates.start || this.formatDate(new Date(anchor.getFullYear(), anchor.getMonth() - 1, 1)), - end: this.formatDate(anchor), - }, - ]; - }, financialSummary() { return this.report.financial.summary || emptyReport().financial.summary; }, @@ -642,12 +614,6 @@ export default { pending: { label: '待核查', className: 'is-pending' }, }[status] || { label: '待核查', className: 'is-pending' }; }, - setQuickRange(range) { - this.dateRange = { start: range.start, end: range.end }; - }, - isQuickRangeActive(range) { - return range.start === this.dateRange.start && range.end === this.dateRange.end; - }, applyTimeRange() { if (!this.canQuery) return; this.queryRange = { ...this.dateRange }; @@ -1064,27 +1030,11 @@ export default { background: #fff; color: var(--ink); } -.quick-ranges { +.filter-status { display: flex; - align-items: center; - flex-wrap: wrap; - gap: 6px; + justify-content: flex-end; margin-bottom: 12px; } -.quick-ranges button { - min-height: 28px; - padding: 0 10px; - border: 1px solid var(--line); - border-radius: 999px; - background: #fff; - color: var(--muted); - font: 600 11px/1 inherit; -} -.quick-ranges button.is-active { - border-color: var(--gold-light); - background: var(--gold-soft); - color: var(--gold); -} .filter-state { display: flex; align-items: center; diff --git a/tests/Unit/View/PeriodBalanceReconciliationTest.php b/tests/Unit/View/PeriodBalanceReconciliationTest.php index 84a6cf6b..3b4c3bdf 100644 --- a/tests/Unit/View/PeriodBalanceReconciliationTest.php +++ b/tests/Unit/View/PeriodBalanceReconciliationTest.php @@ -50,6 +50,8 @@ class PeriodBalanceReconciliationTest extends TestCase $this->assertStringContainsString('200', $component); $this->assertStringContainsString('条件已修改,点击查询后生效', $component); $this->assertStringContainsString('当前数据:{{ dataPeriodLabel }}', $component); + $this->assertStringNotContainsString('快捷时间范围', $component); + $this->assertStringNotContainsString("label: '近 7 天'", $component); $this->assertStringContainsString('金额异常', $component); $this->assertStringContainsString('取数日期待核查', $component); $this->assertStringContainsString('聚水潭未匹配', $component); -- 2.47.2