diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index c51ec7ee0..cd6e5db33 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -12,6 +12,7 @@ export interface TenantVO { password: string expireTime: Date accountCount: number + websites: string[] createTime: Date } diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue index 205a2cf0f..e37ab7155 100644 --- a/src/views/system/tenant/TenantForm.vue +++ b/src/views/system/tenant/TenantForm.vue @@ -54,8 +54,12 @@ value-format="x" /> - - + + @@ -97,7 +101,7 @@ const formData = ref({ contactMobile: undefined, accountCount: undefined, expireTime: undefined, - website: undefined, + websites: [], status: CommonStatusEnum.ENABLE, // 新增专属 username: undefined, @@ -105,12 +109,11 @@ const formData = ref({ }) const formRules = reactive({ name: [{ required: true, message: '租户名不能为空', trigger: 'blur' }], - packageId: [{ required: true, message: '租户套餐不能为空', trigger: 'blur' }], + packageId: [{ required: true, message: '租户套���不能为空', trigger: 'blur' }], contactName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }], status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }], accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }], expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }], - website: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }], username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }], password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }] }) @@ -173,7 +176,7 @@ const resetForm = () => { contactMobile: undefined, accountCount: undefined, expireTime: undefined, - website: undefined, + websites: [], status: CommonStatusEnum.ENABLE, username: undefined, password: undefined diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 295b68640..59b38670b 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -136,7 +136,14 @@ width="180" :formatter="dateFormatter" /> - + + +