From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/components/system/user/OperaUserWindow.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/admin/src/components/system/user/OperaUserWindow.vue b/admin/src/components/system/user/OperaUserWindow.vue
index 87277d0..920d27a 100644
--- a/admin/src/components/system/user/OperaUserWindow.vue
+++ b/admin/src/components/system/user/OperaUserWindow.vue
@@ -4,12 +4,13 @@
:title="title"
:visible.sync="visible"
:confirm-working="isWorking"
+ width="600px"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules">
- <!-- <el-form-item label="鐢ㄦ埛鍚�" prop="username" required>
- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ敤鎴峰悕" v-trim maxlength="50"/>
- </el-form-item> -->
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�">
+ <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>
<el-input v-model="form.realname" placeholder="璇疯緭鍏ュ鍚�" v-trim maxlength="50"/>
</el-form-item>
@@ -34,10 +35,10 @@
<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="departmentId">
+ <!-- <el-form-item label="鎵�灞為儴闂�" prop="departmentId">
<DepartmentSelect v-model="form.departmentId" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�灞為儴闂�" :inline="false" clearable/>
- </el-form-item>
- <div v-if="!form.id" style="color: red">鏂板缓鐢ㄦ埛鐨勯粯璁ゅ瘑鐮佷负鎵嬫満鍙峰悗鍏綅</div>
+ </el-form-item> -->
+ <div v-if="!form.id" style="color: red">鏂板缓鐢ㄦ埛鐨勯粯璁ゅ瘑鐮佽鏌ョ湅鏁版嵁瀛楀吀閰嶇疆</div>
<!-- <el-form-item label="宀椾綅" prop="positionId">
<PositionSelect v-model="form.positionIds" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�鍦ㄥ矖浣�" :inline="false" :multiple="true" clearable/>
</el-form-item>
@@ -69,7 +70,7 @@
// 琛ㄥ崟鏁版嵁
form: {
id: null,
- // username: '', // 鐢ㄦ埛鍚�
+ username: '', // 鐢ㄦ埛鍚�
realname: '', // 濮撳悕
empNo: '', // 宸ュ彿
// departmentId: null, // 鎵�灞為儴闂↖D
@@ -83,9 +84,9 @@
},
// 楠岃瘉瑙勫垯
rules: {
- // username: [
- // { required: true, message: '璇疯緭鍏ョ敤鎴峰悕' }
- // ],
+ username: [
+ { required: true, message: '璇疯緭鍏ョ敤鎴峰悕' }
+ ],
realname: [
{ required: true, message: '璇疯緭鍏ュ鍚�' }
],
@@ -102,7 +103,7 @@
// { required: true, message: '璇烽�夋嫨鐢ㄦ埛鎬у埆' }
// ],
mobile: [
- { required: true, validator: checkMobile }
+ { required: false, validator: checkMobile }
],
// email: [
// { validator: checkEmail }
--
Gitblit v1.9.3