|
@@ -18,7 +18,6 @@ const PicturesWall = React.createClass({
|
|
|
role:[],
|
|
|
district:[],
|
|
|
cityOption:[],
|
|
|
- kkt:false
|
|
|
}
|
|
|
},
|
|
|
handleCancel() {
|
|
@@ -76,6 +75,11 @@ const Newuser = Form.create()(React.createClass({
|
|
|
role:[]
|
|
|
};
|
|
|
},
|
|
|
+ getDefaultProps(){
|
|
|
+ return{
|
|
|
+ userDetaile:false
|
|
|
+ }
|
|
|
+ },
|
|
|
handleSubmit(e) {
|
|
|
e.preventDefault();
|
|
|
if(!this.state.role){
|
|
@@ -295,11 +299,13 @@ const Newuser = Form.create()(React.createClass({
|
|
|
this.state.cityOption=cityArrs;
|
|
|
},
|
|
|
|
|
|
- componentWillReceiveProps(nextProps) {
|
|
|
- this.state.visible = nextProps.showDesc;
|
|
|
- this.state.Detaile=nextProps.userDetaile;
|
|
|
+ componentWillReceiveProps(nextProps) {
|
|
|
if(nextProps.userDetaile&&nextProps.datauser.id){
|
|
|
this.loaduser(nextProps.datauser)
|
|
|
+ console.log(nextProps.role)
|
|
|
+ this.setState({
|
|
|
+ rolek:nextProps.role
|
|
|
+ })
|
|
|
}else{
|
|
|
this.state.name='';
|
|
|
this.state.role=[];
|
|
@@ -314,8 +320,10 @@ const Newuser = Form.create()(React.createClass({
|
|
|
this.state.district=[];
|
|
|
this.state.orgCodeUrl=[];
|
|
|
this.state.id='';
|
|
|
+ this.state.rolek=[];
|
|
|
}
|
|
|
-
|
|
|
+ this.state.visible = nextProps.showDesc;
|
|
|
+
|
|
|
},
|
|
|
render() {
|
|
|
const FormItem = Form.Item
|
|
@@ -329,7 +337,7 @@ const Newuser = Form.create()(React.createClass({
|
|
|
)
|
|
|
const departmentArr=this.props.departmentArr || [];
|
|
|
const roleArrS=this.props.roleArr || [];
|
|
|
- const rolst=this.props.role || [];
|
|
|
+ const rolst=this.state.rolek || [];
|
|
|
return (
|
|
|
<div>
|
|
|
<Modal maskClosable={false} visible={this.state.visible}
|
|
@@ -367,10 +375,10 @@ const Newuser = Form.create()(React.createClass({
|
|
|
placeholder="选择用户角色"
|
|
|
value={this.state.role}
|
|
|
style={{width:'200px'}}
|
|
|
- onChange={(e)=>{this.setState({role:e,kkt:true})}} >
|
|
|
+ onChange={(e)=>{this.setState({role:e})}} >
|
|
|
{
|
|
|
roleArrS.map(function (item) {
|
|
|
- return <Select.Option key={item.id} >{item.roleName}</Select.Option>
|
|
|
+ return <Select.Option key={item.id} >{item.roleName}</Select.Option>
|
|
|
})
|
|
|
}
|
|
|
</Select>
|