From 0269a6ad4fecfcf17a99dcfa1e503e5d30d0236c Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: Thu, 9 Mar 2023 16:21:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E9=94=99=E8=AF=AF=EF=BC=8C=E7=A7=9F=E6=88=B7=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E9=80=89=E6=8B=A9=E5=8A=A0=E5=85=A5=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/tenant/index.vue        | 5 ++++-
 ruoyi-ui/src/views/system/tenantPackage/index.vue | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

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`)
     }