From 8770c9f3743d8d2a733f1b83e4323971468d0d2b Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Thu, 12 Jun 2025 16:48:33 +0800 Subject: [PATCH] fix: utils --- apps/web-antd/src/views/crm/business/data.ts | 3 ++- apps/web-antd/src/views/crm/business/modules/form.vue | 2 +- apps/web-antd/src/views/crm/contract/data.ts | 4 +++- .../src/views/crm/contract/modules/detail-data.ts | 9 ++++++--- apps/web-antd/src/views/crm/contract/modules/form.vue | 2 +- .../src/views/crm/product/modules/detail-data.ts | 4 +++- .../src/views/crm/product/modules/detail-list.vue | 3 ++- .../src/views/crm/product/modules/product-table.vue | 3 ++- apps/web-antd/src/views/crm/receivable/plan/data.ts | 4 +++- apps/web-antd/src/views/pay/demo/withdraw/index.vue | 2 +- apps/web-antd/src/views/pay/order/modules/detail.vue | 4 ++-- apps/web-antd/src/views/pay/transfer/data.ts | 9 ++------- 12 files changed, 28 insertions(+), 21 deletions(-) diff --git a/apps/web-antd/src/views/crm/business/data.ts b/apps/web-antd/src/views/crm/business/data.ts index 34b04a094..6993b9af3 100644 --- a/apps/web-antd/src/views/crm/business/data.ts +++ b/apps/web-antd/src/views/crm/business/data.ts @@ -1,10 +1,11 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { erpPriceMultiply } from '@vben/utils'; + import { getBusinessStatusTypeSimpleList } from '#/api/crm/business/status'; import { getCustomerSimpleList } from '#/api/crm/customer'; import { getSimpleUserList } from '#/api/system/user'; -import { erpPriceMultiply } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/crm/business/modules/form.vue b/apps/web-antd/src/views/crm/business/modules/form.vue index 3a25fb663..b4ed65930 100644 --- a/apps/web-antd/src/views/crm/business/modules/form.vue +++ b/apps/web-antd/src/views/crm/business/modules/form.vue @@ -4,6 +4,7 @@ import type { CrmBusinessApi } from '#/api/crm/business'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { erpPriceMultiply } from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -15,7 +16,6 @@ import { } from '#/api/crm/business'; import { BizTypeEnum } from '#/api/crm/permission'; import { $t } from '#/locales'; -import { erpPriceMultiply } from '#/utils'; import { ProductEditTable } from '#/views/crm/product'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/crm/contract/data.ts b/apps/web-antd/src/views/crm/contract/data.ts index 062823c63..651ddb082 100644 --- a/apps/web-antd/src/views/crm/contract/data.ts +++ b/apps/web-antd/src/views/crm/contract/data.ts @@ -1,12 +1,14 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { erpPriceMultiply, floatToFixed2 } from '@vben/utils'; + import { z } from '#/adapter/form'; 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 { DICT_TYPE, erpPriceMultiply, floatToFixed2 } from '#/utils'; +import { DICT_TYPE } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { 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 5090cd3ed..2421459a7 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,14 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; -import { formatDateTime } from '@vben/utils'; +import { + erpPriceInputFormatter, + floatToFixed2, + formatDateTime, +} from '@vben/utils'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, erpPriceInputFormatter, floatToFixed2 } from '#/utils'; - +import { DICT_TYPE } from '#/utils'; /** 详情头部的配置 */ export function useDetailSchema(): DescriptionItemSchema[] { return [ diff --git a/apps/web-antd/src/views/crm/contract/modules/form.vue b/apps/web-antd/src/views/crm/contract/modules/form.vue index b96f22c02..3cc291a14 100644 --- a/apps/web-antd/src/views/crm/contract/modules/form.vue +++ b/apps/web-antd/src/views/crm/contract/modules/form.vue @@ -4,6 +4,7 @@ import type { CrmContractApi } from '#/api/crm/contract'; import { computed, ref } from 'vue'; import { useVbenForm, useVbenModal } from '@vben/common-ui'; +import { erpPriceMultiply } from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -14,7 +15,6 @@ import { } from '#/api/crm/contract'; import { BizTypeEnum } from '#/api/crm/permission'; import { $t } from '#/locales'; -import { erpPriceMultiply } from '#/utils'; import { ProductEditTable } from '#/views/crm/product'; import { useFormSchema } from '../data'; 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 c317444a9..609612d42 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 @@ -3,8 +3,10 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; +import { erpPriceInputFormatter } from '@vben/utils'; + import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, erpPriceInputFormatter } from '#/utils'; +import { DICT_TYPE } from '#/utils'; /** 详情页的字段 */ export function useDetailSchema(): DescriptionItemSchema[] { diff --git a/apps/web-antd/src/views/crm/product/modules/detail-list.vue b/apps/web-antd/src/views/crm/product/modules/detail-list.vue index 9dfb52ed6..fe840fb67 100644 --- a/apps/web-antd/src/views/crm/product/modules/detail-list.vue +++ b/apps/web-antd/src/views/crm/product/modules/detail-list.vue @@ -4,11 +4,12 @@ import type { CrmProductApi } from '#/api/crm/product'; import { ref } from 'vue'; +import { erpPriceInputFormatter } from '@vben/utils'; + import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getBusiness } from '#/api/crm/business'; import { getContract } from '#/api/crm/contract'; import { BizTypeEnum } from '#/api/crm/permission'; -import { erpPriceInputFormatter } from '#/utils'; import { useDetailListColumns } from './detail-data'; diff --git a/apps/web-antd/src/views/crm/product/modules/product-table.vue b/apps/web-antd/src/views/crm/product/modules/product-table.vue index 6ef206355..a9083b61c 100644 --- a/apps/web-antd/src/views/crm/product/modules/product-table.vue +++ b/apps/web-antd/src/views/crm/product/modules/product-table.vue @@ -5,12 +5,13 @@ import type { CrmProductApi } from '#/api/crm/product'; import { nextTick, onMounted, ref, watch } from 'vue'; +import { erpPriceMultiply } from '@vben/utils'; + import { InputNumber, Select } from 'ant-design-vue'; import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { BizTypeEnum } from '#/api/crm/permission'; import { getProductSimpleList } from '#/api/crm/product'; -import { erpPriceMultiply } from '#/utils'; import { useProductEditTableColumns } from '../data'; 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 6f6eec23a..2ae3fe87e 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/data.ts +++ b/apps/web-antd/src/views/crm/receivable/plan/data.ts @@ -1,8 +1,10 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import { floatToFixed2 } from '@vben/utils'; + import { getCustomerSimpleList } from '#/api/crm/customer'; -import { DICT_TYPE, floatToFixed2, getDictOptions } from '#/utils'; +import { DICT_TYPE, getDictOptions } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { 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 f92e408c5..5243bd4e4 100644 --- a/apps/web-antd/src/views/pay/demo/withdraw/index.vue +++ b/apps/web-antd/src/views/pay/demo/withdraw/index.vue @@ -3,6 +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 { message, Tag } from 'ant-design-vue'; @@ -12,7 +13,6 @@ 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'; 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 d91fc9d13..a7b604fe0 100644 --- a/apps/web-antd/src/views/pay/order/modules/detail.vue +++ b/apps/web-antd/src/views/pay/order/modules/detail.vue @@ -4,13 +4,13 @@ import type { PayOrderApi } from '#/api/pay/order'; import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -import { formatDateTime } from '@vben/utils'; +import { floatToFixed2, formatDateTime } from '@vben/utils'; import { Descriptions, Divider, Tag } from 'ant-design-vue'; import { getOrder } from '#/api/pay/order'; import { DictTag } from '#/components/dict-tag'; -import { DICT_TYPE, floatToFixed2 } from '#/utils'; +import { DICT_TYPE } from '#/utils'; const detailData = ref(); diff --git a/apps/web-antd/src/views/pay/transfer/data.ts b/apps/web-antd/src/views/pay/transfer/data.ts index 06f875b6a..6b74bde2e 100644 --- a/apps/web-antd/src/views/pay/transfer/data.ts +++ b/apps/web-antd/src/views/pay/transfer/data.ts @@ -4,17 +4,12 @@ import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; -import { formatDateTime } from '@vben/utils'; +import { floatToFixed2, formatDateTime } from '@vben/utils'; import { Tag } from 'ant-design-vue'; import { DictTag } from '#/components/dict-tag'; -import { - DICT_TYPE, - floatToFixed2, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; /** 列表的搜索表单 */ export function useGridFormSchema(): VbenFormSchema[] {