refactor: 将枚举和常量从utils移动到constants
This commit is contained in:
@@ -1,7 +1,13 @@
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, ref } from 'vue';
|
||||
|
||||
import * as DateUtil from '@vben/utils';
|
||||
import {
|
||||
getDateRange,
|
||||
getDayRange,
|
||||
getLast1Year,
|
||||
getLast7Days,
|
||||
getLast30Days,
|
||||
} from '@vben/utils';
|
||||
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
@@ -19,11 +25,11 @@ defineExpose({ times }); // 暴露时间范围参数
|
||||
const shortcuts = [
|
||||
{
|
||||
text: '昨天',
|
||||
value: () => DateUtil.getDayRange(new Date(), -1),
|
||||
value: () => getDayRange(new Date(), -1),
|
||||
},
|
||||
{
|
||||
text: '最近7天',
|
||||
value: () => DateUtil.getLast7Days(),
|
||||
value: () => getLast7Days(),
|
||||
},
|
||||
{
|
||||
text: '本月',
|
||||
@@ -31,11 +37,11 @@ const shortcuts = [
|
||||
},
|
||||
{
|
||||
text: '最近30天',
|
||||
value: () => DateUtil.getLast30Days(),
|
||||
value: () => getLast30Days(),
|
||||
},
|
||||
{
|
||||
text: '最近1年',
|
||||
value: () => DateUtil.getLast1Year(),
|
||||
value: () => getLast1Year(),
|
||||
},
|
||||
];
|
||||
|
||||
@@ -43,7 +49,7 @@ const shortcuts = [
|
||||
function setTimes() {
|
||||
const beginDate = dayjs().subtract(shortcutDays.value, 'd');
|
||||
const yesterday = dayjs().subtract(1, 'd');
|
||||
times.value = DateUtil.getDateRange(beginDate, yesterday);
|
||||
times.value = getDateRange(beginDate, yesterday);
|
||||
}
|
||||
|
||||
/** 快捷日期单选按钮选中 */
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts" setup>
|
||||
import { watch } from 'vue';
|
||||
|
||||
import { DeliveryTypeEnum } from '@vben/utils';
|
||||
import { DeliveryTypeEnum } from '@vben/constants';
|
||||
|
||||
import { ElMessage } from 'element-plus';
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@ import { onMounted, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
import { confirm, DocAlert, Page } from '@vben/common-ui';
|
||||
import { ProductSpuStatusEnum } from '@vben/constants';
|
||||
import {
|
||||
downloadFileFromBlobPart,
|
||||
fenToYuan,
|
||||
handleTree,
|
||||
ProductSpuStatusEnum,
|
||||
treeToString,
|
||||
} from '@vben/utils';
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
|
||||
|
||||
import { reactive, ref } from 'vue';
|
||||
|
||||
import { CouponTemplateTakeTypeEnum } from '@vben/utils';
|
||||
import { CouponTemplateTakeTypeEnum } from '@vben/constants';
|
||||
|
||||
import * as CouponTemplateApi from '#/api/mall/promotion/coupon/couponTemplate';
|
||||
import { DICT_TYPE, getIntDictOptions } from '#/utils/dict';
|
||||
|
||||
@@ -2,10 +2,9 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
|
||||
|
||||
import {
|
||||
CouponTemplateValidityTypeEnum,
|
||||
floatToFixed2,
|
||||
formatDate,
|
||||
PromotionDiscountTypeEnum,
|
||||
} from '@vben/utils';
|
||||
} from '@vben/constants';
|
||||
import { floatToFixed2, formatDate } from '@vben/utils';
|
||||
|
||||
// 格式化【优惠金额/折扣】
|
||||
export function discountFormat(row: MallCouponTemplateApi.CouponTemplate) {
|
||||
|
||||
@@ -5,8 +5,8 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
|
||||
import { CommonStatusEnum } from '@vben/constants';
|
||||
import { $t } from '@vben/locales';
|
||||
import { CommonStatusEnum } from '@vben/utils';
|
||||
|
||||
import { ElLoading, ElMessage, ElSwitch } from 'element-plus';
|
||||
|
||||
|
||||
@@ -7,7 +7,8 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { useVbenModal } from '@vben/common-ui';
|
||||
import { BrokerageRecordBizTypeEnum, fenToYuan } from '@vben/utils';
|
||||
import { BrokerageRecordBizTypeEnum } from '@vben/constants';
|
||||
import { fenToYuan } from '@vben/utils';
|
||||
|
||||
import { useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||
import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';
|
||||
|
||||
@@ -9,8 +9,8 @@ import {
|
||||
BrokerageWithdrawStatusEnum,
|
||||
BrokerageWithdrawTypeEnum,
|
||||
DICT_TYPE,
|
||||
formatDateTime,
|
||||
} from '@vben/utils';
|
||||
} from '@vben/constants';
|
||||
import { formatDateTime } from '@vben/utils';
|
||||
|
||||
import { ElInput, ElMessage } from 'element-plus';
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { DeliveryTypeEnum } from '@vben/utils';
|
||||
import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants';
|
||||
|
||||
import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';
|
||||
import { DICT_TYPE, getRangePickerDefaultProps } from '#/utils';
|
||||
import { getRangePickerDefaultProps } from '#/utils';
|
||||
|
||||
const pickUpStoreList = ref<MallDeliveryPickUpStoreApi.PickUpStore[]>([]);
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@ import type { MallOrderApi } from '#/api/mall/trade/order';
|
||||
import { h, onMounted, ref } from 'vue';
|
||||
|
||||
import { Page, prompt } from '@vben/common-ui';
|
||||
import { DeliveryTypeEnum, fenToYuan, TradeOrderStatusEnum } from '@vben/utils';
|
||||
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants';
|
||||
import { fenToYuan } from '@vben/utils';
|
||||
|
||||
import { ElCard, ElInput, ElMessage } from 'element-plus';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickU
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { DeliveryTypeEnum } from '@vben/utils';
|
||||
import { DeliveryTypeEnum } from '@vben/constants';
|
||||
|
||||
import { getSimpleDeliveryExpressList } from '#/api/mall/trade/delivery/express';
|
||||
import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';
|
||||
|
||||
@@ -9,9 +9,9 @@ import { DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui';
|
||||
import {
|
||||
DeliveryTypeEnum,
|
||||
DICT_TYPE,
|
||||
fenToYuan,
|
||||
TradeOrderStatusEnum,
|
||||
} from '@vben/utils';
|
||||
} from '@vben/constants';
|
||||
import { fenToYuan } from '@vben/utils';
|
||||
|
||||
import { ElImage, ElInput, ElTag } from 'element-plus';
|
||||
|
||||
@@ -119,7 +119,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||
<!-- TODO @霖:列表有点丑 -->
|
||||
<template #expand_content="{ row }">
|
||||
<div class="order-items">
|
||||
<div v-for="item in row.items" :key="item.id" class="order-item">
|
||||
<div
|
||||
v-for="(item, index) in row.items"
|
||||
:key="index"
|
||||
class="order-item"
|
||||
>
|
||||
<div class="order-item-image">
|
||||
<ElImage :src="item.picUrl" class="h-40 w-40" />
|
||||
</div>
|
||||
|
||||
@@ -7,12 +7,8 @@ import { onMounted, ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
|
||||
import { confirm, Page, useVbenModal } from '@vben/common-ui';
|
||||
import {
|
||||
DeliveryTypeEnum,
|
||||
fenToYuan,
|
||||
formatDate,
|
||||
TradeOrderStatusEnum,
|
||||
} from '@vben/utils';
|
||||
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@vben/constants';
|
||||
import { fenToYuan, formatDate } from '@vben/utils';
|
||||
|
||||
import {
|
||||
ElDescriptions,
|
||||
|
||||
Reference in New Issue
Block a user