|
@@ -33,6 +33,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
|
|
|
orderNo:this.state.orderNoSearch,//订单编号
|
|
|
deleteSign:this.state.deleteSignSearch,//锁定激活
|
|
|
+ serialNumber:this.state.serialNumberSearch //项目编号
|
|
|
},
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
@@ -57,6 +58,8 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
orderStatus:thisdata.orderStatus,
|
|
|
liquidationStatus:thisdata.liquidationStatus,
|
|
|
approval:thisdata.approval,
|
|
|
+ buyerType:thisdata.buyerType,
|
|
|
+ salesmanName:thisdata.salesmanName
|
|
|
});
|
|
|
};
|
|
|
this.state.pagination.current = data.data.pageNo;
|
|
@@ -108,7 +111,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
}
|
|
|
},
|
|
|
columns: [
|
|
|
- {
|
|
|
+ {
|
|
|
title: '项目编号',
|
|
|
dataIndex: 'serialNumber',
|
|
|
key: 'serialNumber'
|
|
@@ -120,8 +123,12 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'buyerName',
|
|
|
key: 'buyerName'
|
|
|
- },
|
|
|
- {
|
|
|
+ },{
|
|
|
+ title: '客户类型',
|
|
|
+ dataIndex: 'buyerProvince',
|
|
|
+ key: 'buyerProvince',
|
|
|
+ render:(text)=>{return text?'单位客户':'个人客户'}
|
|
|
+ },{
|
|
|
title: '项目类型',
|
|
|
dataIndex: 'projectType',
|
|
|
key: 'projectType',
|
|
@@ -131,7 +138,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
dataIndex: 'projectStatus',
|
|
|
key: 'projectStatus',
|
|
|
render:(text)=>{return getProjectState(text) }
|
|
|
- }, {
|
|
|
+ },{
|
|
|
title: '订单编号',
|
|
|
dataIndex: 'orderNo',
|
|
|
key: 'orderNo',
|
|
@@ -145,6 +152,10 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
key: 'orderStatus',
|
|
|
render:(text)=>{return getOrderState(text) }
|
|
|
},{
|
|
|
+ title: '订单负责人',
|
|
|
+ dataIndex: 'salesmanName',
|
|
|
+ key: 'salesmanName',
|
|
|
+ },{
|
|
|
title: '结算状态',
|
|
|
dataIndex: 'liquidationStatus',
|
|
|
key: 'liquidationStatus',
|
|
@@ -171,6 +182,63 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
}
|
|
|
}
|
|
|
],
|
|
|
+ queryColumns: [
|
|
|
+ {
|
|
|
+ title: '项目编号',
|
|
|
+ dataIndex: 'serialNumber',
|
|
|
+ key: 'serialNumber'
|
|
|
+ },{
|
|
|
+ title: '立项时间',
|
|
|
+ dataIndex: 'signDate',
|
|
|
+ key: 'signDate'
|
|
|
+ },{
|
|
|
+ title: '客户名称',
|
|
|
+ dataIndex: 'buyerName',
|
|
|
+ key: 'buyerName'
|
|
|
+ },{
|
|
|
+ title: '客户类型',
|
|
|
+ dataIndex: 'buyerType',
|
|
|
+ key: 'buyerType',
|
|
|
+ render:(text)=>{return text?'单位客户':'个人客户'}
|
|
|
+ },{
|
|
|
+ title: '项目类型',
|
|
|
+ dataIndex: 'projectType',
|
|
|
+ key: 'projectType',
|
|
|
+ render:(text)=>{return getOrderType(text) }
|
|
|
+ },{
|
|
|
+ title: '项目状态',
|
|
|
+ dataIndex: 'projectStatus',
|
|
|
+ key: 'projectStatus',
|
|
|
+ render:(text)=>{return getProjectState(text) }
|
|
|
+ },{
|
|
|
+ title: '订单编号',
|
|
|
+ dataIndex: 'orderNo',
|
|
|
+ key: 'orderNo',
|
|
|
+ },{
|
|
|
+ title: '下单时间',
|
|
|
+ dataIndex: 'orderTime',
|
|
|
+ key: 'orderTime',
|
|
|
+ },{
|
|
|
+ title: '订单状态',
|
|
|
+ dataIndex: 'orderStatus',
|
|
|
+ key: 'orderStatus',
|
|
|
+ render:(text)=>{return getOrderState(text) }
|
|
|
+ },{
|
|
|
+ title: '订单负责人',
|
|
|
+ dataIndex: 'salesmanName',
|
|
|
+ key: 'salesmanName',
|
|
|
+ },{
|
|
|
+ title: '结算状态',
|
|
|
+ dataIndex: 'liquidationStatus',
|
|
|
+ key: 'liquidationStatus',
|
|
|
+ render:(text)=>{return getPaymentState(text) }
|
|
|
+ },{
|
|
|
+ title: '是否特批',
|
|
|
+ dataIndex: 'approval',
|
|
|
+ key: 'approval',
|
|
|
+ render:(text)=>{return getApprovedState(text) }
|
|
|
+ }
|
|
|
+ ],
|
|
|
dataSource: [],
|
|
|
};
|
|
|
},
|
|
@@ -339,6 +407,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
},
|
|
|
reset() {
|
|
|
this.state.buyerNameSearch='';
|
|
|
+ this.state.serialNumberSearch='';
|
|
|
this.state.releaseDate[0] = undefined;
|
|
|
this.state.releaseDate[1] = undefined;
|
|
|
this.state.releaseDateOrder[0] = undefined;
|
|
@@ -376,7 +445,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
return (
|
|
|
<div className="user-content" >
|
|
|
<div className="content-title">
|
|
|
- <span style={{fontSize:'16px'}}>项目管理</span>
|
|
|
+ <span style={{fontSize:'16px'}}>{this.props.queryProject?'项目查询':'项目管理'}</span>
|
|
|
<div className="user-search">
|
|
|
<Input placeholder="客户名称" style={{width:'150px'}}
|
|
|
value={this.state.buyerNameSearch}
|
|
@@ -389,13 +458,16 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
<Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
|
|
|
<Button onClick={this.reset}>重置</Button>
|
|
|
<span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
|
|
|
- <Button type="primary" className="addButton" onClick={this.addClick} >创建项目<Icon type="plus" /></Button>
|
|
|
+ {this.props.queryProject?'':<Button type="primary" className="addButton" onClick={this.addClick} >创建项目<Icon type="plus" /></Button>}
|
|
|
</div>
|
|
|
<div className='clearfix' style={{marginTop:'5px'}}>
|
|
|
<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
|
|
|
<Input placeholder="订单编号" style={{width:'150px',marginRight:'10px'}}
|
|
|
value={this.state.orderNoSearch}
|
|
|
onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
|
|
|
+ <Input placeholder="项目编号" style={{width:'150px',marginRight:'10px'}}
|
|
|
+ value={this.state.serialNumberSearch}
|
|
|
+ onChange={(e) => { this.setState({ serialNumberSearch: e.target.value }); }} />
|
|
|
<Select placeholder="选择部门" style={{width:'150px'}}
|
|
|
value={this.state.departmentt}
|
|
|
onChange={(e) => { this.setState({ departmentt: e }) }}>
|
|
@@ -417,7 +489,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
</div>
|
|
|
<div className="patent-table">
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
- <Table columns={this.state.columns}
|
|
|
+ <Table columns={this.props.queryProject?this.state.queryColumns:this.state.columns}
|
|
|
dataSource={this.state.dataSource}
|
|
|
rowSelection={rowSelection}
|
|
|
pagination={this.state.pagination}
|
|
@@ -426,6 +498,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
</Spin>
|
|
|
</div>
|
|
|
<MySettlementDetaile
|
|
|
+ queryProject={this.props.queryProject}
|
|
|
departmentArr={this.state.departmentArr}
|
|
|
projectState={this.state.projectState}
|
|
|
newProject={this.state.newProject}
|