|  | @@ -95,19 +95,17 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |              data: {
 | 
	
		
			
				|  |  |                  pageNo: pageNo || 1,
 | 
	
		
			
				|  |  |                  pageSize: this.state.pagination.pageSize,
 | 
	
		
			
				|  |  | -                serialNumber: this.state.serialNumber, //编号
 | 
	
		
			
				|  |  | +               	auditStatus:3,//名称
 | 
	
		
			
				|  |  | +               	serialNumber: this.state.serialNumber, //编号
 | 
	
		
			
				|  |  |                  name: this.state.name,
 | 
	
		
			
				|  |  | -                auditStatus:3,//名称
 | 
	
		
			
				|  |  |                  keyword: this.state.keyword, // 关键词
 | 
	
		
			
				|  |  | -                category: this.state.category, //类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 | 
	
		
			
				|  |  | -                releaseDateStartDate: this.state.releaseDate[0],
 | 
	
		
			
				|  |  | +               	releaseDateStartDate: this.state.releaseDate[0],
 | 
	
		
			
				|  |  |                  releaseDateEndDate: this.state.releaseDate[1],
 | 
	
		
			
				|  |  |                  releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined, //是否发布(0--未发布,1--已发布)
 | 
	
		
			
				|  |  |                  boutique:this.state.boutique,
 | 
	
		
			
				|  |  |                  hot:this.state.hot,
 | 
	
		
			
				|  |  |                  createDateStartDate: this.state.releaseDateS[0],
 | 
	
		
			
				|  |  |                  createDateEndDate: this.state.releaseDateS[1],
 | 
	
		
			
				|  |  | -                ownerType:this.state.ownerType,
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              success: function (data) {
 | 
	
		
			
				|  |  |                  let theArr = [];
 | 
	
	
		
			
				|  | @@ -228,6 +226,10 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                      dataIndex: 'showNumber',
 | 
	
		
			
				|  |  |                      key: 'showNumber',
 | 
	
		
			
				|  |  |                  },  {
 | 
	
		
			
				|  |  | +                    title: '置顶序号',
 | 
	
		
			
				|  |  | +                    dataIndex: 'topNumber',
 | 
	
		
			
				|  |  | +                    key: 'topNumber',
 | 
	
		
			
				|  |  | +                },  {
 | 
	
		
			
				|  |  |                      title: '发布人',
 | 
	
		
			
				|  |  |                      dataIndex: 'publisherName',
 | 
	
		
			
				|  |  |                      key: 'publisherName',
 | 
	
	
		
			
				|  | @@ -406,6 +408,41 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  	//编辑部门,保存
 | 
	
		
			
				|  |  |      edithandleSubmit(e){
 | 
	
		
			
				|  |  |      	e.preventDefault();	
 | 
	
		
			
				|  |  | +    	if(!this.state.editifTop){
 | 
	
		
			
				|  |  | +    		message.warning('请确认是否置顶'); 
 | 
	
		
			
				|  |  | +    		return false;
 | 
	
		
			
				|  |  | +    	}
 | 
	
		
			
				|  |  | +    	let topNumbers=(this.state.edittopNumber==9999999)?undefined:this.state.edittopNumber;
 | 
	
		
			
				|  |  | +    	topNumbers=topNumbers?topNumbers:undefined;
 | 
	
		
			
				|  |  | +    	if(this.state.ifTop==0){
 | 
	
		
			
				|  |  | +    		if(!topNumbers){
 | 
	
		
			
				|  |  | +	    		message.warning('请输入置顶序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +    		}
 | 
	
		
			
				|  |  | +    		let b=this.state.topNumber.split('');
 | 
	
		
			
				|  |  | +			for(var i=0;i<b.length;i++){
 | 
	
		
			
				|  |  | +				if(parseInt(b[i]).toString()=='NaN'){
 | 
	
		
			
				|  |  | +					message.warning('置顶序号请输入数字'); 
 | 
	
		
			
				|  |  | +	    			return false;
 | 
	
		
			
				|  |  | +				};
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +    	}else{
 | 
	
		
			
				|  |  | +    		if(topNumbers){
 | 
	
		
			
				|  |  | +	    		message.warning('请清空置顶序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +    		}
 | 
	
		
			
				|  |  | +    		if(!this.state.editshowNumber){
 | 
	
		
			
				|  |  | +	    		message.warning('请输入展示序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +	    	}
 | 
	
		
			
				|  |  | +    		let b=this.state.showNumber.split('');
 | 
	
		
			
				|  |  | +			for(var i=0;i<b.length;i++){
 | 
	
		
			
				|  |  | +				if(parseInt(b[i]).toString()=='NaN'){
 | 
	
		
			
				|  |  | +					message.warning('展示序号请输入数字'); 
 | 
	
		
			
				|  |  | +	    			return false;
 | 
	
		
			
				|  |  | +				};
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +    	}
 | 
	
		
			
				|  |  |      	//上级组织字典
 | 
	
		
			
				|  |  |          let nameText=this.state.SuperArr;
 | 
	
		
			
				|  |  |          let nameTexts=this.state.SuperArrs;
 | 
	
	
		
			
				|  | @@ -423,7 +460,7 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |                  publishClient:this.state.editpublishClient,//发布客户端
 | 
	
		
			
				|  |  |                  publishPage:superTexts,//发布页面
 | 
	
		
			
				|  |  |                  ifTop:this.state.editifTop,//是否置顶
 | 
	
		
			
				|  |  | -                topNumber:this.state.edittopNumber,//置顶序号
 | 
	
		
			
				|  |  | +                topNumber:topNumbers,//置顶序号
 | 
	
		
			
				|  |  |                  showNumber:this.state.editshowNumber,//展示序号
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }).done(function (data) { 
 | 
	
	
		
			
				|  | @@ -479,23 +516,37 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |      		message.warning('请确认是否置顶'); 
 | 
	
		
			
				|  |  |      		return false;
 | 
	
		
			
				|  |  |      	}
 | 
	
		
			
				|  |  | -    	if(!this.state.topNumber){
 | 
	
		
			
				|  |  | -    		message.warning('请输入置顶序号'); 
 | 
	
		
			
				|  |  | -    		return false;
 | 
	
		
			
				|  |  | -    	}
 | 
	
		
			
				|  |  | -    	if(!this.state.showNumber){
 | 
	
		
			
				|  |  | -    		message.warning('请输入展示序号'); 
 | 
	
		
			
				|  |  | -    		return false;
 | 
	
		
			
				|  |  | +    	if(this.state.ifTop==0){
 | 
	
		
			
				|  |  | +    		if(!this.state.topNumber){
 | 
	
		
			
				|  |  | +	    		message.warning('请输入置顶序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +    		}
 | 
	
		
			
				|  |  | +    		let b=this.state.topNumber.split('');
 | 
	
		
			
				|  |  | +			for(var i=0;i<b.length;i++){
 | 
	
		
			
				|  |  | +				if(parseInt(b[i]).toString()=='NaN'){
 | 
	
		
			
				|  |  | +					message.warning('置顶序号请输入数字'); 
 | 
	
		
			
				|  |  | +	    			return false;
 | 
	
		
			
				|  |  | +				};
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +    	}else{
 | 
	
		
			
				|  |  | +    		if(this.state.topNumber){
 | 
	
		
			
				|  |  | +	    		message.warning('请清空置顶序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +    		}
 | 
	
		
			
				|  |  | +    		if(!this.state.showNumber){
 | 
	
		
			
				|  |  | +	    		message.warning('请输入展示序号'); 
 | 
	
		
			
				|  |  | +	    		return false;
 | 
	
		
			
				|  |  | +	    	}
 | 
	
		
			
				|  |  | +    		let b=this.state.showNumber.split('');
 | 
	
		
			
				|  |  | +			for(var i=0;i<b.length;i++){
 | 
	
		
			
				|  |  | +				if(parseInt(b[i]).toString()=='NaN'){
 | 
	
		
			
				|  |  | +					message.warning('展示序号请输入数字'); 
 | 
	
		
			
				|  |  | +	    			return false;
 | 
	
		
			
				|  |  | +				};
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  |      	}
 | 
	
		
			
				|  |  | -    	if(!this.state.topNumber){
 | 
	
		
			
				|  |  | -    		message.warning('请输入置顶序号'); 
 | 
	
		
			
				|  |  | -    		return false;
 | 
	
		
			
				|  |  | -    	}
 | 
	
		
			
				|  |  | -    	if(!this.state.showNumber){
 | 
	
		
			
				|  |  | -    		message.warning('请输入展示序号'); 
 | 
	
		
			
				|  |  | -    		return false;
 | 
	
		
			
				|  |  | -    	}
 | 
	
		
			
				|  |  | -		this.props.form.validateFields((err, values) => {                                 
 | 
	
		
			
				|  |  | +    	
 | 
	
		
			
				|  |  | +    	this.props.form.validateFields((err, values) => {                                 
 | 
	
		
			
				|  |  |              if (!err) {
 | 
	
		
			
				|  |  |                  this.setState({
 | 
	
		
			
				|  |  |                      loading: true
 | 
	
	
		
			
				|  | @@ -621,6 +672,9 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |      search() {
 | 
	
		
			
				|  |  |          this.loadData();
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    searchs() {
 | 
	
		
			
				|  |  | +        this.loadDatas();
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      //把搜索的部分置零
 | 
	
		
			
				|  |  |      reset() {
 | 
	
		
			
				|  |  |      	this.state.name = undefined;//成果名称清零
 | 
	
	
		
			
				|  | @@ -630,6 +684,21 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |          this.state.ifTop = undefined;//是否置顶清零
 | 
	
		
			
				|  |  |          this.loadData();       
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    resets() {
 | 
	
		
			
				|  |  | +        this.state.serialNumber = undefined;
 | 
	
		
			
				|  |  | +        this.state.name = undefined;
 | 
	
		
			
				|  |  | +        this.state.keyword = undefined;
 | 
	
		
			
				|  |  | +        this.state.category = undefined;
 | 
	
		
			
				|  |  | +        this.state.ownerType = undefined;
 | 
	
		
			
				|  |  | +        this.state.releaseStatus = undefined;
 | 
	
		
			
				|  |  | +        this.state.auditStatus = undefined;
 | 
	
		
			
				|  |  | +        this.state.searchName = undefined;
 | 
	
		
			
				|  |  | +        this.state.releaseDate = [];
 | 
	
		
			
				|  |  | +        this.state.releaseDateS = [];
 | 
	
		
			
				|  |  | +        this.state.boutique = '';
 | 
	
		
			
				|  |  | +        this.state.hot='' ;
 | 
	
		
			
				|  |  | +        this.loadDatas();       
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      searchSwitch() {
 | 
	
		
			
				|  |  |          this.setState({
 | 
	
		
			
				|  |  |              searchMore: !this.state.searchMore
 | 
	
	
		
			
				|  | @@ -803,6 +872,36 @@ const Organization=Form.create()(React.createClass({
 | 
	
		
			
				|  |  |  				                                onChange={(e)=>{this.setState({showNumber:e.target.value})}}/>
 | 
	
		
			
				|  |  |  					                    </FormItem>
 | 
	
		
			
				|  |  |  				                    </div>
 | 
	
		
			
				|  |  | +				                    <div className="user-search">
 | 
	
		
			
				|  |  | +					                    <Input placeholder="编号" style={{"width":"150px","display":"inlineBlock","marginRight":"10px",'marginBottom':"5px"}}
 | 
	
		
			
				|  |  | +					                        value={this.state.serialNumber}
 | 
	
		
			
				|  |  | +					                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
 | 
	
		
			
				|  |  | +					                    <Input placeholder="名称" style={{"width":"150px","display":"inlineBlock","marginRight":"10px"}}
 | 
	
		
			
				|  |  | +					                        value={this.state.name}
 | 
	
		
			
				|  |  | +					                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
 | 
	
		
			
				|  |  | +					                    <Input placeholder="关键字" style={{"width":"150px","display":"inlineBlock","marginRight":"10px"}}
 | 
	
		
			
				|  |  | +					                        value={this.state.keyword}
 | 
	
		
			
				|  |  | +					                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
 | 
	
		
			
				|  |  | +					                   	<span style={{"marginRight":"5px"}}>是否精品 :</span>
 | 
	
		
			
				|  |  | +					                   	<Radio.Group value={this.state.boutique} onChange={(e) => {
 | 
	
		
			
				|  |  | +						                    this.setState({ boutique: e.target.value })
 | 
	
		
			
				|  |  | +						                    }}>
 | 
	
		
			
				|  |  | +						                        <Radio value={1}>精品</Radio>
 | 
	
		
			
				|  |  | +						                        <Radio value={0}>非精品</Radio>
 | 
	
		
			
				|  |  | +						                </Radio.Group>
 | 
	
		
			
				|  |  | +						                <span style={{"marginRight":"5px"}}>发布时间 :</span>
 | 
	
		
			
				|  |  | +						                <RangePicker style={{"marginRight":"150px"}}
 | 
	
		
			
				|  |  | +				                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 | 
	
		
			
				|  |  | +				                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
 | 
	
		
			
				|  |  | +				                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
 | 
	
		
			
				|  |  | +				                         <span style={{'marginRight':'5px'}}>录入时间 :</span>
 | 
	
		
			
				|  |  | +				                        <RangePicker  style={{"display":"inlineBlock",'marginRight':'10px'}}
 | 
	
		
			
				|  |  | +				                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
 | 
	
		
			
				|  |  | +				                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
 | 
	
		
			
				|  |  | +				                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
 | 
	
		
			
				|  |  | +				                    	<Button type="primary" onClick={this.searchs} style={{"display":"inlineBlock",'marginRight':'10px'}}>搜索</Button>
 | 
	
		
			
				|  |  | +					                    <Button onClick={this.resets} style={{"display":"inlineBlock"}}>重置</Button>
 | 
	
		
			
				|  |  | +				                    </div>
 | 
	
		
			
				|  |  |  				                    <div className="patent-table">
 | 
	
		
			
				|  |  |  					                    <Spin spinning={this.state.loading}>
 | 
	
		
			
				|  |  |  					                        <Table columns={this.state.column}
 |