diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 7e71fd5ff..206cf57a1 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -10,7 +10,12 @@ import { setupVbenVxeTable, useVbenVxeGrid, } from '@vben/plugins/vxe-table'; -import { isFunction, isString } from '@vben/utils'; +import { + floatToFixed2, + formatToFractionDigit, + isFunction, + isString, +} from '@vben/utils'; import { Button, Image, Popconfirm, Switch } from 'ant-design-vue'; @@ -313,33 +318,13 @@ setupVbenVxeTable({ // add by 星语:数量格式化,例如说:金额 vxeUI.formats.add('formatNumber', { tableCellFormatMethod({ cellValue }, digits = 2) { - if (cellValue === null || cellValue === undefined) { - return ''; - } - if (isString(cellValue)) { - cellValue = Number.parseFloat(cellValue); - } - // 如果非 number,则直接返回空串 - if (Number.isNaN(cellValue)) { - return ''; - } - return cellValue.toFixed(digits); + return formatToFractionDigit(cellValue, digits); }, }); vxeUI.formats.add('formatAmount2', { tableCellFormatMethod({ cellValue }) { - if (cellValue === null || cellValue === undefined) { - return '0.00'; - } - if (isString(cellValue)) { - cellValue = Number.parseFloat(cellValue); - } - // 如果非 number,则直接返回空串 - if (Number.isNaN(cellValue)) { - return '0.00'; - } - return `${(cellValue / 100).toFixed(2)}元`; + return `${floatToFixed2(cellValue)}元`; }, }); }, diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue index 06cb93495..6a39cce2f 100644 --- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue +++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue @@ -25,7 +25,7 @@ import { Tooltip, } from 'ant-design-vue'; -import { BpmModelFormType } from '#/utils/constants'; +import { BpmModelFormType } from '#/utils'; import { COMPARISON_OPERATORS, diff --git a/apps/web-antd/src/utils/index.ts b/apps/web-antd/src/utils/index.ts index eb173b636..aaa0682f5 100644 --- a/apps/web-antd/src/utils/index.ts +++ b/apps/web-antd/src/utils/index.ts @@ -1,7 +1,6 @@ export * from './constants'; export * from './dict'; export * from './download'; -export * from './formatNumber'; export * from './formCreate'; export * from './rangePickerProps'; export * from './routerHelper'; diff --git a/apps/web-antd/src/views/bpm/model/definition/index.vue b/apps/web-antd/src/views/bpm/model/definition/index.vue index 1555abed9..000a3c138 100644 --- a/apps/web-antd/src/views/bpm/model/definition/index.vue +++ b/apps/web-antd/src/views/bpm/model/definition/index.vue @@ -4,14 +4,13 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { onMounted } from 'vue'; import { useRoute, useRouter } from 'vue-router'; -import { Page, useVbenModal } from '@vben/common-ui'; +import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; import { Button, Image, Tag, Tooltip } from 'ant-design-vue'; import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getProcessDefinitionPage } from '#/api/bpm/definition'; -import { DocAlert } from '#/components/doc-alert'; -import { BpmModelFormType } from '#/utils/constants'; +import { BpmModelFormType } from '#/utils'; // 导入 FormCreate 表单详情 import FormCreateDetail from '../../form/modules/detail.vue'; diff --git a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue index 10bbfed01..ee42d6801 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue @@ -26,8 +26,11 @@ import { HttpRequestSetting, parseFormFields, } from '#/components/simple-process-design'; -import { ProcessVariableEnum } from '#/utils'; -import { BpmAutoApproveType, BpmModelFormType } from '#/utils/constants'; +import { + BpmAutoApproveType, + BpmModelFormType, + ProcessVariableEnum, +} from '#/utils'; const modelData = defineModel(); diff --git a/apps/web-antd/src/views/crm/business/data.ts b/apps/web-antd/src/views/crm/business/data.ts index 0cfd32130..34b04a094 100644 --- a/apps/web-antd/src/views/crm/business/data.ts +++ b/apps/web-antd/src/views/crm/business/data.ts @@ -167,7 +167,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'totalPrice', title: '商机金额(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'dealTime', diff --git a/apps/web-antd/src/views/crm/business/modules/detail-data.ts b/apps/web-antd/src/views/crm/business/modules/detail-data.ts index cab0f65be..5ff123f36 100644 --- a/apps/web-antd/src/views/crm/business/modules/detail-data.ts +++ b/apps/web-antd/src/views/crm/business/modules/detail-data.ts @@ -1,9 +1,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { DescriptionItemSchema } from '#/components/description'; -import { formatDateTime } from '@vben/utils'; - -import { erpPriceInputFormatter } from '#/utils'; +import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; /** 详情页的字段 */ export function useDetailSchema(): DescriptionItemSchema[] { @@ -97,7 +95,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] { { field: 'totalPrice', title: '商机金额(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'dealTime', diff --git a/apps/web-antd/src/views/crm/contract/data.ts b/apps/web-antd/src/views/crm/contract/data.ts index 2c20e7a71..062823c63 100644 --- a/apps/web-antd/src/views/crm/contract/data.ts +++ b/apps/web-antd/src/views/crm/contract/data.ts @@ -6,8 +6,7 @@ import { getSimpleBusinessList } from '#/api/crm/business'; import { getSimpleContactList } from '#/api/crm/contact'; import { getCustomerSimpleList } from '#/api/crm/customer'; import { getSimpleUserList } from '#/api/system/user'; -import { erpPriceMultiply, floatToFixed2 } from '#/utils'; -import { DICT_TYPE } from '#/utils/dict'; +import { DICT_TYPE, erpPriceMultiply, floatToFixed2 } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -242,7 +241,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '合同金额(元)', field: 'totalPrice', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '下单时间', @@ -277,7 +276,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '已回款金额(元)', field: 'totalReceivablePrice', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '未回款金额(元)', 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 cffb31427..5090cd3ed 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 @@ -120,7 +120,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] { title: '合同金额(元)', field: 'totalPrice', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '合同开始时间', @@ -138,7 +138,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] { title: '已回款金额(元)', field: 'totalReceivablePrice', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '未回款金额(元)', diff --git a/apps/web-antd/src/views/crm/customer/pool/data.ts b/apps/web-antd/src/views/crm/customer/pool/data.ts index 177742ea4..fe7b22f9a 100644 --- a/apps/web-antd/src/views/crm/customer/pool/data.ts +++ b/apps/web-antd/src/views/crm/customer/pool/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/crm/product/data.ts b/apps/web-antd/src/views/crm/product/data.ts index fa56e96b6..2ccfe6dfd 100644 --- a/apps/web-antd/src/views/crm/product/data.ts +++ b/apps/web-antd/src/views/crm/product/data.ts @@ -134,7 +134,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'price', title: '价格(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'description', @@ -203,7 +203,7 @@ export function useProductEditTableColumns(): VxeTableGridOptions['columns'] { field: 'productPrice', title: '价格(元)', minWidth: 100, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'sellingPrice', @@ -221,7 +221,7 @@ export function useProductEditTableColumns(): VxeTableGridOptions['columns'] { field: 'totalPrice', title: '合计', minWidth: 100, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '操作', diff --git a/apps/web-antd/src/views/crm/product/modules/detail-data.ts b/apps/web-antd/src/views/crm/product/modules/detail-data.ts index a8c0a10e1..c317444a9 100644 --- a/apps/web-antd/src/views/crm/product/modules/detail-data.ts +++ b/apps/web-antd/src/views/crm/product/modules/detail-data.ts @@ -94,12 +94,12 @@ export function useDetailListColumns( { field: 'productPrice', title: '产品价格(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'businessPrice', title: '商机价格(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', visible: showBussinePrice, }, { @@ -110,7 +110,7 @@ export function useDetailListColumns( { field: 'totalPrice', title: '合计金额(元)', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, ]; } diff --git a/apps/web-antd/src/views/crm/receivable/data.ts b/apps/web-antd/src/views/crm/receivable/data.ts index 1c33d1aec..c8c5d981e 100644 --- a/apps/web-antd/src/views/crm/receivable/data.ts +++ b/apps/web-antd/src/views/crm/receivable/data.ts @@ -5,7 +5,7 @@ import { getContractSimpleList } from '#/api/crm/contract'; import { getCustomerSimpleList } from '#/api/crm/customer'; import { getReceivablePlanSimpleList } from '#/api/crm/receivable/plan'; import { getSimpleUserList } from '#/api/system/user'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -199,7 +199,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '回款金额(元)', field: 'price', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '回款方式', @@ -219,7 +219,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '合同金额(元)', field: 'contract.totalPrice', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '负责人', diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts index 744a74e0b..880f8e192 100644 --- a/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts +++ b/apps/web-antd/src/views/crm/receivable/modules/detail-data.ts @@ -3,10 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; -import { formatDateTime } from '@vben/utils'; +import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, erpPriceInputFormatter } from '#/utils'; +import { DICT_TYPE } from '#/utils'; /** 详情页的字段 */ export function useDetailSchema(): DescriptionItemSchema[] { @@ -108,7 +108,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] { title: '回款金额(元)', field: 'price', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '回款方式', 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 519c41f13..6f6eec23a 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 { getCustomerSimpleList } from '#/api/crm/customer'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, floatToFixed2, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -141,7 +141,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '计划回款金额(元)', field: 'price', minWidth: 160, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '计划回款日期', @@ -183,7 +183,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '实际回款金额(元)', field: 'receivable.price', minWidth: 160, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '实际回款日期', @@ -197,9 +197,9 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { minWidth: 160, formatter: ({ row }) => { if (row.receivable) { - return row.price - row.receivable.price; + return floatToFixed2(row.price - row.receivable.price); } - return row.price; + return floatToFixed2(row.price); }, }, { diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts index 8947dcef0..85b5b5efd 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts @@ -3,10 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; -import { formatDateTime } from '@vben/utils'; +import { erpPriceInputFormatter, formatDateTime } from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, erpPriceInputFormatter } from '#/utils'; +import { DICT_TYPE } from '#/utils'; /** 详情页的字段 */ export function useDetailSchema(): DescriptionItemSchema[] { @@ -101,7 +101,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] { title: '计划回款(元)', field: 'price', minWidth: 150, - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { title: '计划回款日期', diff --git a/apps/web-antd/src/views/mall/product/spu/index.vue b/apps/web-antd/src/views/mall/product/spu/index.vue index 34f1979c8..0b7802496 100644 --- a/apps/web-antd/src/views/mall/product/spu/index.vue +++ b/apps/web-antd/src/views/mall/product/spu/index.vue @@ -8,6 +8,7 @@ import { useRouter } from 'vue-router'; import { confirm, DocAlert, Page } from '@vben/common-ui'; import { downloadFileFromBlobPart, + fenToYuan, handleTree, treeToString, } from '@vben/utils'; @@ -24,7 +25,7 @@ import { updateStatus, } from '#/api/mall/product/spu'; import { $t } from '#/locales'; -import { fenToYuan, ProductSpuStatusEnum } from '#/utils'; +import { ProductSpuStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue index e5e5fc449..e5bb21c95 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue @@ -5,6 +5,7 @@ import type { MallOrderApi } from '#/api/mall/trade/order'; import { h, onMounted, ref } from 'vue'; import { Page, prompt } from '@vben/common-ui'; +import { fenToYuan } from '@vben/utils'; import { Card, Input, message } from 'ant-design-vue'; @@ -15,7 +16,7 @@ import { getOrderSummary, } from '#/api/mall/trade/order'; import { SummaryCard } from '#/components/summary-card'; -import { DeliveryTypeEnum, fenToYuan, TradeOrderStatusEnum } from '#/utils'; +import { DeliveryTypeEnum, TradeOrderStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mall/trade/order/index.vue b/apps/web-antd/src/views/mall/trade/order/index.vue index c3fc83ea8..983affb8e 100644 --- a/apps/web-antd/src/views/mall/trade/order/index.vue +++ b/apps/web-antd/src/views/mall/trade/order/index.vue @@ -6,6 +6,7 @@ import { h } from 'vue'; import { useRouter } from 'vue-router'; import { DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui'; +import { fenToYuan } from '@vben/utils'; import { Image, List, Tag, Textarea } from 'ant-design-vue'; @@ -13,12 +14,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getOrderPage, updateOrderRemark } from '#/api/mall/trade/order'; import { DictTag } from '#/components/dict-tag'; import { $t } from '#/locales'; -import { - DeliveryTypeEnum, - DICT_TYPE, - fenToYuan, - TradeOrderStatusEnum, -} from '#/utils'; +import { DeliveryTypeEnum, DICT_TYPE, TradeOrderStatusEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import DeleveryForm from './modules/delevery-form.vue'; diff --git a/apps/web-antd/src/views/member/user/components/user-account-info.vue b/apps/web-antd/src/views/member/user/components/user-account-info.vue index 097d9beba..846fd584f 100644 --- a/apps/web-antd/src/views/member/user/components/user-account-info.vue +++ b/apps/web-antd/src/views/member/user/components/user-account-info.vue @@ -2,10 +2,11 @@ import type { MemberUserApi } from '#/api/member/user'; import type { PayWalletApi } from '#/api/pay/wallet/balance'; +import { fenToYuan } from '@vben/utils'; + import { Card } from 'ant-design-vue'; import { useDescription } from '#/components/description'; -import { fenToYuan } from '#/utils'; withDefaults( defineProps<{ diff --git a/apps/web-antd/src/views/member/user/data.ts b/apps/web-antd/src/views/member/user/data.ts index 1232cca3a..866160f4d 100644 --- a/apps/web-antd/src/views/member/user/data.ts +++ b/apps/web-antd/src/views/member/user/data.ts @@ -3,6 +3,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { h } from 'vue'; +import { convertToInteger, formatToFraction } from '@vben/utils'; + import { Tag } from 'ant-design-vue'; import { z } from '#/adapter/form'; @@ -12,9 +14,7 @@ import { getSimpleTagList } from '#/api/member/tag'; import { getAreaTree } from '#/api/system/area'; import { CommonStatusEnum, - convertToInteger, DICT_TYPE, - formatToFraction, getDictOptions, getRangePickerDefaultProps, } from '#/utils'; diff --git a/apps/web-antd/src/views/member/user/modules/balance-form.vue b/apps/web-antd/src/views/member/user/modules/balance-form.vue index 3c0b7377f..c11b1d479 100644 --- a/apps/web-antd/src/views/member/user/modules/balance-form.vue +++ b/apps/web-antd/src/views/member/user/modules/balance-form.vue @@ -4,6 +4,7 @@ import type { MemberUserApi } from '#/api/member/user'; import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { formatToFraction } from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -11,7 +12,6 @@ import { useVbenForm } from '#/adapter/form'; import { getUser, updateUser } from '#/api/member/user'; import { getWallet } from '#/api/pay/wallet/balance'; import { $t } from '#/locales'; -import { formatToFraction } from '#/utils'; import { useBalanceFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts index 50fc87eb6..a132eea05 100644 --- a/apps/web-antd/src/views/pay/app/data.ts +++ b/apps/web-antd/src/views/pay/app/data.ts @@ -2,8 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { PayAppApi } from '#/api/pay/app'; -import { CommonStatusEnum } from '#/utils/constants'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; export function useGridFormSchema(): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue index a2ccc4e53..f909a0583 100644 --- a/apps/web-antd/src/views/pay/app/index.vue +++ b/apps/web-antd/src/views/pay/app/index.vue @@ -10,7 +10,7 @@ import { message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { changeAppStatus, deleteApp, getAppPage } from '#/api/pay/app'; import { $t } from '#/locales'; -import { CommonStatusEnum, PayChannelEnum } from '#/utils/constants'; +import { CommonStatusEnum, PayChannelEnum } from '#/utils'; import { useGridColumns, useGridFormSchema } from './data'; import appFrom from './modules/app-form.vue'; diff --git a/apps/web-antd/src/views/pay/app/modules/data.ts b/apps/web-antd/src/views/pay/app/modules/data.ts index 424dc4524..56188df2c 100644 --- a/apps/web-antd/src/views/pay/app/modules/data.ts +++ b/apps/web-antd/src/views/pay/app/modules/data.ts @@ -3,7 +3,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import { h } from 'vue'; import { InputUpload } from '#/components/upload'; -import { DICT_TYPE, getDictOptions } from '#/utils/dict'; +import { DICT_TYPE, getDictOptions } from '#/utils'; export function channelSchema(formType: string): VbenFormSchema[] { if (formType.includes('alipay_')) { diff --git a/apps/web-antd/src/views/pay/cashier/index.vue b/apps/web-antd/src/views/pay/cashier/index.vue index 3fa92eea9..c4973bf45 100644 --- a/apps/web-antd/src/views/pay/cashier/index.vue +++ b/apps/web-antd/src/views/pay/cashier/index.vue @@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router'; import { Page, useVbenModal } from '@vben/common-ui'; import { useTabs } from '@vben/hooks'; -import { formatDate } from '@vben/utils'; +import { fenToYuan, formatDate } from '@vben/utils'; import { Button, @@ -19,7 +19,6 @@ import { import { getOrder, submitOrder } from '#/api/pay/order'; import { - fenToYuan, PayChannelEnum, PayDisplayModeEnum, PayOrderStatusEnum, diff --git a/apps/web-antd/src/views/pay/demo/order/data.ts b/apps/web-antd/src/views/pay/demo/order/data.ts index f38050df5..9dde3e144 100644 --- a/apps/web-antd/src/views/pay/demo/order/data.ts +++ b/apps/web-antd/src/views/pay/demo/order/data.ts @@ -50,12 +50,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'price', title: '支付价格', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'refundPrice', title: '退款金额', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'createTime', diff --git a/apps/web-antd/src/views/pay/demo/withdraw/data.ts b/apps/web-antd/src/views/pay/demo/withdraw/data.ts index 7fcfb6055..bd2ee6169 100644 --- a/apps/web-antd/src/views/pay/demo/withdraw/data.ts +++ b/apps/web-antd/src/views/pay/demo/withdraw/data.ts @@ -78,7 +78,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'price', title: '提现金额', - formatter: 'formatNumber', + formatter: 'formatAmount2', }, { field: 'userName', 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 cbfe713a6..f92e408c5 100644 --- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue +++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue @@ -12,6 +12,7 @@ import { transferDemoWithdraw, } from '#/api/pay/demo/withdraw'; import { $t } from '#/locales'; +import { floatToFixed2 } from '#/utils'; import { useGridColumns } from './data'; import Form from './modules/form.vue'; @@ -109,7 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ 钱包余额