|
@@ -24,9 +24,9 @@
|
|
|
:replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
|
|
:replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
|
|
|
/>
|
|
/>
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
- <a-form-model-item label="职工职务" prop="roles">
|
|
|
|
|
|
|
+ <a-form-model-item label="职工职务" prop="roleIds">
|
|
|
<sys-list-select-tag
|
|
<sys-list-select-tag
|
|
|
- v-model="model.roles"
|
|
|
|
|
|
|
+ v-model="model.roleIds"
|
|
|
mode="multiple"
|
|
mode="multiple"
|
|
|
dict-code="role"
|
|
dict-code="role"
|
|
|
/>
|
|
/>
|
|
@@ -44,7 +44,7 @@
|
|
|
<a-input v-model="model.email" />
|
|
<a-input v-model="model.email" />
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="出生日期">
|
|
<a-form-model-item label="出生日期">
|
|
|
- <a-date-picker style="width: 100%" v-model="model.birthday" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择"/>
|
|
|
|
|
|
|
+ <a-date-picker v-model="model.birthday" style="width: 100%" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" />
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="性别">
|
|
<a-form-model-item label="性别">
|
|
|
<j-dict-select-tag
|
|
<j-dict-select-tag
|
|
@@ -76,16 +76,18 @@ export default {
|
|
|
isCheck: false,
|
|
isCheck: false,
|
|
|
model: {},
|
|
model: {},
|
|
|
validatorRules: {
|
|
validatorRules: {
|
|
|
|
|
+ userName: [{ required: true, message: '请输入' }],
|
|
|
realName: [{ required: true, message: '请输入' }],
|
|
realName: [{ required: true, message: '请输入' }],
|
|
|
deptId: [{ required: true, message: '请选择' }],
|
|
deptId: [{ required: true, message: '请选择' }],
|
|
|
nickName: [{ required: true, message: '请选择' }],
|
|
nickName: [{ required: true, message: '请选择' }],
|
|
|
- roles: [{ required: true, message: '请选择' }],
|
|
|
|
|
|
|
+ roleIds: [{ required: true, message: '请选择' }],
|
|
|
phone: [{ required: true, message: '请输入' }]
|
|
phone: [{ required: true, message: '请输入' }]
|
|
|
},
|
|
},
|
|
|
url: {
|
|
url: {
|
|
|
add: '/system/user',
|
|
add: '/system/user',
|
|
|
edit: '/system/user',
|
|
edit: '/system/user',
|
|
|
- tree: '/system/dept/treeSelect'
|
|
|
|
|
|
|
+ tree: '/system/dept/treeSelect',
|
|
|
|
|
+ roleIds: '/system/user/authRole/'
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -109,6 +111,7 @@ export default {
|
|
|
this.model = Object.assign({}, record)
|
|
this.model = Object.assign({}, record)
|
|
|
this.visible = true
|
|
this.visible = true
|
|
|
this.loadTree()
|
|
this.loadTree()
|
|
|
|
|
+ this.getRoleIds()
|
|
|
},
|
|
},
|
|
|
close(isSubmit) {
|
|
close(isSubmit) {
|
|
|
if (isSubmit) {
|
|
if (isSubmit) {
|
|
@@ -144,6 +147,14 @@ export default {
|
|
|
console.log(res)
|
|
console.log(res)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ },
|
|
|
|
|
+ getRoleIds() {
|
|
|
|
|
+ getAction(this.url.roleIds + this.model.userId).then((res) => {
|
|
|
|
|
+ if (res.code === 200) {
|
|
|
|
|
+ this.model.roleIds = res.user.roleIds
|
|
|
|
|
+ debugger
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|