From 41f816483bf6c48707444b7edf5a19d71671ec49 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Wed, 11 Jun 2025 09:23:29 +0800 Subject: [PATCH 1/4] fix: error --- apps/web-antd/src/views/bpm/model/definition/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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..6410ccd31 100644 --- a/apps/web-antd/src/views/bpm/model/definition/index.vue +++ b/apps/web-antd/src/views/bpm/model/definition/index.vue @@ -4,13 +4,12 @@ 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'; // 导入 FormCreate 表单详情 From 355a2056f4d393febe70a74e1571a2ab5f99f4e0 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Wed, 11 Jun 2025 18:07:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20&&=20utils=20=E5=BC=95=E7=94=A8=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/nodes-config/modules/condition.vue | 2 +- apps/web-antd/src/views/bpm/model/definition/index.vue | 2 +- .../src/views/bpm/model/form/modules/extra-setting.vue | 7 +++++-- apps/web-antd/src/views/crm/business/data.ts | 2 +- .../src/views/crm/business/modules/detail-data.ts | 2 +- apps/web-antd/src/views/crm/contract/data.ts | 7 +++---- .../src/views/crm/contract/modules/detail-data.ts | 4 ++-- apps/web-antd/src/views/crm/customer/pool/data.ts | 2 +- apps/web-antd/src/views/crm/product/data.ts | 6 +++--- .../src/views/crm/product/modules/detail-data.ts | 6 +++--- apps/web-antd/src/views/crm/receivable/data.ts | 6 +++--- .../src/views/crm/receivable/modules/detail-data.ts | 2 +- apps/web-antd/src/views/crm/receivable/plan/data.ts | 10 +++++----- .../views/crm/receivable/plan/modules/detail-data.ts | 2 +- apps/web-antd/src/views/pay/app/data.ts | 3 +-- apps/web-antd/src/views/pay/app/index.vue | 2 +- apps/web-antd/src/views/pay/app/modules/data.ts | 2 +- apps/web-antd/src/views/pay/demo/order/data.ts | 4 ++-- apps/web-antd/src/views/pay/demo/withdraw/data.ts | 2 +- apps/web-antd/src/views/pay/order/data.ts | 6 +++--- apps/web-antd/src/views/pay/order/modules/detail.vue | 2 +- 21 files changed, 41 insertions(+), 40 deletions(-) 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/views/bpm/model/definition/index.vue b/apps/web-antd/src/views/bpm/model/definition/index.vue index 6410ccd31..000a3c138 100644 --- a/apps/web-antd/src/views/bpm/model/definition/index.vue +++ b/apps/web-antd/src/views/bpm/model/definition/index.vue @@ -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'; 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..0e16a01fe 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 @@ -97,7 +97,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..7468b6c2d 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 @@ -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..d74100f07 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 @@ -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/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/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/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts index 9a05cc0cd..5f69fc3b3 100644 --- a/apps/web-antd/src/views/pay/order/data.ts +++ b/apps/web-antd/src/views/pay/order/data.ts @@ -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: '订单号', diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue index 8da61c918..3d9b6e539 100644 --- a/apps/web-antd/src/views/pay/order/modules/detail.vue +++ b/apps/web-antd/src/views/pay/order/modules/detail.vue @@ -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(); From 21f2472561bf189f3fb6c1691511525781f2ce53 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Wed, 11 Jun 2025 18:12:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/pay/demo/withdraw/index.vue | 3 ++- apps/web-antd/src/views/pay/order/modules/detail.vue | 10 +++++----- apps/web-antd/src/views/pay/transfer/data.ts | 11 ++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) 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({ 钱包余额