smart-flow/yudao-ui-admin-vben
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：【antd】调整 formatNumber 为 formatAmount3 保留 3 位，formatAmount2 保留 2 位

Browse Source
This commit is contained in:
YunaiV
2025-10-04 14:53:31 +08:00
parent ceabd731ba
commit 3182a86b80
13 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web-antd/src/views/erp/purchase/in/data.ts
View File

@@ -452,18 +452,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalPrice',
title: '应付金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'paymentPrice',
title: '已付金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
@@ -564,23 +565,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'inCount',
title: '入库数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
];

9
apps/web-antd/src/views/erp/purchase/order/data.ts
View File

@@ -379,34 +379,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'inCount',
title: '入库数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'returnCount',
title: '退货数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'depositPrice',
title: '支付订金',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{

8
apps/web-antd/src/views/erp/purchase/return/data.ts
View File

@@ -452,6 +452,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
@@ -572,28 +573,31 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'inCount',
title: '入库数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'returnCount',
title: '退货数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
];

9
apps/web-antd/src/views/erp/sale/order/data.ts
View File

@@ -409,34 +409,37 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'outCount',
title: '出库数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'returnCount',
title: '退货数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'depositPrice',
title: '收取订金',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{

20
apps/web-antd/src/views/erp/sale/out/data.ts
View File

@@ -197,7 +197,7 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
componentProps: {
precision: 2,
min: 0,
disabled: true
disabled: true,
},
rules: z.number().min(0).optional(),
},
@@ -456,18 +456,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalPrice',
title: '应收金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'receiptPrice',
title: '已收金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
@@ -505,7 +506,6 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
componentProps: {
placeholder: '请输入订单单号',
allowClear: true,
disabled: true,
},
},
{
@@ -528,10 +528,8 @@ export function useOrderGridFormSchema(): VbenFormSchema[] {
label: '订单时间',
component: 'RangePicker',
componentProps: {
placeholder: ['开始时间', '结束时间'],
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
@@ -576,23 +574,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'outCount',
title: '出库数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
];

13
apps/web-antd/src/views/erp/sale/return/data.ts
View File

@@ -232,11 +232,13 @@ export function useSaleReturnItemTableColumns(): VxeTableGridOptions['columns']
{
field: 'totalCount',
title: '原数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'returnCount',
title: '已退货数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
@@ -449,18 +451,19 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalPrice',
title: '应退金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'refundPrice',
title: '已退金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
@@ -569,23 +572,25 @@ export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '总数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'returnCount',
title: '已退货数量',
formatter: 'formatAmount3',
minWidth: 120,
},
{
field: 'totalProductPrice',
title: '金额合计',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
{
field: 'totalPrice',
title: '含税金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
minWidth: 120,
},
];

2
apps/web-antd/src/views/erp/stock/check/data.ts
View File

@@ -288,11 +288,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '数量',
formatter: 'formatAmount3',
minWidth: 100,
},
{
field: 'totalPrice',
title: '金额',
formatter: 'formatAmount2',
minWidth: 100,
},
{

1
apps/web-antd/src/views/erp/stock/in/data.ts
View File

@@ -141,6 +141,7 @@ export function useStockInItemTableColumns(
minWidth: 120,
slots: { default: 'count' },
className: createRequiredValidation(isValidating, 'count'),
formatter: 'formatAmount3',
},
{
field: 'productPrice',

2
apps/web-antd/src/views/erp/stock/move/data.ts
View File

@@ -287,11 +287,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '数量',
formatter: 'formatAmount3',
minWidth: 100,
},
{
field: 'totalPrice',
title: '金额',
formatter: 'formatAmount2',
minWidth: 100,
},
{

3
apps/web-antd/src/views/erp/stock/out/data.ts
View File

@@ -149,6 +149,7 @@ export function useStockInItemTableColumns(
minWidth: 120,
slots: { default: 'count' },
className: createRequiredValidation(isValidating, 'count'),
formatter: 'formatAmount3',
},
{
field: 'productPrice',
@@ -304,11 +305,13 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalCount',
title: '数量',
formatter: 'formatAmount3',
minWidth: 100,
},
{
field: 'totalPrice',
title: '价格',
formatter: 'formatAmount2',
minWidth: 100,
},
{