From 627b9602d1d873346a32b1d392d1669b9e82e067 Mon Sep 17 00:00:00 2001 From: wujinliang <2318309077@qq.com> Date: Wed, 26 Aug 2026 14:33:13 +0800 Subject: [PATCH] 1 --- .../pages/FinanceCustomerStatementsView.vue | 14 +++++++------- .../finance/pages/FinancePresentation.test.ts | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/modules/finance/pages/FinanceCustomerStatementsView.vue b/src/modules/finance/pages/FinanceCustomerStatementsView.vue index 00d6d5ec..4f68a5e8 100644 --- a/src/modules/finance/pages/FinanceCustomerStatementsView.vue +++ b/src/modules/finance/pages/FinanceCustomerStatementsView.vue @@ -99,18 +99,18 @@ const selectedCreateAmount = computed(() => selectedCreateSources.value.reduce(( const detailRouteId = computed(() => route.name === 'finance-customer-statement-detail' ? String(route.params.statementId || '') : '') const isDetailRoute = computed(() => Boolean(detailRouteId.value)) const fields = computed(() => [ - { key: 'status', type: 'select', label: '审核状态', width: 180, placeholder: '全部审核状态', options: [ + { key: 'status', type: 'select', label: '审核状态', width: 180, placeholder: '请选择审核状态', options: [ { label: '草稿', value: 'DRAFT' }, { label: '待审核', value: 'PENDING_REVIEW' }, { label: '审核通过', value: 'APPROVED' }, { label: '审核拒绝', value: 'REJECTED' }, { label: '已出账', value: 'ISSUED' }, { label: '已作废', value: 'VOIDED' }, ] }, { key: 'billNo', type: 'input', label: '对账单号', width: 210, placeholder: '请输入对账单号' }, - { key: 'customerId', type: 'select', label: '客户名称', width: 260, placeholder: '全部客户', props: { filterable: true, clearable: true }, options: customers.value.filter((item) => item.status === 'ACTIVE').map((item) => ({ label: item.tenantName, value: String(item.id) })) }, + { key: 'customerId', type: 'select', label: '客户名称', width: 260, placeholder: '请选择客户', props: { filterable: true, clearable: true }, options: customers.value.filter((item) => item.status === 'ACTIVE').map((item) => ({ label: item.tenantName, value: String(item.id) })) }, { key: 'containerNo', type: 'input', label: '柜次号', width: 190, placeholder: canViewFeeSource.value ? '请输入柜次号' : '缺少费用来源查看权限', props: { disabled: !canViewFeeSource.value } }, - { key: 'periodStartRange', type: 'daterange', label: '结算起始日', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '开始日期', endPlaceholder: '结束日期' } }, - { key: 'periodEndRange', type: 'daterange', label: '结算结束日', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '开始日期', endPlaceholder: '结束日期' } }, - { key: 'settled', type: 'select', label: '是否结清', width: 160, placeholder: '全部', options: [{ label: '是', value: 'true' }, { label: '否', value: 'false' }] }, - { key: 'lastPaymentRange', type: 'daterange', label: '最后收款时间', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '开始日期', endPlaceholder: '结束日期' } }, - { key: 'createdRange', type: 'daterange', label: '创建日期', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '开始日期', endPlaceholder: '结束日期' } }, + { key: 'periodStartRange', type: 'daterange', label: '结算起始日', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '请选择开始日期', endPlaceholder: '请选择结束日期' } }, + { key: 'periodEndRange', type: 'daterange', label: '结算结束日', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '请选择开始日期', endPlaceholder: '请选择结束日期' } }, + { key: 'settled', type: 'select', label: '是否结清', width: 160, placeholder: '请选择结清状态', options: [{ label: '是', value: 'true' }, { label: '否', value: 'false' }] }, + { key: 'lastPaymentRange', type: 'daterange', label: '最后收款时间', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '请选择开始日期', endPlaceholder: '请选择结束日期' } }, + { key: 'createdRange', type: 'daterange', label: '创建日期', width: 280, props: { valueFormat: 'YYYY-MM-DD', startPlaceholder: '请选择开始日期', endPlaceholder: '请选择结束日期' } }, ]) const columns: DataTableColumn[] = [ { key: 'actions', label: '操作', width: 280, fixed: 'left', slotName: 'actions' }, diff --git a/src/modules/finance/pages/FinancePresentation.test.ts b/src/modules/finance/pages/FinancePresentation.test.ts index f3440c04..dc607ff4 100644 --- a/src/modules/finance/pages/FinancePresentation.test.ts +++ b/src/modules/finance/pages/FinancePresentation.test.ts @@ -67,13 +67,19 @@ describe('finance presentation governance', () => { }) it('uses optional all-customer filters without a customer-selection blocker', () => { - for (const source of [settlement, statements]) { + for (const source of [settlement]) { expect(source).toContain("placeholder: '全部客户'") expect(source).not.toContain('全客户查询暂不可用') expect(source).not.toContain('empty-text="请选择客户查询') } expect(arap).toContain("placeholder: '请选择客户'") expect(arap).not.toContain("placeholder: '全部客户'") + expect(statements).toContain("placeholder: '请选择客户'") + expect(statements).toContain("placeholder: '请选择审核状态'") + expect(statements).toContain("placeholder: '请选择结清状态'") + expect(statements).toContain("startPlaceholder: '请选择开始日期'") + expect(statements).toContain("endPlaceholder: '请选择结束日期'") + expect(statements).not.toContain("placeholder: '全部客户'") }) it('uses active-customer name selectors across all formal finance pages', () => {