123

src/views/system/tenant/add-or-update-tenant.vue

@@ -10,10 +10,10 @@
       <el-form-item label="联系电话" prop="contactPhone">
         <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
       </el-form-item>
-      <el-form-item v-if="!form.id" label="用户名" prop="username">
+      <el-form-item label="用户前缀" prop="prefix">
-        <el-input v-model="form.username" placeholder="请输入系统用户名" maxlength="30" />
+        <el-input :disabled="form.id" v-model="form.prefix" placeholder="请输入用户前缀" maxlength="4" />
       </el-form-item>
-      <el-form-item v-if="!form.id" label="用户密码" prop="password">
+      <el-form-item v-if="!form.id" label="管理员密码" prop="password">
         <el-input type="password" v-model="form.password" placeholder="请输入系统用户密码" maxlength="20" />
       </el-form-item>
       <el-form-item label="租户套餐" prop="packageId">
@@ -21,7 +21,7 @@
           <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="过期时间" prop="expireTime">
+<!--      <el-form-item label="过期时间" prop="expireTime">
         <el-date-picker clearable v-model="form.expireTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择过期时间">
         </el-date-picker>
       </el-form-item>
@@ -39,7 +39,7 @@
       </el-form-item>
       <el-form-item label="企业简介" prop="intro">
         <el-input type="textarea" v-model="form.intro" placeholder="请输入企业简介" />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="备注" prop="remark">
         <el-input v-model="form.remark" placeholder="请输入备注" />
       </el-form-item>
@@ -72,7 +72,7 @@ export default {
         companyName: undefined,
         contactUserName: undefined,
         contactPhone: undefined,
-        username: undefined,
+        prefix: undefined,
         password: undefined,
         packageId: undefined,
         expireTime: undefined,
@@ -90,13 +90,13 @@ export default {
         contactUserName: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
         contactPhone: [{ required: true, message: "联系电话不能为空", trigger: "blur" }],
         companyName: [{ required: true, message: "企业名称不能为空", trigger: "blur" }],
-        username: [
+        prefix: [
-          { required: true, message: "用户名不能为空", trigger: "blur" },
+          { required: true, message: "用户名前缀不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { min: 2, max: 4, message: '用户前缀长度必须介于 2 和 4 之间', trigger: 'blur' }
         ],
         password: [
-          { required: true, message: "密码不能为空", trigger: "blur" },
+          { required: true, message: "管理员不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          { min: 5, max: 20, message: '管理员密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ]
       },
       buttonLoading:false,

src/views/system/tenant/index.vue

@@ -72,11 +72,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" v-if="false" />
       <el-table-column label="平台编号" align="center" prop="tenantId" />
+      <el-table-column label="用户前缀" align="center" prop="prefix" />
       <el-table-column label="联系人" align="center" prop="contactUserName" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" />
       <el-table-column label="企业名称" align="center" prop="companyName" />
-      <el-table-column label="社会信用代码" align="center" prop="licenseNumber" />
+<!--      <el-table-column label="社会信用代码" align="center" prop="licenseNumber" />-->
-      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" />
+<!--      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" />-->
       <el-table-column label="租户状态" align="center" prop="status">
         <template v-slot="scope">
           <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -243,3 +244,4 @@ export default {
 <style scoped lang="scss">
 
 </style>
+

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
-        target: `http://124.222.254.188:8090`,
+        // target: `http://124.222.254.188:8090`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''