From 97db3cf24127a5e23c02e433c2ad47d9cece606d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98zhengbw=E2=80=99?= <‘q59323016@qq.com’>
Date: Tue, 18 Feb 2025 10:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A5=97=E9=A4=90=E5=92=8C=E7=A7=9F=E6=88=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/index.vue        | 321 +++++++++++++++++------
 src/views/system/tenantPackage/index.vue | 213 +++++++++++----
 2 files changed, 411 insertions(+), 123 deletions(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index bc3f198..05f49da 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -2,28 +2,68 @@
   <div class="app-container">
     <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="租户名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入租户名" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入租户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="联系人" prop="contactName">
-        <el-input v-model="queryParams.contactName" placeholder="请输入联系人" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.contactName"
+          placeholder="请输入联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="联系手机" prop="contactMobile">
-        <el-input v-model="queryParams.contactMobile" placeholder="请输入联系手机" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.contactMobile"
+          placeholder="请输入联系手机"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="租户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择租户状态" clearable>
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择租户状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+        <el-date-picker
+          v-model="queryParams.createTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -31,14 +71,32 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:tenant:create']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:tenant:create']"
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:tenant:export']">导出</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['system:tenant:export']"
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -47,45 +105,83 @@
       <el-table-column label="租户名" align="center" prop="name" />
       <el-table-column label="租户套餐" align="center" prop="packageId">
         <template v-slot="scope">
-          <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
-          <el-tag v-else> {{getPackageName(scope.row.packageId)}} </el-tag>
+          <el-tag v-if="scope.row.packageId === 0" type="danger"
+            >系统租户</el-tag
+          >
+          <el-tag v-else> {{ getPackageName(scope.row.packageId) }} </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="联系人" align="center" prop="contactName" />
       <el-table-column label="联系手机" align="center" prop="contactMobile" />
       <el-table-column label="账号额度" align="center" prop="accountCount">
         <template v-slot="scope">
-          <el-tag> {{scope.row.accountCount}} </el-tag>
+          <el-tag> {{ scope.row.accountCount }} </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="过期时间" align="center" prop="expireTime" width="180">
+      <el-table-column
+        label="过期时间"
+        align="center"
+        prop="expireTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.expireTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column
+        label="绑定域名"
+        align="center"
+        prop="domain"
+        width="180"
+      />
       <el-table-column label="租户状态" align="center" prop="status">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:tenant:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:tenant:delete']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:tenant:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:tenant:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -94,8 +190,18 @@
           <el-input v-model="form.name" placeholder="请输入租户名" />
         </el-form-item>
         <el-form-item label="租户套餐" prop="packageId">
-          <el-select v-model="form.packageId" placeholder="请选择租户套餐" clearable size="small">
-            <el-option v-for="item in packageList" :key="item.id" :label="item.name" :value="item.id"/>
+          <el-select
+            v-model="form.packageId"
+            placeholder="请选择租户套餐"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in packageList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="联系人" prop="contactName">
@@ -104,26 +210,54 @@
         <el-form-item label="联系手机" prop="contactMobile">
           <el-input v-model="form.contactMobile" placeholder="请输入联系手机" />
         </el-form-item>
-        <el-form-item v-if="form.id === undefined" label="用户名称" prop="username">
+        <el-form-item
+          v-if="form.id === undefined"
+          label="用户名称"
+          prop="username"
+        >
           <el-input v-model="form.username" placeholder="请输入用户名称" />
         </el-form-item>
-        <el-form-item v-if="form.id === undefined" label="用户密码" prop="password">
-          <el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password />
+        <el-form-item
+          v-if="form.id === undefined"
+          label="用户密码"
+          prop="password"
+        >
+          <el-input
+            v-model="form.password"
+            placeholder="请输入用户密码"
+            type="password"
+            show-password
+          />
         </el-form-item>
         <el-form-item label="账号额度" prop="accountCount">
-          <el-input-number v-model="form.accountCount" placeholder="请输入账号额度" controls-position="right" :min="0" />
+          <el-input-number
+            v-model="form.accountCount"
+            placeholder="请输入账号额度"
+            controls-position="right"
+            :min="0"
+          />
         </el-form-item>
         <el-form-item label="过期时间" prop="expireTime">
-          <el-date-picker clearable size="small" v-model="form.expireTime" type="date"
-                          value-format="timestamp" placeholder="请选择过期时间" />
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.expireTime"
+            type="date"
+            value-format="timestamp"
+            placeholder="请选择过期时间"
+          />
         </el-form-item>
         <el-form-item label="绑定域名" prop="domain">
           <el-input v-model="form.domain" placeholder="请输入绑定域名" />
         </el-form-item>
         <el-form-item label="租户状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+            <el-radio
+              v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -136,14 +270,20 @@
 </template>
 
 <script>
-import { createTenant, updateTenant, deleteTenant, getTenant, getTenantPage, exportTenantExcel } from "@/api/system/tenant";
-import { CommonStatusEnum } from '@/utils/constants'
-import {getTenantPackageList} from "@/api/system/tenantPackage";
+import {
+  createTenant,
+  updateTenant,
+  deleteTenant,
+  getTenant,
+  getTenantPage,
+  exportTenantExcel,
+} from "@/api/system/tenant";
+import { CommonStatusEnum } from "@/utils/constants";
+import { getTenantPackageList } from "@/api/system/tenantPackage";
 
 export default {
   name: "Tenant",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -170,37 +310,64 @@ export default {
         contactName: null,
         contactMobile: null,
         status: undefined,
-        createTime: []
+        createTime: [],
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        name: [{ 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" }],
-        domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
-        username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
-        password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
-      }
+        name: [
+          { required: true, message: "租户名不能为空", trigger: "blur" },
+          { max: 20, message: "租户名不能超过20个字符", trigger: "blur" },
+        ],
+        packageId: [
+          { required: true, message: "租户套餐不能为空", trigger: "blur" },
+        ],
+        contactName: [
+          { required: true, message: "联系人不能为空", trigger: "blur" },
+          { max: 64, message: "联系人不能可超过64个字符", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "租户状态不能为空", trigger: "blur" },
+        ],
+        accountCount: [
+          { required: true, message: "账号额度不能为空", trigger: "blur" },
+        ],
+        expireTime: [
+          { required: true, message: "过期时间不能为空", trigger: "blur" },
+        ],
+        domain: [
+          { required: true, message: "绑定域名不能为空", trigger: "blur" },
+        ],
+        username: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+        ],
+        contactMobile: [
+          {
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/,
+            message: "请输入正确联系手机号码",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   created() {
     this.getList();
     // 获得租户套餐列表
-    getTenantPackageList().then(response => {
+    getTenantPackageList().then((response) => {
       this.packageList = response.data;
-    })
+    });
   },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
       // 执行查询
-      getTenantPage(this.queryParams).then(response => {
+      getTenantPage(this.queryParams).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -246,7 +413,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getTenant(id).then(response => {
+      getTenant(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改租户";
@@ -254,13 +421,13 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
         // 修改的提交
         if (this.form.id != null) {
-          updateTenant(this.form).then(response => {
+          updateTenant(this.form).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -268,7 +435,7 @@ export default {
           return;
         }
         // 添加的提交
-        createTenant(this.form).then(response => {
+        createTenant(this.form).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -278,27 +445,35 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除租户编号为"' + id + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除租户编号为"' + id + '"的数据项?')
+        .then(function () {
           return deleteTenant(id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = {...this.queryParams};
+      let params = { ...this.queryParams };
       params.pageNo = undefined;
       params.pageSize = undefined;
       // 执行导出
-      this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
+      this.$modal
+        .confirm("是否确认导出所有租户数据项?")
+        .then(() => {
           this.exportLoading = true;
           return exportTenantExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '租户.xls');
+        })
+        .then((response) => {
+          this.$download.excel(response, "租户.xls");
           this.exportLoading = false;
-      }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 套餐名格式化 */
     getPackageName(packageId) {
@@ -307,8 +482,8 @@ export default {
           return item.name;
         }
       }
-      return '未知套餐';
-    }
-  }
+      return "未知套餐";
+    },
+  },
 };
 </script>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 822849b..a58b44d 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -2,22 +2,52 @@
   <div class="app-container">
     <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="套餐名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入套餐名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+        <el-date-picker
+          v-model="queryParams.createTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -25,10 +55,20 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:tenant-package:create']">新增</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:tenant-package:create']"
+          >新增</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -41,23 +81,49 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:tenant-package:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:tenant-package:delete']">删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:tenant-package:update']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:tenant-package:delete']"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -66,15 +132,35 @@
           <el-input v-model="form.name" placeholder="请输入套餐名" />
         </el-form-item>
         <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event)">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event)">全选/全不选</el-checkbox>
-          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id"
-                   :check-strictly="menuCheckStrictly" empty-text="加载中，请稍后" :props="defaultProps"></el-tree>
+          <el-checkbox
+            v-model="menuExpand"
+            @change="handleCheckedTreeExpand($event)"
+            >展开/折叠</el-checkbox
+          >
+          <el-checkbox
+            v-model="menuNodeAll"
+            @change="handleCheckedTreeNodeAll($event)"
+            >全选/全不选</el-checkbox
+          >
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menu"
+            node-key="id"
+            :check-strictly="menuCheckStrictly"
+            empty-text="加载中，请稍后"
+            :props="defaultProps"
+          ></el-tree>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+            <el-radio
+              v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -90,14 +176,19 @@
 </template>
 
 <script>
-import { createTenantPackage, updateTenantPackage, deleteTenantPackage, getTenantPackage, getTenantPackagePage} from "@/api/system/tenantPackage";
-import {CommonStatusEnum} from "@/utils/constants";
-import {listSimpleMenus} from "@/api/system/menu";
+import {
+  createTenantPackage,
+  updateTenantPackage,
+  deleteTenantPackage,
+  getTenantPackage,
+  getTenantPackagePage,
+} from "@/api/system/tenantPackage";
+import { CommonStatusEnum } from "@/utils/constants";
+import { listSimpleMenus } from "@/api/system/menu";
 
 export default {
   name: "TenantPackage",
-  components: {
-  },
+  components: {},
   data() {
     return {
       // 遮罩层
@@ -121,7 +212,7 @@ export default {
         name: null,
         status: null,
         remark: null,
-        createTime: []
+        createTime: [],
       },
       // 表单参数
       form: {},
@@ -130,15 +221,27 @@ export default {
       menuCheckStrictly: true,
       defaultProps: {
         label: "name",
-        children: "children"
+        children: "children",
       },
       menuOptions: [], // 菜单列表
       // 表单校验
       rules: {
-        name: [{ required: true, message: "套餐名不能为空", trigger: "blur" }],
+        name: [
+          { required: true, message: "套餐名不能为空", trigger: "blur" },
+          { max: 10, message: "套餐名不能超过10个字符", trigger: "blur" },
+        ],
         status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
-        menuIds: [{ required: true, message: "关联的菜单编号不能为空", trigger: "blur" }],
-      }
+        menuIds: [
+          {
+            required: true,
+            message: "关联的菜单编号不能为空",
+            trigger: "blur",
+          },
+        ],
+        remark: [
+          { max: 255, message: "备注不能超过255个字符", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -150,7 +253,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getTenantPackagePage(this.queryParams).then(response => {
+      getTenantPackagePage(this.queryParams).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -206,20 +309,20 @@ export default {
       this.open = true;
       this.title = "修改租户套餐";
       // 获得菜单列表
-      getTenantPackage(id).then(response => {
+      getTenantPackage(id).then((response) => {
         this.form = response.data;
         // 设置菜单项
         // 设置为严格，避免设置父节点自动选中子节点，解决半选中问题
-        this.menuCheckStrictly = true
+        this.menuCheckStrictly = true;
         // 设置选中
         this.$refs.menu.setCheckedKeys(response.data.menuIds);
         // 设置为非严格，继续使用半选中
-        this.menuCheckStrictly = false
+        this.menuCheckStrictly = false;
       });
     },
     /** 获得菜单 */
     getMenus() {
-      listSimpleMenus().then(response => {
+      listSimpleMenus().then((response) => {
         // 处理 menuOptions 参数
         this.menuOptions = [];
         // 只需要配置
@@ -228,7 +331,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (!valid) {
           return;
         }
@@ -236,8 +339,11 @@ export default {
         if (this.form.id != null) {
           updateTenantPackage({
             ...this.form,
-            menuIds: [...this.$refs.menu.getCheckedKeys(), ...this.$refs.menu.getHalfCheckedKeys()]
-          }).then(response => {
+            menuIds: [
+              ...this.$refs.menu.getCheckedKeys(),
+              ...this.$refs.menu.getHalfCheckedKeys(),
+            ],
+          }).then((response) => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
@@ -247,8 +353,11 @@ export default {
         // 添加的提交
         createTenantPackage({
           ...this.form,
-          menuIds: [...this.$refs.menu.getCheckedKeys(), ...this.$refs.menu.getHalfCheckedKeys()]
-        }).then(response => {
+          menuIds: [
+            ...this.$refs.menu.getCheckedKeys(),
+            ...this.$refs.menu.getHalfCheckedKeys(),
+          ],
+        }).then((response) => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
@@ -258,12 +367,16 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除租户套餐编号为"' + id + '"的数据项?').then(function() {
+      this.$modal
+        .confirm('是否确认删除租户套餐编号为"' + id + '"的数据项?')
+        .then(function () {
           return deleteTenantPackage(id);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     // 树权限（展开/折叠）
     handleCheckedTreeExpand(value, type) {
@@ -274,12 +387,12 @@ export default {
     },
     // 树权限（全选/全不选）
     handleCheckedTreeNodeAll(value) {
-      this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+      this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
     },
     // 树权限（父子联动）
     handleCheckedTreeConnect(value) {
       this.form.menuCheckStrictly = value;
     },
-  }
+  },
 };
 </script>