From 437cea8dc75f57389e55a222d96a644e322a7f8d Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 13 Aug 2024 17:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=AF=86=E7=A0=81=E7=9A=84=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 src/views/base/company/form/CompanyForm.vue   | 18 ++++++++++---
 src/views/company/property/position/index.vue |  8 ------
 src/views/company/staff/form/StaffForm.vue    | 18 ++++++++++---
 src/views/system/tenant/index.vue             | 26 +++++++++++++------
 5 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index a056811..d9cdca2 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "clipboard": "2.0.8",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
+    "dayjs": "^1.11.12",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
diff --git a/src/views/base/company/form/CompanyForm.vue b/src/views/base/company/form/CompanyForm.vue
index a230f78..cc4d33d 100644
--- a/src/views/base/company/form/CompanyForm.vue
+++ b/src/views/base/company/form/CompanyForm.vue
@@ -58,12 +58,12 @@
         <el-row :gutter="2">
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="管理员登录账号" prop="loginAccount">
-              <el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号" />
+              <el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号" maxlength="16" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="管理员登录密码" prop="password">
-              <el-input v-model="formData.password" placeholder="请输入管理员登录密码" type="password" show-password />
+              <el-input v-model="formData.password" placeholder="请输入管理员登录密码" type="password" maxlength="16" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,8 +148,18 @@ export default {
           { required: true, message: '联系方式不能为空', trigger: 'blur' },
           { pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,message: '请输入正确的联系方式', trigger: ["blur", "change"] },
           ],
-        loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }],
-        password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }]
+        loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '管理员登录账号长度在4到16个字符',
+          trigger: 'blur'
+        }],
+        password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '管理员登录密码长度在4到16个字符',
+          trigger: 'blur'
+        }]
       }
     }
   },
diff --git a/src/views/company/property/position/index.vue b/src/views/company/property/position/index.vue
index 71cc58b..df0dcad 100644
--- a/src/views/company/property/position/index.vue
+++ b/src/views/company/property/position/index.vue
@@ -2,14 +2,6 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <!-- <el-form-item label="企业id" prop="corpId">
-        <el-input v-model="queryParams.corpId" placeholder="请输入企业id（base_company表中的id）" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
       <el-form-item label="存放地名称" prop="posName" label-width="100">
         <el-input v-model="queryParams.posName" placeholder="请输入存放地名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue
index 471071c..abe803b 100644
--- a/src/views/company/staff/form/StaffForm.vue
+++ b/src/views/company/staff/form/StaffForm.vue
@@ -60,12 +60,12 @@
         <el-row :gutter="2">
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="登录账号" prop="loginAccount">
-              <el-input v-model="formData.loginAccount" placeholder="请输入登录账号" />
+              <el-input v-model="formData.loginAccount" placeholder="请输入登录账号" maxlength="16" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="formData.id === undefined" label="登录密码" prop="password">
-              <el-input v-model="formData.password" placeholder="请输入登录密码" type="password" show-password />
+              <el-input v-model="formData.password" placeholder="请输入登录密码" type="password" maxlength="16" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -169,8 +169,18 @@ export default {
         workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}],
         joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}],
         education: [{required: true, message: "学历不能为空", trigger: 'blur'}],
-        loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
-        password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }],
+        loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '登录账号长度在4到16个字符',
+          trigger: 'blur'
+        }],
+        password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '登录密码长度在4到16个字符',
+          trigger: 'blur'
+        }],
         workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
         joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }],
       },
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index a5515da..6992d93 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -88,8 +88,8 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="租户名" prop="name">
           <el-input v-model="form.name" placeholder="请输入租户名" />
         </el-form-item>
@@ -104,11 +104,11 @@
         <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-input v-model="form.username" placeholder="请输入用户名称" />
+        <el-form-item v-if="form.id === undefined" label="管理员登录账号" prop="username">
+          <el-input v-model="form.username" placeholder="请输入管理员登录账号" maxlength="16" />
         </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" maxlength="16" show-password />
         </el-form-item>
         <el-form-item label="账号额度" prop="accountCount">
           <el-input-number v-model="form.accountCount" placeholder="请输入账号额度" controls-position="right" :min="0" />
@@ -183,8 +183,18 @@ export default {
         accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
         expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
         website: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
-        username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
-        password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
+        username: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '管理员登录账号长度在4到16个字符',
+          trigger: 'blur'
+        }],
+        password: [{ required: true, message: '管理员登录密码不能为空', trigger: 'blur' }, {
+          min: 4,
+          max: 16,
+          message: '管理员登录密码长度在4到16个字符',
+          trigger: 'blur'
+        }]
       }
     };
   },