diff --git a/apps/web-antd/src/views/crm/contract/data.ts b/apps/web-antd/src/views/crm/contract/data.ts
index 44a0cd14..727d8661 100644
--- a/apps/web-antd/src/views/crm/contract/data.ts
+++ b/apps/web-antd/src/views/crm/contract/data.ts
@@ -2,7 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import { useUserStore } from '@vben/stores';
-import { erpPriceMultiply, floatToFixed2 } from '@vben/utils';
+import { erpPriceInputFormatter, erpPriceMultiply } from '@vben/utils';
import { z } from '#/adapter/form';
import { getSimpleBusinessList } from '#/api/crm/business';
@@ -341,7 +341,9 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
field: 'unpaidPrice',
minWidth: 150,
formatter: ({ row }) => {
- return floatToFixed2(row.totalPrice - row.totalReceivablePrice);
+ return erpPriceInputFormatter(
+ row.totalPrice - row.totalReceivablePrice,
+ );
},
},
{
diff --git a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
index 2421459a..c8ffeb15 100644
--- a/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
+++ b/apps/web-antd/src/views/crm/contract/modules/detail-data.ts
@@ -3,11 +3,7 @@ import type { DescriptionItemSchema } from '#/components/description';
import { h } from 'vue';
-import {
- erpPriceInputFormatter,
- floatToFixed2,
- formatDateTime,
-} from '@vben/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
import { DICT_TYPE } from '#/utils';
@@ -148,7 +144,9 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
field: 'unpaidPrice',
minWidth: 150,
formatter: ({ row }) => {
- return floatToFixed2(row.totalPrice - row.totalReceivablePrice);
+ return erpPriceInputFormatter(
+ row.totalPrice - row.totalReceivablePrice,
+ );
},
},
{
diff --git a/apps/web-antd/src/views/crm/receivable/plan/data.ts b/apps/web-antd/src/views/crm/receivable/plan/data.ts
index 1704b376..baab21d1 100644
--- a/apps/web-antd/src/views/crm/receivable/plan/data.ts
+++ b/apps/web-antd/src/views/crm/receivable/plan/data.ts
@@ -2,7 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import { useUserStore } from '@vben/stores';
-import { floatToFixed2 } from '@vben/utils';
+import { erpPriceInputFormatter } from '@vben/utils';
import { getContractSimpleList } from '#/api/crm/contract';
import { getCustomerSimpleList } from '#/api/crm/customer';
@@ -254,9 +254,9 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
minWidth: 160,
formatter: ({ row }) => {
if (row.receivable) {
- return floatToFixed2(row.price - row.receivable.price);
+ return erpPriceInputFormatter(row.price - row.receivable.price);
}
- return floatToFixed2(row.price);
+ return erpPriceInputFormatter(row.price);
},
},
{
diff --git a/apps/web-antd/src/views/pay/demo/withdraw/index.vue b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
index 5243bd4e..fd683883 100644
--- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue
+++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue
@@ -3,7 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { DemoWithdrawApi } from '#/api/pay/demo/withdraw';
import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { floatToFixed2 } from '@vben/utils';
+import { erpPriceInputFormatter } from '@vben/utils';
import { message, Tag } from 'ant-design-vue';
@@ -110,7 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
钱包余额
- ¥{{ floatToFixed2(row.price) }}
+ ¥{{ erpPriceInputFormatter(row.price) }}
diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts
index b3455ee8..0e9ad03b 100644
--- a/apps/web-antd/src/views/pay/order/data.ts
+++ b/apps/web-antd/src/views/pay/order/data.ts
@@ -4,7 +4,7 @@ import type { DescriptionItemSchema } from '#/components/description';
import { h } from 'vue';
-import { floatToFixed2, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
import { Tag } from 'ant-design-vue';
@@ -174,17 +174,17 @@ export function useDetailSchema(): DescriptionItemSchema[] {
{
field: 'price',
label: '支付金额',
- content: (data) => `¥${floatToFixed2(data?.price)}`,
+ content: (data) => `¥${erpPriceInputFormatter(data?.price)}`,
},
{
field: 'channelFeePrice',
label: '手续费',
- content: (data) => `¥${floatToFixed2(data?.channelFeePrice)}`,
+ content: (data) => `¥${erpPriceInputFormatter(data?.channelFeePrice)}`,
},
{
field: 'channelFeeRate',
label: '手续费比例',
- content: (data) => `${floatToFixed2(data?.channelFeeRate)}%`,
+ content: (data) => `${erpPriceInputFormatter(data?.channelFeeRate)}%`,
},
{
field: 'successTime',
@@ -240,7 +240,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
{
field: 'refundPrice',
label: '退款金额',
- content: (data) => `¥${floatToFixed2(data?.refundPrice)}`,
+ content: (data) => `¥${erpPriceInputFormatter(data?.refundPrice)}`,
},
{
field: 'notifyUrl',
diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts
index 6b74bde2..f400e334 100644
--- a/apps/web-antd/src/views/pay/transfer/data.ts
+++ b/apps/web-antd/src/views/pay/transfer/data.ts
@@ -4,7 +4,7 @@ import type { DescriptionItemSchema } from '#/components/description';
import { h } from 'vue';
-import { floatToFixed2, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
import { Tag } from 'ant-design-vue';
@@ -217,7 +217,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
content: (data) => {
return h(Tag, {
color: 'blue',
- content: `¥${floatToFixed2(data?.price)}`,
+ content: `¥${erpPriceInputFormatter(data?.price)}`,
});
},
},