smart-flow/yudao-ui-admin-vben
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	apps/web-antd/src/views/mall/promotion/point/activity/data.ts
#	apps/web-antd/src/views/mall/promotion/point/activity/index.vue
This commit is contained in:
YunaiV
2025-10-23 12:46:02 +08:00
parent 74bf240f52 8b7780d52d
commit 319e9dc7bd
31 changed files with 176 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/web-antd/src/router/routes/modules/iot.ts
View File

@@ -18,7 +18,8 @@ const routes: RouteRecordRaw[] = [
title: '产品详情',
activePath: '/iot/device/product',
},
component: () => import('#/views/iot/product/product/modules/detail/index.vue'),
component: () =>
import('#/views/iot/product/product/modules/detail/index.vue'),
},
{
path: 'device/detail/:id',
@@ -27,7 +28,8 @@ const routes: RouteRecordRaw[] = [
title: '设备详情',
activePath: '/iot/device/device',
},
component: () => import('#/views/iot/device/device/modules/detail/index.vue'),
component: () =>
import('#/views/iot/device/device/modules/detail/index.vue'),
},
{
path: 'ota/firmware/detail/:id',
@@ -36,11 +38,11 @@ const routes: RouteRecordRaw[] = [
title: '固件详情',
activePath: '/iot/ota',
},
component: () => import('#/views/iot/ota/modules/firmware-detail/index.vue'),
component: () =>
import('#/views/iot/ota/modules/firmware-detail/index.vue'),
},
],
},
];
export default routes;

2
apps/web-antd/src/views/crm/backlog/modules/clue-follow-list.vue
View File

