|
@@ -37,9 +37,20 @@
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
<a-row :gutter="20">
|
|
|
- <a-col :span="24">
|
|
|
- <a-form-model-item label="用户账号" prop="loginName" :label-col="{span: 3}" :wrapper-col="{span: 20}">
|
|
|
- <a-input id="userEdit-loginName" v-model.trim="form.loginName":maxLength="50" allowClear placeholder="请输入用户账号(最多50个字符)"/>
|
|
|
+ <a-col :span="12">
|
|
|
+ <a-form-model-item label="用户账号" prop="loginName">
|
|
|
+ <a-input id="userEdit-loginName" v-model.trim="form.loginName" :maxLength="50" allowClear placeholder="请输入用户账号(最多50个字符)"/>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="12">
|
|
|
+ <a-form-model-item label="账号密码" prop="password">
|
|
|
+ <a-input
|
|
|
+ id="userEdit-password"
|
|
|
+ v-model.trim="form.password"
|
|
|
+ :maxLength="50"
|
|
|
+ :minLength="6"
|
|
|
+ allowClear
|
|
|
+ placeholder="请输入账号密码(6-50个字符)"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -131,6 +142,7 @@ export default {
|
|
|
name: '', // 用户名称
|
|
|
phone: '', // 手机号码
|
|
|
loginName: '', // 用户账号
|
|
|
+ password: undefined, // 账号密码
|
|
|
sex: undefined, // 性别
|
|
|
loginFlag: '', // 状态
|
|
|
roleNames: undefined, // 角色
|
|
@@ -140,6 +152,7 @@ export default {
|
|
|
name: [ { required: true, message: '请输入用户名称', trigger: 'blur' }, { pattern: '^[^<|>]{1,30}$', message: '请输入不含<或>的字符,最多30个字符' } ],
|
|
|
phone: [ { required: true, message: '请输入手机号码', trigger: 'blur' }, { pattern: /^[1][0-9]{10}$/, message: '请输入正确的手机号码!' } ],
|
|
|
loginName: [ { required: true, message: '请输入用户账号', trigger: 'blur' }, { pattern: /^[0-9A-Za-z]+$/, message: '用户账号为数字或大小写字母组成!' } ],
|
|
|
+ password: [ { message: '请输入账号密码', trigger: 'blur' }, { pattern: '^[^<|>]{6,50}$', message: '请输入不含<或>的字符,6-50个字符' } ],
|
|
|
sex: [ { required: true, message: '请选择性别', trigger: 'change' } ],
|
|
|
loginFlag: [ { required: true, message: '请选择状态', trigger: 'change' } ],
|
|
|
roleNames: [ { required: true, message: '请选择角色', trigger: 'change' } ]
|
|
@@ -204,6 +217,7 @@ export default {
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
this.form.name = ''
|
|
|
this.form.phone = ''
|
|
|
+ this.form.password = undefined
|
|
|
this.form.loginName = ''
|
|
|
this.form.sex = undefined
|
|
|
this.form.loginFlag = ''
|