租户升级；租户分配公司数量、账号数量

src/api/tenant/record.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询租户SQL执行记录列表
+export function listRecord(query) {
+  return request({
+    url: '/tenant/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询租户SQL执行记录详细
+export function getRecord(id) {
+  return request({
+    url: '/tenant/record/' + id,
+    method: 'get'
+  })
+}
+
+// 新增租户SQL执行记录
+export function addRecord(data) {
+  return request({
+    url: '/tenant/record',
+    method: 'post',
+    data: data
+  })
+}
+
+export function uploadScript(data) {
+  return request({
+    url: '/tenant/record/uploadScript',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改租户SQL执行记录
+export function updateRecord(data) {
+  return request({
+    url: '/tenant/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除租户SQL执行记录
+export function delRecord(id) {
+  return request({
+    url: '/tenant/record/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出租户SQL执行记录
+export function exportRecord(query) {
+  return request({
+    url: '/tenant/record/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/saas/record/index.vue

@@ -0,0 +1,340 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="数据库名" prop="dbName">
+        <el-input
+          v-model="queryParams.dbName"
+          placeholder="请输入数据库名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="执行状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择执行状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="执行时间" prop="executeTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.executeTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择执行时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- 上传脚本按钮 -->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-upload"
+          size="mini"
+          @click="handleUploadScript"
+          v-hasPermi="['tenant:record:add']"
+        >上传脚本</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['tenant:record:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['tenant:record:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['tenant:record:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="租户ID" align="center" prop="tenantId" />
+      <el-table-column label="租户编码" align="center" prop="tenantCode" />
+      <el-table-column label="数据库名" align="center" prop="dbName" />
+      <el-table-column label="执行的SQL文件" align="center" prop="sqlFile" />
+      <el-table-column label="执行状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="失败原因" align="center" prop="errorMsg" />
+      <el-table-column label="执行时间" align="center" prop="executeTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.executeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['tenant:record:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['tenant:record:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改租户SQL执行记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="租户ID" prop="tenantId">
+          <el-input v-model="form.tenantId" placeholder="请输入租户ID" />
+        </el-form-item>
+        <el-form-item label="数据库名" prop="dbName">
+          <el-input v-model="form.dbName" placeholder="请输入数据库名" />
+        </el-form-item>
+        <el-form-item label="执行状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="parseInt(dict.dictValue)"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="失败原因" prop="errorMsg">
+          <el-input v-model="form.errorMsg" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="执行时间" prop="executeTime">
+          <el-date-picker clearable size="small"
+                          v-model="form.executeTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择执行时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecord,
+  getRecord,
+  delRecord,
+  addRecord,
+  updateRecord,
+  exportRecord,
+  uploadScript
+} from "@/api/tenant/record";
+
+export default {
+  name: "Record",
+  data() {
+    return {
+      loading: true,
+      exportLoading: false,
+      ids: [],
+      single: true,
+      multiple: true,
+      showSearch: true,
+      total: 0,
+      recordList: [],
+      open: false,
+      statusOptions: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dbName: null,
+        sqlFile: null,
+        status: null,
+        errorMsg: null,
+        executeTime: null
+      },
+      form: {},
+      // 弹出层标题
+      title: "",
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("tenant_execute_status").then(response => {
+      this.statusOptions = response.data;
+    });
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listRecord(this.queryParams).then(response => {
+        this.recordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    cancel() {
+      this.open = false;
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+
+    /** ==================================
+     *  核心：点击上传脚本 → 直接选择文件上传
+     *  ================================== */
+    handleUploadScript() {
+      // 创建隐藏的文件选择框
+      const input = document.createElement('input');
+      input.type = 'file';
+      input.accept = '.sql'; // 只允许选择sql文件
+
+      // 文件选择后触发
+      input.onchange = (e) => {
+        const file = e.target.files[0];
+        if (!file) return;
+
+        // 校验后缀
+        const ext = file.name.split('.').pop().toLowerCase();
+        if (ext !== 'sql') {
+          this.msgError('只能上传 .sql 脚本文件！');
+          return;
+        }
+
+        // 组装FormData上传
+        const formData = new FormData();
+        formData.append('file', file);
+
+        // 调用上传接口（根据你项目实际接口修改）
+        this.uploadSqlFile(formData);
+      };
+      input.click();
+    },
+
+    /** 上传SQL文件接口 */
+    uploadSqlFile(formData) {
+      this.loading = true;
+      // 这里替换成你真实的上传接口
+      uploadScript(formData).then(res => {
+        this.msgSuccess(res.msg);
+        this.getList();
+      }).catch(err => {
+        this.msgError('上传失败：' + err.msg);
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tenantId: null,
+        dbName: null,
+        sqlFile: null,
+        status: 0,
+        errorMsg: null,
+        executeTime: null
+      };
+      this.resetForm("form");
+    },
+
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRecord(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改租户升级记录";
+      });
+    },
+
+    submitForm() {},
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除租户SQL执行记录编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return delRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有租户SQL执行记录数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportRecord(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/saas/tenant/index.vue

@@ -148,6 +148,13 @@
                 @click="handleConfig(scope.row)"
                 v-hasPermi="['tenant:config:edit']"
               >修改配置</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-setting"
+                @click="handleSqlScript(scope.row)"
+                v-hasPermi="['tenant:config:edit']"
+              >上传sql脚本</el-button>
             </div>
           </template>
         </el-table-column>
@@ -163,8 +170,8 @@
     </div>
 
     <!-- 添加或修改租户基础信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body class="tenant-dialog">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" class="tenant-data-form">
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body class="tenant-dialog">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="tenant-data-form">
         <el-form-item label="租户编码" prop="tenantCode">
           <el-input v-model="form.tenantCode" placeholder="请输入租户编码" />
         </el-form-item>
@@ -180,7 +187,7 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item> -->
-        <el-form-item label="租户有效期" prop="expireTime" label-width="100px">
+        <el-form-item label="租户有效期" prop="expireTime" label-width="120px">
           <el-date-picker clearable size="small"
                           v-model="form.expireTime"
                           type="date"
@@ -191,27 +198,33 @@
         <!--        <el-form-item label="数据库连接地址" prop="dbUrl">-->
         <!--          <el-input v-model="form.dbUrl" placeholder="请输入数据库连接地址" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="数据库IP" prop="dbIp" label-width="100px">
+        <el-form-item label="数据库IP" prop="dbIp" label-width="120px">
           <el-input v-model="form.dbIp" placeholder="请输入数据库ip地址" />
         </el-form-item>
-        <el-form-item label="数据库端口" prop="dbPort" label-width="100px">
+        <el-form-item label="数据库端口" prop="dbPort" label-width="120px">
           <el-input v-model="form.dbPort" placeholder="请输入数据库端口" />
         </el-form-item>
-        <el-form-item label="数据库名称" prop="dbName" label-width="100px">
+        <el-form-item label="数据库名称" prop="dbName" label-width="120px">
           <el-input v-model="form.dbName" placeholder="请输入数据库名称" />
         </el-form-item>
-        <el-form-item label="数据库帐号" prop="dbAccount" label-width="100px">
+        <el-form-item label="数据库帐号" prop="dbAccount" label-width="120px">
           <el-input v-model="form.dbAccount" placeholder="请输入数据库帐号" />
         </el-form-item>
-        <el-form-item label="数据库密码" prop="dbPwd" label-width="100px">
+        <el-form-item label="数据库密码" prop="dbPwd" label-width="120px">
           <el-input v-model="form.dbPwd" placeholder="请输入数据库密码" />
         </el-form-item>
         <el-form-item label="联系电话" prop="contactPhone">
           <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
         </el-form-item>
-        <el-form-item label="联系人" prop="contactName">
+        <el-form-item label="联系人" prop="contactName" label-width="120px">
           <el-input v-model="form.contactName" placeholder="请输入联系人" />
         </el-form-item>
+        <el-form-item label="销售公司数量" prop="companyNum" label-width="120px">
+          <el-input v-model="form.companyNum" placeholder="请输入销售公司数量" />
+        </el-form-item>
+        <el-form-item label="账号数量" prop="accountNum">
+          <el-input v-model="form.accountNum" placeholder="请输入账号数量" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -253,18 +266,17 @@
 
 <script>
 import {
-  listTenant,
-  getTenant,
-  delTenant,
   addTenant,
-  updateTenant,
+  delTenant,
   exportTenant,
+  getTenant,
+  listTenant,
+  menuEdit,
   roleMenuTreeselect,
-  menuEdit
+  updateTenant
 } from "@/api/tenant/tenant";
-import {code} from "quill/ui/icons";
-import {getRole} from "@/api/system/role";
 import ConfigIndex from "./config/index";
+import {uploadScript} from "@/api/tenant/record";
 
 export default {
   name: "Tenant",
@@ -347,6 +359,12 @@ export default {
         ],
         contactName: [
           { required: true, message: "联系人不能为空", trigger: "blur" }
+        ],
+        companyNum: [
+          { required: true, message: "销售公司数量不能为空", trigger: "blur" }
+        ],
+        accountNum: [
+          { required: true, message: "账号数量不能为空", trigger: "blur" }
         ]
       },
       menuExpand: false,
@@ -651,6 +669,49 @@ export default {
     handleConfigSuccess() {
       this.openConfig = false;
     },
+
+    handleSqlScript(row){
+      // 创建隐藏的文件选择框
+      const input = document.createElement('input');
+      input.type = 'file';
+      input.accept = '.sql'; // 只允许选择sql文件
+
+      // 文件选择后触发
+      input.onchange = (e) => {
+        const file = e.target.files[0];
+        if (!file) return;
+
+        // 校验后缀
+        const ext = file.name.split('.').pop().toLowerCase();
+        if (ext !== 'sql') {
+          this.msgError('只能上传 .sql 脚本文件！');
+          return;
+        }
+
+        // 组装FormData上传
+        const formData = new FormData();
+        formData.append('file', file);
+        formData.append('tenantId', row.id);
+
+        // 调用上传接口（根据你项目实际接口修改）
+        this.uploadSqlFile(formData);
+      };
+      input.click();
+    },
+
+    /** 上传SQL文件接口 */
+    uploadSqlFile(formData) {
+      this.loading = true;
+      // 这里替换成你真实的上传接口
+      uploadScript(formData).then(res => {
+        this.msgSuccess(res.msg);
+        this.getList();
+      }).catch(err => {
+        this.msgError('上传失败：' + err.msg);
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
   }
 };
 </script>