diff --git a/web-admin/scripts/issue-41-archive-stats-plan-no-align.test.ts b/web-admin/scripts/issue-41-archive-stats-plan-no-align.test.ts new file mode 100644 index 000000000..b4484de16 --- /dev/null +++ b/web-admin/scripts/issue-41-archive-stats-plan-no-align.test.ts @@ -0,0 +1,66 @@ +/** + * #41 回归:运输归档绿色合计行须与表头列一一对应。 + * planNo 可隐藏后,不得再无条件硬编码插入 planNo,否则按索引错位。 + */ +import test from 'node:test' +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' +import { buildStatsRowColumns } from '../src/utils/list-column-stats.ts' + +const root = join(dirname(fileURLToPath(import.meta.url)), '..') + +const ARCHIVE_DEFS = [ + { prop: 'planNo' }, + { prop: 'planDate' }, + { prop: 'planQty' }, + { prop: 'actualQty' }, + { prop: 'amount' } +] + +test('buildStatsRowColumns: hidden planNo must not leave a phantom stats cell', () => { + const visible = new Set(['planDate', 'planQty', 'actualQty', 'amount']) + const cols = buildStatsRowColumns({ + leadingSpacers: 2, + optionalDefs: ARCHIVE_DEFS, + isColumnVisible: (prop) => visible.has(prop), + moneyProps: ['amount'] + }) + const props = cols.map((c) => c.prop || c.key) + assert.deepEqual(props, [ + '__spacer_0', + '__spacer_1', + 'planDate', + 'planQty', + 'actualQty', + 'amount' + ]) + assert.equal(cols.filter((c) => c.prop === 'planNo').length, 0) +}) + +test('buildStatsRowColumns: visible planNo appears once after spacers', () => { + const visible = new Set(['planNo', 'planDate', 'planQty']) + const cols = buildStatsRowColumns({ + leadingSpacers: 2, + optionalDefs: ARCHIVE_DEFS, + isColumnVisible: (prop) => visible.has(prop) + }) + const props = cols.map((c) => c.prop || c.key) + assert.deepEqual(props, ['__spacer_0', '__spacer_1', 'planNo', 'planDate', 'planQty']) + assert.equal(cols.filter((c) => c.prop === 'planNo').length, 1) +}) + +test('plan-archive: stats row builds from visible columns without always-on planNo', () => { + const src = readFileSync(join(root, 'src/views/pl/plan-archive/index.vue'), 'utf8') + assert.match( + src, + /archiveStatsRowColumns[\s\S]*?buildStatsRowColumns\s*\(/, + 'archive stats columns should use buildStatsRowColumns so visibility stays in sync' + ) + assert.doesNotMatch( + src, + /archiveStatsRowColumns[\s\S]*?key:\s*'__index'[\s\S]*?key:\s*'planNo'[\s\S]*?for\s*\(\s*const\s+def\s+of\s+listColumnDefs/, + 'must not hardcode planNo before looping listColumnDefs (causes off-by-one when hidden)' + ) +}) diff --git a/web-admin/src/views/pl/plan-archive/index.vue b/web-admin/src/views/pl/plan-archive/index.vue index 90b2ac1d5..6188d2cce 100644 --- a/web-admin/src/views/pl/plan-archive/index.vue +++ b/web-admin/src/views/pl/plan-archive/index.vue @@ -970,7 +970,7 @@ import { overflowExportPlaceholder } from '@/utils/list-toolbar-overflow-items' import ListColumnStatsRow from '@/components/business/list-column-stats-row/index.vue' -import type { StatsRowColumn } from '@/utils/list-column-stats' +import { buildStatsRowColumns, type StatsRowColumn } from '@/utils/list-column-stats' import { useContractDetailDialog } from '@/composables/useContractDetailDialog' import { usePersistedListColumns } from '@/composables/usePersistedListColumns' import { useListTableViewportHeight } from '@/composables/useListTableViewportHeight' @@ -1287,22 +1287,15 @@ const { const archiveStatsRowRef = ref<{ resync?: () => void } | null>(null) -const archiveStatsRowColumns = computed((): StatsRowColumn[] => { - const cols: StatsRowColumn[] = [ - { key: '__selection', interactive: false }, - { key: '__index', interactive: false }, - { key: 'planNo', interactive: true, prop: 'planNo' } - ] - for (const def of listColumnDefs.value) { - if (!isArchiveColumnVisible(def.prop)) continue - cols.push({ - key: def.prop, - interactive: true, - prop: def.prop - }) - } - return cols -}) +/** 与表头可见列一一对应:勾选/序号占位 + 可见业务列(含可隐藏的 planNo) */ +const archiveStatsRowColumns = computed((): StatsRowColumn[] => + buildStatsRowColumns({ + leadingSpacers: 2, + optionalDefs: listColumnDefs.value, + isColumnVisible: isArchiveColumnVisible, + moneyProps: PRICE_COLUMN_PROPS + }) +) function getArchiveStatCellValue(row: PlPlanListDisplayRow, prop: string): unknown { const plan = row.plan