|
@@ -86,6 +86,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
pageNo: pageNo || 1,
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
|
name: this.state.nameSearch,
|
|
|
+ dataGrade: this.state.dataGrade,
|
|
|
province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
|
|
|
city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
|
|
|
startDate: this.state.releaseDate[0],
|
|
@@ -143,7 +144,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
url: globalConfig.context + "/api/admin/achievement/listUserAchievement",
|
|
|
data: {
|
|
|
pageNo: pageNo || 1,
|
|
|
- pageSize: this.state.pagination.pageSize,
|
|
|
+ pageSize: this.state.paginationDate.pageSize,
|
|
|
uid:this.state.uid,
|
|
|
},
|
|
|
success: function (data) {
|
|
@@ -178,12 +179,12 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
remark:thisdata.remark
|
|
|
});
|
|
|
};
|
|
|
- this.state.pagination.current = data.data.pageNo;
|
|
|
- this.state.pagination.total = data.data.totalCount;
|
|
|
+ this.state.paginationDate.current = data.data.pageNo;
|
|
|
+ this.state.paginationDate.total = data.data.totalCount;
|
|
|
};
|
|
|
this.setState({
|
|
|
dataSourceDate: theArr,
|
|
|
- pagination: this.state.pagination
|
|
|
+ paginationDate: this.state.paginationDate
|
|
|
});
|
|
|
}.bind(this),
|
|
|
}).always(function () {
|
|
@@ -282,10 +283,6 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
dataIndex: 'category',
|
|
|
key: 'category',
|
|
|
render: text => { return getAchievementCategory(text); }
|
|
|
- }, {
|
|
|
- title: '录入人',
|
|
|
- dataIndex: 'techBrokerId',
|
|
|
- key: 'techBrokerId',
|
|
|
},{
|
|
|
title: '审核状态',
|
|
|
dataIndex: 'auditStatus',
|
|
@@ -353,6 +350,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
reset() {
|
|
|
this.state.nameSearch = '';
|
|
|
this.state.addressSearch = [];
|
|
|
+ this.state.dataGrade=undefined;
|
|
|
this.state.provinceSearch = undefined;
|
|
|
this.state.citySearch = undefined;
|
|
|
this.state.releaseDate[0] = undefined;
|
|
@@ -423,6 +421,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
informationMaintainerName:thisDetail.informationMaintainerName,//资料维护人
|
|
|
coreTechnology:thisDetail.coreTechnology,//核心技术
|
|
|
accomplishSituation:thisDetail.accomplishSituation,//客户已完成项目情况
|
|
|
+ creditRating:thisDetail.creditRating,//信用等级
|
|
|
});
|
|
|
}}.bind(this),
|
|
|
}).always(function() {
|
|
@@ -454,6 +453,10 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
message.warning('请填写公司主营产品');
|
|
|
return false;
|
|
|
};
|
|
|
+ if(!this.state.intellectualProperty) {
|
|
|
+ message.warning('请填写已有知识产权情况');
|
|
|
+ return false;
|
|
|
+ };
|
|
|
var reg = /^[1-9]\d*$|^0$/;
|
|
|
if(this.state.consultationPrice) {
|
|
|
if(this.state.consultationPrice.length > 6) {
|
|
@@ -544,6 +547,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
informationMaintainerName:this.state.informationMaintainerName,//资料维护人
|
|
|
coreTechnology:this.state.coreTechnology,//核心技术
|
|
|
accomplishSituation:this.state.accomplishSituation,//客户已完成项目情况
|
|
|
+ creditRating:this.state.creditRating,//信用等级
|
|
|
}
|
|
|
}).done(function(data) {
|
|
|
this.setState({
|
|
@@ -714,7 +718,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
closeDesc(e, s) {
|
|
|
this.state.showDesc = e;
|
|
|
if (s) {
|
|
|
- this.loadData();
|
|
|
+ this.loadDatas();
|
|
|
};
|
|
|
},
|
|
|
tableRowClickDate(record, index) {
|
|
@@ -776,6 +780,12 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
<Cascader options={citySelect()} value={this.state.addressSearch} placeholder="选择城市"
|
|
|
onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />
|
|
|
</span>
|
|
|
+ <Select placeholder="选择资料质量" style={{ width: 120 }}
|
|
|
+ value={this.state.dataGrade}
|
|
|
+ onChange={(e) => { this.setState({ dataGrade: e }) }}>
|
|
|
+ <Select.Option value="0" >有效资料</Select.Option>
|
|
|
+ <Select.Option value="1" >优质资料</Select.Option>
|
|
|
+ </Select>
|
|
|
<RangePicker style={{marginRight:'10px'}}
|
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|
|
|
this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
|
|
@@ -893,6 +903,16 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
<span style={{color:'red',marginLeft:'5px'}}>*</span>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
+ <div className='clearfix'>
|
|
|
+ <FormItem
|
|
|
+ labelCol={{ span:4 }}
|
|
|
+ wrapperCol={{ span: 20 }}
|
|
|
+ label="已有知识产权情况" >
|
|
|
+ <Input type="textarea" rows={2} value={this.state.intellectualProperty} style={{width:'95%'}}
|
|
|
+ onChange={(e,pre) => { this.setState({ intellectualProperty: e.target.value })}}/>
|
|
|
+ <span style={{color:'red',marginLeft:'5px'}}>*</span>
|
|
|
+ </FormItem>
|
|
|
+ </div>
|
|
|
<FormItem className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label="通信地址"
|
|
@@ -980,15 +1000,7 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
onChange={(e,pre) => { this.setState({ introduction: e.target.value })}}/>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- <div className='clearfix'>
|
|
|
- <FormItem
|
|
|
- labelCol={{ span:4 }}
|
|
|
- wrapperCol={{ span: 18 }}
|
|
|
- label="已有知识产权情况" >
|
|
|
- <Input type="textarea" rows={3} value={this.state.intellectualProperty}
|
|
|
- onChange={(e,pre) => { this.setState({ intellectualProperty: e.target.value })}}/>
|
|
|
- </FormItem>
|
|
|
- </div>
|
|
|
+
|
|
|
<div className="clearfix pictures">
|
|
|
<FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'95px'}}
|
|
|
labelCol={{ span: 8 }}
|
|
@@ -1036,8 +1048,8 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
{...formItemLayout}
|
|
|
label="客户信用等级"
|
|
|
>
|
|
|
- <Select placeholder="客户信用等级" value={this.state.societyTag}
|
|
|
- onChange={(e)=>{this.setState({societyTag:e})}}>
|
|
|
+ <Select placeholder="客户信用等级" value={this.state.creditRating}
|
|
|
+ onChange={(e)=>{this.setState({creditRating:e})}}>
|
|
|
{
|
|
|
slcRedit.map(function (item) {
|
|
|
return <Select.Option key={item.value} >{item.key}</Select.Option>
|
|
@@ -1108,7 +1120,10 @@ const IntentionCustomer = Form.create()(React.createClass({
|
|
|
achievementCategoryOption={this.state.achievementCategoryOption}
|
|
|
showDesc={this.state.showDesc}
|
|
|
uid={this.state.uid}
|
|
|
- closeDesc={this.closeDesc} />
|
|
|
+ closeDesc={this.closeDesc}
|
|
|
+ loadDatas={this.loadDatas}
|
|
|
+ />
|
|
|
+
|
|
|
</div >
|
|
|
|
|
|
);
|