|
@@ -33,7 +33,8 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
|
|
financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
|
|
orderNo:this.state.orderNoSearch,//订单编号
|
|
orderNo:this.state.orderNoSearch,//订单编号
|
|
deletedSign:this.state.deleteSignSearch,//锁定激活
|
|
deletedSign:this.state.deleteSignSearch,//锁定激活
|
|
- serialNumber:this.state.serialNumberSearch //项目编号
|
|
|
|
|
|
+ serialNumber:this.state.serialNumberSearch,//项目编号
|
|
|
|
+ principalName:this.state.principalNameSearch
|
|
},
|
|
},
|
|
success: function (data) {
|
|
success: function (data) {
|
|
let theArr = [];
|
|
let theArr = [];
|
|
@@ -61,6 +62,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
buyerType:thisdata.buyerType,
|
|
buyerType:thisdata.buyerType,
|
|
salesmanName:thisdata.salesmanName,
|
|
salesmanName:thisdata.salesmanName,
|
|
departmentName:thisdata.departmentName,
|
|
departmentName:thisdata.departmentName,
|
|
|
|
+ principalName:thisdata.principalName
|
|
});
|
|
});
|
|
};
|
|
};
|
|
this.state.pagination.current = data.data.pageNo;
|
|
this.state.pagination.current = data.data.pageNo;
|
|
@@ -157,6 +159,10 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
dataIndex: 'salesmanName',
|
|
dataIndex: 'salesmanName',
|
|
key: 'salesmanName',
|
|
key: 'salesmanName',
|
|
},{
|
|
},{
|
|
|
|
+ title: '项目负责人',
|
|
|
|
+ dataIndex: 'principalName',
|
|
|
|
+ key: 'principalName',
|
|
|
|
+ },{
|
|
title: '订单部门',
|
|
title: '订单部门',
|
|
dataIndex: 'departmentName',
|
|
dataIndex: 'departmentName',
|
|
key: 'departmentName',
|
|
key: 'departmentName',
|
|
@@ -209,7 +215,6 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
title: '业务品类',
|
|
title: '业务品类',
|
|
dataIndex: 'projectType',
|
|
dataIndex: 'projectType',
|
|
key: 'projectType',
|
|
key: 'projectType',
|
|
- render:(text)=>{return getOrderType(text) }
|
|
|
|
},{
|
|
},{
|
|
title: '项目状态',
|
|
title: '项目状态',
|
|
dataIndex: 'projectStatus',
|
|
dataIndex: 'projectStatus',
|
|
@@ -233,6 +238,10 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
dataIndex: 'salesmanName',
|
|
dataIndex: 'salesmanName',
|
|
key: 'salesmanName',
|
|
key: 'salesmanName',
|
|
},{
|
|
},{
|
|
|
|
+ title: '项目负责人',
|
|
|
|
+ dataIndex: 'principalName',
|
|
|
|
+ key: 'principalName',
|
|
|
|
+ },{
|
|
title: '订单部门',
|
|
title: '订单部门',
|
|
dataIndex: 'departmentName',
|
|
dataIndex: 'departmentName',
|
|
key: 'departmentName',
|
|
key: 'departmentName',
|
|
@@ -458,6 +467,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
reset() {
|
|
reset() {
|
|
this.state.buyerNameSearch='';
|
|
this.state.buyerNameSearch='';
|
|
this.state.serialNumberSearch='';
|
|
this.state.serialNumberSearch='';
|
|
|
|
+ this.state.principalNameSearch='';
|
|
this.state.releaseDate[0] = undefined;
|
|
this.state.releaseDate[0] = undefined;
|
|
this.state.releaseDate[1] = undefined;
|
|
this.state.releaseDate[1] = undefined;
|
|
this.state.releaseDateOrder[0] = undefined;
|
|
this.state.releaseDateOrder[0] = undefined;
|
|
@@ -500,6 +510,9 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
<Input placeholder="客户名称" style={{width:'150px'}}
|
|
<Input placeholder="客户名称" style={{width:'150px'}}
|
|
value={this.state.buyerNameSearch}
|
|
value={this.state.buyerNameSearch}
|
|
onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
|
|
|
|
+ <Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
|
|
|
|
+ value={this.state.principalNameSearch}
|
|
|
|
+ onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} />
|
|
<span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>
|
|
<span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>
|
|
<RangePicker
|
|
<RangePicker
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|