From 2d1d8d97966cbdb119456a35959b8e783476a2a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 六月 2025 13:50:04 +0800
Subject: [PATCH] ~
---
admin/src/components/system/user/OperaUserWindow.vue | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/admin/src/components/system/user/OperaUserWindow.vue b/admin/src/components/system/user/OperaUserWindow.vue
index 8fe9643..c5da65d 100644
--- a/admin/src/components/system/user/OperaUserWindow.vue
+++ b/admin/src/components/system/user/OperaUserWindow.vue
@@ -7,7 +7,7 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username" required v-if="form.id ==null">
+ <el-form-item label="鐢ㄦ埛鍚�" prop="username" required>
<el-input v-model="form.username" placeholder="璇疯緭鍏ョ敤鎴峰悕" v-trim maxlength="50"/>
</el-form-item>
<el-form-item label="濮撳悕" prop="realname" required>
@@ -19,30 +19,24 @@
<el-radio label="0">濂�</el-radio>
</el-radio-group>
</el-form-item>
-<!-- <el-form-item label="澶村儚" prop="avatar" required>-->
-<!-- <el-radio-group v-model="form.avatar" class="form-item-avatar">-->
-<!-- <el-radio label="/avatar/man.png" border><img src="/avatar/man.png" alt=""></el-radio>-->
-<!-- <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>-->
-<!-- </el-radio-group>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>-->
-<!-- <el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鎵�灞為儴闂�" prop="departmentId" required>-->
-<!-- <DepartmentSelect v-model="form.departmentId" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�灞為儴闂�" :inline="false" clearable/>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="宀椾綅" prop="positionId">-->
-<!-- <PositionSelect v-model="form.positionIds" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�鍦ㄥ矖浣�" :inline="false" :multiple="true" clearable/>-->
-<!-- </el-form-item>-->
+ <el-form-item label="澶村儚" prop="avatar" required>
+ <el-radio-group v-model="form.avatar" class="form-item-avatar">
+ <el-radio label="avatar/man.png" border><img src="@/assets/avatar/man.png" alt=""></el-radio>
+ <el-radio label="avatar/woman.png" border><img src="@/assets/avatar/woman.png" alt=""></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>
+ <el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>
+ </el-form-item>
<el-form-item label="宸ュ彿" prop="empNo">
<el-input v-model="form.empNo" placeholder="璇疯緭鍏ュ伐鍙�" v-trim maxlength="50"/>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="form.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" v-trim maxlength="11"/>
</el-form-item>
-<!-- <el-form-item label="閭" prop="email">-->
-<!-- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" v-trim maxlength="200"/>-->
-<!-- </el-form-item>-->
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" v-trim maxlength="200"/>
+ </el-form-item>
<el-form-item label="鐢熸棩" prop="birthday">
<el-date-picker v-model="form.birthday" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鐢ㄦ埛鐢熸棩"/>
</el-form-item>
@@ -53,14 +47,12 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import DepartmentSelect from '@/components/common/DepartmentSelect'
-import PositionSelect from '@/components/common/PositionSelect'
import { checkMobile, checkEmail } from '@/utils/form'
export default {
name: 'OperaUserWindow',
extends: BaseOpera,
- components: { PositionSelect, DepartmentSelect, GlobalWindow },
+ components: { GlobalWindow },
data () {
return {
// 琛ㄥ崟鏁版嵁
@@ -69,8 +61,6 @@
username: '', // 鐢ㄦ埛鍚�
realname: '', // 濮撳悕
empNo: '', // 宸ュ彿
- departmentId: null, // 鎵�灞為儴闂↖D
- positionIds: [], // 鎵�灞炲矖浣岻D闆�
avatar: '/avatar/man.png', // 澶村儚
password: '', // 瀵嗙爜
mobile: '', // 鎵嬫満鍙风爜
@@ -87,10 +77,8 @@
{ required: true, message: '璇疯緭鍏ュ鍚�' }
],
password: [
- { required: true, message: '璇疯緭鍏ュ瘑鐮�' }
- ],
- departmentId: [
- { required: true, message: '璇烽�夋嫨閮ㄩ棬' }
+ { required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' },
+ { validator: this.validatePassword, trigger: 'blur' }
],
avatar: [
{ required: true, message: '璇烽�夋嫨鐢ㄦ埛澶村儚' }
@@ -108,9 +96,31 @@
}
},
methods: {
+ validatePassword (rule, value, callback) {
+ if (!value) {
+ callback(new Error('璇疯緭鍏ュ瘑鐮�'))
+ } else {
+ const lengthValid = /^.{6,20}$/.test(value)
+ const hasLetter = /[a-zA-Z]/.test(value)
+ const hasNumber = /[0-9]/.test(value)
+ const hasSpecial = /[!@#$%^&*(),.?":{}|<>]/.test(value)
+
+ const typesCount = [hasLetter, hasNumber, hasSpecial].filter(Boolean).length
+
+ if (!lengthValid) {
+ callback(new Error('瀵嗙爜闀垮害闇�涓�6鍒�20涓瓧绗�'))
+ } else if (typesCount < 2) {
+ callback(new Error('瀵嗙爜闇�鍖呭惈瀛楁瘝銆佹暟瀛楀強鐗规畩瀛楃涓殑鑷冲皯涓ょ'))
+ } else {
+ callback() // 楠岃瘉閫氳繃
+ }
+ }
+ },
/**
- * @title 绐楀彛鏍囬
- * @target 缂栬緫鐨勭敤鎴峰璞�
+ * 鎵撳紑绐楀彛
+ *
+ * @param title 绐楀彛鏍囬
+ * @param target 琛屽璞★紙浠呯紪杈戦渶璇ュ弬鏁帮級
*/
open (title, target) {
this.title = title
@@ -122,7 +132,6 @@
this.form.id = null
this.form.departmentId = null
this.form.positionIds = []
- this.form.username=null
})
return
}
--
Gitblit v1.9.3