|
@@ -14,9 +14,6 @@ const Organization=Form.create()(React.createClass({
|
|
|
loading: true,
|
|
|
ispage:pageNo,
|
|
|
});
|
|
|
- let nameText=this.state.SuperArr;
|
|
|
- let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].name:"";
|
|
|
-
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
@@ -26,7 +23,7 @@ const Organization=Form.create()(React.createClass({
|
|
|
pageNo: pageNo || 1,
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
|
name: this.state.name, //组织名称
|
|
|
- superId:superText,//上级组织
|
|
|
+ superId:this.state.superId,//上级组织
|
|
|
type:this.state.type,//组织类型
|
|
|
depNo:this.state.depNo,//组织编号
|
|
|
},
|
|
@@ -45,8 +42,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
depNo:thisdata.depNo,//组织编号
|
|
|
name:thisdata.name,//组织名称
|
|
|
type:thisdata.type,//组织类型
|
|
|
- managerId:thisdata.managerId,//负责人
|
|
|
- superId:thisdata.superId,//上级组织
|
|
|
+ managerId:thisdata.managerName,//负责人
|
|
|
+ superId:thisdata.superName,//上级组织
|
|
|
status:thisdata.status,//组织状态
|
|
|
});
|
|
|
};
|
|
@@ -145,7 +142,7 @@ const Organization=Form.create()(React.createClass({
|
|
|
for(var i=0;i<data.data.length;i++){
|
|
|
let theData = data.data[i];
|
|
|
theArr.push(
|
|
|
- <Select.Option value={i.toString()} key={theData.name}>{theData.name}</Select.Option>
|
|
|
+ <Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
|
|
|
);
|
|
|
};
|
|
|
this.setState({
|
|
@@ -175,7 +172,6 @@ const Organization=Form.create()(React.createClass({
|
|
|
if(isStatus==1){
|
|
|
if(confirm('是否要解散该部门?')){
|
|
|
if(!(superOne==superText)){
|
|
|
- let changeSuper=nameText[parseInt(this.state.editSuperId)].name;
|
|
|
if(confirm('上级组织已修改,是否保存?')){
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
@@ -185,8 +181,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
data:{
|
|
|
name:this.state.editName,//组织名称
|
|
|
type:this.state.editType, //组织类型
|
|
|
- managerId:this.state.managerIdOrganization,//负责人ID
|
|
|
- superId:changeSuper,//上级组织
|
|
|
+ managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
|
|
|
+ superId:this.state.editSuperId,//上级组织
|
|
|
status:this.state.editStatus,//组织状态
|
|
|
remarks:remarksText,//组织职能说明
|
|
|
id:this.state.editId,//组织ID
|
|
@@ -214,8 +210,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
data:{
|
|
|
name:this.state.editName,//组织名称
|
|
|
type:this.state.editType, //组织类型
|
|
|
- managerId:this.state.managerIdOrganization,//负责人ID
|
|
|
- superId:superText,//上级组织
|
|
|
+ managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
|
|
|
+ superId:this.state.editSuperId,//上级组织
|
|
|
status:this.state.editStatus,//组织状态
|
|
|
remarks:remarksText,//组织职能说明
|
|
|
id:this.state.editId,//组织ID
|
|
@@ -236,7 +232,6 @@ const Organization=Form.create()(React.createClass({
|
|
|
}
|
|
|
}else{
|
|
|
if(!(superOne==superText)){
|
|
|
- let changeSuper=nameText[parseInt(this.state.editSuperId)].name;
|
|
|
if(confirm('上级组织已修改,是否保存?')){
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
@@ -246,8 +241,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
data:{
|
|
|
name:this.state.editName,//组织名称
|
|
|
type:this.state.editType, //组织类型
|
|
|
- managerId:this.state.managerIdOrganization,//负责人ID
|
|
|
- superId:changeSuper,//上级组织
|
|
|
+ managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
|
|
|
+ superId:this.state.editSuperId,//上级组织
|
|
|
status:this.state.editStatus,//组织状态
|
|
|
remarks:remarksText,//组织职能说明
|
|
|
id:this.state.editId,//组织ID
|
|
@@ -275,8 +270,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
data:{
|
|
|
name:this.state.editName,//组织名称
|
|
|
type:this.state.editType, //组织类型
|
|
|
- managerId:this.state.managerIdOrganization,//负责人ID
|
|
|
- superId:superText,//上级组织
|
|
|
+ managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
|
|
|
+ superId:this.state.editSuperId,//上级组织
|
|
|
status:this.state.editStatus,//组织状态
|
|
|
remarks:remarksText,//组织职能说明
|
|
|
id:this.state.editId,//组织ID
|
|
@@ -338,7 +333,8 @@ const Organization=Form.create()(React.createClass({
|
|
|
this.setState({
|
|
|
editId: thisdata.id,//每一条记录的ID
|
|
|
editName:thisdata.name,//组织名称
|
|
|
- managerIdOrganization:thisdata.managerId,//负责人
|
|
|
+ managerIdOrganization:thisdata.managerName,//负责人名字
|
|
|
+ managerIdOrganizationId:thisdata.managerId,//负责人idmanagerName
|
|
|
editType:thisdata.type,//组织类型
|
|
|
editStatus:thisdata.status,//组织状态
|
|
|
editSuperId:thisdata.superId,//上级组织
|
|
@@ -349,7 +345,10 @@ const Organization=Form.create()(React.createClass({
|
|
|
editDataSource: theArr,
|
|
|
});
|
|
|
}.bind(this),
|
|
|
- }).always(function () {
|
|
|
+ }).always(function (data) {
|
|
|
+ if (data.error.length) {
|
|
|
+ message.warn(data.error[0].message);
|
|
|
+ };
|
|
|
this.setState({
|
|
|
loading: false
|
|
|
});
|
|
@@ -408,9 +407,6 @@ const Organization=Form.create()(React.createClass({
|
|
|
this.setState({
|
|
|
loading: true
|
|
|
});
|
|
|
- //上级组织字典
|
|
|
- let nameText=this.state.SuperArr
|
|
|
- let superText=nameText[parseInt(this.state.upOrganization)].name
|
|
|
$.ajax({
|
|
|
method: "post",
|
|
|
dataType: "json",
|
|
@@ -420,7 +416,7 @@ const Organization=Form.create()(React.createClass({
|
|
|
name:this.state.nameOrganization,//组织名称
|
|
|
managerId:this.state.theTypes,//负责人ID
|
|
|
type:this.state.typeOrganization, //组织类型
|
|
|
- superId:superText,//上级组织
|
|
|
+ superId:this.state.upOrganization,//上级组织
|
|
|
remarks:this.state.remarksOrganization,//组织职能说明
|
|
|
}
|
|
|
}).done(function (data) {
|
|
@@ -472,21 +468,22 @@ const Organization=Form.create()(React.createClass({
|
|
|
this.setState({
|
|
|
managerIdOrganization:value
|
|
|
})
|
|
|
+ let theType='';
|
|
|
+ let contactLists=this.state.customerArr||[];
|
|
|
+ if (value) {
|
|
|
+ contactLists.map(function (item) {
|
|
|
+ if (item.name == value.toString()) {
|
|
|
+ theType = item.id;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ this.setState({
|
|
|
+ theTypes:theType
|
|
|
+ })
|
|
|
},
|
|
|
//失去焦点时
|
|
|
blurChange(e){
|
|
|
-// let theType='';
|
|
|
-// let contactLists=this.state.customerArr||[];
|
|
|
-// if (e) {
|
|
|
-// contactLists.map(function (item) {
|
|
|
-// if (item.name == e.toString()) {
|
|
|
-// theType = item.id;
|
|
|
-// }
|
|
|
-// });
|
|
|
-// }
|
|
|
- this.setState({
|
|
|
- theTypes:e
|
|
|
- })
|
|
|
+
|
|
|
},
|
|
|
//值改变时请求客户名称
|
|
|
httpChange(e){
|
|
@@ -498,6 +495,7 @@ const Organization=Form.create()(React.createClass({
|
|
|
})
|
|
|
},
|
|
|
addClick() {
|
|
|
+ this.state.theTypes='';
|
|
|
this.state.nameOrganization='';//组织名称清零
|
|
|
this.state.managerIdOrganization= '';//负责人ID清零
|
|
|
this.state.typeOrganization= undefined; //组织类型清零
|
|
@@ -679,8 +677,11 @@ const Organization=Form.create()(React.createClass({
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="上级组织"
|
|
|
>
|
|
|
- <Select placeholder="请选择上级组织" value={this.state.upOrganization} onChange={(e)=>{this.setState({upOrganization:e})}}
|
|
|
- notFoundContent="未获取到上级组织列表" style={{width:'95%'}} required="required">
|
|
|
+ <Select placeholder="请选择上级组织"
|
|
|
+ value={this.state.upOrganization}
|
|
|
+ onChange={(e)=>{this.setState({upOrganization:e})}}
|
|
|
+ notFoundContent="未获取到上级组织列表"
|
|
|
+ style={{width:'95%'}} required="required">
|
|
|
{this.state.contactsOption}
|
|
|
</Select>
|
|
|
<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
|
|
@@ -785,7 +786,9 @@ const Organization=Form.create()(React.createClass({
|
|
|
wrapperCol={{ span: 12 }}
|
|
|
label="上级组织"
|
|
|
>
|
|
|
- <Select placeholder="请选择上级组织" value={this.state.editSuperId} onChange={(e)=>{this.setState({editSuperId:e})}}
|
|
|
+ <Select placeholder="请选择上级组织"
|
|
|
+ value={this.state.editSuperId}
|
|
|
+ onChange={(e)=>{this.setState({editSuperId:e})}}
|
|
|
notFoundContent="未获取到上级组织列表">
|
|
|
{this.state.contactsOption}
|
|
|
</Select>
|