dengzhiguo il y a 7 ans
Parent
commit
becda2f046
38 fichiers modifiés avec 2429 ajouts et 430 suppressions
  1. 36 0
      js/component/dataDic.js
  2. 11 0
      js/component/manageCenter/achievement/content.jsx
  3. 63 0
      js/component/manageCenter/achievement/content.less
  4. 3 2
      js/component/manageCenter/achievement/myTechAchievement.jsx
  5. 941 0
      js/component/manageCenter/achievement/releaseResults.jsx
  6. 3 2
      js/component/manageCenter/achievement/techAchievement.jsx
  7. 3 3
      js/component/manageCenter/achievement/techAchievementAudit/auditDesc.jsx
  8. 35 37
      js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx
  9. 2 3
      js/component/manageCenter/achievement/techAchievementDesc.jsx
  10. 0 35
      js/component/manageCenter/achievement/techAchievementQuery.jsx
  11. 39 43
      js/component/manageCenter/achievement/techAchievementRelease/techAchievementAudit.jsx
  12. 11 25
      js/component/manageCenter/customer/customerData/myClient.jsx
  13. 7 6
      js/component/manageCenter/customer/customerManagement/expertManage.jsx
  14. 9 33
      js/component/manageCenter/customer/customerManagement/organizationManages.jsx
  15. 23 8
      js/component/manageCenter/customer/customerManagement/personalManages.jsx
  16. 9 34
      js/component/manageCenter/customer/customerManagement/publicManages.jsx
  17. 7 32
      js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx
  18. 7 6
      js/component/manageCenter/customer/customerService/businessManges.jsx
  19. 7 6
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  20. 11 24
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  21. 3 2
      js/component/manageCenter/customer/release/expertRelease.jsx
  22. 5 4
      js/component/manageCenter/customer/reviewed/enteringAudit.jsx
  23. 4 4
      js/component/manageCenter/customer/reviewed/expertReview.jsx
  24. 14 6
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  25. 9 4
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  26. 12 1
      js/component/manageCenter/demand/content.jsx
  27. 63 0
      js/component/manageCenter/demand/content.less
  28. 2 3
      js/component/manageCenter/demand/demandAudit/demandAuditDesc.jsx
  29. 37 40
      js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx
  30. 36 38
      js/component/manageCenter/demand/demandRelease/techDemandRelease.jsx
  31. 933 0
      js/component/manageCenter/demand/releaseDemand.jsx
  32. 3 2
      js/component/manageCenter/demand/techDemand.jsx
  33. 11 5
      js/component/manageCenter/idea/policy/inquiry.jsx
  34. 12 6
      js/component/manageCenter/idea/policy/manage.jsx
  35. 6 6
      js/component/manageCenter/idea/policy/techPolicyAudits.jsx
  36. 6 6
      js/component/manageCenter/idea/policy/techPolicyPublishs.jsx
  37. 2 1
      js/component/manageCenter/set/organization/organization.jsx
  38. 44 3
      js/component/tools.js

+ 36 - 0
js/component/dataDic.js

@@ -823,6 +823,22 @@ module.exports = {
             key: "审核未通过"
         }
     ],
+    //需求和成果审核状态
+    auditStatusLists:[
+        {
+            value: "0",
+            key: "未提交审核(草稿)"
+        }, {
+            value: "1",
+            key: "审核中"
+        }, {
+            value: "2",
+            key: "审核通过"
+        }, {
+            value: "3",
+            key: "审核未通过"
+        }
+    ],
     //成熟度
     maturityList:[
         {
@@ -1766,6 +1782,26 @@ module.exports = {
 	        key: "二级菜单"
 	    }
     ],
+    //客户端
+    client:[
+	    {
+	        value: "0",
+	        key: "网站"
+	    }, {
+	        value: "1",
+	        key: "APP"
+	    }
+    ],
+     //是否置顶
+    stick:[
+	    {
+	        value: "0",
+	        key: "置顶"
+	    }, {
+	        value: "1",
+	        key: "不置顶"
+	    }
+    ],
     actives:[
 		    {value:'客户管理',key:'myClient'},
 			{value:'科技服务项目',key:'services'},

+ 11 - 0
js/component/manageCenter/achievement/content.jsx

@@ -115,6 +115,17 @@ class Content extends Component {
                         detailApiUrl: '/api/admin/achievement/userDetail'
                     });
                 });
