From 2adbfd2aed024bf8fda3b85b3e7af07108329f85 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 09 十二月 2024 14:01:43 +0800
Subject: [PATCH] 修改报销表

---
 src/views/system/user/index.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d6cfdd6..594df62 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -5,7 +5,7 @@
          <el-col :span="4" :xs="24">
             <div class="head-container">
                <el-input
-                  v-model="deptName"
+                   v-model.trim="deptName"
                   placeholder="请输入部门名称"
                   clearable
                   prefix-icon="Search"
@@ -31,7 +31,7 @@
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
                <el-form-item label="用户名称" prop="userName">
                   <el-input
-                     v-model="queryParams.userName"
+                      v-model.trim="queryParams.userName"
                      placeholder="请输入用户名称"
                      clearable
                      style="width: 240px"
@@ -40,7 +40,7 @@
                </el-form-item>
                <el-form-item label="手机号码" prop="phonenumber">
                   <el-input
-                     v-model="queryParams.phonenumber"
+                      v-model.trim="queryParams.phonenumber"
                      placeholder="请输入手机号码"
                      clearable
                      style="width: 240px"
@@ -184,7 +184,7 @@
             <el-row>
                <el-col :span="12">
                   <el-form-item label="用户昵称" prop="nickName">
-                     <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                     <el-input v-model.trim="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
                   </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -264,7 +264,7 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="角色">
+                  <el-form-item label="角色" prop="roleIds">
                      <el-select v-model="form.roleIds" multiple placeholder="请选择">
                         <el-option
                            v-for="item in roleOptions"
@@ -391,9 +391,11 @@
   rules: {
     userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+    deptId: [{ required: true, message: "部门处室不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+    roleIds: [{ required: true, message: "请为账户配置角色信息", trigger: ["blur", "change"] }],
   }
 });
 
@@ -492,8 +494,8 @@
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     closeOnClickModal: false,
-    inputPattern: /^.{5,20}$/,
-    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputPattern: /^(?=.*[A-Za-z])(?=.*\d).{8,}$/,
+    inputErrorMessage: "用户密码须包含字母和数字且长度不少于8个字符",
   }).then(({ value }) => {
     resetUserPwd(row.userId, value).then(response => {
       proxy.$modal.msgSuccess("修改成功,新密码是:" + value);

--
Gitblit v1.9.2