Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

liting2017 7 years ago
parent
commit
dc4801c031

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

@@ -30,7 +30,8 @@ const AchievementList = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name, //名称
-                ownerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                ownerName: this.state.ownerName, //名称
+                //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, // 关键词
@@ -249,7 +250,7 @@ const AchievementList = React.createClass({
     addClick() {
         this.state.RowData = {};
         this.setState({
-            showDesc: true
+            showDesc: true,
         });
     },
     closeDesc(e, s) {
@@ -264,6 +265,7 @@ const AchievementList = React.createClass({
     reset() {
         this.state.serialNumber = undefined;
         this.state.name = undefined;
+        this.state.ownerName = undefined;
         this.state.keyword = undefined;
         this.state.category = undefined;
         this.state.ownerType = undefined;
@@ -335,6 +337,9 @@ const AchievementList = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="成果所有人"
+                        value={this.state.ownerName}
+                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 6 - 1
js/component/manageCenter/achievement/releaseResults.jsx

@@ -26,6 +26,7 @@ const Organization=Form.create()(React.createClass({
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
+                ownerName:this.state.ownerName, //成果所有人
                 name: this.state.name, //成果名称
                 publishPlatform:superText,//发布子平台
                 publishClient:this.state.publishClient,//发布客户端
@@ -96,7 +97,7 @@ const Organization=Form.create()(React.createClass({
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                	auditStatus:3,//名称
-               	serialNumber: this.state.serialNumber, //编号
+                serialNumber: this.state.serialNumber, //编号
                 name: this.state.name,
                 keyword: this.state.keyword, // 关键词
                	releaseDateStartDate: this.state.releaseDate[0],
@@ -677,6 +678,7 @@ const Organization=Form.create()(React.createClass({
     },
     //把搜索的部分置零
     reset() {
+    	this.state.ownerName= undefined;//成果所有人清零
     	this.state.name = undefined;//成果名称清零
         this.state.superId = undefined;//发布子平台清零
         this.state.publishClient = undefined;//发布客户端清零
@@ -752,6 +754,9 @@ const Organization=Form.create()(React.createClass({
 	                    <Input placeholder="成果名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
 	                        value={this.state.name}
 	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+	                    <Input placeholder="成果所有人"
+	                        value={this.state.ownerName}
+	                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
 	                    <Select placeholder="发布子平台"
                             style={{ width:'200px',marginRight:'10px' }}
                             value={this.state.superId}

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

@@ -30,8 +30,9 @@ const AchievementList = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name, //名称
-                recordPerson: this.state.recordPerson,
-                ownerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                recordPerson: this.state.recordPerson,//录入人
+                ownerName: this.state.ownerName,//成果所有人
+                //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, // 关键词
@@ -266,6 +267,7 @@ const AchievementList = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.recordPerson= undefined;
+        this.state.ownerName= undefined;
         this.state.keyword = undefined;
         this.state.category = undefined;
         this.state.ownerType = undefined;
@@ -340,6 +342,9 @@ const AchievementList = React.createClass({
                     <Input placeholder="录入人名称"
                         value={this.state.recordPerson}
                         onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                    <Input placeholder="成果所有人"
+                        value={this.state.ownerName}
+                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />    
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 5 - 0
js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx

@@ -30,6 +30,7 @@ const AchievementList = React.createClass({
                 auditStatus:2,
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name, //名称
+                ownerName:this.state.ownerName, //成果所有人
 //              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,
@@ -303,6 +304,7 @@ const AchievementList = React.createClass({
     reset() {
         this.state.serialNumber = undefined;
         this.state.name = undefined;
+        this.state.ownerName= undefined;
         this.state.keyword = undefined;
         this.state.category = undefined;
         this.state.ownerType = undefined;
@@ -374,6 +376,9 @@ const AchievementList = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="成果所有人"
+                        value={this.state.ownerName}
+                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />    
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 44 - 51
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -132,6 +132,7 @@ const PicturesWall = React.createClass({
 });
 
 const AchievementDetailShow = Form.create()(React.createClass({
+    //初始定义
     getInitialState() {
         return {
             loading: false,
@@ -548,16 +549,26 @@ const AchievementDetailShow = Form.create()(React.createClass({
                         <div className="clearfix" >
                             <FormItem className="half-item"
                                 {...formItemLayout}
-                                label="成果所有人名称" >
+                                label="成果所有人" >
                                 <span>{theData.ownerName}</span>
                             </FormItem>
                             <FormItem className="half-item"
                                 {...formItemLayout}
-                                label="联系电话" >
+                                label="所有人电话" >
                                 <span>{theData.ownerMobile}</span>
                             </FormItem>
                             <FormItem className="half-item"
                                 {...formItemLayout}
+                                label="成果联系人" >
+                                <span>{theData.contacts}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="联系人电话" >
+                                <span>{theData.contactMobile}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
                                 label="证件号" >
                                 <span>{theData.ownerIdNumber}</span>
                             </FormItem>
@@ -765,6 +776,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             textFileList: [],
             switchValue: false,
             radios: false,
+            orgDisplay:'1',
             techPlanFileList: [],
             data: {},
             tags: [],
@@ -992,17 +1004,18 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         maturityVideoUrl: values.maturityVideoUrl,
                         innovation: values.innovation,
                         //
-                        switchSign: this.state.switchValue ? 1 : 0,
+                        //switchSign: this.state.switchValue ? 1 : 0,
                         //
                         ownerId: !this.state.switchValue ? (this.state.dataSourceObj ? this.state.dataSourceObj[values.iOwnerName] : this.state.data.ownerId) : undefined,
-                        contacts: !this.state.switchValue ? values.contacts : undefined,
                         ownerType: this.state.orgDisplay,//this.props.detailApiUrl.indexOf('org') != -1 ? 1 : 0,
                         //自定义
-                        ownerName: this.state.switchValue ? values.ownerName : undefined,
-                        ownerIdNumber: this.state.switchValue ? values.ownerIdNumber : undefined,
-                        ownerMobile: this.state.switchValue ? values.ownerMobile : undefined,
-                        ownerEmail: this.state.switchValue ? values.ownerEmail : undefined,
-                        ownerPostalAddress: this.state.switchValue ? values.ownerPostalAddress : undefined,
+                        ownerName:values.ownerName,
+                        contacts:values.contacts,
+                        ownerIdNumber:values.ownerIdNumber,
+                        ownerMobile:values.ownerMobile,
+                        contactMobile:values.contactMobile,
+                        ownerEmail:values.ownerEmail,
+                        ownerPostalAddress:values.ownerPostalAddress,
                         //
                         cooperationMode: values.cooperationMode,
                         transferMode: values.transferMode,
@@ -1060,7 +1073,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
             this.state.techPlanFileList = [];
             this.state.businessPlanFileList = [];
             this.props.form.resetFields();
-            this.state.orgDisplay=undefined;
         };
     },
     render() {
@@ -1071,6 +1083,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
         };
+        console.log(this.state.orgDisplay)
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
@@ -1335,13 +1348,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             <Input />
                             )}
                     </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="自定义成果所有人" >
-                        <Switch checked={this.state.switchValue} onChange={(e) => { this.setState({ switchValue: e }); }} />
-                    </FormItem>
-                    {this.state.switchValue ? <div className="clearfix" >
+                    <div className="clearfix" >
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="成果所有人" >
@@ -1353,7 +1360,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
-                            label="联系电话" >
+                            label="所有人电话" >
                             {getFieldDecorator('ownerMobile', {
                                 initialValue: theData.ownerMobile
                             })(
@@ -1362,6 +1369,24 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
+                            label="成果联系人" >
+                            {getFieldDecorator('contacts', {
+                                initialValue: theData.contacts
+                            })(
+                                <Input />
+                                )}
+                        </FormItem>
+                        <FormItem className="half-item"
+                            {...formItemLayout}
+                            label="联系人电话" >
+                            {getFieldDecorator('contactMobile', {
+                                initialValue: theData.contactMobile
+                            })(
+                                <Input />
+                                )}
+                        </FormItem>
+                        <FormItem className="half-item"
+                            {...formItemLayout}
                             label="证件号" >
                             {getFieldDecorator('ownerIdNumber', {
                                 initialValue: theData.ownerIdNumber
@@ -1387,39 +1412,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 <Input />
                                 )}
                         </FormItem>
-                    </div> : <div className="clearfix" >
-                            <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="成果所有人" >
-                                {getFieldDecorator('iOwnerName', {
-                                    initialValue: theData.iOwnerName || ''
-                                })(
-                                    <AutoComplete
-                                        dataSource={this.state.dataSource}
-                                        style={{ width: 200 }}
-                                        onSearch={this.state.therottleSearch}
-                                        placeholder="输入成果所有人"
-                                        onSelect={(e) => {
-                                            this.getContactsList(this.state.dataSourceObj[e]);
-                                        }} />
-                                    )}
-                            </FormItem>
-                            {this.props.detailApiUrl.indexOf('org') >= 0 ? <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="联系人" >
-                                {getFieldDecorator('contacts', {
-                                    initialValue: theData.contacts
-                                })(
-                                    <Select style={{ width: 260 }}
-                                        placeholder="请选择联系人"
-                                        notFoundContent="未获取到联系人列表"
-                                        showSearch
-                                        filterOption={companySearch}>
-                                        {this.state.contactsOption}
-                                    </Select>
-                                    )}
-                            </FormItem> : <div></div>}
-                        </div>}
+                    </div>
                     <div className="clearfix">
                         <FormItem className="half-item"
                             {...formItemLayout}

+ 5 - 1
js/component/manageCenter/achievement/techAchievementQuery.jsx

@@ -30,7 +30,7 @@ const AchievementList = React.createClass({
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name, //名称
                 recordPerson: this.state.recordPerson,
-                ownerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                ownerName: this.state.ownerName,
                 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, // 关键词
@@ -232,6 +232,7 @@ const AchievementList = React.createClass({
     reset() {
         this.state.serialNumber = undefined;
         this.state.name = undefined;
+        this.state.ownerName= undefined;
         this.state.recordPerson= undefined;
         this.state.keyword = undefined;
         this.state.category = undefined;
@@ -307,6 +308,9 @@ const AchievementList = React.createClass({
                     <Input placeholder="录入人名称"
                         value={this.state.recordPerson}
                         onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                    <Input placeholder="成果所有人"
+                        value={this.state.ownerName}
+                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 5 - 0
js/component/manageCenter/achievement/techAchievementRelease/techAchievementAudit.jsx

@@ -29,6 +29,7 @@ const AchievementList = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 serialNumber: this.state.serialNumber, //编号
                 name: this.state.name,
+                ownerName: this.state.ownerName,
                 auditStatus:3,//名称
                 keyword: this.state.keyword, // 关键词
                 category: this.state.category, //类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
@@ -299,6 +300,7 @@ const AchievementList = React.createClass({
     reset() {
         this.state.serialNumber = undefined;
         this.state.name = undefined;
+        this.state.ownerName= undefined;
         this.state.keyword = undefined;
         this.state.category = undefined;
         this.state.ownerType = undefined;
@@ -370,6 +372,9 @@ const AchievementList = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="成果所有人"
+                        value={this.state.ownerName}
+                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 96 - 29
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -48,6 +48,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							adminName: thisdata.adminName,
 							contactMobile: thisdata.contactMobile,
 							auditOpinion:thisdata.auditOpinion,
+							societyTag:thisdata.societyTag,
 						});
 					};
 					this.state.pagination.current = data.data.pageNo;
@@ -58,7 +59,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					this.state.pagination.total=0;
 				}
 				this.setState({
-					
 					dataSource: theArr,
 					pagination: this.state.pagination,
 					selectedRowKeys:[]
@@ -214,6 +214,49 @@ const PublicCustomer = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
+	//修改信息提交
+	submit(e) {
+        e.preventDefault();
+        this.props.form.validateFields((err, values) => { 
+        	if(!this.state.societyTag){
+	    		message.warning('社会属性不能为空')
+	    		return false;
+		    	};
+			if(this.state.mobile.length>13){
+	    		message.warning('电话号码字数不超过13个')
+	    		return false;
+	    	};
+            if (!err) {
+                this.setState({
+                    loading: true
+                });
+                $.ajax({
+                    method: "POST",
+                    dataType: "json",
+                    crossDomain: false,
+                    url: globalConfig.context + '/api/admin/customer/updateRefusedCustomer',
+                    data: {
+                        nickname:this.state.nickname,
+                        societyTag:this.state.societyTag,
+                        mobile: this.state.mobile, 
+                        id: this.state.id,
+                    }
+                }).done(function (data) { 
+                    this.setState({
+                        loading: false
+                    });
+                    if (!data.error.length) {
+                        message.success('提交成功!');
+                        this.detailsModal();
+                        this.loadData();
+                    } else {
+                        message.warning(data.error[0].message);
+                    }
+                }.bind(this));
+            }
+        });
+    },
+
 	//审核实名认证通过功能
 	auditRowse(e) {
 		e.preventDefault();	
@@ -252,14 +295,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		});
 	},
 	//整行点击
-//	tableRowClick(record, index) {
-//		this.state.RowData = record;
-//		this.detailsModalOk(record);
-//		this.setState({
-//			name:record.name,
-//			id:record.id,
-//		})
-//	},
+	tableRowClick(record, index) {
+		this.state.RowData = record;
+		this.detailsModalOk(record);
+		this.setState({
+			nickname:record.name,
+			mobile:record.contactMobile,
+			societyTag:record.societyTag,
+			id:record.id,
+		})
+	},
 	detailsModalOk(e) {
 		this.setState({ 
 			modal5Visible: true 
@@ -319,7 +364,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		const { RangePicker } = DatePicker;
 		const { getFieldDecorator } = this.props.form;
 		const formItemLayout = {
-			labelCol: { span: 8 },
+			labelCol: { span: 6 },
 			wrapperCol: { span: 14 },
 		};
 		//const theDatak = this.state.datak || {};
@@ -357,38 +402,60 @@ const PublicCustomer = Form.create()(React.createClass({
                 </div> 
                 <Modal	
 				      className="customeDetails"				      
-			          title="单位客户资料审核"
+			          title="被拒绝客户详情"
 			          width='500px'
 			          visible={this.state.modal5Visible}
 			          onOk={this.detailsModal}
 			          onCancel={this.detailsModal}
 			          footer=''
 			        >				    
-					<Form horizontal onSubmit={this.auditRows} id="add-form">
+					<Form horizontal onSubmit={this.submit} id="add-form">
 		                <Spin spinning={this.state.loading}>
-		                    <div className="clearfix">
+		                   <div className="clearfix">
 		                    	<FormItem 
-			                            labelCol={{ span: 6 }}
-			                        	wrapperCol={{ span: 15 }}
-			                            label="客户名称" >
-		                                <span>{this.state.name}</span>
+			                            {...formItemLayout}
+			                            label="客户姓名" >   
+			                           {getFieldDecorator('nickname', {
+			                                rules: [{ required: true, message: '此项为必填项!' }],
+			                                initialValue: this.state.nickname
+		                                })(
+		                                    <Input placeholder="客户姓名" onChange={(e)=>{this.setState({nickname:e.target.value})}}/>
+		                                )} 
 			                    </FormItem>
 		                    </div>
 		                    <div className="clearfix">
-	                   		    <FormItem
-			                        labelCol={{ span: 6 }}
-			                        wrapperCol={{ span: 15 }}
-			                        label="审核意见" >					                        
-			                        <Input type="textarea" rows={4} placeholder="审核意见" value={this.state.auditOpinion}
-                       				 	onChange={(e) => { this.setState({ auditOpinion: e.target.value }) }} style={{width:'95%'}}/>					                           
+		                    	<FormItem 
+			                            {...formItemLayout}
+			                            label="联系电话" >
+			                    		{getFieldDecorator('mobile', {
+			                                rules: [{ required: true, message: '此项为必填项!' }],
+			                                initialValue: this.state.mobile
+		                                })(
+		                                    <Input placeholder="联系电话" onChange={(e)=>{this.setState({mobile:e.target.value})}}/>
+		                                )} 
 			                    </FormItem>
-			                </div>    
-		                    <FormItem wrapperCol={{ span: 25, offset: 4 }}>
-		                        <Button className="set-submit" type="primary" onClick={this.auditRowse}>审核通过</Button> 
-		                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'30px'}}>审核不通过</Button>  
-		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{marginLeft:'30px'}}>取消</Button>
+		                    </div>
+		                    
+		                    <div className="clearfix">
+		                    	<FormItem  
+		                         	{...formItemLayout}
+		                           	label="社会属性"
+		                         > 
+			                          <Select placeholder="客户社会属性" value={this.state.societyTag} 
+		                                onChange={(e)=>{this.setState({societyTag:e})}}> 
+		                                {
+		                                    socialAttribute.map(function (item) {
+		                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
+		                                    })
+		                                }
+		                              </Select>
+		                   		 </FormItem>
+		                    </div>
+		                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
+		                        <Button className="set-submit" type="primary" htmlType="submit">提交审核</Button>  
+		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{'marginLeft':'40px'}}>取消</Button>
 		                    </FormItem> 
-		                </Spin>
+						</Spin>
 		            </Form >                          
 				</Modal>
           </div >

+ 36 - 8
js/component/manageCenter/customer/reviewed/enteringAudit.jsx

@@ -42,7 +42,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					for(let i = 0; i < data.data.list.length; i++) {
 						thisdata = data.data.list[i];
 						theArr.push({
-							key: i,
+							key: thisdata.uid,
 							id: thisdata.uid,
 							name: thisdata.name,
 							createTime: thisdata.createTime,
@@ -103,6 +103,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			addressSearch: [],
 			orgCodeUrl: [],
 			companyLogoUrl: [],
+			allID:[],
 			visible: false,
 			searchMore: true,
 			releaseDate: [],
@@ -167,6 +168,7 @@ const PublicCustomer = Form.create()(React.createClass({
     	let api=1;
     	this.examine(api,record);
     },
+    //审核功能
     examine(api,record) {
         this.setState({
             selectedRowKeys: [],
@@ -193,6 +195,30 @@ const PublicCustomer = Form.create()(React.createClass({
             this.loadData(this.state.ispage);
         }.bind(this));
     },
+    //审核多选功能
+    examines(){
+    	$.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+            data: {
+                id:this.state.selectedRowKey.join(","),
+                auditStatus:1,
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                    selectedRowKey:[],
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData(this.state.ispage);
+        }.bind(this));
+    },
 	componentWillMount() {
 		this.loadData();
 	},
@@ -306,22 +332,22 @@ const PublicCustomer = Form.create()(React.createClass({
 			},
 		};
 		const rowSelections = {
-			selectedRowKeys: this.state.selectedRowKey,
+			selectedRowKey: this.state.selectedRowKey,
 			onChange: (selectedRowKey, selectedRow) => {
 				this.setState({
-					selectedRow: selectedRow.slice(-1),
-					selectedRowKey: selectedRowKey.slice(-1)
+					selectedRow: selectedRow,
+					selectedRowKey: selectedRowKey
 				});
 			},
 			onSelect: (records, selected, selectedRow) => {
 				this.setState({
-					selectedRow: selectedRow.slice(-1),
+					//selectedRow: selectedRow.slice(-1),
 					records: records.id,
 				})
 			},
 
 		};
-		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const hasSelected = this.state.selectedRowKey.length > 0;
 		const { RangePicker } = DatePicker;
 		const { getFieldDecorator } = this.props.form;
 		const formItemLayout = {
@@ -349,15 +375,17 @@ const PublicCustomer = Form.create()(React.createClass({
                         value={this.state.adminName}
                         onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                                         				
+                    <Button onClick={this.reset}>重置</Button>      
+                    <Button type="primary" onClick={this.examines} disabled={!hasSelected}>全部通过</Button>  
 				</div>                                               
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}    
-                            rowSelection={rowSelection}
+                            rowSelection={rowSelections}
                             pagination={this.state.pagination} 
                             onRowClick={this.tableRowClick}
+                           
                            />
                     </Spin>
                 </div> 

+ 1 - 1
js/component/manageCenter/demand/demandAudit/demandAuditDesc.jsx

@@ -674,7 +674,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                     <FormItem wrapperCol={{ span: 12, offset: 3 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">确认</Button>
                         <Button className="set-submit" type="ghost" onClick={this.props.closeDesc}>取消</Button>
-                        {window.showAuditStatus ? <Button className="set-submit" loading={this.state.buttonLoading} type="primary" onClick={this.buildMatchList} >生成匹配列表</Button> : <span></span>}
+                        {window.showAuditStatus ? <Button className="set-submit" loading={this.state.buttonLoading} type="primary" onClick={this.buildMatchList} style={{"display":"none"}}>生成匹配列表</Button> : <span></span>}
                     </FormItem>
                     <Modal maskClosable={false} title="确认"
                         visible={this.state.formSubmitVisible}

+ 6 - 9
js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx

@@ -31,6 +31,7 @@ const TechDemandPublish = React.createClass({
                 name: this.state.name,
                 auditStatus:2,
                 keyword: this.state.keyword,
+                employerName: this.state.employerName,
                 infoSources: this.state.infoSources ? Number(this.state.infoSources) : undefined,
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
                 //username: this.state.username,
@@ -45,7 +46,7 @@ const TechDemandPublish = React.createClass({
                 boutique:this.state.boutique,
                 hot:this.state.hot,
                 dataCategory:this.state.dataCategory,
-                employerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                //employerName: 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,
             },
@@ -172,14 +173,6 @@ const TechDemandPublish = React.createClass({
                         }
                     }
                 }, {
-                    title: '加急天数',
-                    dataIndex: 'urgentDays',
-                    key: 'urgentDays',
-                }, {
-                    title: '加急报酬(万)',
-                    dataIndex: 'urgentMoney',
-                    key: 'urgentMoney',
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -435,6 +428,7 @@ const TechDemandPublish = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.keyword = undefined;
+        this.state.employerName= undefined;
         this.state.infoSources = undefined;
         this.state.demandType = undefined;
         this.state.searchName = undefined;
@@ -509,6 +503,9 @@ const TechDemandPublish = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="需求雇主名称"
+                        value={this.state.employerName}
+                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 6 - 9
js/component/manageCenter/demand/demandRelease/techDemandRelease.jsx

@@ -30,6 +30,7 @@ const TechDemandPublish = React.createClass({
                 serialNumber: this.state.serialNumber,
                 name: this.state.name,
                 keyword: this.state.keyword,
+                employerName: this.state.employerName,
                 infoSources: this.state.infoSources ? Number(this.state.infoSources) : undefined,
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
                 //username: this.state.username,
@@ -45,7 +46,7 @@ const TechDemandPublish = React.createClass({
                 boutique:this.state.boutique,
                 hot:this.state.hot,
                 dataCategory:this.state.dataCategory,
-                employerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                //employerName: 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,
             },
@@ -171,14 +172,6 @@ const TechDemandPublish = React.createClass({
                         }
                     }
                 }, {
-                    title: '加急天数',
-                    dataIndex: 'urgentDays',
-                    key: 'urgentDays',
-                }, {
-                    title: '加急报酬(万)',
-                    dataIndex: 'urgentMoney',
-                    key: 'urgentMoney',
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -445,6 +438,7 @@ const TechDemandPublish = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.keyword = undefined;
+        this.state.employerName= undefined;
         this.state.infoSources = undefined;
         this.state.demandType = undefined;
         this.state.searchName = undefined;
@@ -519,6 +513,9 @@ const TechDemandPublish = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="需求雇主名称"
+                        value={this.state.employerName}
+                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 6 - 9
js/component/manageCenter/demand/myTechDemand.jsx

@@ -30,6 +30,7 @@ const DemandList = React.createClass({
                 serialNumber: this.state.serialNumber,
                 name: this.state.name,
                 keyword: this.state.keyword,
+                employerName: this.state.employerName,
                 infoSources: this.state.infoSources ? Number(this.state.infoSources) : undefined,
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
                 //username: this.state.username,
@@ -45,7 +46,7 @@ const DemandList = React.createClass({
                 boutique:this.state.boutique,
                 hot:this.state.hot,
                 dataCategory:this.state.dataCategory,
-                employerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                //employerName: 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,
             },
@@ -171,14 +172,6 @@ const DemandList = React.createClass({
                         }
                     }
                 }, {
-                    title: '加急天数',
-                    dataIndex: 'urgentDays',
-                    key: 'urgentDays',
-                }, {
-                    title: '加急报酬(万)',
-                    dataIndex: 'urgentMoney',
-                    key: 'urgentMoney',
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -394,6 +387,7 @@ const DemandList = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.keyword = undefined;
+        this.state.employerName= undefined;
         this.state.infoSources = undefined;
         this.state.demandType = undefined;
         this.state.searchName = undefined;
@@ -468,6 +462,9 @@ const DemandList = React.createClass({
                     <Input placeholder="关键字"
                         value={this.state.keyword}
                         onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                    <Input placeholder="需求雇主名称"
+                        value={this.state.employerName}
+                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

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

@@ -27,6 +27,7 @@ const Organization=Form.create()(React.createClass({
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.name, //需求名称
+                employerName: this.state.employerName, //需求雇主名称
                 publishPlatform:superText,//发布子平台
                 publishClient:this.state.publishClient,//发布客户端
                 publishPage:superTexts,//发布页面
@@ -680,6 +681,7 @@ const Organization=Form.create()(React.createClass({
     reset() {
     	this.state.name = undefined;//成果名称清零
         this.state.superId = undefined;//发布子平台清零
+        this.state.employerName= undefined;//需求雇主清零
         this.state.publishClient = undefined;//发布客户端清零
         this.state.publishPage = undefined;//发布页面清零
         this.state.ifTop = undefined;//是否置顶清零
@@ -757,6 +759,9 @@ const Organization=Form.create()(React.createClass({
 	                    <Input placeholder="需求名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
 	                        value={this.state.name}
 	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+	                    <Input placeholder="需求雇主名称"
+	                        value={this.state.employerName}
+	                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
 	                    <Select placeholder="发布子平台"
                             style={{ width:'200px',marginRight:'10px' }}
                             value={this.state.superId}

+ 6 - 9
js/component/manageCenter/demand/techDemand.jsx

@@ -31,6 +31,7 @@ const DemandList = React.createClass({
                 serialNumber: this.state.serialNumber,
                 name: this.state.name,
                 recordPerson:this.state.recordPerson,//录入人
+                employerName:this.state.employerName,//录入人
                 keyword: this.state.keyword,
                 infoSources: this.state.infoSources ? Number(this.state.infoSources) : undefined,
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
@@ -47,7 +48,7 @@ const DemandList = React.createClass({
                 boutique:this.state.boutique,
                 hot:this.state.hot,
                 dataCategory:this.state.dataCategory,
-                employerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                //employerName: 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,
             },
@@ -173,14 +174,6 @@ const DemandList = React.createClass({
                         }
                     }
                 }, {
-                    title: '加急天数',
-                    dataIndex: 'urgentDays',
-                    key: 'urgentDays',
-                }, {
-                    title: '加急报酬(万)',
-                    dataIndex: 'urgentMoney',
-                    key: 'urgentMoney',
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -395,6 +388,7 @@ const DemandList = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.recordPerson= undefined;
+        this.state.employerName= undefined;
         this.state.keyword = undefined;
         this.state.infoSources = undefined;
         this.state.demandType = undefined;
@@ -473,6 +467,9 @@ const DemandList = React.createClass({
                     <Input placeholder="录入人名称"
                         value={this.state.recordPerson}
                         onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                    <Input placeholder="需求雇主名称"
+                        value={this.state.employerName}
+                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>

+ 7 - 10
js/component/manageCenter/demand/techDemandQuery.jsx

@@ -30,6 +30,7 @@ const DemandList = React.createClass({
                 serialNumber: this.state.serialNumber,
                 name: this.state.name,
                 recordPerson: this.state.recordPerson,
+                employerName: this.state.employerName,
                 keyword: this.state.keyword,
                 infoSources: this.state.infoSources ? Number(this.state.infoSources) : undefined,
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
@@ -46,7 +47,7 @@ const DemandList = React.createClass({
                 boutique:this.state.boutique,
                 hot:this.state.hot,
                 dataCategory:this.state.dataCategory,
-                employerName: this.state.searchType == 1 ? this.state.searchName : undefined,
+                //employerName: 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,
             },
@@ -172,14 +173,6 @@ const DemandList = React.createClass({
                         }
                     }
                 }, {
-                    title: '加急天数',
-                    dataIndex: 'urgentDays',
-                    key: 'urgentDays',
-                }, {
-                    title: '加急报酬(万)',
-                    dataIndex: 'urgentMoney',
-                    key: 'urgentMoney',
-                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -394,6 +387,7 @@ const DemandList = React.createClass({
         this.state.serialNumber = undefined;
         this.state.name = undefined;
         this.state.recordPerson= undefined;
+        this.state.employerName= undefined;
         this.state.keyword = undefined;
         this.state.infoSources = undefined;
         this.state.demandType = undefined;
@@ -430,7 +424,7 @@ const DemandList = 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/demand/uploadTemplate"}
@@ -472,6 +466,9 @@ const DemandList = React.createClass({
                     <Input placeholder="录入人名称"
                         value={this.state.recordPerson}
                         onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                    <Input placeholder="需求雇主名称"
+                        value={this.state.employerName}
+                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
                     <Radio.Group value={this.state.searchType} onChange={(e) => {
                         this.setState({ searchType: e.target.value })
                     }}>