+                break; 
+             //发布新
+            case 'releaseResults':
+                require.ensure([], () => {
+                    const ReleaseResults = require('./releaseResults').default;
+                    this.setState({
+                        component: ReleaseResults,
+                        listApiUrl: '/api/admin/achievement/userList',
+                        detailApiUrl: '/api/admin/achievement/userDetail'
+                    });
+                });
                 break;    
             default:
             require.ensure([], () => {

+ 63 - 0
js/component/manageCenter/achievement/content.less

@@ -0,0 +1,63 @@
+.set-content {
+    background: #fff;
+    padding: 20px;
+    .set-title {
+        >span {
+            font-size: 16px;
+            color: #333;
+        }
+        >button {
+            float: right;
+            margin-right: 20px;
+        }
+    }
+    .member-table {
+        margin-top: 20px;
+    }
+    .set-search {
+        >input {
+            width: 120px;
+        }
+        >* {
+            margin-right: 10px;
+            margin-top: 10px;
+        }
+    }
+}
+
+.ant-modal-body {
+    .modal-content {
+        >.list {
+            margin-bottom: 20px;
+            float: left;
+            width: 50%;
+            >span {
+                margin-right: 20px;
+                display: inline-block;
+                width: 60px;
+                text-align: right;
+            }
+            >input {
+                width: 200px;
+            }
+            .modal-det {
+                width: 200px;
+                text-align: left;
+            }
+        }
+    }
+    .modal-text {
+        margin-right: 20px;
+        display: inline-block;
+        width: 60px;
+        text-align: right;
+    }
+}
+.user-content{
+    padding: 15px;
+    background: #ffffff;
+}
+thead>tr>.ant-table-selection-column>span .ant-checkbox-inner{display:none;}
+.half-item{    float: left;
+    width: 50%;
+    margin-bottom: 10px;}

+ 3 - 2
js/component/manageCenter/achievement/myTechAchievement.jsx

@@ -17,7 +17,8 @@ const AchievementList = React.createClass({
       	return false;
       }
          this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -248,7 +249,7 @@ const AchievementList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     addClick() {

+ 941 - 0
js/component/manageCenter/achievement/releaseResults.jsx

@@ -0,0 +1,941 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import './content.less';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete } from 'antd';
+import {patternOrganization,conditionOrganization,client,stick} from '../../dataDic.js';
+import {getPattern,getAchievementCategory,getboutique,getClient,getStick} from '../../tools.js';
+
+const Organization=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            loading: true,
+            ispage:pageNo,
+        });
+        let nameText=this.state.SuperArr;
+        let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].id:undefined;
+        let nameTexts=this.state.SuperArrs;
+        let superTexts=(this.state.publishPage)?nameTexts[parseInt(this.state.publishPage)].id:undefined;
+       	$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/achievement/listPublish',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                name: this.state.name, //成果名称
+                publishPlatform:superText,//发布子平台
+                publishClient:this.state.publishClient,//发布客户端
+                publishPage:superTexts,//发布页面
+                ifTop:this.state.ifTop,//是否置顶
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: i,
+                            id: thisdata.id,//发布成果ID
+                            achievementId:thisdata.achievementId,//成果ID
+                            publishPlatform:thisdata.publishPlatform,//发布子平台ID
+                            platformName:thisdata.platformName,//发布子平台ID
+                            publishClient:thisdata.publishClient.toString(),//发布客户端
+                            publishPage:thisdata.publishPage,//发布页面
+                            publishPageName:thisdata.publishPageName,//发布页面
+                            ifTop:thisdata.ifTop.toString(),//是否置顶
+                            topNumber:thisdata.topNumber,//置顶编号
+                            showNumber:thisdata.showNumber,//显示编号
+                            publisher:thisdata.publisher,//发布人ID
+                            publishTime:thisdata.publishTime,//发布时间
+                            serialNumber:thisdata.serialNumber,//成果编号
+                            name:thisdata.name,//成果名称
+                            userName:thisdata.userName,//成果所有人
+                            publisherName:thisdata.publisherName,//发布人名称
+                            publishTimeFormattedDate:thisdata.publishTimeFormattedDate,//发布时间
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                this.setState({
+                    dataSource: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+       
+    },
+    loadDatas(pageNo, apiUrl) {
+        this.state.data = [];
+      if(this.state.serialNumber&&isNaN(this.state.serialNumber)){
+     	message.warning('请输入正确的编号格式');
+      	return false;
+      }
+         this.setState({
+            loading: true,
+            ispage:pageNo,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/achievement/orgList',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                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],
+                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 = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: thisdata.id,
+                            id: thisdata.id,
+                            serialNumber: thisdata.serialNumber,
+                            dataCategory: thisdata.dataCategory,
+                            name: thisdata.name,
+                            keyword: thisdata.keyword,
+                            theName: thisdata.username || thisdata.ownerName,
+                            category: thisdata.category,
+                            ownerName: thisdata.username ? thisdata.username : thisdata.ownerName,
+                            ownerType: thisdata.ownerType,
+                            ownerMobile: thisdata.ownerMobile,
+                            status: thisdata.status,
+                            releaseDate: thisdata.releaseDate,
+                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
+                            auditStatus: thisdata.auditStatus,
+                            boutique: thisdata.boutique,
+                            hot: thisdata.hot,
+                            releaseStatus: thisdata.releaseStatus,
+                            techBrokerId:thisdata.techBrokerId,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
+                            remark:thisdata.remark,
+                            ispage:pageNo,
+                        });
+                    };
+                    this.state.paginations.current = data.data.pageNo;
+                    this.state.paginations.total = data.data.totalCount;
+                };
+                this.setState({
+                    dataSourcesli: theArr,
+                    paginations: this.state.paginations
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false,
+                visible: true
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+            searchMore: true,
+            selectedRowKeys: [],
+            selectedRowKeysli:[],
+            selectedRows: [],
+            releaseDate: [],
+            releaseDateS: [],
+            loading: false,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            paginations: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadDatas(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '成果编号',
+                    dataIndex: 'serialNumber',
+                    key: 'serialNumber',
+                }, {
+                    title: '成果名称',
+                    dataIndex: 'name',
+                    key: 'name',
+                }, {
+                    title: '客户名称',
+                    dataIndex: 'userName',
+                    key: 'userName',
+                }, {
+                    title: '发布子平台',
+                    dataIndex: 'platformName',
+                    key: 'platformName',
+                },{
+                    title: '发布客户端',
+                    dataIndex: 'publishClient',
+                    key: 'publishClient',
+                    render: text => { return getClient(text) }
+                },  {
+                    title: '发布页面',
+                    dataIndex: 'publishPageName',
+                    key: 'publishPageName',
+                },{
+                    title: '是否置顶',
+                    dataIndex: 'ifTop',
+                    key: 'ifTop',
+                    render: text => { return getStick(text) }
+                  
+                },  {
+                    title: '展示序号',
+                    dataIndex: 'showNumber',
+                    key: 'showNumber',
+                },  {
+                    title: '发布人',
+                    dataIndex: 'publisherName',
+                    key: 'publisherName',
+                },  {
+                    title: '发布时间',
+                    dataIndex: 'publishTimeFormattedDate',
+                    key: 'publishTimeFormattedDate',
+                }, {
+                    title: '操作',
+                    dataIndex: 'ee',
+                    key: 'ee',
+                    render: (text, record, index) => {
+                    	return <div>
+							<Popconfirm title={'请确认撤销发布成果【'+record.name+'】'} onConfirm={(e)=>{this.examine(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">撤销发布</Button>                 
+							</Popconfirm>
+                        </div>
+					}
+                }
+            ],
+            dataSource: [],
+            searchTime: [,],
+            column: [
+                {
+                    title: '编号',
+                    dataIndex: 'serialNumber',
+                    key: 'serialNumber',
+                }, {
+                    title: '名称',
+                    dataIndex: 'name',
+                    key: 'name',
+                }, {
+                    title: '关键字',
+                    dataIndex: 'keyword',
+                    key: 'keyword',
+                }, {
+                    title: '类型',
+                    dataIndex: 'category',
+                    key: 'category',
+                    render: text => { return getAchievementCategory(text); }
+                }, {
+                    title: '录入人',
+                    dataIndex: 'techBrokerId',
+                    key: 'techBrokerId',
+                },
+                {
+                    title: '是否精品',
+                    dataIndex: 'boutique',
+                    key: 'boutique',
+                    render: text => { return getboutique(text) }
+                },
+                {
+                    title: '发布时间',
+                    dataIndex: 'releaseDateFormattedDate',
+                    key: 'releaseDateFormattedDate',
+                },{
+                    title: '录入时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
+                }
+            ],
+            dataSourcesli: [],
+            searchTime: [,]
+        };
+    },
+    componentWillMount() {
+    	this.selectSuperIds();
+    	
+    },
+    examine(record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/achievement/deletePublish',
+            data: {
+                id:record.id,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData(this.state.ispage);
+        }.bind(this));
+    },
+    //获取发布子平台
+    selectSuperId() {  
+    	this.state.data = []
+         $.ajax({
+                method: "get",
+                dataType: "json",
+                crossDomain: false,
+                url: globalConfig.context + "/api/admin/achievement/getBranchInformation",
+                data:{
+                  
+                },
+                success: function (data) {                	  
+                		let theArr = [];
+					    let thedata=data.data;
+					    if (!thedata) {
+		                    if (data.error && data.error.length) {
+		                        message.warning(data.error[0].message);
+		                    };	
+		                    thedata = {}; 
+		              };   
+					    var contactIds=[];
+				        for(var i=0;i<data.data.length;i++){
+	                    	let theData = data.data[i];
+		                    theArr.push(
+		                        <Select.Option value={i.toString()} key={theData.platformName}>{theData.platformName}</Select.Option>
+		                    );
+		                };
+						this.setState({	
+							SuperArr:thedata,
+		                    contactsOption: theArr, 
+		                    orderStatusOptions:data.data,
+	                    });
+	                    
+					}.bind(this),
+				}).always(function () {
+				this.loadData();
+	            this.setState({
+	                loading: false
+	            });
+	        }.bind(this));
+	},
+	//获取发布页面
+    selectSuperIds() {  
+    	this.state.data = []
+         $.ajax({
+                method: "get",
+                dataType: "json",
+                crossDomain: false,
+                url: globalConfig.context + "/api/admin/achievement/getPublishPage",
+                data:{
+                  
+                },
+                success: function (data) {                	  
+                		let theArr = [];
+					    let thedata=data.data;
+					    if (!thedata) {
+		                    if (data.error && data.error.length) {
+		                        message.warning(data.error[0].message);
+		                    };	
+		                    thedata = {}; 
+		              };   
+					    var contactIds=[];
+				        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>
+		                    );
+		                };
+						this.setState({	
+							SuperArrs:thedata,
+		                    contactsOptions: theArr, 
+		                    orderStatusOptions:data.data,
+	                    });
+	                    
+					}.bind(this),
+				}).always(function () {
+				this.selectSuperId();
+	            this.setState({
+	                loading: false
+	            });
+	        }.bind(this));
+	},
+	//编辑部门,保存
+    edithandleSubmit(e){
+    	e.preventDefault();	
+    	//上级组织字典
+        let nameText=this.state.SuperArr;
+        let nameTexts=this.state.SuperArrs;
+        let superText=(parseInt(this.state.editpublishPlatform).toString()=='NaN')?undefined:nameText[parseInt(this.state.editpublishPlatform)].id;
+        let superTexts=(parseInt(this.state.editpublishPage).toString()=='NaN')?undefined:nameTexts[parseInt(this.state.editpublishPage)].id;
+    	$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url:globalConfig.context + '/api/admin/achievement/updatePublish',
+            data:{
+            	id:this.state.editid,//成果发布ID
+            	achievementId:this.state.editachievementId, //成果ID
+            	publishPlatform:superText,//发布平台
+                publishClient:this.state.editpublishClient,//发布客户端
+                publishPage:superTexts,//发布页面
+                ifTop:this.state.editifTop,//是否置顶
+                topNumber:this.state.edittopNumber,//置顶序号
+                showNumber:this.state.editshowNumber,//展示序号
+            }
+        }).done(function (data) { 
+            this.setState({
+                loading: false
+            });
+            if (!data.error.length) {
+                message.success('保存成功!'); 
+                this.edithandleCancel();
+                this.selectSuperId();
+            } else {
+                message.warning(data.error[0].message);
+            }
+        }.bind(this));
+    },  
+	//整行点击
+    tableRowClick(record, index) {
+    	this.selectSuperIds();
+    	this.state.RowData = record; 
+        this.setState({
+        	editvisible: true,
+        	selectedRowKeys:[],
+        	editid:record.id,
+        	editachievementId:record.achievementId,
+        	editpublishPlatform:record.platformName,
+        	editpublishClient:record.publishClient,
+        	editpublishPage:record.publishPageName,
+        	editifTop:record.ifTop,
+        	edittopNumber:record.topNumber,
+        	editshowNumber:record.showNumber,
+        	editserialNumber:record.serialNumber,
+        	editname:record.name,
+        	edituserName:record.userName,
+        })    
+    },
+    
+    //新增一个部门,保存
+    addhandleSubmit(e){
+    	e.preventDefault();	
+    	if(!this.state.publishPlatform){
+    		message.warning('请选择发布子平台');
+    		return false;
+    	}
+    	if(!this.state.publishClient){
+    		message.warning('请选择发布客户端');
+    		return false;
+    	}
+    	if(!this.state.publishPage){
+    		message.warning('请选择发布页面'); 
+    		return false;
+    	}
+    	if(!this.state.ifTop){
+    		message.warning('请确认是否置顶'); 
+    		return false;
+    	}
+    	if(!this.state.topNumber){
+    		message.warning('请输入置顶序号'); 
+    		return false;
+    	}
+    	if(!this.state.showNumber){
+    		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) => {                                 
+            if (!err) {
+                this.setState({
+                    loading: true
+                }); 
+                //上级组织字典
+                let nameText=this.state.SuperArr;
+        		let superText=nameText[parseInt(this.state.publishPlatform)].id;
+        		let nameTexts=this.state.SuperArrs;
+        		let superTexts=nameTexts[parseInt(this.state.publishPage)].id;
+       			$.ajax({
+                    method: "post",
+                    dataType: "json",
+                    crossDomain: false,
+                    url:globalConfig.context + '/api/admin/achievement/addAchievementPublish',
+                    data:{
+                    	achievementId:this.state.selectedRowKeysli?this.state.selectedRowKeysli.join(","):undefined,//成果ID
+                    	publishPlatform:superText,//发布平台
+                    	publishClient:this.state.publishClient,//发布客户端
+                        publishPage:superTexts, //发布页面
+                        ifTop:this.state.ifTop,//是否置顶
+                        topNumber:this.state.topNumber,//置顶序号
+                        showNumber:this.state.showNumber,//展示序号
+                    }
+                }).done(function (data) { 
+                    this.setState({
+                        loading: false
+                    });
+                    if (!data.error.length) {
+                        message.success('保存成功!'); 
+                        this.handleCancel();
+                        this.selectSuperId();
+                    } else {
+                        message.warning(data.error[0].message);
+                    }
+                }.bind(this));
+            }
+        });
+    },
+    
+    //主管初始加载(自动补全)
+	supervisor(e){ 
+		$.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectName",
+            data:{
+            	name:e
+            },
+            success: function (data) {                	  
+				       let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+              }; 
+					this.setState({
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//上级主管输入框失去焦点是判断客户是否存在
+	selectAuto(value,options){
+		this.setState({
+			managerIdOrganization:value
+		})
+	},
+	//失去焦点时
+	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){
+		if(e.length>=2){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			managerIdOrganization:e
+		})
+	},
+    addClick() {
+    	this.state.name = undefined;//成果名称清零
+        this.state.publishPlatform = undefined;//发布子平台清零
+        this.state.publishClient = undefined;//发布客户端清零
+        this.state.publishPage = undefined;//发布页面清零
+        this.state.ifTop = undefined;//是否置顶清零
+        this.state.topNumber = undefined;//置顶序号清零
+        this.state.showNumber = undefined;//展示序号清零
+        this.state.selectedRowKeysli=undefined;//选定的成果ID清零
+        this.state.RowData = {};
+        this.selectSuperId();
+        this.loadDatas();
+    },
+    editClick() {
+        this.state.RowData = {};
+        this.setState({
+            editvisible: true
+        });
+    },
+   	handleCancel() {
+        this.setState({ visible: false })
+    },
+    edithandleCancel() {
+        this.setState({ editvisible: false })
+    },
+    search() {
+        this.loadData();
+    },
+    //把搜索的部分置零
+    reset() {
+    	this.state.name = undefined;//成果名称清零
+        this.state.superId = undefined;//发布子平台清零
+        this.state.publishClient = undefined;//发布客户端清零
+        this.state.publishPage = undefined;//发布页面清零
+        this.state.ifTop = undefined;//是否置顶清零
+        this.loadData();       
+    },
+    searchSwitch() {
+        this.setState({
+            searchMore: !this.state.searchMore
+        });
+    },
+    render() {
+    	const FormItem = Form.Item
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1)
+                });
+            },
+            onSelect: (recordt, selected, selectedRows) => {			   
+			    this.setState({
+			    	recordt:recordt.id
+			    })
+			},
+        };
+         const rowSelections = {
+            selectedRowKeysli: this.state.selectedRowKeysli,
+            onChange: (selectedRowKeysli, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows,
+                    selectedRowKeysli: selectedRowKeysli
+                });
+            },
+            onSelect: (recordt, selected, selectedRows) => {
+			    this.setState({
+			    	recordt:recordt.id
+			    })
+			},
+        };
+        const formItemLayout = {
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+        };
+       	const { getFieldDecorator } = this.props.form;
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        const { RangePicker } = DatePicker;
+        const dataSources=this.state.customerArr || [];
+        const options = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+	                <div className="user-search">
+	                    <Input placeholder="成果名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
+	                        value={this.state.name}
+	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+	                    <Select placeholder="发布子平台"
+                            style={{ width:'200px',marginRight:'10px' }}
+                            value={this.state.superId}
+                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+                            {this.state.contactsOption}
+		                </Select>
+		                <Select placeholder="发布客户端"
+                            style={{width:'150px',marginRight:'20px'}}
+                            value={this.state.publishClient}
+                            onChange={(e) => { this.setState({ publishClient: e }) }}>
+                            <Select.Option value="0" >网站</Select.Option>
+                            <Select.Option value="1" >APP</Select.Option>
+		                </Select>
+	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
+                        <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+	                    <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
+	                    	<Select placeholder="发布页面"
+	                            style={{ width:'200px',marginRight:'10px' }}
+	                            value={this.state.publishPage}
+	                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
+	                            {this.state.contactsOptions}
+			                </Select>
+			                <Select placeholder="是否置顶"
+	                            style={{width:'150px',marginRight:'50px'}}
+	                            value={this.state.ifTop}
+	                            onChange={(e) => { this.setState({ ifTop: e }) }}>
+	                            <Select.Option value="0" >置顶</Select.Option>
+	                            <Select.Option value="1" >不置顶</Select.Option>
+			                </Select>
+		                </div>
+	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布成果<Icon type="plus" /></Button>
+	                </div>
+	                <div className="patent-table">
+	                    <Spin spinning={this.state.loading}>
+	                        <Table columns={this.state.columns}
+	                            dataSource={this.state.dataSource}
+	                            rowSelection={rowSelection}
+	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick} />
+	                    </Spin>
+	                </div>
+	             
+	                 <div className="patent-desc">
+	                    <Modal maskClosable={false} visible={this.state.visible}
+	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
+	                        width='1200px'
+	                        title='发布成果'                       
+	                        footer=''
+	                        className="admin-desc-content">
+	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
+				                <Spin spinning={this.state.loading}>
+				                    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布子平台"
+			                               > 
+			                              <Select placeholder="请选择子平台" value={this.state.publishPlatform} onChange={(e)=>{this.setState({publishPlatform:e})}}
+				                                notFoundContent="未获取到子平台">
+				                                {this.state.contactsOption}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="发布客户端"
+				                         > 
+					                          <Select placeholder="选择客户端" value={this.state.publishClient} 
+				                                onChange={(e)=>{this.setState({publishClient:e})}}> 
+				                                {
+				                                    client.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+		                   		    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布页面位置"
+			                               > 
+			                              <Select placeholder="请选择页面位置" value={this.state.publishPage} onChange={(e)=>{this.setState({publishPage:e})}}
+				                                notFoundContent="未获取到页面位置">
+				                                {this.state.contactsOptions}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="是否置顶"
+				                         > 
+					                          <Select placeholder="选择是否置顶" value={this.state.ifTop} 
+				                                onChange={(e)=>{this.setState({ifTop:e})}}> 
+				                                {
+				                                    stick.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="置顶序号" >
+				                    	     <Input placeholder="请输入置顶序号" value={this.state.topNumber} 
+				                                onChange={(e)=>{this.setState({topNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12}}
+					                            label="展示序号" >
+					                             <Input placeholder="请输入展示序号" value={this.state.showNumber} 
+				                                onChange={(e)=>{this.setState({showNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    </div>
+				                    <div className="patent-table">
+					                    <Spin spinning={this.state.loading}>
+					                        <Table columns={this.state.column}
+					                            dataSource={this.state.dataSourcesli}
+					                            rowSelection={rowSelections}
+					                            pagination={this.state.paginations}
+					                             />
+					                    </Spin>
+					                </div>
+				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'100px'}}>取消</Button>
+				                    </FormItem> 
+				                </Spin>
+				            </Form >
+	                    </Modal>
+                	</div>
+                	<div className="patent-desc">
+	                    <Modal maskClosable={false} visible={this.state.editvisible}
+	                        onOk={this.checkPatentProcess} onCancel={this.edithandleCancel}
+	                        width='900px'
+	                        title='编辑发布'                       
+	                        footer=''
+	                        className="admin-desc-content">
+	                         <Form horizontal onSubmit={this.edithandleSubmit} id="edit-form">
+				                <Spin spinning={this.state.loading}>
+				                	<div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布子平台"
+			                               > 
+			                              <Select placeholder="请选择子平台" value={this.state.editpublishPlatform} onChange={(e)=>{this.setState({editpublishPlatform:e})}}
+				                                notFoundContent="未获取到子平台">
+				                                {this.state.contactsOption}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="发布客户端"
+				                         > 
+					                          <Select placeholder="选择客户端" value={this.state.editpublishClient} 
+				                                onChange={(e)=>{this.setState({editpublishClient:e})}}> 
+				                                {
+				                                    client.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+		                   		    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布页面位置"
+			                               > 
+			                              <Select placeholder="请选择页面位置" value={this.state.editpublishPage} onChange={(e)=>{this.setState({editpublishPage:e})}}
+				                                notFoundContent="未获取到页面位置">
+				                                {this.state.contactsOptions}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="是否置顶"
+				                         > 
+					                          <Select placeholder="选择是否置顶" value={this.state.editifTop} 
+				                                onChange={(e)=>{this.setState({editifTop:e})}}> 
+				                                {
+				                                    stick.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 6 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="置顶序号" >
+				                    	     <Input placeholder="请输入置顶序号" value={this.state.edittopNumber} 
+				                                onChange={(e)=>{this.setState({edittopNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 6 }}
+					                        	wrapperCol={{ span: 12}}
+					                            label="展示序号" >
+					                             <Input placeholder="请输入展示序号" value={this.state.editshowNumber} 
+				                                onChange={(e)=>{this.setState({editshowNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+						                    labelCol={{ span: 6 }}
+						                    wrapperCol={{ span: 12 }}
+						                    label="成果编号"
+					                        >
+					                        <span>{this.state.editserialNumber}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+						                    labelCol={{ span: 6 }}
+						                    wrapperCol={{ span: 12 }}
+						                    label="客户名称"
+					                        >
+					                        <span>{this.state.edituserName}</span>
+					                    </FormItem>
+					               		
+					                </div>
+					                <div className="clearfix">
+				                    	<FormItem 
+						                    labelCol={{ span: 3 }}
+						                    wrapperCol={{ span: 18 }}
+						                    label="成果名称"
+					                        >
+					                        <span>{this.state.editname}</span>
+					                    </FormItem>
+					                </div>
+		                   		    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                   		<Button className="set-submit" type="ghost" onClick={this.edithandleCancel} style={{marginLeft:'100px'}}>取消</Button>
+				                    </FormItem> 
+				                </Spin>
+				            </Form >
+	                    </Modal>
+                	 </div>
+                	 
+            	</div>
+            </div>
+        );
+    }
+}));
+
+export default Organization;

+ 3 - 2
js/component/manageCenter/achievement/techAchievement.jsx

@@ -17,7 +17,8 @@ const AchievementList = React.createClass({
       	return false;
       }
          this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -248,7 +249,7 @@ const AchievementList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     addClick() {

+ 3 - 3
js/component/manageCenter/achievement/techAchievementAudit/auditDesc.jsx

@@ -151,7 +151,8 @@ const AchievementDetailShow = Form.create()(React.createClass({
         this.setState({
             loading: true
         });
-      
+      	console.log(ownerType);
+      	console.log(this.props.data.ownerType);
         $.ajax({
             method: "get",
             dataType: "json",
@@ -344,8 +345,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
     	this.loadData(this.props.data.id, this.props.detailApiUrl,this.props.data.ownerType);
     },
     componentWillReceiveProps(nextProps) {
-    	console.log(nextProps)
-        if (!this.props.visible && nextProps.visible) {
+    	if (!this.props.visible && nextProps.visible) {
             this.loadData(nextProps.data.id, nextProps.detailApiUrl,nextProps.data.ownerType);
             this.state.textFileList = [];
             this.state.techPlanFileList = [];

+ 35 - 37
js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx

@@ -16,7 +16,8 @@ const AchievementList = React.createClass({
       	return false;
       }
          this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -208,38 +209,38 @@ const AchievementList = React.createClass({
         	});
         }
     },
-    delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
-        this.setState({
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/achievement/delete",
-            data: {
-                ids: deletedIds
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
-    },
+//  delectRow() {
+//      let deletedIds = [];
+//      for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+//          let rowItem = this.state.selectedRows[idx];
+//          if (rowItem.id) {
+//              deletedIds.push(rowItem.id)
+//          };
+//      };
+//      this.setState({
+//          selectedRowKeys: [],
+//          loading: deletedIds.length > 0
+//      });
+//      $.ajax({
+//          method: "POST",
+//          dataType: "json",
+//          crossDomain: false,
+//          url: globalConfig.context + "/api/admin/achievement/delete",
+//          data: {
+//              ids: deletedIds
+//          }
+//      }).done(function (data) {
+//          if (!data.error.length) {
+//              message.success('删除成功!');
+//              this.setState({
+//                  loading: false,
+//              });
+//          } else {
+//              message.warning(data.error[0].message);
+//          };
+//          this.loadData();
+//      }.bind(this));
+//  },
     //审核不通过
     examineCancel(){
     	let nub=4;
@@ -293,7 +294,7 @@ const AchievementList = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.ispage);
         };
     },
     search() {
@@ -383,9 +384,6 @@ const AchievementList = React.createClass({
                     <Button onClick={this.reset}>重置</Button>
                     <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
                     <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Radio.Group value={this.state.boutique} onChange={(e) => {

+ 2 - 3
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -151,8 +151,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
         this.setState({
             loading: true
         });
-      
-        $.ajax({
+      	$.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
@@ -791,7 +790,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
         this.setState({
             loading: true
         });
-        $.ajax({
+      	$.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,

+ 0 - 35
js/component/manageCenter/achievement/techAchievementQuery.jsx

@@ -219,38 +219,6 @@ const AchievementList = React.createClass({
         	});
         }
     },
-    delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
-        this.setState({
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/achievement/delete",
-            data: {
-                ids: deletedIds
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
-    },
     addClick() {
         this.state.RowData = {};
         this.setState({
@@ -348,9 +316,6 @@ const AchievementList = React.createClass({
                     </Radio.Group>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Radio.Group value={this.state.boutique} onChange={(e) => {

+ 39 - 43
js/component/manageCenter/achievement/techAchievementRelease/techAchievementAudit.jsx

@@ -16,7 +16,8 @@ const AchievementList = React.createClass({
       	return false;
       }
          this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -29,9 +30,6 @@ const AchievementList = React.createClass({
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name,
                 auditStatus:3,//名称
-//              ownerName: this.state.searchType == 1 ? this.state.searchName : undefined,
-//              username: this.state.searchType == 0 && this.props['data-listApiUrl'].indexOf('org') == -1 ? this.state.searchName : undefined,
-//              unitName: this.state.searchType == 0 && this.props['data-listApiUrl'].indexOf('user') == -1 ? this.state.searchName : undefined,
                 keyword: this.state.keyword, // 关键词
                 category: this.state.category, //类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
                 releaseDateStartDate: this.state.releaseDate[0],
@@ -73,7 +71,8 @@ const AchievementList = React.createClass({
                             releaseStatus: thisdata.releaseStatus,
                             techBrokerId:thisdata.techBrokerId,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                            remark:thisdata.remark
+                            remark:thisdata.remark,
+                            ispage:pageNo,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -253,41 +252,41 @@ const AchievementList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
-        }.bind(this));
-    },
-    delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
-        this.setState({
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/achievement/delete",
-            data: {
-                ids: deletedIds
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
+//  delectRow() {
+//      let deletedIds = [];
+//      for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+//          let rowItem = this.state.selectedRows[idx];
+//          if (rowItem.id) {
+//              deletedIds.push(rowItem.id)
+//          };
+//      };
+//      this.setState({
+//          selectedRowKeys: [],
+//          loading: deletedIds.length > 0
+//      });
+//      $.ajax({
+//          method: "POST",
+//          dataType: "json",
+//          crossDomain: false,
+//          url: globalConfig.context + "/api/admin/achievement/delete",
+//          data: {
+//              ids: deletedIds
+//          }
+//      }).done(function (data) {
+//          if (!data.error.length) {
+//              message.success('删除成功!');
+//              this.setState({
+//                  loading: false,
+//              });
+//          } else {
+//              message.warning(data.error[0].message);
+//          };
+//          this.loadData(this.state.ispage);
+//      }.bind(this));
+//  },
     addClick() {
         this.state.RowData = {};
         this.setState({
@@ -297,7 +296,7 @@ const AchievementList = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.ispage);
         };
     },
     search() {
@@ -338,7 +337,7 @@ const AchievementList = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                   <span>成果发布管理</span>
+                   <span>科技成果发布</span>
                     <div className="patent-addNew clearfix">
                         <Upload
                             action={globalConfig.context + "/api/admin/achievement/uploadTemplate"}
@@ -385,9 +384,6 @@ const AchievementList = React.createClass({
                     </Radio.Group>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Radio.Group value={this.state.boutique} onChange={(e) => {

+ 11 - 25
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -67,7 +67,8 @@ const PicturesWall = React.createClass({
 const MyClient = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 
 		$.ajax({
@@ -804,7 +805,7 @@ const MyClient = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	//列表删除功能
@@ -837,7 +838,7 @@ const MyClient = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 
@@ -899,7 +900,7 @@ const MyClient = Form.create()(React.createClass({
 	closeDesc(e, s) {
 		this.state.showDesc = e;
 		if(s) {
-			this.loadData();
+			this.loadData(this.state.ispage);
 		};
 	},
 	search() {
@@ -1058,7 +1059,7 @@ const MyClient = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1255,7 +1256,7 @@ const MyClient = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1707,7 +1708,7 @@ const MyClient = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1777,7 +1778,7 @@ const MyClient = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1953,7 +1954,7 @@ const MyClient = Form.create()(React.createClass({
 				} else {
 					message.warning(data.error[0].message);
 				};
-				this.loadData();
+				this.loadData(this.state.ispage);
 			}.bind(this));
 		}else{
 			message.warning('请输入转交人姓名')
@@ -2343,22 +2344,7 @@ const MyClient = Form.create()(React.createClass({
 						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode} 
 											    				onChange={(e)=>{this.setState({orgCode:e.target.value})}}/>
 						                    </FormItem>
-								            <FormItem className="half-item" 
-									            	labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-							                        label="实名认证"
-									            >
-									                <Select placeholder="实名认证"
-							                            value={this.state.auditStatus}
-							                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-							                            {
-						                                    auditStatusL.map(function (item) {
-						                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-						                                    })
-						                                }
-								                    </Select>  
-									        </FormItem>
-									        <div className="clearfix">
+								           <div className="clearfix">
 									        <FormItem className="half-item"
 						                   			 labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}

+ 7 - 6
js/component/manageCenter/customer/customerManagement/expertManage.jsx

@@ -69,7 +69,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -808,7 +809,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	//领取
@@ -1079,7 +1080,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1280,7 +1281,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1742,7 +1743,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1812,7 +1813,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}

+ 9 - 33
js/component/manageCenter/customer/customerManagement/organizationManages.jsx

@@ -69,7 +69,8 @@ const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -790,7 +791,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 
@@ -897,35 +898,10 @@ const PublicCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
-		}.bind(this));
-	},
-	//领取
-	changeRow(uids) {
-		this.setState({
-			loading: true,
-			selectedRowKeys: [],
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/customer/receiveCustomer",
-			data: {
-				uid: uids.id,
-			}
-		}).done(function(data) {
-			if(!data.error.length) {
-				message.success('领取成功!');
-				this.setState({
-					loading: false,
-				});
-			} else {
-				message.warning(data.error[0].message);
-			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
+	
 	getOrgCodeUrl(e) {
 		this.setState({ orgCodeUrl: e });
 	},
@@ -1117,7 +1093,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1324,7 +1300,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1775,7 +1751,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1849,7 +1825,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}

+ 23 - 8
js/component/manageCenter/customer/customerManagement/personalManages.jsx

@@ -69,7 +69,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -808,7 +809,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	//领取
@@ -834,7 +835,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	getHeadPortraitUrl(e) {
@@ -895,7 +896,7 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.state.lvlArrOption = lvlArr;
 		this.state.currentMemberArrOption = currentMemberArr;
 		this.state.customerStatusArrOption = customerStatusArr;
-		this.loadData();
+		this.loadData(this.state.ispage);
 	},
 
 	search() {
@@ -1079,7 +1080,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1280,7 +1281,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1742,7 +1743,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1812,7 +1813,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -2233,6 +2234,20 @@ const QueryCustomer = Form.create()(React.createClass({
 							                                <Input ref='consul' placeholder="输入数字且不超过6位" value={this.state.consultationPrice} 
 	    												onChange={(e) => {this.setState({consultationPrice: e.target.value })}}/>
 							                    </FormItem>
+							                    <FormItem className="half-item" 
+									            	 	{...formItemLayout}
+							                        	label="实名认证"
+									            		>
+								                   		<Select placeholder="实名认证"
+								                            value={this.state.auditStatus}
+								                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
+								                            {
+							                                    auditStatusL.map(function (item) {
+							                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+							                                    })
+							                                }
+									                    </Select>
+									        </FormItem>
 							                <div className='clearfix'>
 							                    <FormItem
 							                        labelCol={{ span: 4 }}

+ 9 - 34
js/component/manageCenter/customer/customerManagement/publicManages.jsx

@@ -114,7 +114,8 @@ const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -853,7 +854,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 
@@ -960,33 +961,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
-		}.bind(this));
-	},
-	//领取
-	changeRow(uids) {
-		this.setState({
-			loading: true,
-			selectedRowKeys: [],
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/customer/receiveCustomer",
-			data: {
-				uid: uids.id,
-			}
-		}).done(function(data) {
-			if(!data.error.length) {
-				message.success('领取成功!');
-				this.setState({
-					loading: false,
-				});
-			} else {
-				message.warning(data.error[0].message);
-			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	getOrgCodeUrl(e) {
@@ -1197,7 +1172,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1404,7 +1379,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1855,7 +1830,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1929,7 +1904,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -2023,7 +1998,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			this.state.data = {};
 			this.state.companyLogoUrl = [];
 			this.state.orgCodeUrl = [];
-			this.loadData(null);
+			//this.loadData(null);
 
 		};
 	},

+ 7 - 32
js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx

@@ -111,7 +111,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -849,33 +850,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
-		}.bind(this));
-	},
-	//领取
-	changeRow(e) {
-		this.setState({
-			loading: true,
-			selectedRowKeys: [],
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/customer/receiveCustomer",
-			data: {
-				uid: e.id,
-			}
-		}).done(function(data) {
-			if(!data.error.length) {
-				message.success('已领取!');
-				this.setState({
-					loading: false,
-				});
-			} else {
-				message.warning(data.error[0].message);
-			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	getHeadPortraitUrl(e) {
@@ -1140,7 +1115,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1341,7 +1316,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1803,7 +1778,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1873,7 +1848,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}

+ 7 - 6
js/component/manageCenter/customer/customerService/businessManges.jsx

@@ -14,7 +14,8 @@ const MyBusiness = Form.create()(React.createClass({
     loadData(pageNo, apiUrl) {
         this.state.data = [];
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });      
         $.ajax({
             method: "post",
@@ -263,7 +264,7 @@ const MyBusiness = Form.create()(React.createClass({
                 message.warning(data.error[0].message);
             };
             this.loadVisit();
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     //更多操作
@@ -302,7 +303,7 @@ const MyBusiness = Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));  
     },
     //停止跟进
@@ -327,7 +328,7 @@ const MyBusiness = Form.create()(React.createClass({
 	            } else {
 	                message.warning(data.error[0].message);
 	            };
-	            this.loadData();
+	            this.loadData(this.state.ispage);
 	        }.bind(this));
     },
     getOrgCodeUrl(e) {
@@ -427,7 +428,7 @@ const MyBusiness = Form.create()(React.createClass({
                     if (!data.error.length) {
                         message.success('保存成功!');
                         this.detailsModal() ;
-                        this.loadData();
+                        this.loadData(this.state.ispage);
                     } else {
                         message.warning(data.error[0].message);
                     }
@@ -642,7 +643,7 @@ const MyBusiness = Form.create()(React.createClass({
                     if (!data.error.length) {
                         message.success('保存成功!'); 
                         this.addClickCancel();
-                        this.loadData(); 
+                        this.loadData(this.state.ispage); 
                         this.state.businessId='';
                     } else {
                         message.warning(data.error[0].message);

+ 7 - 6
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -15,7 +15,8 @@ const MyBusiness = Form.create()(React.createClass({
     loadData(pageNo, apiUrl) {
         this.state.data = [];
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });      
         $.ajax({
             method: "post",
@@ -264,7 +265,7 @@ const MyBusiness = Form.create()(React.createClass({
                 message.warning(data.error[0].message);
             };
             this.loadVisit();
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     //更多操作
@@ -303,7 +304,7 @@ const MyBusiness = Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));  
     },
     //停止跟进
@@ -328,7 +329,7 @@ const MyBusiness = Form.create()(React.createClass({
 	            } else {
 	                message.warning(data.error[0].message);
 	            };
-	            this.loadData();
+	            this.loadData(this.state.ispage);
 	        }.bind(this));
     },
     getOrgCodeUrl(e) {
@@ -430,7 +431,7 @@ const MyBusiness = Form.create()(React.createClass({
                     if (!data.error.length) {
                         message.success('保存成功!');
                         this.detailsModal() ;
-                        this.loadData();
+                        this.loadData(this.state.ispage);
                     } else {
                         message.warning(data.error[0].message);
                     }
@@ -645,7 +646,7 @@ const MyBusiness = Form.create()(React.createClass({
                     if (!data.error.length) {
                         message.success('保存成功!'); 
                         this.addClickCancel();
-                        this.loadData(); 
+                        this.loadData(this.state.ispage); 
                         this.state.businessId='';
                     } else {
                         message.warning(data.error[0].message);

+ 11 - 24
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -69,7 +69,8 @@ const PicturesWall = React.createClass({
 const IndividualCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -822,7 +823,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 
@@ -858,7 +859,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 				} else {
 					message.warning(data.error[0].message);
 				};
-				this.loadData();
+				this.loadData(this.state.ispage);
 			}.bind(this));
 		}else{
 			message.warning('请输入转交人姓名')
@@ -894,7 +895,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	getHeadPortraitUrl(e) {
@@ -972,7 +973,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 	closeDesc(e, s) {
 		this.state.showDesc = e;
 		if(s) {
-			this.loadData();
+			this.loadData(this.state.ispage);
 		};
 	},
 	search() {
@@ -1159,7 +1160,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					if(!data.error.length) {
 						message.success('保存成功!');
 						this.detailsModal()
-						this.loadData();
+						this.loadData(this.state.ispage);
 					} else {
 						message.warning(data.error[0].message);
 					}
@@ -1357,7 +1358,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.loadVisit(); //
-				this.loadData();
+				this.loadData(this.state.ispage);
 				this.visitCancel();
 			} else {
 				message.warning(data.error[0].message);
@@ -1822,7 +1823,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -1892,7 +1893,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('保存成功!');
 				this.detailsModal();
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -2424,21 +2425,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 							                                <Input ref='consul' placeholder="请输入咨询费用" value={this.state.consultationPrice} 
 	    												onChange={(e) => {this.setState({consultationPrice: e.target.value })}}/>
 							                    </FormItem>
-							                     <FormItem className="half-item" 
-										            	{...formItemLayout}
-								                        label="实名认证"
-										            >
-										                <Select placeholder="实名认证"
-								                            value={this.state.auditStatus}
-								                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-								                            {
-							                                    auditStatusL.map(function (item) {
-							                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-							                                    })
-							                                }
-									                    </Select> 
-										        </FormItem>
-						                    </div>
+							                </div>
 						                    <div className="clearfix">
 						                        <FormItem className="half-item"
 							                   			 {...formItemLayout}

+ 3 - 2
js/component/manageCenter/customer/release/expertRelease.jsx

@@ -69,7 +69,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -621,7 +622,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})

+ 5 - 4
js/component/manageCenter/customer/reviewed/enteringAudit.jsx

@@ -17,7 +17,8 @@ const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -189,7 +190,7 @@ const PublicCustomer = Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
 	componentWillMount() {
@@ -213,7 +214,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('操作成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -237,7 +238,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('操作成功!');
 				this.detailsModal()
-				this.loadData();
+				this.loadData(this.state.ispage);
 			} else {
 				message.warning(data.error[0].message);
 			}

+ 4 - 4
js/component/manageCenter/customer/reviewed/expertReview.jsx

@@ -69,7 +69,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -757,7 +758,6 @@ const QueryCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",
@@ -777,7 +777,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})
@@ -824,7 +824,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})

+ 14 - 6
js/component/manageCenter/customer/reviewed/identityAudits.jsx

@@ -70,7 +70,8 @@ const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -129,6 +130,8 @@ const PublicCustomer = Form.create()(React.createClass({
 							international: thisdata.international,
 							listed: thisdata.listed,
 							adminName: thisdata.adminName,
+							expert: thisdata.expert,
+							expertAudit: thisdata.expertAudit,
 							highTechZone: thisdata.highTechZone,
 							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city || '' + '-' + thisdata.area : '--'
 						});
@@ -708,20 +711,23 @@ const PublicCustomer = Form.create()(React.createClass({
 	//审核实名认证通过功能
 	delectRow() {
 		let deletedIds;
+		let rowItem;
 		for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
-			let rowItem = this.state.selectedRows[idx];
+			rowItem = this.state.selectedRows[idx];
 			if(rowItem.id) {
 				deletedIds = rowItem.id;
 			};
+			console.log(rowItem);
 		};
 		this.setState({
 			selectedRowKeys: [],
 		});
+		
 		$.ajax({
 			method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/findPersonalCustomerDetail',
+			url: globalConfig.context + '/api/admin/customer/findOrganizationCustomerDetail',
 			data: {
 				uid: deletedIds,
 			},
@@ -732,11 +738,13 @@ const PublicCustomer = Form.create()(React.createClass({
 					method: "post",
 					dataType: "json",
 					crossDomain: false,
-					url: globalConfig.context + "/api/admin/customer/updatePersonalCustomer",
+					url: globalConfig.context + "/api/admin/customer/updateOrganizationCustomer",
 					data: {
 						uid: deletedIds, //审核通过的ID  
 						id:thisData.id,
 						auditStatus:5,
+//						expert:rowItem.expert,
+//						expertAudit:rowItem.expertAudit,
 					}
 				}).done(function(data) {
 					if(!data.error.length) {
@@ -747,7 +755,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})
@@ -794,7 +802,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})

+ 9 - 4
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx

@@ -69,7 +69,8 @@ const QueryCustomer = Form.create()(React.createClass({
 	loadData(pageNo, apiUrl) {
 		this.state.data = [];
 		this.setState({
-			loading: true
+			loading: true,
+			ispage:pageNo,
 		});
 		$.ajax({
 			method: "post",
@@ -132,6 +133,7 @@ const QueryCustomer = Form.create()(React.createClass({
 							listed: thisdata.listed,
 							international: thisdata.international,
 							expert: thisdata.expert,
+							expertAudit: thisdata.expertAudit,
 							celebrity: thisdata.celebrity,
 							adminName: thisdata.adminName,
 							highTechZone: thisdata.highTechZone,
@@ -634,8 +636,9 @@ const QueryCustomer = Form.create()(React.createClass({
 	//审核专家通过功能
 	delectRow() {
 		let deletedIds;
+		let rowItem;
 		for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
-			let rowItem = this.state.selectedRows[idx];
+			rowItem = this.state.selectedRows[idx];
 			if(rowItem.id) {
 				deletedIds = rowItem.id;
 			};
@@ -663,6 +666,8 @@ const QueryCustomer = Form.create()(React.createClass({
 						uid: deletedIds, //审核通过的ID  
 						id:thisData.id,
 						auditStatus:5,
+						expert:rowItem.expert,
+						expertAudit:rowItem.expertAudit,
 					}
 				}).done(function(data) {
 					if(!data.error.length) {
@@ -673,7 +678,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})
@@ -720,7 +725,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					} else {
 						message.warning(data.error[0].message);
 					};
-					this.loadData();
+					this.loadData(this.state.ispage);
 				}.bind(this));
 			}.bind(this),
 		})

+ 12 - 1
js/component/manageCenter/demand/content.jsx

@@ -115,7 +115,18 @@ class Content extends Component {
                         detailApiUrl: '/api/admin/demand/userDemandDetail'
                     });
                 });
-                break;    
+                break;
+            //需求发布新  
+            case 'releaseDemand':
+                require.ensure([], () => {
+                    const ReleaseDemand = require('./releaseDemand.jsx').default;
+                    this.setState({
+                        component: ReleaseDemand,
+                        listApiUrl: '/api/admin/portal/order/userDemandOrderList',
+                        detailApiUrl: '/api/admin/demand/userDemandDetail'
+                    });
+                });
+                break;  
             default:
             require.ensure([], () => {
                 const Module = require('../module').default;

+ 63 - 0
js/component/manageCenter/demand/content.less

@@ -0,0 +1,63 @@
+.set-content {
+    background: #fff;
+    padding: 20px;
+    .set-title {
+        >span {
+            font-size: 16px;
+            color: #333;
+        }
+        >button {
+            float: right;
+            margin-right: 20px;
+        }
+    }
+    .member-table {
+        margin-top: 20px;
+    }
+    .set-search {
+        >input {
+            width: 120px;
+        }
+        >* {
+            margin-right: 10px;
+            margin-top: 10px;
+        }
+    }
+}
+
+.ant-modal-body {
+    .modal-content {
+        >.list {
+            margin-bottom: 20px;
+            float: left;
+            width: 50%;
+            >span {
+                margin-right: 20px;
+                display: inline-block;
+                width: 60px;
+                text-align: right;
+            }
+            >input {
+                width: 200px;
+            }
+            .modal-det {
+                width: 200px;
+                text-align: left;
+            }
+        }
+    }
+    .modal-text {
+        margin-right: 20px;
+        display: inline-block;
+        width: 60px;
+        text-align: right;
+    }
+}
+.user-content{
+    padding: 15px;
+    background: #ffffff;
+}
+thead>tr>.ant-table-selection-column>span .ant-checkbox-inner{display:none;}
+.half-item{    float: left;
+    width: 50%;
+    margin-bottom: 10px;}

+ 2 - 3
js/component/manageCenter/demand/demandAudit/demandAuditDesc.jsx

@@ -146,15 +146,14 @@ const DemandDetailShow = Form.create()(React.createClass({
         };
     },
     loadData(id, detailApiUrl,dataCategory) {
-    	console.log(dataCategory);
-        this.setState({
+    	this.setState({
             loading: true
         });
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + detailApiUrl,
+            url: globalConfig.context + '/api/admin/demand/orgDemandDetail',
             data: {
                 id: id,
                 dataCategory:dataCategory?dataCategory:this.props.data.dataCategory

+ 37 - 40
js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx

@@ -16,7 +16,8 @@ const TechDemandPublish = React.createClass({
         	return false;
         }
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -312,8 +313,7 @@ const TechDemandPublish = React.createClass({
                 deletedIds.push(rowItem.id,rowItem.techBrokerIdd)
             };
         };
-        console.log(deletedIds);
-        this.setState({
+       this.setState({
             selectedRowKeys: [],
             loading: deletedIds.length > 0
         });
@@ -337,7 +337,7 @@ const TechDemandPublish = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     componentWillMount() {
@@ -390,38 +390,38 @@ const TechDemandPublish = React.createClass({
         	});
         }
     },
-    delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
-        this.setState({
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/demand/delete",
-            data: {
-                ids: deletedIds
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
-    },
+//  delectRow() {
+//      let deletedIds = [];
+//      for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+//          let rowItem = this.state.selectedRows[idx];
+//          if (rowItem.id) {
+//              deletedIds.push(rowItem.id)
+//          };
+//      };
+//      this.setState({
+//          selectedRowKeys: [],
+//          loading: deletedIds.length > 0
+//      });
+//      $.ajax({
+//          method: "POST",
+//          dataType: "json",
+//          crossDomain: false,
+//          url: globalConfig.context + "/api/admin/demand/delete",
+//          data: {
+//              ids: deletedIds
+//          }
+//      }).done(function (data) {
+//          if (!data.error.length) {
+//              message.success('删除成功!');
+//              this.setState({
+//                  loading: false,
+//              });
+//          } else {
+//              message.warning(data.error[0].message);
+//          };
+//          this.loadData();
+//      }.bind(this));
+//  },
     addClick() {
         this.state.RowData = {};
         this.setState({
@@ -431,7 +431,7 @@ const TechDemandPublish = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.ispage);
         };
     },
     search() {
@@ -525,9 +525,6 @@ const TechDemandPublish = React.createClass({
                     <Button onClick={this.reset}>重置</Button>
                      <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
                     <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Radio.Group value={this.state.boutique} onChange={(e) => {

+ 36 - 38
js/component/manageCenter/demand/demandRelease/techDemandRelease.jsx

@@ -16,7 +16,8 @@ const TechDemandPublish = React.createClass({
         	return false;
         }
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -346,7 +347,7 @@ const TechDemandPublish = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     componentWillMount() {
@@ -399,38 +400,38 @@ const TechDemandPublish = React.createClass({
         	});
         }
     },
-    delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
-        this.setState({
-            selectedRowKeys: [],
-            loading: deletedIds.length > 0
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/demand/delete",
-            data: {
-                ids: deletedIds
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('删除成功!');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
-    },
+//  delectRow() {
+//      let deletedIds = [];
+//      for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+//          let rowItem = this.state.selectedRows[idx];
+//          if (rowItem.id) {
+//              deletedIds.push(rowItem.id)
+//          };
+//      };
+//      this.setState({
+//          selectedRowKeys: [],
+//          loading: deletedIds.length > 0
+//      });
+//      $.ajax({
+//          method: "POST",
+//          dataType: "json",
+//          crossDomain: false,
+//          url: globalConfig.context + "/api/admin/demand/delete",
+//          data: {
+//              ids: deletedIds
+//          }
+//      }).done(function (data) {
+//          if (!data.error.length) {
+//              message.success('删除成功!');
+//              this.setState({
+//                  loading: false,
+//              });
+//          } else {
+//              message.warning(data.error[0].message);
+//          };
+//          this.loadData();
+//      }.bind(this));
+//  },
     addClick() {
         this.state.RowData = {};
         this.setState({
@@ -440,7 +441,7 @@ const TechDemandPublish = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.ispage);
         };
     },
     search() {
@@ -532,9 +533,6 @@ const TechDemandPublish = React.createClass({
                     </Radio.Group>                   
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Radio.Group value={this.state.boutique} onChange={(e) => {

+ 933 - 0
js/component/manageCenter/demand/releaseDemand.jsx

@@ -0,0 +1,933 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import './content.less';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete } from 'antd';
+import {patternOrganization,conditionOrganization,client,stick} from '../../dataDic.js';
+import {getPattern,getAchievementCategory,getboutique,getClient,getStick} from '../../tools.js';
+
+const Organization=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            loading: true,
+            ispage:pageNo,
+        });
+        let nameText=this.state.SuperArr;
+        let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].id:undefined;
+        let nameTexts=this.state.SuperArrs;
+        let superTexts=(this.state.publishPage)?nameTexts[parseInt(this.state.publishPage)].id:undefined;
+       	$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/demand/listPublish',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                name: this.state.name, //需求名称
+                publishPlatform:superText,//发布子平台
+                publishClient:this.state.publishClient,//发布客户端
+                publishPage:superTexts,//发布页面
+                ifTop:this.state.ifTop,//是否置顶
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: i,
+                            id: thisdata.id,//发布需求ID
+                            achievementId:thisdata.demandId,//成果ID
+                            publishPlatform:thisdata.publishPlatform,//发布子平台ID
+                            platformName:thisdata.platformName,//发布子平台ID
+                            publishClient:thisdata.publishClient.toString(),//发布客户端
+                            publishPage:thisdata.publishPage,//发布页面
+                            publishPageName:thisdata.publishPageName,//发布页面
+                            ifTop:thisdata.ifTop.toString(),//是否置顶
+                            topNumber:thisdata.topNumber,//置顶编号
+                            showNumber:thisdata.showNumber,//显示编号
+                            publisher:thisdata.publisher,//发布人ID
+                            publishTime:thisdata.publishTime,//发布时间
+                            serialNumber:thisdata.serialNumber,//成果编号
+                            name:thisdata.name,//成果名称
+                            userName:thisdata.userName,//成果所有人
+                            publisherName:thisdata.publisherName,//发布人名称
+                            publishTimeFormattedDate:thisdata.publishTimeFormattedDate,//发布时间
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                this.setState({
+                    dataSource: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+       
+    },
+    loadDatas(pageNo, apiUrl) {
+        this.state.data = [];
+      if(this.state.serialNumber&&isNaN(this.state.serialNumber)){
+     	message.warning('请输入正确的编号格式');
+      	return false;
+      }
+         this.setState({
+            loading: true,
+            ispage:pageNo,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/demand/orgList',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                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],
+                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 = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: thisdata.id,
+                            id: thisdata.id,
+                            serialNumber: thisdata.serialNumber,
+                            dataCategory: thisdata.dataCategory,
+                            name: thisdata.name,
+                            keyword: thisdata.keyword,
+                            theName: thisdata.username || thisdata.ownerName,
+                            category: thisdata.category,
+                            ownerName: thisdata.username ? thisdata.username : thisdata.ownerName,
+                            ownerType: thisdata.ownerType,
+                            ownerMobile: thisdata.ownerMobile,
+                            status: thisdata.status,
+                            releaseDate: thisdata.releaseDate,
+                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
+                            auditStatus: thisdata.auditStatus,
+                            boutique: thisdata.boutique,
+                            hot: thisdata.hot,
+                            releaseStatus: thisdata.releaseStatus,
+                            techBrokerId:thisdata.techBrokerId,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
+                            remark:thisdata.remark,
+                            ispage:pageNo,
+                        });
+                    };
+                    this.state.paginations.current = data.data.pageNo;
+                    this.state.paginations.total = data.data.totalCount;
+                };
+                this.setState({
+                    dataSourcesli: theArr,
+                    paginations: this.state.paginations
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false,
+                visible: true
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+            searchMore: true,
+            selectedRowKeys: [],
+            selectedRowKeysli:[],
+            selectedRows: [],
+            releaseDate: [],
+            releaseDateS: [],
+            loading: false,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            paginations: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadDatas(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            columns: [
+                {
+                    title: '需求编号',
+                    dataIndex: 'serialNumber',
+                    key: 'serialNumber',
+                }, {
+                    title: '需求名称',
+                    dataIndex: 'name',
+                    key: 'name',
+                }, {
+                    title: '客户名称',
+                    dataIndex: 'userName',
+                    key: 'userName',
+                }, {
+                    title: '发布子平台',
+                    dataIndex: 'platformName',
+                    key: 'platformName',
+                },{
+                    title: '发布客户端',
+                    dataIndex: 'publishClient',
+                    key: 'publishClient',
+                    render: text => { return getClient(text) }
+                },  {
+                    title: '发布页面',
+                    dataIndex: 'publishPageName',
+                    key: 'publishPageName',
+                },{
+                    title: '是否置顶',
+                    dataIndex: 'ifTop',
+                    key: 'ifTop',
+                    render: text => { return getStick(text) }
+                  
+                },  {
+                    title: '展示序号',
+                    dataIndex: 'showNumber',
+                    key: 'showNumber',
+                },  {
+                    title: '发布人',
+                    dataIndex: 'publisherName',
+                    key: 'publisherName',
+                },  {
+                    title: '发布时间',
+                    dataIndex: 'publishTimeFormattedDate',
+                    key: 'publishTimeFormattedDate',
+                }, {
+                    title: '操作',
+                    dataIndex: 'ee',
+                    key: 'ee',
+                    render: (text, record, index) => {
+                    	return <div>
+							<Popconfirm title={'请确认撤销发布成果【'+record.name+'】'} onConfirm={(e)=>{this.examine(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">撤销发布</Button>                 
+							</Popconfirm>
+                        </div>
+					}
+                }
+            ],
+            dataSource: [],
+            searchTime: [,],
+            column: [
+                {
+                    title: '编号',
+                    dataIndex: 'serialNumber',
+                    key: 'serialNumber',
+                }, {
+                    title: '名称',
+                    dataIndex: 'name',
+                    key: 'name',
+                }, {
+                    title: '关键字',
+                    dataIndex: 'keyword',
+                    key: 'keyword',
+                }, {
+                    title: '类型',
+                    dataIndex: 'category',
+                    key: 'category',
+                    render: text => { return getAchievementCategory(text); }
+                }, {
+                    title: '录入人',
+                    dataIndex: 'techBrokerId',
+                    key: 'techBrokerId',
+                },
+                {
+                    title: '是否精品',
+                    dataIndex: 'boutique',
+                    key: 'boutique',
+                    render: text => { return getboutique(text) }
+                },
+                {
+                    title: '发布时间',
+                    dataIndex: 'releaseDateFormattedDate',
+                    key: 'releaseDateFormattedDate',
+                },{
+                    title: '录入时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
+                }
+            ],
+            dataSourcesli: [],
+            searchTime: [,]
+        };
+    },
+    componentWillMount() {
+    	this.selectSuperIds();
+    	
+    },
+    examine(record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/demand/deletePublish',
+            data: {
+                id:record.id,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData(this.state.ispage);
+        }.bind(this));
+    },
+    //获取发布子平台
+    selectSuperId() {  
+    	this.state.data = []
+         $.ajax({
+                method: "get",
+                dataType: "json",
+                crossDomain: false,
+                url: globalConfig.context + "/api/admin/achievement/getBranchInformation",
+                data:{
+                  
+                },
+                success: function (data) {                	  
+                		let theArr = [];
+					    let thedata=data.data;
+					    if (!thedata) {
+		                    if (data.error && data.error.length) {
+		                        message.warning(data.error[0].message);
+		                    };	
+		                    thedata = {}; 
+		              };   
+					    var contactIds=[];
+				        for(var i=0;i<data.data.length;i++){
+	                    	let theData = data.data[i];
+		                    theArr.push(
+		                        <Select.Option value={i.toString()} key={theData.platformName}>{theData.platformName}</Select.Option>
+		                    );
+		                };
+						this.setState({	
+							SuperArr:thedata,
+		                    contactsOption: theArr, 
+		                    orderStatusOptions:data.data,
+	                    });
+	                    
+					}.bind(this),
+				}).always(function () {
+				this.loadData();
+	            this.setState({
+	                loading: false
+	            });
+	        }.bind(this));
+	},
+	//获取发布页面
+    selectSuperIds() {  
+    	this.state.data = []
+         $.ajax({
+                method: "get",
+                dataType: "json",
+                crossDomain: false,
+                url: globalConfig.context + "/api/admin/achievement/getPublishPage",
+                data:{
+                  
+                },
+                success: function (data) {                	  
+                		let theArr = [];
+					    let thedata=data.data;
+					    if (!thedata) {
+		                    if (data.error && data.error.length) {
+		                        message.warning(data.error[0].message);
+		                    };	
+		                    thedata = {}; 
+		              };   
+					    var contactIds=[];
+				        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>
+		                    );
+		                };
+						this.setState({	
+							SuperArrs:thedata,
+		                    contactsOptions: theArr, 
+		                    orderStatusOptions:data.data,
+	                    });
+	                    
+					}.bind(this),
+				}).always(function () {
+				this.selectSuperId();
+	            this.setState({
+	                loading: false
+	            });
+	        }.bind(this));
+	},
+	//编辑部门,保存
+    edithandleSubmit(e){
+    	e.preventDefault();	
+    	//上级组织字典
+        let nameText=this.state.SuperArr;
+        let nameTexts=this.state.SuperArrs;
+        let superText=(parseInt(this.state.editpublishPlatform).toString()=='NaN')?undefined:nameText[parseInt(this.state.editpublishPlatform)].id;
+        let superTexts=(parseInt(this.state.editpublishPage).toString()=='NaN')?undefined:nameTexts[parseInt(this.state.editpublishPage)].id;
+    	$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url:globalConfig.context + '/api/admin/demand/updatePublish',
+            data:{
+            	id:this.state.editid,//成果发布ID
+            	demandId:this.state.editachievementId, //成果ID
+            	publishPlatform:superText,//发布平台
+                publishClient:this.state.editpublishClient,//发布客户端
+                publishPage:superTexts,//发布页面
+                ifTop:this.state.editifTop,//是否置顶
+                topNumber:this.state.edittopNumber,//置顶序号
+                showNumber:this.state.editshowNumber,//展示序号
+            }
+        }).done(function (data) { 
+            this.setState({
+                loading: false
+            });
+            if (!data.error.length) {
+                message.success('保存成功!'); 
+                this.edithandleCancel();
+                this.selectSuperId();
+            } else {
+                message.warning(data.error[0].message);
+            }
+        }.bind(this));
+    },  
+	//整行点击
+    tableRowClick(record, index) {
+    	this.selectSuperIds();
+    	this.state.RowData = record; 
+        this.setState({
+        	editvisible: true,
+        	selectedRowKeys:[],
+        	editid:record.id,
+        	editachievementId:record.achievementId,
+        	editpublishPlatform:record.platformName,
+        	editpublishClient:record.publishClient,
+        	editpublishPage:record.publishPageName,
+        	editifTop:record.ifTop,
+        	edittopNumber:record.topNumber,
+        	editshowNumber:record.showNumber,
+        	editserialNumber:record.serialNumber,
+        	editname:record.name,
+        	edituserName:record.userName,
+        })    
+    },
+    
+    //新增一个部门,保存
+    addhandleSubmit(e){
+    	e.preventDefault();	
+    	if(!this.state.publishPlatform){
+    		message.warning('请选择发布子平台');
+    		return false;
+    	}
+    	if(!this.state.publishClient){
+    		message.warning('请选择发布客户端');
+    		return false;
+    	}
+    	if(!this.state.publishPage){
+    		message.warning('请选择发布页面'); 
+    		return false;
+    	}
+    	if(!this.state.ifTop){
+    		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) => {                                 
+            if (!err) {
+                this.setState({
+                    loading: true
+                }); 
+                //上级组织字典
+                let nameText=this.state.SuperArr;
+        		let superText=nameText[parseInt(this.state.publishPlatform)].id;
+        		let nameTexts=this.state.SuperArrs;
+        		let superTexts=nameTexts[parseInt(this.state.publishPage)].id;
+       			$.ajax({
+                    method: "post",
+                    dataType: "json",
+                    crossDomain: false,
+                    url:globalConfig.context + '/api/admin/demand/addDemandPublish',
+                    data:{
+                    	demandId:this.state.selectedRowKeysli?this.state.selectedRowKeysli.join(","):undefined,//成果ID
+                    	publishPlatform:superText,//发布平台
+                    	publishClient:this.state.publishClient,//发布客户端
+                        publishPage:superTexts, //发布页面
+                        ifTop:this.state.ifTop,//是否置顶
+                        topNumber:this.state.topNumber,//置顶序号
+                        showNumber:this.state.showNumber,//展示序号
+                    }
+                }).done(function (data) { 
+                    this.setState({
+                        loading: false
+                    });
+                    if (!data.error.length) {
+                        message.success('保存成功!'); 
+                        this.handleCancel();
+                        this.selectSuperId();
+                    } else {
+                        message.warning(data.error[0].message);
+                    }
+                }.bind(this));
+            }
+        });
+    },
+    
+    //主管初始加载(自动补全)
+	supervisor(e){ 
+		$.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectName",
+            data:{
+            	name:e
+            },
+            success: function (data) {                	  
+				       let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+              }; 
+					this.setState({
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//上级主管输入框失去焦点是判断客户是否存在
+	selectAuto(value,options){
+		this.setState({
+			managerIdOrganization:value
+		})
+	},
+	//失去焦点时
+	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){
+		if(e.length>=2){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			managerIdOrganization:e
+		})
+	},
+    addClick() {
+    	this.state.name = undefined;//成果名称清零
+        this.state.publishPlatform = undefined;//发布子平台清零
+        this.state.publishClient = undefined;//发布客户端清零
+        this.state.publishPage = undefined;//发布页面清零
+        this.state.ifTop = undefined;//是否置顶清零
+        this.state.topNumber = undefined;//置顶序号清零
+        this.state.showNumber = undefined;//展示序号清零
+        this.state.selectedRowKeysli=undefined;//选定的成果ID清零
+        this.state.RowData = {};
+        this.selectSuperId();
+        this.loadDatas();
+    },
+    editClick() {
+        this.state.RowData = {};
+        this.setState({
+            editvisible: true
+        });
+    },
+   	handleCancel() {
+        this.setState({ visible: false })
+    },
+    edithandleCancel() {
+        this.setState({ editvisible: false })
+    },
+    search() {
+        this.loadData();
+    },
+    //把搜索的部分置零
+    reset() {
+    	this.state.name = undefined;//成果名称清零
+        this.state.superId = undefined;//发布子平台清零
+        this.state.publishClient = undefined;//发布客户端清零
+        this.state.publishPage = undefined;//发布页面清零
+        this.state.ifTop = undefined;//是否置顶清零
+        this.loadData();       
+    },
+    searchSwitch() {
+        this.setState({
+            searchMore: !this.state.searchMore
+        });
+    },
+    render() {
+    	const FormItem = Form.Item
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1)
+                });
+            },
+            onSelect: (recordt, selected, selectedRows) => {			   
+			    this.setState({
+			    	recordt:recordt.id
+			    })
+			},
+        };
+         const rowSelections = {
+            selectedRowKeysli: this.state.selectedRowKeysli,
+            onChange: (selectedRowKeysli, selectedRows) => {
+                this.setState({
+                    selectedRows: selectedRows,
+                    selectedRowKeysli: selectedRowKeysli
+                });
+            },
+            onSelect: (recordt, selected, selectedRows) => {
+			    this.setState({
+			    	recordt:recordt.id
+			    })
+			},
+        };
+        const formItemLayout = {
+            labelCol: { span: 8 },
+            wrapperCol: { span: 14 },
+        };
+       	const { getFieldDecorator } = this.props.form;
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        const { RangePicker } = DatePicker;
+        const dataSources=this.state.customerArr || [];
+        const options = dataSources.map((group,index) =>
+				      <Option key={index} value={group.name}>{group.name}</Option>
+				     )
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+	                <div className="user-search">
+	                    <Input placeholder="需求名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
+	                        value={this.state.name}
+	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+	                    <Select placeholder="发布子平台"
+                            style={{ width:'200px',marginRight:'10px' }}
+                            value={this.state.superId}
+                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+                            {this.state.contactsOption}
+		                </Select>
+		                <Select placeholder="发布客户端"
+                            style={{width:'150px',marginRight:'20px'}}
+                            value={this.state.publishClient}
+                            onChange={(e) => { this.setState({ publishClient: e }) }}>
+                            <Select.Option value="0" >网站</Select.Option>
+                            <Select.Option value="1" >APP</Select.Option>
+		                </Select>
+	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
+                        <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+	                    <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
+	                    	<Select placeholder="发布页面"
+	                            style={{ width:'200px',marginRight:'10px' }}
+	                            value={this.state.publishPage}
+	                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
+	                            {this.state.contactsOptions}
+			                </Select>
+			                <Select placeholder="是否置顶"
+	                            style={{width:'150px',marginRight:'50px'}}
+	                            value={this.state.ifTop}
+	                            onChange={(e) => { this.setState({ ifTop: e }) }}>
+	                            <Select.Option value="0" >置顶</Select.Option>
+	                            <Select.Option value="1" >不置顶</Select.Option>
+			                </Select>
+		                </div>
+	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布需求<Icon type="plus" /></Button>
+	                </div>
+	                <div className="patent-table">
+	                    <Spin spinning={this.state.loading}>
+	                        <Table columns={this.state.columns}
+	                            dataSource={this.state.dataSource}
+	                            rowSelection={rowSelection}
+	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick} />
+	                    </Spin>
+	                </div>
+	             
+	                 <div className="patent-desc">
+	                    <Modal maskClosable={false} visible={this.state.visible}
+	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
+	                        width='1200px'
+	                        title='发布需求'                       
+	                        footer=''
+	                        className="admin-desc-content">
+	                         <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
+				                <Spin spinning={this.state.loading}>
+				                    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布子平台"
+			                               > 
+			                              <Select placeholder="请选择子平台" value={this.state.publishPlatform} onChange={(e)=>{this.setState({publishPlatform:e})}}
+				                                notFoundContent="未获取到子平台">
+				                                {this.state.contactsOption}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="发布客户端"
+				                         > 
+					                          <Select placeholder="选择客户端" value={this.state.publishClient} 
+				                                onChange={(e)=>{this.setState({publishClient:e})}}> 
+				                                {
+				                                    client.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+		                   		    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布页面位置"
+			                               > 
+			                              <Select placeholder="请选择页面位置" value={this.state.publishPage} onChange={(e)=>{this.setState({publishPage:e})}}
+				                                notFoundContent="未获取到页面位置">
+				                                {this.state.contactsOptions}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 7 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="是否置顶"
+				                         > 
+					                          <Select placeholder="选择是否置顶" value={this.state.ifTop} 
+				                                onChange={(e)=>{this.setState({ifTop:e})}}> 
+				                                {
+				                                    stick.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="置顶序号" >
+				                    	     <Input placeholder="请输入置顶序号" value={this.state.topNumber} 
+				                                onChange={(e)=>{this.setState({topNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12}}
+					                            label="展示序号" >
+					                             <Input placeholder="请输入展示序号" value={this.state.showNumber} 
+				                                onChange={(e)=>{this.setState({showNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    </div>
+				                    <div className="patent-table">
+					                    <Spin spinning={this.state.loading}>
+					                        <Table columns={this.state.column}
+					                            dataSource={this.state.dataSourcesli}
+					                            rowSelection={rowSelections}
+					                            pagination={this.state.paginations}
+					                             />
+					                    </Spin>
+					                </div>
+				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'100px'}}>取消</Button>
+				                    </FormItem> 
+				                </Spin>
+				            </Form >
+	                    </Modal>
+                	</div>
+                	<div className="patent-desc">
+	                    <Modal maskClosable={false} visible={this.state.editvisible}
+	                        onOk={this.checkPatentProcess} onCancel={this.edithandleCancel}
+	                        width='900px'
+	                        title='编辑发布'                       
+	                        footer=''
+	                        className="admin-desc-content">
+	                         <Form horizontal onSubmit={this.edithandleSubmit} id="edit-form">
+				                <Spin spinning={this.state.loading}>
+				                	<div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布子平台"
+			                               > 
+			                              <Select placeholder="请选择子平台" value={this.state.editpublishPlatform} onChange={(e)=>{this.setState({editpublishPlatform:e})}}
+				                                notFoundContent="未获取到子平台">
+				                                {this.state.contactsOption}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="发布客户端"
+				                         > 
+					                          <Select placeholder="选择客户端" value={this.state.editpublishClient} 
+				                                onChange={(e)=>{this.setState({editpublishClient:e})}}> 
+				                                {
+				                                    client.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+		                   		    <div className="clearfix">
+					                    <FormItem  className="half-item"
+					                    	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           label="发布页面位置"
+			                               > 
+			                              <Select placeholder="请选择页面位置" value={this.state.editpublishPage} onChange={(e)=>{this.setState({editpublishPage:e})}}
+				                                notFoundContent="未获取到页面位置">
+				                                {this.state.contactsOptions}
+				                            </Select> 
+				                        </FormItem>
+				                        <FormItem  className="half-item"
+				                         	labelCol={{ span: 6 }}
+					                        wrapperCol={{ span: 12 }}
+				                           	label="是否置顶"
+				                         > 
+					                          <Select placeholder="选择是否置顶" value={this.state.editifTop} 
+				                                onChange={(e)=>{this.setState({editifTop:e})}}> 
+				                                {
+				                                    stick.map(function (item) {
+				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+				                              </Select>
+				                   		 </FormItem>
+		                   		    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 6 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="置顶序号" >
+				                    	     <Input placeholder="请输入置顶序号" value={this.state.edittopNumber} 
+				                                onChange={(e)=>{this.setState({edittopNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    	<FormItem className="half-item"
+					                            labelCol={{ span: 6 }}
+					                        	wrapperCol={{ span: 12}}
+					                            label="展示序号" >
+					                             <Input placeholder="请输入展示序号" value={this.state.editshowNumber} 
+				                                onChange={(e)=>{this.setState({editshowNumber:e.target.value})}}/>
+					                    </FormItem>
+				                    </div>
+				                    <div className="clearfix">
+				                    	<FormItem className="half-item"
+						                    labelCol={{ span: 6 }}
+						                    wrapperCol={{ span: 12 }}
+						                    label="需求编号"
+					                        >
+					                        <span>{this.state.editserialNumber}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+						                    labelCol={{ span: 6 }}
+						                    wrapperCol={{ span: 12 }}
+						                    label="客户名称"
+					                        >
+					                        <span>{this.state.edituserName}</span>
+					                    </FormItem>
+					               		
+					                </div>
+					                <div className="clearfix">
+				                    	<FormItem 
+						                    labelCol={{ span: 3 }}
+						                    wrapperCol={{ span: 18 }}
+						                    label="需求名称"
+					                        >
+					                        <span>{this.state.editname}</span>
+					                    </FormItem>
+					                </div>
+		                   		    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                   		<Button className="set-submit" type="ghost" onClick={this.edithandleCancel} style={{marginLeft:'100px'}}>取消</Button>
+				                    </FormItem> 
+				                </Spin>
+				            </Form >
+	                    </Modal>
+                	 </div>
+                	 
+            	</div>
+            </div>
+        );
+    }
+}));
+
+export default Organization;

+ 3 - 2
js/component/manageCenter/demand/techDemand.jsx

@@ -17,7 +17,8 @@ const DemandList = React.createClass({
         	return false;
         }
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -377,7 +378,7 @@ const DemandList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.ispage);
         }.bind(this));
     },
     addClick() {

+ 11 - 5
js/component/manageCenter/idea/policy/inquiry.jsx

@@ -9,7 +9,7 @@ import moment from 'moment';
 import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceList';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs,Checkbox,Tree,Cascader} from 'antd';
 import {patternOrganization,conditionOrganization,intentionalService,messageType,designatedObjects,socialAttributeS,industry,socialAttribute,industryS,designatedObjectse,auditStatusL} from '../../../dataDic.js';
-import {beforeUpload, getBase64,getprovince} from '../../../tools.js';
+import {beforeUpload, getBase64,getprovince,getauditStatus} from '../../../tools.js';
 const TabPane = Tabs.TabPane;
 const TreeNodet = Tree.TreeNode;
 const CheckboxGroup = Checkbox.Group;
@@ -54,7 +54,8 @@ const Avatar = React.createClass({
 const Inquiry=React.createClass({
 	loadData(pageNo, theType) {
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -96,7 +97,7 @@ const Inquiry=React.createClass({
                             summary: thisdata.summary,
                             content: thisdata.content,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                            
+                            auditStatus:thisdata.auditStatus,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -184,6 +185,11 @@ const Inquiry=React.createClass({
                     dataIndex: 'author',
                     key: 'author',
                 }, {
+                    title: '审核状态',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
+                    render: text => { return getauditStatus(text) }
+                }, {
                     title: '来源',
                     dataIndex: 'source',
                     key: 'source',
@@ -300,7 +306,7 @@ const Inquiry=React.createClass({
                 } else {
                     message.success('保存成功!');
                     this.setState({ visible: false });
-                    this.loadData(1,this.state.callnub);
+                    this.loadData(this.state.ispage,this.state.callnub);
                 };
             }.bind(this),
         }).always(function () {
@@ -338,7 +344,7 @@ const Inquiry=React.createClass({
             this.setState({
                 loading: false,
             });
-            this.loadData(1,this.state.callnub);
+            this.loadData(this.state.ispage,this.state.callnub);
         }.bind(this));
     },
     reset() {

+ 12 - 6
js/component/manageCenter/idea/policy/manage.jsx

@@ -9,7 +9,7 @@ import moment from 'moment';
 import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceList';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs,Checkbox,Tree,Cascader} from 'antd';
 import {policy} from '../../../dataDic.js';
-import {beforeUpload, getBase64} from '../../../tools.js';
+import {beforeUpload, getBase64,getauditStatus} from '../../../tools.js';
 const TabPane = Tabs.TabPane;
 const TreeNodet = Tree.TreeNode;
 const CheckboxGroup = Checkbox.Group;
@@ -54,7 +54,8 @@ const Avatar = React.createClass({
 const Manage=React.createClass({
 	loadData(pageNo, theType) {
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -97,7 +98,7 @@ const Manage=React.createClass({
                             summary: thisdata.summary,
                             content: thisdata.content,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                            
+                            auditStatus:thisdata.auditStatus,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -186,6 +187,11 @@ const Manage=React.createClass({
                     dataIndex: 'author',
                     key: 'author',
                 }, {
+                    title: '审核状态',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
+                    render: text => { return getauditStatus(text) }
+                }, {
                     title: '来源',
                     dataIndex: 'source',
                     key: 'source',
@@ -304,7 +310,7 @@ const Manage=React.createClass({
                 } else {
                     message.success('保存成功!');
                     this.setState({ visible: false });
-                    this.loadData(1,this.state.callnub);
+                    this.loadData(this.state.ispage,this.state.callnub);
                 };
             }.bind(this),
         }).always(function () {
@@ -356,7 +362,7 @@ const Manage=React.createClass({
                 } else {
                     message.success('保存成功!');
                     this.setState({ visible: false });
-                    this.loadData(1,this.state.callnub);
+                    this.loadData(this.state.ispage,this.state.callnub);
                 };
             }.bind(this),
         }).always(function () {
@@ -394,7 +400,7 @@ const Manage=React.createClass({
             this.setState({
                 loading: false,
             });
-            this.loadData(1,this.state.callnub);
+            this.loadData(this.state.ispage,this.state.callnub);
         }.bind(this));
     },
     reset() {

+ 6 - 6
js/component/manageCenter/idea/policy/techPolicyAudits.jsx

@@ -54,7 +54,8 @@ const Avatar = React.createClass({
 const Inquiry=React.createClass({
 	loadData(pageNo, theType) {
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -301,7 +302,7 @@ const Inquiry=React.createClass({
                 } else {
                     message.success('保存成功!');
                     this.setState({ visible: false });
-                    this.loadData(1,this.state.callnub);
+                    this.loadData(this.state.ispage,this.state.callnub);
                 };
             }.bind(this),
         }).always(function () {
@@ -353,11 +354,10 @@ const Inquiry=React.createClass({
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
 	//审核专家不通过功能
-	//审核专家通过功能
 	delectRows() {
 		let deletedIds;
 		let rowItem;
@@ -392,14 +392,14 @@ const Inquiry=React.createClass({
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
-				message.success('已成功通过审核!');
+				message.success('操作成功!');
 				this.setState({
 					loading: false,
 				});
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
     reset() {

+ 6 - 6
js/component/manageCenter/idea/policy/techPolicyPublishs.jsx

@@ -54,7 +54,8 @@ const Avatar = React.createClass({
 const Inquiry=React.createClass({
 	loadData(pageNo, theType) {
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         $.ajax({
             method: "get",
@@ -232,7 +233,6 @@ const Inquiry=React.createClass({
 				deletedIds = rowItem.id;
 			};
 		};
-		console.log(record);
 		this.setState({
 			selectedRowKeys: [],
 		});
@@ -259,14 +259,14 @@ const Inquiry=React.createClass({
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
-				message.success('已成功发布!');
+				message.success('操作成功!');
 				this.setState({
 					loading: false,
 				});
 			} else {
 				message.warning(data.error[0].message);
 			};
-			this.loadData();
+			this.loadData(this.state.ispage);
 		}.bind(this));
 		
 	},
@@ -372,7 +372,7 @@ const Inquiry=React.createClass({
                 } else {
                     message.success('保存成功!');
                     this.setState({ visible: false });
-                    this.loadData(1,this.state.callnub);
+                    this.loadData(this.state.ispage,this.state.callnub);
                 };
             }.bind(this),
         }).always(function () {
@@ -410,7 +410,7 @@ const Inquiry=React.createClass({
             this.setState({
                 loading: false,
             });
-            this.loadData(1,this.state.callnub);
+            this.loadData(this.state.ispage,this.state.callnub);
         }.bind(this));
     },
     reset() {

+ 2 - 1
js/component/manageCenter/set/organization/organization.jsx

@@ -11,7 +11,8 @@ const Organization=Form.create()(React.createClass({
 	loadData(pageNo) {
         this.state.data = [];
         this.setState({
-            loading: true
+            loading: true,
+            ispage:pageNo,
         });
         let nameText=this.state.SuperArr;
 		let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].name:"";

+ 44 - 3
js/component/tools.js

@@ -23,6 +23,7 @@ import {
     demandTypeList,
     achievementCategoryList,
     techAuditStatusList,
+    auditStatusLists,
     maturityList,
     transferModeList,
     innovationList,
@@ -60,7 +61,9 @@ import {
     messageType,
     designated,
     featured,
-    actives
+    actives,
+    client,
+    stick
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -583,6 +586,19 @@ module.exports = {
             return theType;
         }
     },
+    //获取政策审核状态
+    getauditStatus: function (e) {
+        if (e||e>=0) {
+        	let tt=e.toString()
+            let theType = '';
+            auditStatusLists.map(function (item) {
+                if (item.value == tt) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+    },
     //获取需求和成果审核状态
     getMaturity: function (e) {
         if (e) {
@@ -1038,8 +1054,33 @@ module.exports = {
             });
             return theType;
         }
-    
-	},
+    },
+    //客户端
+	getClient:function(index){
+	 	let e=index?index.toString():'';
+   		 if (e) {
+            let theType = '';
+            client.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+    },
+    //是否置顶
+	getStick:function(index){
+	 	let e=index?index.toString():'';
+   		 if (e) {
+            let theType = '';
+            stick.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+    },
 	getFeatured:function(index){
 	 	let e=index?index.toString():'';
    		 if (e) {