@@ -26,7 +26,7 @@ const [Grid] = useVbenVxeGrid({
{
fieldName: 'followUpStatus',
label: '状态',
component: 'Select',
component: 'RadioGroup',
componentProps: {
allowClear: true,
options: FOLLOWUP_STATUS,

2
apps/web-antd/src/views/crm/backlog/modules/customer-follow-list.vue
View File

@@ -26,7 +26,7 @@ const [Grid] = useVbenVxeGrid({
{
fieldName: 'followUpStatus',
label: '状态',
component: 'Select',
component: 'RadioGroup',
componentProps: {
allowClear: true,
options: FOLLOWUP_STATUS,

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

@@ -171,7 +171,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'transformStatus',
label: '转化状态',
component: 'Select',
component: 'RadioGroup',
componentProps: {
options: [
{ label: '未转化', value: false },

7
apps/web-antd/src/views/iot/alert/config/data.ts
View File

@@ -76,7 +76,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '接收的用户',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleUserList(),
api: getSimpleUserList,
labelField: 'nickname',
valueField: 'id',
mode: 'multiple',
@@ -124,7 +124,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

11
apps/web-antd/src/views/iot/alert/record/data.ts
View File

@@ -17,7 +17,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '告警配置',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleAlertConfigList(),
api: getSimpleAlertConfigList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择告警配置',
@@ -40,7 +40,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -53,7 +53,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '设备',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleDeviceList(),
api: getSimpleDeviceList,
labelField: 'deviceName',
valueField: 'id',
placeholder: '请选择设备',
@@ -75,7 +75,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

10
apps/web-antd/src/views/iot/device/device/data.ts
View File

@@ -28,7 +28,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -89,7 +89,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '设备分组',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleDeviceGroupList(),
api: getSimpleDeviceGroupList,
labelField: 'name',
valueField: 'id',
mode: 'multiple',
@@ -156,7 +156,7 @@ export function useGroupFormSchema(): VbenFormSchema[] {
label: '设备分组',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleDeviceGroupList(),
api: getSimpleDeviceGroupList,
labelField: 'name',
valueField: 'id',
mode: 'multiple',
@@ -199,7 +199,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -249,7 +249,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '设备分组',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleDeviceGroupList(),
api: getSimpleDeviceGroupList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择设备分组',

2
apps/web-antd/src/views/iot/device/group/data.ts
View File

@@ -34,7 +34,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '父级分组',
component: 'ApiTreeSelect',
componentProps: {
api: () => getSimpleDeviceGroupList(),
api: getSimpleDeviceGroupList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择父级分组',

9
apps/web-antd/src/views/iot/ota/data.ts
View File

@@ -29,7 +29,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '所属产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -85,7 +85,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -96,7 +96,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

9
apps/web-antd/src/views/iot/ota/firmware/data.ts
View File

@@ -29,7 +29,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '所属产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -86,7 +86,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -97,7 +97,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

36
apps/web-antd/src/views/iot/ota/firmware/index.vue
View File

@@ -2,9 +2,10 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { useRouter } from 'vue-router';
import { message } from 'ant-design-vue';
@@ -39,7 +40,6 @@ function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
formModalApi.setData({ type: 'update', id: row.id }).open();
}
/** 删除固件 */
async function handleDelete(row: IoTOtaFirmwareApi.Firmware) {
const hideLoading = message.loading({
@@ -117,19 +117,25 @@ const [Grid, gridApi] = useVbenVxeGrid({
<!-- 固件文件列 -->
<template #fileUrl="{ row }">
<div v-if="row.fileUrl" class="inline-flex items-center gap-1.5 align-middle leading-none">
<IconifyIcon icon="ant-design:download-outlined" class="shrink-0 text-base align-middle text-primary" />
<a
:href="row.fileUrl"
target="_blank"
download
class="text-primary cursor-pointer hover:underline align-middle"
>
下载固件
</a>
</div>
<span v-else class="text-gray-400">无文件</span>
</template>
<div
v-if="row.fileUrl"
class="inline-flex items-center gap-1.5 align-middle leading-none"
>
<IconifyIcon
icon="ant-design:download-outlined"
class="text-primary shrink-0 align-middle text-base"
/>
<a
:href="row.fileUrl"
target="_blank"
download
class="text-primary cursor-pointer align-middle hover:underline"
>
下载固件
</a>
</div>
<span v-else class="text-gray-400">无文件</span>
</template>
<!-- 操作列 -->
<template #actions="{ row }">

2
apps/web-antd/src/views/iot/product/category/data.ts
View File

@@ -34,7 +34,7 @@ export function useFormSchema(): VbenFormSchema[] {
label: '父级分类',
component: 'ApiTreeSelect',
componentProps: {
api: () => getSimpleProductCategoryList(),
api: getSimpleProductCategoryList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择父级分类',

4
apps/web-antd/src/views/iot/product/product/data.ts
View File

@@ -93,7 +93,7 @@ export function useFormSchema(formApi?: any): VbenFormSchema[] {
label: '产品分类',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductCategoryList(),
api: getSimpleProductCategoryList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品分类',
@@ -246,7 +246,7 @@ export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
label: '产品分类',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductCategoryList(),
api: getSimpleProductCategoryList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品分类',

7
apps/web-antd/src/views/iot/rule/data/data.ts
View File

@@ -24,7 +24,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '产品',
component: 'ApiSelect',
componentProps: {
api: () => getSimpleProductList(),
api: getSimpleProductList,
labelField: 'name',
valueField: 'id',
placeholder: '请选择产品',
@@ -45,7 +45,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

5
apps/web-antd/src/views/iot/rule/data/rule/data.ts
View File

@@ -32,7 +32,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

5
apps/web-antd/src/views/iot/rule/data/sink/data.ts
View File

@@ -42,7 +42,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

5
apps/web-antd/src/views/iot/rule/scene/data.ts
View File

@@ -77,7 +77,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
fieldName: 'createTime',
label: '创建时间',
component: 'RangePicker',
componentProps: getRangePickerDefaultProps(),
componentProps: {
...getRangePickerDefaultProps(),
allowClear: true,
},
},
];
}

2
apps/web-antd/src/views/mall/product/comment/data.ts
View File

@@ -101,7 +101,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'replyStatus',
label: '回复状态',
component: 'Select',
component: 'RadioGroup',
componentProps: {
options: [
{ label: '已回复', value: true },

2
apps/web-antd/src/views/mall/product/spu/form/index.vue
View File

@@ -283,7 +283,7 @@ function openPropertyAddForm() {
}
/** 调用 SkuList generateTableData 方法*/
function generateSkus(propertyList: any[]) {
function generateSkus(propertyList: PropertyAndValues[]) {
skuListRef.value.generateTableData(propertyList);
}

54
apps/web-antd/src/views/mall/product/spu/form/modules/product-attributes.vue
View File

@@ -6,7 +6,9 @@ import type { MallPropertyApi } from '#/api/mall/product/property';
import { computed, ref, watch } from 'vue';
import { Button, Col, Divider, message, Select, Tag } from 'ant-design-vue';
import { IconifyIcon } from '@vben/icons';
import { Col, Divider, message, Select, Tag } from 'ant-design-vue';
import {
createPropertyValue,
@@ -80,13 +82,19 @@ watch(
);
/** 删除属性值 */
function handleCloseValue(index: number, valueIndex: number) {
attributeList.value?.[index]?.values?.splice(valueIndex, 1);
function handleCloseValue(index: number, value: PropertyAndValues) {
if (attributeList.value[index]) {
attributeList.value[index].values = attributeList.value?.[
index
]?.values?.filter((item) => item.id !== value.id);
}
}
/** 删除属性 */
function handleCloseProperty(index: number) {
attributeList.value?.splice(index, 1);
function handleCloseProperty(item: PropertyAndValues) {
attributeList.value = attributeList.value.filter(
(attribute) => attribute.id !== item.id,
);
emit('success', attributeList.value);
}
@@ -158,27 +166,28 @@ async function getAttributeOptions(propertyId: number) {
</script>
<template>
<Col v-for="(item, index) in attributeList" :key="index">
<Col v-for="(attribute, index) in attributeList" :key="index">
<Divider class="my-4" />
<!-- TODO @puhui999：1）间隙可以看看；2)vue3 + element-plus 添加属性这个按钮，是和属性名在一排，感觉更好看点。 -->
<div>
<div class="mt-1">
<span class="mx-1">属性名：</span>
<Tag
:closable="!isDetail"
class="mx-1"
color="success"
@close="handleCloseProperty(index)"
@close="handleCloseProperty(attribute)"
>
{{ item.name }}
{{ attribute.name }}
</Tag>
</div>
<div>
<div class="mt-2">
<span class="mx-1">属性值：</span>
<Tag
v-for="(value, valueIndex) in item.values"
:key="value.id"
v-for="(value, valueIndex) in attribute.values"
:key="valueIndex"
:closable="!isDetail"
class="mx-1"
@close="handleCloseValue(index, valueIndex)"
@close="handleCloseValue(index, value)"
>
<!-- TODO @puhui999：这里貌似爆红？！idea -->
{{ value.name }}
@@ -194,9 +203,9 @@ async function getAttributeOptions(propertyId: number) {
:filter-option="true"
size="small"
style="width: 100px"
@blur="handleInputConfirm(index, item.id)"
@change="handleInputConfirm(index, item.id)"
@keyup.enter="handleInputConfirm(index, item.id)"
@blur="handleInputConfirm(index, attribute.id)"
@change="handleInputConfirm(index, attribute.id)"
@keyup.enter="handleInputConfirm(index, attribute.id)"
>
<Select.Option
v-for="item2 in attributeOptions"
@@ -206,15 +215,16 @@ async function getAttributeOptions(propertyId: number) {
{{ item2.name }}
</Select.Option>
</Select>
<Button
<Tag
v-show="!inputVisible(index)"
class="button-new-tag ml-1"
size="small"
@click="showInput(index)"
class="mx-1 border-dashed bg-gray-100"
>
+ 添加
</Button>
<div class="flex items-center">
<IconifyIcon class="mr-2" icon="lucide:plus" />
添加
</div>
</Tag>
</div>
<Divider class="my-10px" />
</Col>
</template>

77
apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
View File

@@ -64,7 +64,6 @@ const formSchema: VbenFormSchema[] = [
filterOption: true,
placeholder: '请选择属性名称。如果不存在，可手动输入选择',
mode: 'tags',
maxTagCount: 1,
allowClear: true,
},
rules: 'required',
@@ -77,7 +76,7 @@ const [Form, formApi] = useVbenForm({
class: 'w-full',
},
formItemClass: 'col-span-2',
labelWidth: 120,
labelWidth: 80,
},
layout: 'horizontal',
schema: formSchema,
@@ -91,51 +90,47 @@ const [Modal, modalApi] = useVbenModal({
if (!valid) {
return;
}
modalApi.lock();
const values = await formApi.getValues();
const name = Array.isArray(values.name) ? values.name[0] : values.name;
// 重复添加校验
for (const attrItem of attributeList.value) {
if (attrItem.name === name) {
message.error('该属性已存在，请勿重复添加');
return;
// name 为数组，遍历数组，进行重复添加校验
const names = values.name;
for (const name of names) {
// 重复添加校验
for (const attrItem of attributeList.value) {
if (attrItem.name === name) {
message.error('该属性已存在，请勿重复添加');
return;
}
}
}
// TODO @puhui999：modalApi.lock(); 这种写法；
// 情况一：属性名已存在，则直接使用
const existProperty = attributeOptions.value.find(
(item: MallPropertyApi.Property) => item.name === name,
);
if (existProperty) {
attributeList.value.push({
id: existProperty.id,
name,
values: [],
});
// TODO @puhui999：这里要不 if else；这样 await modalApi.close(); emit('success'); 可以复用？另外，感觉甚至可以情况二：add 后，成为 existProperty，可以进一步简化？
await modalApi.close();
emit('success');
return;
}
// 情况二：如果是不存在的属性，则需要执行新增
try {
const data = { name } as MallPropertyApi.Property;
const propertyId = await createProperty(data);
// 添加到属性列表
attributeList.value.push({
id: propertyId,
name,
values: [],
});
message.success($t('ui.actionMessage.operationSuccess'));
await modalApi.close();
emit('success');
} catch (error) {
console.error('添加属性失败:', error);
for (const name of names) {
const existProperty = attributeOptions.value.find(
(item: MallPropertyApi.Property) => item.name === name,
);
if (existProperty) {
// 情况一：如果属性已存在，则直接使用并结束
attributeList.value.push({
id: existProperty.id,
name,
values: [],
});
} else {
// 情况二：如果是不存在的属性，则需要执行新增
const propertyId = await createProperty({ name });
attributeList.value.push({
id: propertyId,
name,
values: [],
});
}
}
message.success($t('ui.actionMessage.operationSuccess'));
modalApi.unlock();
await modalApi.close();
emit('success');
},
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
return;

4
apps/web-antd/src/views/mall/promotion/banner/data.ts
View File

@@ -143,7 +143,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
field: 'status',
minWidth: 150,
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.COMMON_STATUS,
},
@@ -154,7 +154,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
field: 'position',
minWidth: 150,
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.PROMOTION_BANNER_POSITION,
},

17
apps/web-antd/src/views/mall/promotion/components/spu-sku-select.vue
View File

@@ -197,15 +197,9 @@ function selectSku(skus: MallSpuApi.Sku[]) {
selectedSkuIds.value = [];
return;
}
// TODO @puhui999：有 idea 告警
if (props.radio) {
// 单选模式
selectedSkuIds.value = [skus[0]?.id!];
} else {
// 多选模式
selectedSkuIds.value = skus.map((sku) => sku.id!);
}
props.radio
? (selectedSkuIds.value = [skus[0]?.id!])
: (selectedSkuIds.value = skus.map((sku) => sku.id!));
}
/** 展开行，加载 SKU 列表 */
@@ -280,7 +274,10 @@ const [Modal, modalApi] = useVbenModal({
await gridApi.query();
},
});
defineExpose({
open: modalApi.open,
close: modalApi.close,
});
/** 初始化分类数据 */
onMounted(async () => {
categoryList.value = await getCategoryList({});

4
apps/web-antd/src/views/mall/promotion/point/activity/index.vue
View File

@@ -110,6 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
label: $t('ui.actionTitle.create', ['积分活动']),
type: 'primary',
icon: ACTION_ICON.ADD,
auth: ['promotion:point-activity:create'],
onClick: handleCreate,
},
]"
@@ -122,6 +123,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
label: $t('common.edit'),
type: 'link',
icon: ACTION_ICON.EDIT,
auth: ['promotion:point-activity:update'],
onClick: handleEdit.bind(null, row),
},
{
@@ -130,6 +132,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
danger: true,
icon: ACTION_ICON.CLOSE,
ifShow: row.status === 0,
auth: ['promotion:point-activity:close'],
popConfirm: {
title: '确认关闭该积分商城活动吗？',
confirm: handleClose.bind(null, row),
@@ -141,6 +144,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
danger: true,
icon: ACTION_ICON.DELETE,
ifShow: row.status !== 0,
auth: ['promotion:point-activity:delete'],
popConfirm: {
title: $t('ui.actionMessage.deleteConfirm', [row.spuName]),
confirm: handleDelete.bind(null, row),

2
apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
View File

@@ -109,7 +109,7 @@ const gridColumns = computed<VxeGridProps['columns']>(() => {
field: 'marketPrice',
title: '原价',
minWidth: 100,
formatter: 'formatAmount',
formatter: 'formatAmount2',
},
{
field: 'status',

4
apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
View File

@@ -64,7 +64,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
minWidth: 120,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: { type: DICT_TYPE.PROMOTION_PRODUCT_SCOPE },
},
},
@@ -88,7 +88,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
minWidth: 100,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: { type: DICT_TYPE.COMMON_STATUS },
},
},

4
apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue
View File

@@ -53,7 +53,9 @@ async function handleClose(row: MallRewardActivityApi.RewardActivity) {
async function handleDelete(row: MallRewardActivityApi.RewardActivity) {
await deleteRewardActivity(row.id!);
message.success($t('common.delSuccess'));
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
});
handleRefresh();
}

4
apps/web-antd/src/views/mall/trade/afterSale/data.ts
View File

@@ -146,7 +146,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
width: 100,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.TRADE_AFTER_SALE_STATUS,
},
@@ -158,7 +158,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
width: 100,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.TRADE_AFTER_SALE_WAY,
},

2
apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
View File

@@ -23,7 +23,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'brokerageEnabled',
label: '推广资格',
component: 'Select',
component: 'RadioGroup',
componentProps: {
placeholder: '请选择推广资格',
allowClear: true,

4
apps/web-ele/src/views/mall/promotion/banner/data.ts
View File

@@ -139,7 +139,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
field: 'status',
minWidth: 150,
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.COMMON_STATUS,
},
@@ -150,7 +150,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
field: 'position',
minWidth: 150,
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.PROMOTION_BANNER_POSITION,
},

4
apps/web-ele/src/views/mall/trade/afterSale/data.ts
View File

@@ -146,7 +146,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
width: 100,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.TRADE_AFTER_SALE_STATUS,
},
@@ -158,7 +158,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
width: 100,
align: 'center',
cellRender: {
name: 'CellDictTag',
name: 'CellDict',
props: {
dictType: DICT_TYPE.TRADE_AFTER_SALE_WAY,
},