diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts
index 875817178..7ac4e2899 100644
--- a/apps/web-antd/src/views/system/tenantPackage/data.ts
+++ b/apps/web-antd/src/views/system/tenantPackage/data.ts
@@ -90,14 +90,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'id',
title: '套餐编号',
+ minWidth: 100,
},
{
field: 'name',
title: '套餐名称',
+ minWidth: 180,
},
{
field: 'status',
title: '状态',
+ minWidth: 100,
cellRender: {
name: 'CellDict',
props: { type: DICT_TYPE.COMMON_STATUS },
@@ -106,15 +109,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'remark',
title: '备注',
+ minWidth: 200,
},
{
field: 'createTime',
title: '创建时间',
+ minWidth: 180,
formatter: 'formatDateTime',
},
{
title: '操作',
- width: 130,
+ width: 220,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/apps/web-antd/src/views/system/tenantPackage/index.vue b/apps/web-antd/src/views/system/tenantPackage/index.vue
index d63019f5d..b0fa86f02 100644
--- a/apps/web-antd/src/views/system/tenantPackage/index.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/index.vue
@@ -4,7 +4,7 @@ import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
import { ref } from 'vue';
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
import { isEmpty } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -26,7 +26,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -48,11 +48,25 @@ async function handleDelete(row: SystemTenantPackageApi.TenantPackage) {
});
try {
await deleteTenantPackage(row.id as number);
- message.success({
- content: $t('ui.actionMessage.deleteSuccess', [row.name]),
- key: 'action_key_msg',
- });
- onRefresh();
+ message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+ handleRefresh();
+ } finally {
+ hideLoading();
+ }
+}
+
+/** 批量删除租户套餐 */
+async function handleDeleteBatch() {
+ await confirm($t('ui.actionMessage.deleteBatchConfirm'));
+ const hideLoading = message.loading({
+ content: $t('ui.actionMessage.deletingBatch'),
+ duration: 0,
+ });
+ try {
+ await deleteTenantPackageList(checkedIds.value);
+ checkedIds.value = [];
+ message.success($t('ui.actionMessage.deleteSuccess'));
+ handleRefresh();
} finally {
hideLoading();
}
@@ -67,23 +81,6 @@ function handleRowCheckboxChange({
checkedIds.value = records.map((item) => item.id!);
}
-/** 批量删除租户套餐 */
-async function handleDeleteBatch() {
- const hideLoading = message.loading({
- content: $t('ui.actionMessage.deleting'),
- duration: 0,
- key: 'action_process_msg',
- });
- try {
- await deleteTenantPackageList(checkedIds.value);
- checkedIds.value = [];
- message.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
- } finally {
- hideLoading();
- }
-}
-
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
schema: useGridFormSchema(),
@@ -125,7 +122,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
-
+
-
+
全选
-
+
全部展开
diff --git a/apps/web-ele/src/views/system/tenantPackage/data.ts b/apps/web-ele/src/views/system/tenantPackage/data.ts
index 158020941..b8c312c9d 100644
--- a/apps/web-ele/src/views/system/tenantPackage/data.ts
+++ b/apps/web-ele/src/views/system/tenantPackage/data.ts
@@ -1,16 +1,12 @@
import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import { useAccess } from '@vben/access';
import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { z } from '#/adapter/form';
import { getRangePickerDefaultProps } from '#/utils';
-const { hasAccessByCodes } = useAccess();
-
/** 新增/修改的表单 */
export function useFormSchema(): VbenFormSchema[] {
return [
@@ -88,14 +84,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
}
/** 列表的字段 */
-export function useGridColumns(
- onActionClick: OnActionClickFn,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
- {
- type: 'checkbox',
- width: 40,
- },
+ { type: 'checkbox', width: 40 },
{
field: 'id',
title: '套餐编号',
@@ -127,29 +118,10 @@ export function useGridColumns(
formatter: 'formatDateTime',
},
{
- field: 'operation',
title: '操作',
- minWidth: 130,
- align: 'center',
+ width: 220,
fixed: 'right',
- cellRender: {
- attrs: {
- nameField: 'name',
- nameTitle: '套餐',
- onClick: onActionClick,
- },
- name: 'CellOperation',
- options: [
- {
- code: 'edit',
- show: hasAccessByCodes(['system:tenant-package:update']),
- },
- {
- code: 'delete',
- show: hasAccessByCodes(['system:tenant-package:delete']),
- },
- ],
- },
+ slots: { default: 'actions' },
},
];
}
diff --git a/apps/web-ele/src/views/system/tenantPackage/index.vue b/apps/web-ele/src/views/system/tenantPackage/index.vue
index e4128036d..09da641dd 100644
--- a/apps/web-ele/src/views/system/tenantPackage/index.vue
+++ b/apps/web-ele/src/views/system/tenantPackage/index.vue
@@ -1,8 +1,5 @@
-
+