From bcc67be745fd4b1b9a57e0e8cd7c13cab8dfd2fd Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期四, 17 十月 2024 19:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/student/edit.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/user/student/edit.vue b/src/views/user/student/edit.vue
index b31d09e..6a94955 100644
--- a/src/views/user/student/edit.vue
+++ b/src/views/user/student/edit.vue
@@ -11,7 +11,7 @@
<el-form-item label="鐧诲綍璐﹀彿锛�" prop="userName" required>
<el-input v-model="form.userName" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" v-if="form.id === null" required>
+ <el-form-item v-if="!form.id" label="鐧诲綍瀵嗙爜锛�" prop="password" required>
<el-input v-model="form.password" show-password autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="骞撮緞锛�">
@@ -51,7 +51,7 @@
data () {
var validatePassword = (rule, value, callback) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ュ瘑鐮�'))
+ callback(new Error('璇疯緭鍏ョ櫥褰曞瘑鐮�'))
} else if (!/[A-Z]/.test(value)) {
callback(new Error('瀵嗙爜蹇呴』鍖呭惈鑷冲皯涓�涓ぇ鍐欏瓧姣�'))
} else if (!/[a-z]/.test(value)) {
@@ -90,7 +90,7 @@
formLoading: false,
rules: {
userName: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰悕', trigger: 'blur' }
+ { required: true, message: '璇疯緭鍏ョ櫥褰曡处鍙�', trigger: 'blur' }
],
realName: [
{ required: true, message: '璇疯緭鍏ョ湡瀹炲鍚�', trigger: 'blur' }
--
Gitblit v1.8.0