From 74d56ddd8210ce45b1e7f5a657437f38c85b7c65 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Sat, 5 Oct 2024 23:23:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web-antd/src/views/system/tenant/data.tsx | 44 +++-
.../src/views/system/tenant/index.vue | 215 +++++++++++++++---
2 files changed, 223 insertions(+), 36 deletions(-)
diff --git a/apps/web-antd/src/views/system/tenant/data.tsx b/apps/web-antd/src/views/system/tenant/data.tsx
index 1148a479..d31ca6d7 100644
--- a/apps/web-antd/src/views/system/tenant/data.tsx
+++ b/apps/web-antd/src/views/system/tenant/data.tsx
@@ -2,7 +2,7 @@ import { getPopupContainer } from '@vben/utils';
import dayjs from 'dayjs';
-import { type FormSchemaGetter, z } from '#/adapter';
+import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter';
export const querySchema: FormSchemaGetter = () => [
{
@@ -27,6 +27,48 @@ export const querySchema: FormSchemaGetter = () => [
},
];
+export const columns: VxeGridProps['columns'] = [
+ { type: 'checkbox', width: 60 },
+ {
+ title: '租户编号',
+ field: 'tenantId',
+ },
+ {
+ title: '租户名称',
+ field: 'companyName',
+ },
+ {
+ title: '联系人',
+ field: 'contactUserName',
+ },
+ {
+ title: '联系电话',
+ field: 'contactPhone',
+ },
+ {
+ title: '到期时间',
+ field: 'expireTime',
+ formatter: ({ cellValue }) => {
+ if (!cellValue) {
+ return '无期限';
+ }
+ return cellValue;
+ },
+ },
+ {
+ title: '租户状态',
+ field: 'status',
+ slots: { default: 'status' },
+ },
+ {
+ field: 'action',
+ fixed: 'right',
+ slots: { default: 'action' },
+ title: '操作',
+ width: 180,
+ },
+];
+
const defaultExpireTime = dayjs()
.add(365, 'days')
.startOf('day')
diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue
index 8c570272..f8033d92 100644
--- a/apps/web-antd/src/views/system/tenant/index.vue
+++ b/apps/web-antd/src/views/system/tenant/index.vue
@@ -1,55 +1,200 @@
-
-
-
-
-
- {{ $t('pages.common.add') }}
-
-
+
+ todo 新增修改删除与store同步 修改不显示密码
+
+
+ 租户列表
+
+
+
+
+ {{ $t('pages.common.export') }}
+
+
+ {{ $t('pages.common.delete') }}
+
+
+ {{ $t('pages.common.add') }}
+
+
+
+
+
+
+
+
+ {{ $t('pages.common.edit') }}
+
+
+
+ {{ $t('pages.common.delete') }}
+
+
+
+
+