+
属性值：
{{ 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)"
>
-
+
+
+ 添加
+
+
-
diff --git a/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue b/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
index 3686325fc..f6b4f0548 100644
--- a/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
+++ b/apps/web-antd/src/views/mall/product/spu/form/modules/product-property-add-form.vue
@@ -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;
diff --git a/apps/web-antd/src/views/mall/promotion/banner/data.ts b/apps/web-antd/src/views/mall/promotion/banner/data.ts
index f1b166ee4..a168e6492 100644
--- a/apps/web-antd/src/views/mall/promotion/banner/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/banner/data.ts
@@ -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,
},
diff --git a/apps/web-antd/src/views/mall/promotion/components/spu-sku-select.vue b/apps/web-antd/src/views/mall/promotion/components/spu-sku-select.vue
index a482d5f85..8b1ff79d5 100644
--- a/apps/web-antd/src/views/mall/promotion/components/spu-sku-select.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/spu-sku-select.vue
@@ -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({});
diff --git a/apps/web-antd/src/views/mall/promotion/point/activity/index.vue b/apps/web-antd/src/views/mall/promotion/point/activity/index.vue
index 762d47087..d0ce962db 100644
--- a/apps/web-antd/src/views/mall/promotion/point/activity/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/activity/index.vue
@@ -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),
diff --git a/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue b/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
index e349d2ccb..018fe48d5 100644
--- a/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/components/point-table-select.vue
@@ -109,7 +109,7 @@ const gridColumns = computed
(() => {
field: 'marketPrice',
title: '原价',
minWidth: 100,
- formatter: 'formatAmount',
+ formatter: 'formatAmount2',
},
{
field: 'status',
diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
index b75ecdb10..272aeec0e 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
@@ -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 },
},
},
diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue
index 8523a85f3..cc1d021f4 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/index.vue
@@ -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();
}
diff --git a/apps/web-antd/src/views/mall/trade/afterSale/data.ts b/apps/web-antd/src/views/mall/trade/afterSale/data.ts
index fb0126017..150a9fff9 100644
--- a/apps/web-antd/src/views/mall/trade/afterSale/data.ts
+++ b/apps/web-antd/src/views/mall/trade/afterSale/data.ts
@@ -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,
},
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
index bf7a66a72..58ff07082 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
@@ -23,7 +23,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'brokerageEnabled',
label: '推广资格',
- component: 'Select',
+ component: 'RadioGroup',
componentProps: {
placeholder: '请选择推广资格',
allowClear: true,
diff --git a/apps/web-ele/src/views/mall/promotion/banner/data.ts b/apps/web-ele/src/views/mall/promotion/banner/data.ts
index df31aefb4..37f5ac085 100644
--- a/apps/web-ele/src/views/mall/promotion/banner/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/banner/data.ts
@@ -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,
},
diff --git a/apps/web-ele/src/views/mall/trade/afterSale/data.ts b/apps/web-ele/src/views/mall/trade/afterSale/data.ts
index 2f3caa5b5..a995b0b96 100644
--- a/apps/web-ele/src/views/mall/trade/afterSale/data.ts
+++ b/apps/web-ele/src/views/mall/trade/afterSale/data.ts
@@ -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,
},