|
@@ -81,7 +81,7 @@
|
|
<a-col :span="24">
|
|
<a-col :span="24">
|
|
<a-form-model-item label="角色" prop="roleNames" :label-col="{span: 3}" :wrapper-col="{span: 20}">
|
|
<a-form-model-item label="角色" prop="roleNames" :label-col="{span: 3}" :wrapper-col="{span: 20}">
|
|
<a-select placeholder="请选择角色" id="userSyncEdit-roleNames" allowClear v-model="form.roleNames" mode="multiple">
|
|
<a-select placeholder="请选择角色" id="userSyncEdit-roleNames" allowClear v-model="form.roleNames" mode="multiple">
|
|
- <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
|
|
|
|
|
|
+ <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="!item.isEnable">{{ item.name }}</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
@@ -150,7 +150,7 @@ export default {
|
|
password: [ { required: true, message: '请输入用户密码', trigger: 'blur' }, { pattern: /^[0-9A-Za-z]{6,16}$/, message: '用户密码为6到16位数字或大小写字母组成!' } ],
|
|
password: [ { required: true, message: '请输入用户密码', trigger: 'blur' }, { pattern: /^[0-9A-Za-z]{6,16}$/, message: '用户密码为6到16位数字或大小写字母组成!' } ],
|
|
sex: [ { required: true, message: '请选择性别', trigger: 'change' } ],
|
|
sex: [ { required: true, message: '请选择性别', trigger: 'change' } ],
|
|
loginFlag: [ { required: true, message: '请选择状态', trigger: 'change' } ],
|
|
loginFlag: [ { required: true, message: '请选择状态', trigger: 'change' } ],
|
|
- roleNames: [ { required: true, message: '请选择角色', trigger: 'change' } ]
|
|
|
|
|
|
+ roleNames: [ { required: true, type: 'array', message: '请选择角色', trigger: 'change' } ]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -226,6 +226,7 @@ export default {
|
|
if (this.isshow && newValue) {
|
|
if (this.isshow && newValue) {
|
|
if (this.nowData.id) { // 编辑
|
|
if (this.nowData.id) { // 编辑
|
|
this.titleText = '编辑用户'
|
|
this.titleText = '编辑用户'
|
|
|
|
+ console.log(this.nowData)
|
|
this.form = Object.assign({}, this.nowData)
|
|
this.form = Object.assign({}, this.nowData)
|
|
if (this.nowData.roleIds) {
|
|
if (this.nowData.roleIds) {
|
|
this.form.roleNames = this.nowData.roleIds.split(',')
|
|
this.form.roleNames = this.nowData.roleIds.split(',')
|