diff --git a/ruoyi-ui/src/views/system/tenant/index.vue b/ruoyi-ui/src/views/system/tenant/index.vue index 571e33a00..4ba62aba9 100644 --- a/ruoyi-ui/src/views/system/tenant/index.vue +++ b/ruoyi-ui/src/views/system/tenant/index.vue @@ -271,6 +271,9 @@ export default { password: [ { required: true, message: "密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' } + ], + packageId: [ + { required: true, message: "租户套餐不能为空", trigger: "blur" }, ] } }; @@ -401,7 +404,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除租户编号为"' + ids + '"的数据项?').then(() => { + this.$modal.confirm('是否确认删除租户编号为"' + row.tenantId + '"的数据项?').then(() => { this.loading = true; return delTenant(ids); }).then(() => { diff --git a/ruoyi-ui/src/views/system/tenantPackage/index.vue b/ruoyi-ui/src/views/system/tenantPackage/index.vue index d20943b71..44025b312 100644 --- a/ruoyi-ui/src/views/system/tenantPackage/index.vue +++ b/ruoyi-ui/src/views/system/tenantPackage/index.vue @@ -379,7 +379,7 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.download('system/tenantPackage/export', { + this.download('system/tenant/package/export', { ...this.queryParams }, `tenantPackage_${new Date().getTime()}.xlsx`) }