yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 金额显示问题 && utils 引用路径

pull/138/head^2
xingyu4j 2025-06-11 18:07:25 +08:00
parent 41f816483b
commit 355a2056f4
21 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition.vue
View File

@ -25,7 +25,7 @@ import {
Tooltip,
} from 'ant-design-vue';
import { BpmModelFormType } from '#/utils/constants';
import { BpmModelFormType } from '#/utils';
import {
COMPARISON_OPERATORS,

2
apps/web-antd/src/views/bpm/model/definition/index.vue
View File

@ -10,7 +10,7 @@ import { Button, Image, Tag, Tooltip } from 'ant-design-vue';
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { getProcessDefinitionPage } from '#/api/bpm/definition';
import { BpmModelFormType } from '#/utils/constants';
import { BpmModelFormType } from '#/utils';
// 导入 FormCreate 表单详情
import FormCreateDetail from '../../form/modules/detail.vue';

7
apps/web-antd/src/views/bpm/model/form/modules/extra-setting.vue
View File

@ -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<any>();

2
apps/web-antd/src/views/crm/business/data.ts
View File

@ -167,7 +167,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalPrice',
title: '商机金额（元）',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
field: 'dealTime',

2
apps/web-antd/src/views/crm/business/modules/detail-data.ts
View File

@ -97,7 +97,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
{
field: 'totalPrice',
title: '商机金额（元）',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
field: 'dealTime',

7
apps/web-antd/src/views/crm/contract/data.ts
View File

@ -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: '未回款金额（元）',

4
apps/web-antd/src/views/crm/contract/modules/detail-data.ts
View File

@ -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: '未回款金额（元）',

2
apps/web-antd/src/views/crm/customer/pool/data.ts
View File

@ -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[] {

6
apps/web-antd/src/views/crm/product/data.ts
View File

@ -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: '操作',

6
apps/web-antd/src/views/crm/product/modules/detail-data.ts
View File

@ -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',
},
];
}

6
apps/web-antd/src/views/crm/receivable/data.ts
View File

@ -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: '负责人',

2
apps/web-antd/src/views/crm/receivable/modules/detail-data.ts
View File

@ -108,7 +108,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
title: '回款金额（元）',
field: 'price',
minWidth: 150,
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
title: '回款方式',

10
apps/web-antd/src/views/crm/receivable/plan/data.ts
View File

@ -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);
},
},
{

2
apps/web-antd/src/views/crm/receivable/plan/modules/detail-data.ts
View File

@ -101,7 +101,7 @@ export function useDetailListColumns(): VxeTableGridOptions['columns'] {
title: '计划回款(元)',
field: 'price',
minWidth: 150,
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
title: '计划回款日期',

3
apps/web-antd/src/views/pay/app/data.ts
View File

@ -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 [

2
apps/web-antd/src/views/pay/app/index.vue
View File

@ -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';

2
apps/web-antd/src/views/pay/app/modules/data.ts
View File

@ -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_')) {

4
apps/web-antd/src/views/pay/demo/order/data.ts
View File

@ -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',

2
apps/web-antd/src/views/pay/demo/withdraw/data.ts
View File

@ -78,7 +78,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'price',
title: '提现金额',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
field: 'userName',

6
apps/web-antd/src/views/pay/order/data.ts
View File

@ -78,17 +78,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
title: '支付金额',
field: 'price',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
title: '退款金额',
field: 'refundPrice',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
title: '手续金额',
field: 'channelFeePrice',
formatter: 'formatNumber',
formatter: 'formatAmount2',
},
{
title: '订单号',

2
apps/web-antd/src/views/pay/order/modules/detail.vue
View File

@ -10,7 +10,7 @@ import { Descriptions, Divider, Tag } from 'ant-design-vue';
import { getOrder } from '#/api/pay/order';
import { DictTag } from '#/components/dict-tag';
import { DICT_TYPE } from '#/utils/dict';
import { DICT_TYPE } from '#/utils';
const detailData = ref<PayOrderApi.Order>();