用户调整

src/views/system/user/index-client.vue

@@ -29,10 +29,10 @@
          <!--用户数据-->
          <el-col :span="20" :xs="24">
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-               <el-form-item label="用户名称" prop="userName">
+               <el-form-item label="登录名" prop="userName">
                   <el-input
                      v-model="queryParams.userName"
-                     placeholder="请输入用户名称"
+                     placeholder="请输入用户登录名"
                      clearable
                      style="width: 240px"
                      @keyup.enter="handleQuery"
@@ -229,10 +229,10 @@
                 </el-form-item>
               </el-col>
             </el-row>
-<!--            <el-row>
+            <el-row>
                <el-col :span="12">
-                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                  <el-form-item v-if="form.userId == undefined" label="用户登录名" prop="userName">
+                     <el-input v-model="form.userName" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -240,7 +240,7 @@
                      <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
                   </el-form-item>
                </el-col>
-            </el-row>-->
+            </el-row>
 <!--            <el-row>
                <el-col :span="12">
                   <el-form-item label="用户性别">
@@ -284,12 +284,12 @@
             <el-row>
                <el-col :span="12">
                   <el-form-item label="报警手机号">
-                     <el-input v-model="form.emergencyPhone" placeholder="请输入用户名称" maxlength="30" />
+                     <el-input v-model="form.emergencyPhone" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="微信号">
-                     <el-input v-model="form.wechat" placeholder="请输入用户名称" maxlength="30" />
+                     <el-input v-model="form.wechat" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
             </el-row>
@@ -401,7 +401,7 @@ const upload = reactive({
 // 列显隐信息
 const columns = ref([
   { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
+  { key: 1, label: `用户登录名`, visible: true },
   { key: 2, label: `用户昵称`, visible: true },
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
@@ -432,7 +432,7 @@ const data = reactive({
     deptId: undefined
   },
   rules: {
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+    userName: [{ required: true, message: "用户登录名不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户登录名长度必须介于 2 和 20 之间", trigger: "blur" }],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],

src/views/system/user/index.vue

@@ -29,10 +29,10 @@
          <!--用户数据-->
          <el-col :span="20" :xs="24">
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-               <el-form-item label="用户名称" prop="userName">
+               <el-form-item label="登录名" prop="userName">
                   <el-input
                      v-model="queryParams.userName"
-                     placeholder="请输入用户名称"
+                     placeholder="请输入用户登录名"
                      clearable
                      style="width: 240px"
                      @keyup.enter="handleQuery"
@@ -218,8 +218,8 @@
             </el-row>
             <el-row>
                <el-col :span="12">
-                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-                     <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                  <el-form-item v-if="form.userId == undefined" label="用户登录名" prop="userName">
+                     <el-input v-model="form.userName" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -284,12 +284,12 @@
 <!--            <el-row>
                <el-col :span="12">
                   <el-form-item label="报警手机号">
-                     <el-input v-model="form.emergencyPhone" placeholder="请输入用户名称" maxlength="30" />
+                     <el-input v-model="form.emergencyPhone" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="职位">
-                     <el-input v-model="form.position" placeholder="请输入用户名称" maxlength="30" />
+                     <el-input v-model="form.position" placeholder="请输入用户登录名" maxlength="30" />
                   </el-form-item>
                </el-col>
             </el-row>
@@ -401,7 +401,7 @@ const upload = reactive({
 // 列显隐信息
 const columns = ref([
   { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
+  { key: 1, label: `用户登录名`, visible: true },
   { key: 2, label: `用户昵称`, visible: true },
   { key: 3, label: `部门`, visible: true },
   { key: 4, label: `手机号码`, visible: true },
@@ -432,7 +432,7 @@ const data = reactive({
     deptId: undefined
   },
   rules: {
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+    userName: [{ required: true, message: "用户登录名不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户登录名长度必须介于 2 和 20 之间", trigger: "blur" }],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],