liting2017 6 years ago
parent
commit
d333ab1819

+ 1 - 1
js/admin/index/leftMenu.jsx

@@ -89,7 +89,7 @@ const LeftTab = React.createClass({
 					{!this.state.switch && <img src={logo} alt="" />}
 					{!this.state.switch && <img src={logo} alt="" />}
 					{!this.state.switch && (
 					{!this.state.switch && (
 						<span>
 						<span>
-							<a href={globalConfig.context + '/user/account/index.html'}>会员中心管理</a>
+							<a href={globalConfig.context + '/user/account/index.html'}>个人中心管理</a>
 						</span>
 						</span>
 					)}
 					)}
 					<Icon type={this.state.switch ? 'forward' : 'backward'} className="icon" onClick={this.iconFun} />
 					<Icon type={this.state.switch ? 'forward' : 'backward'} className="icon" onClick={this.iconFun} />

+ 2 - 2
js/component/account/demand/demandDesc.jsx

@@ -29,7 +29,7 @@ class DemandDesc extends React.Component {
 
 
 	}
 	}
 	render() {
 	render() {
-		let data = this.props.data || {releaseStatus:0};
+		let data = this.props.data || {auditStatus:0};
 		return (
 		return (
 			<div className="patent-desc">
 			<div className="patent-desc">
 				<Modal
 				<Modal
@@ -44,7 +44,7 @@ class DemandDesc extends React.Component {
 				>
 				>
 					<div>
 					<div>
 						<div>
 						<div>
-								{data.releaseStatus=='1'||data.releaseStatus=='2'?
+								{data.auditStatus=='1'||data.auditStatus=='2'?
 									<DemandDetaiel
 									<DemandDetaiel
 									closeDesc={this.handleCancel.bind(this)}
 									closeDesc={this.handleCancel.bind(this)}
 									data={this.props.data}
 									data={this.props.data}

+ 41 - 35
js/component/account/demand/demandDetaiel.jsx

@@ -47,7 +47,7 @@ const DemandDetail = Form.create()(React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context +  '/api/user/demand/orgDemandDetail' ,
+            url: globalConfig.context +  '/api/user/demand/demandDetail' ,
             data: {
             data: {
                 id: id
                 id: id
             },
             },
@@ -58,14 +58,20 @@ const DemandDetail = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
                     };
                     };
                     thisData = {};
                     thisData = {};
-                };
-                let ProvinceS = thisData.locationProvince, //getprovince
-				    citys = thisData.locationCity,
-				    Areas = thisData.locationArea,
-				    ProvinceCity = getProvince(ProvinceS, citys, Areas);
+				};
+				// let ProvinceCityArr = [];
+				// let ProvinceS = thisData.locationProvince; //getprovince
+				// let citys = thisData.locationCity;
+				// let Areas = thisData.locationArea;
+				// ProvinceCityArr.push(ProvinceS, citys, Areas);
                 this.setState({
                 this.setState({
-
-                    data: thisData,
+					//ProvinceCity:ProvinceCityArr,
+					id:thisData.id,
+					data: thisData,
+					isHot:thisData.isHot,
+					isUrgent:thisData.isUrgent,
+					status:thisData.status,
+					isHot:thisData.isHot,
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
                 });
             }.bind(this),
             }.bind(this),
@@ -125,11 +131,9 @@ const DemandDetail = Form.create()(React.createClass({
                 this.loadData(nextProps.data.id);
                 this.loadData(nextProps.data.id);
             } else {
             } else {
 				this.state.data = {};
 				this.state.data = {};
-				this.state.demandType=undefined; //需求类型
-				this.state.urgent=undefined;//加急需求
-				this.state.offer=undefined;//是否悬赏
-				this.state.hotDemand=undefined;
-				this.state.solve=undefined;
+				this.state.isUrgent=undefined;//加急需求
+				this.state.isHot=undefined;//是否悬赏
+				this.state.status=undefined;
                 this.state.pictureUrl = [];
                 this.state.pictureUrl = [];
             };
             };
             this.props.form.resetFields();
             this.props.form.resetFields();
@@ -164,13 +168,13 @@ const DemandDetail = Form.create()(React.createClass({
 						</FormItem>
 						</FormItem>
 						{theData.demandType=='5'&&
 						{theData.demandType=='5'&&
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
-							     <span>{theData.demandType1} 元/月</span>
+							     <span>{theData.crowdCost} 元/月</span>
 						    </FormItem>}
 						    </FormItem>}
 						{theData.demandType=='3'&&<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
 						{theData.demandType=='3'&&<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
-                            <span>{theData.demandType2}万元</span>
+                            <span>{theData.budgetCost}万元</span>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
-							<span>{theData.yongtu?'扩大再生产':'研发'}</span>
+							<span>{theData.researchType?'扩大再生产':'研发'}</span>
 						</FormItem>
 						</FormItem>
 						</div>
 						</div>
 						}
 						}
@@ -178,29 +182,29 @@ const DemandDetail = Form.create()(React.createClass({
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="加急需求">
 						<FormItem className="half-item" {...formItemLayout} label="加急需求">
-                            <span>{theData.urgent?'加急':'非加急'}</span>
+                            <span>{theData.isUrgent?'加急':'非加急'}</span>
 						</FormItem>
 						</FormItem>
-						{theData.urgent?<FormItem className="half-item" {...formItemLayout} label="日期">
-							<span>{theData.urgentTime}</span>
-						</FormItem>:''}
-					</div>
-					<div className="clearfix">
-						<FormItem className="half-item" {...formItemLayout} label="悬赏需求">
-                            <span>{theData.offer?'悬赏':'未悬赏'}</span>
+						{theData.isUrgent?<div><FormItem className="half-item" {...formItemLayout} label="日期">
+							<span>{theData.urgentDays}</span>
+                        </FormItem>
+                        <FormItem className="half-item" {...formItemLayout} label="悬赏金额">
+							<span style={{ marginLeft: '20px' }}>{theData.urgentMoney}万元</span>
 						</FormItem>
 						</FormItem>
-						{theData.offer>=1&&<FormItem className="half-item" {...formItemLayout} label="悬赏金额">
-							<span style={{ marginLeft: '20px' }}>{theData.budgetCost}万元</span>
-						</FormItem>}
+                        </div>:''}
 					</div>
 					</div>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
-                            <span>{theData.hotDemand?'热点':'非热点'}</span>
+                            <span>{theData.isHot?'热点':'非热点'}</span>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="解决">
 						<FormItem className="half-item" {...formItemLayout} label="解决">
-                            <span>{theData.solve?'已解决':'未解决'}</span>
+                            <span>
+                                {theData.status=='0'&&'进行中'}
+                                {theData.status=='1'&&'未解决'}
+                                {theData.status=='2'&&'已解决'}
+                            </span>
 						</FormItem>
 						</FormItem>
 					</div>
 					</div>
-					<div className="clearfix">
+					{/* <div className="clearfix">
 						<FormItem
 						<FormItem
 							className="half-item"
 							className="half-item"
 							{...formItemLayout}
 							{...formItemLayout}
@@ -208,7 +212,7 @@ const DemandDetail = Form.create()(React.createClass({
 						>
 						>
 							{this.state.ProvinceCity}
 							{this.state.ProvinceCity}
 						</FormItem>  
 						</FormItem>  
-					</div>
+					</div> */}
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
                         <div className="clearfix">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                 <Upload className="demandDetailShow-upload"
@@ -232,16 +236,18 @@ const DemandDetail = Form.create()(React.createClass({
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
 							<span>{getReleaseStateList(theData.releaseState)}</span>
 							<span>{getReleaseStateList(theData.releaseState)}</span>
 						</FormItem>
 						</FormItem>
-						<FormItem className="half-item" {...formItemLayout} label="发布时间">
-                                <span>{theData.releaseTime}</span>
-						</FormItem>
 					</div>
 					</div>
                     <div>
                     <div>
                         <FormItem className="half-item" labelCol={{ span: 6 }}
                         <FormItem className="half-item" labelCol={{ span: 6 }}
 							wrapperCol={{ span: 18 }} label="发布位置">
 							wrapperCol={{ span: 18 }} label="发布位置">
-                                <span>{getReleasePositionList(theData.releasePosition)}</span>
+                                <span>{getReleasePositionList(theData.publishPages)}</span>
 						</FormItem>
 						</FormItem>
                     </div>
                     </div>
+                    <div className="clearfix">
+                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="审核信息">
+                                <span>{theData.auditInfo}</span>
+                            </FormItem>
+					</div>
 					<div className="clearfix">
 					<div className="clearfix">
 						{this.props.data.releaseStatus=='2'&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 						{this.props.data.releaseStatus=='2'&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >

+ 85 - 72
js/component/account/demand/demandForm.jsx

@@ -101,7 +101,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context +  '/api/user/demand/orgDemandDetail' ,
+            url: globalConfig.context +  '/api/user/demand/demandDetail' ,
             data: {
             data: {
                 id: id
                 id: id
             },
             },
@@ -113,14 +113,19 @@ const DemandDetailForm = Form.create()(React.createClass({
                     };
                     };
                     thisData = {};
                     thisData = {};
 				};
 				};
-				let ProvinceCityArr = [];
-				let ProvinceS = thisData.locationProvince; //getprovince
-				let citys = thisData.locationCity;
-				let Areas = thisData.locationArea;
-				ProvinceCityArr.push(ProvinceS, citys, Areas);
+				// let ProvinceCityArr = [];
+				// let ProvinceS = thisData.locationProvince; //getprovince
+				// let citys = thisData.locationCity;
+				// let Areas = thisData.locationArea;
+				// ProvinceCityArr.push(ProvinceS, citys, Areas);
                 this.setState({
                 this.setState({
-					ProvinceCity:ProvinceCityArr,
-                    data: thisData,
+					//ProvinceCity:ProvinceCityArr,
+					id:thisData.id,
+					data: thisData,
+					isHot:thisData.isHot,
+					isUrgent:thisData.isUrgent,
+					status:thisData.status,
+					isHot:thisData.isHot,
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
                 });
             }.bind(this),
             }.bind(this),
@@ -156,41 +161,30 @@ const DemandDetailForm = Form.create()(React.createClass({
                     loading: true
                     loading: true
                 });
                 });
                 $.ajax({
                 $.ajax({
-                    method: "POST",
+                    method: "post",
                     dataType: "json",
                     dataType: "json",
-                    crossDomain: false,
+                    // crossDomain: false,
                     url: this.props.data.id ? globalConfig.context + '/api/user/demand/update' : globalConfig.context + '/api/user/demand/apply',
                     url: this.props.data.id ? globalConfig.context + '/api/user/demand/update' : globalConfig.context + '/api/user/demand/apply',
                     data: {
                     data: {
                         id: this.props.data.id,
                         id: this.props.data.id,
-                        dataCategory: Number(window.userData.type),
-                        serialNumber: this.props.data.serialNumber,
                         name: values.name,
                         name: values.name,
-                        keywords: this.state.tags,
-                        infoSources: 1,
                         industryCategoryA: values.industryCategory ? values.industryCategory[0] : undefined,
                         industryCategoryA: values.industryCategory ? values.industryCategory[0] : undefined,
                         industryCategoryB: values.industryCategory ? values.industryCategory[1] : undefined,
                         industryCategoryB: values.industryCategory ? values.industryCategory[1] : undefined,
                         demandType: values.demandType,
                         demandType: values.demandType,
                         problemDes: values.problemDes,
                         problemDes: values.problemDes,
-                        technicalRequirements: values.technicalRequirements,
-                        pictureUrl: thePictureUrl,
-                        textFileUrl: this.state.textFileUrl,
-                        videoUrl: values.videoUrl,
-                        fixedBudget: values.fixedBudget,
-                        fixedCycle: values.fixedCycle,
-                        peopleNumber: values.peopleNumber,
-                        fixedScheme: values.fixedScheme,
-                        costEscrow: values.costEscrow,
-                        budgetCost: values.budgetCost,
-                        releaseStatus: values.releaseStatus,
-                        principalId: values.principalId,
-                        validityPeriodFormattedDate: values.validityPeriod ? values.validityPeriod.format('YYYY-MM-DD') : undefined,
-                        //
-                        contacts: values.contacts,
+                      //  pictureUrl: thePictureUrl,
+						crowdCost:values.crowdCost,
+						budgetCost:values.budgetCost,
+						urgentDays:values.urgentDays?values.urgentDays.format('YYYY-MM-DD'):undefined,
+						urgentMoney:values.urgentMoney,
+						auditStatus:values.auditStatus,
                         status: this.state.status,
                         status: this.state.status,
-                        auditStatus: this.state.auditStatus
+						isUrgent: this.state.isUrgent,
+						isHot:this.state.isHot,
+						publishPages:JSON.stringify(values.publishPages),
+						researchType:values.researchType
                     }
                     }
                 }).done(function (data) {
                 }).done(function (data) {
-                    this.state.auditStatus = 0;
                     this.setState({
                     this.setState({
                         loading: false
                         loading: false
                     });
                     });
@@ -207,6 +201,28 @@ const DemandDetailForm = Form.create()(React.createClass({
             }
             }
         });
         });
 	},
 	},
+	submission(record){
+		this.handleSubmit();
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/user/demand/deletet",
+            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));
+    },
 	cancelFun(){
 	cancelFun(){
 		this.props.closeDesc();
 		this.props.closeDesc();
 	},
 	},
@@ -225,11 +241,9 @@ const DemandDetailForm = Form.create()(React.createClass({
                 this.loadData(nextProps.data.id);
                 this.loadData(nextProps.data.id);
             } else {
             } else {
 				this.state.data = {};
 				this.state.data = {};
-				this.state.demandType=undefined; //需求类型
-				this.state.urgent=undefined;//加急需求
-				this.state.offer=undefined;//是否悬赏
-				this.state.hotDemand=undefined;
-				this.state.solve=undefined;
+				this.state.isUrgent=undefined;//加急需求
+				this.state.isHot=undefined;//是否悬赏
+				this.state.status=undefined;
                 this.state.pictureUrl = [];
                 this.state.pictureUrl = [];
             };
             };
             this.props.form.resetFields();
             this.props.form.resetFields();
@@ -282,23 +296,23 @@ const DemandDetailForm = Form.create()(React.createClass({
 						</FormItem>
 						</FormItem>
 						{demandType=='5'||theData.demandType=='5'?
 						{demandType=='5'||theData.demandType=='5'?
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
-							{getFieldDecorator('name', {
+							{getFieldDecorator('crowdCost', {
 								rules: [ { required: false } ],
 								rules: [ { required: false } ],
-								initialValue: theData.namea
+								initialValue: theData.crowdCost
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入酬劳."/>)}
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入酬劳."/>)}
 							<span style={{ marginLeft: '20px' }}>元/月</span>
 							<span style={{ marginLeft: '20px' }}>元/月</span>
 						</FormItem>:''}
 						</FormItem>:''}
 						{demandType=='3'||theData.demandType=='3'?<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
 						{demandType=='3'||theData.demandType=='3'?<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
-							{getFieldDecorator('name', {
+							{getFieldDecorator('budgetCost', {
 								rules: [ { required: false } ],
 								rules: [ { required: false } ],
-								initialValue: theData.namea
+								initialValue: theData.budgetCost
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入资金需求额度."/>)}
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入资金需求额度."/>)}
-							<span style={{ marginLeft: '20px' }}>万元</span>
+							<span style={{ marginLeft: '10px' }}>万元</span>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
-							{getFieldDecorator('namea', {
+							{getFieldDecorator('researchType', {
 								rules: [ { required: false } ],
 								rules: [ { required: false } ],
-								initialValue: theData.namea
+								initialValue: theData.researchType
 							})(
 							})(
 								<Select placeholder="选择资金用途" style={{ width: 160 }} >
 								<Select placeholder="选择资金用途" style={{ width: 160 }} >
 									<Select.Option value="0" >研发</Select.Option>
 									<Select.Option value="0" >研发</Select.Option>
@@ -312,46 +326,40 @@ const DemandDetailForm = Form.create()(React.createClass({
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="加急">
 						<FormItem className="half-item" {...formItemLayout} label="加急">
-							<Radio.Group value={this.state.urgent} onChange={(e)=>{this.setState({urgent:e.target.value})}}>
+							<Radio.Group value={this.state.isUrgent} onChange={(e)=>{this.setState({isUrgent:e.target.value})}}>
 								<Radio value={1}>加急</Radio>
 								<Radio value={1}>加急</Radio>
 								<Radio value={0}>非加急</Radio>
 								<Radio value={0}>非加急</Radio>
 							</Radio.Group>
 							</Radio.Group>
 						</FormItem>
 						</FormItem>
-						{this.state.urgent?<FormItem className="half-item" {...formItemLayout} label="日期">
-							{getFieldDecorator('validitytime', {
-								initialValue: theData.validitytime ? moment(theData.validitytime) : null
+						{this.state.isUrgent?<div className="clearfix">
+						<FormItem className="half-item" {...formItemLayout} label="日期">
+							{getFieldDecorator('urgentDays', {
+								initialValue: theData.urgentDays ? moment(theData.urgentDays) : null
 							})(<DatePicker />)}
 							})(<DatePicker />)}
-						</FormItem>:''}
-					</div>
-					<div className="clearfix">
-						<FormItem className="half-item" {...formItemLayout} label="悬赏需求">
-							<Radio.Group value={this.state.offer} onChange={(e)=>{this.setState({offer:e.target.value})}}>
-								<Radio value={0}>否</Radio>
-								<Radio value={1}>是</Radio>
-							</Radio.Group>
 						</FormItem>
 						</FormItem>
-						{this.state.offer>=1&&<FormItem className="half-item" {...formItemLayout} label="悬赏金额">
-							{getFieldDecorator('budgetCost', {
-								initialValue: theData.budgetCost
+						<FormItem className="half-item" {...formItemLayout} label="加急金额">
+							{getFieldDecorator('urgentMoney', {
+								initialValue: theData.urgentMoney
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入金额."/>)}
 							})(<InputNumber min={0} max={999999} step={0.01} placeholder="输入金额."/>)}
 							<span style={{ marginLeft: '20px' }}>万元</span>
 							<span style={{ marginLeft: '20px' }}>万元</span>
-						</FormItem>}
+						</FormItem></div>:''}
 					</div>
 					</div>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
-							<Radio.Group value={this.state.hotDemand} onChange={(e)=>{this.setState({hotDemand:e.target.value})}}>
+							<Radio.Group value={this.state.isHot} onChange={(e)=>{this.setState({isHot:e.target.value})}}>
 								<Radio value={0}>否</Radio>
 								<Radio value={0}>否</Radio>
 								<Radio value={1}>是</Radio>
 								<Radio value={1}>是</Radio>
 							</Radio.Group>
 							</Radio.Group>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="解决">
 						<FormItem className="half-item" {...formItemLayout} label="解决">
-							<Radio.Group value={this.state.solve} onChange={(e)=>{this.setState({solve:e.target.value})}}>
-								<Radio value={0}>未解决</Radio>
-								<Radio value={1}>已解决</Radio>
+							<Radio.Group value={this.state.status} onChange={(e)=>{this.setState({status:e.target.value})}}>
+								<Radio value={0}>进行中</Radio>
+								<Radio value={1}>未解决</Radio>
+								<Radio value={2}>已解决</Radio>
 							</Radio.Group>
 							</Radio.Group>
 						</FormItem>
 						</FormItem>
 					</div>
 					</div>
-					<div className="clearfix">
+					{/* <div className="clearfix">
 						<FormItem
 						<FormItem
 							className="half-item"
 							className="half-item"
 							{...formItemLayout}
 							{...formItemLayout}
@@ -366,7 +374,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 								}}
 								}}
 							/>
 							/>
 						</FormItem>  
 						</FormItem>  
-					</div>
+					</div> */}
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
 						<PicturesWall
 						<PicturesWall
 							uid={theData.employerId}
 							uid={theData.employerId}
@@ -377,9 +385,9 @@ const DemandDetailForm = Form.create()(React.createClass({
 					</FormItem>
 					</FormItem>
 					<div>
 					<div>
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
-							{getFieldDecorator('releaseState', {
+							{getFieldDecorator('auditStatus', {
 								rules: [ { required: false } ],
 								rules: [ { required: false } ],
-								initialValue: theData.releaseState
+								initialValue: theData.auditStatus
 							})(
 							})(
 								<Select placeholder="选择发布状态" style={{ width: 160 }} >
 								<Select placeholder="选择发布状态" style={{ width: 160 }} >
 									<Select.Option value="0" >草稿</Select.Option>
 									<Select.Option value="0" >草稿</Select.Option>
@@ -390,19 +398,19 @@ const DemandDetailForm = Form.create()(React.createClass({
 								</Select>
 								</Select>
 							)}
 							)}
 						</FormItem>
 						</FormItem>
-						<FormItem className="half-item" {...formItemLayout} label="发布时间">
+						{/* <FormItem className="half-item" {...formItemLayout} label="发布时间">
 								{getFieldDecorator('releaseTime', {
 								{getFieldDecorator('releaseTime', {
 									initialValue: theData.releaseTime ? moment(theData.releaseTime) : null
 									initialValue: theData.releaseTime ? moment(theData.releaseTime) : null
 								})(<DatePicker />)}
 								})(<DatePicker />)}
-						</FormItem>
+						</FormItem> */}
 					</div>
 					</div>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="full-item" 
 						<FormItem className="full-item" 
 							labelCol={{ span: 3 }}
 							labelCol={{ span: 3 }}
 							wrapperCol={{ span: 18 }} label="发布位置">
 							wrapperCol={{ span: 18 }} label="发布位置">
-							{getFieldDecorator('releasePosition', {
+							{getFieldDecorator('publishPages', {
 								rules: [ { required: false } ],
 								rules: [ { required: false } ],
-								initialValue: theData.releasePosition
+								initialValue: theData.publishPages
 							})(
 							})(
 								<Checkbox.Group>
 								<Checkbox.Group>
 									<Row>
 									<Row>
@@ -417,6 +425,11 @@ const DemandDetailForm = Form.create()(React.createClass({
 							)}
 							)}
 						</FormItem>
 						</FormItem>
 					</div>
 					</div>
+					{theData.auditInfo&&<div className="clearfix">
+						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="审核信息">
+							<span>{theData.auditInfo}</span>
+						</FormItem>
+					</div>}
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 						<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 							<Button className="set-submit" type="primary" htmlType="submit">
 							<Button className="set-submit" type="primary" htmlType="submit">
@@ -426,7 +439,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 								className="set-submit"
 								className="set-submit"
 								type="ghost"
 								type="ghost"
 								onClick={(e) => {
 								onClick={(e) => {
-									this.state.auditStatus = 1;
+									this.submission()
 								}}
 								}}
 								htmlType="submit"
 								htmlType="submit"
 							>
 							>

+ 25 - 71
js/component/account/demand/techDemand.jsx

@@ -22,17 +22,9 @@ const DemandList = React.createClass({
             data: {
             data: {
                 pageNo: pageNo || 1,
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 pageSize: this.state.pagination.pageSize,
-                serialNumber: this.state.serialNumber,
-                name: this.state.name,
-                keyword: this.state.keyword,
-                demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
-                status: this.state.status ? Number(this.state.status) : undefined,
-                releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
-                validityPeriodStartDate: this.state.validityPeriodDate[0],
-                validityPeriodEndDate: this.state.validityPeriodDate[1],
-                releaseDateStartDate: this.state.releaseDate[0],
-                releaseDateEndDate: this.state.releaseDate[1],
-                auditStatus: this.state.auditStatus
+                name: this.state.name, //需求名称
+                startDate: this.state.releaseDate[0],
+                endDate: this.state.releaseDate[1],
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -46,19 +38,12 @@ const DemandList = React.createClass({
                         theArr.push({
                         theArr.push({
                             key: i,
                             key: i,
                             id: thisdata.id,
                             id: thisdata.id,
-                            serialNumber: thisdata.serialNumber,
-                            dataCategory: thisdata.dataCategory,
+                            serialNumber: thisdata.serialNumber, //编号
                             name: thisdata.name,
                             name: thisdata.name,
-                            keyword: thisdata.keyword,
-                            releaseDate: thisdata.releaseDate,
                             demandType: thisdata.demandType,
                             demandType: thisdata.demandType,
-                            validityPeriod: thisdata.validityPeriod,
-                            status: thisdata.status,
-                            releaseStatus: thisdata.releaseStatus,
-                            employerId: thisdata.employerId,
-                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
-                            validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
-                            auditStatus: thisdata.auditStatus
+                            auditStatus: thisdata.auditStatus, //审核状态
+                            createDate:thisdata.createDate,
+                            status:thisdata.status  //需求状态
                         });
                         });
                     };
                     };
                 }
                 }
@@ -112,18 +97,18 @@ const DemandList = React.createClass({
                 },
                 },
                 {
                 {
                     title: '发布状态',
                     title: '发布状态',
-                    dataIndex: 'releaseStatus',
-                    key: 'releaseStatus',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
                     render: text => { return getReleaseStateList(text) }
                     render: text => { return getReleaseStateList(text) }
                 }, {
                 }, {
                     title: '发布时间',
                     title: '发布时间',
-                    dataIndex: 'demandType1',
-                    key: 'demandType1'
+                    dataIndex: 'createDate',
+                    key: 'createDate'
                 },
                 },
                 {
                 {
                     title: '解决状态',
                     title: '解决状态',
-                    dataIndex: 'demandType11',
-                    key: 'demandType11'
+                    dataIndex: 'status',
+                    key: 'status'
                 },
                 },
                 {
                 {
                     title: '审核',
                     title: '审核',
@@ -131,11 +116,11 @@ const DemandList = React.createClass({
                     key: 'caozuo',
                     key: 'caozuo',
                     render:(text,recard) => {
                     render:(text,recard) => {
                         return  <div className="btnRight">
                         return  <div className="btnRight">
-                                   <Button type="primary" onClick={(e)=>{e.stopPropagation;this.tableRowClick(recard)}}>{recard.releaseStatus=='1'||recard.releaseStatus=='2'?'查看':'编辑'}</Button>
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="primary" style={{ background: "#3fcf9e", border: "none", color: "#fff" }} onClick={(e)=>{e.stopPropagation;this.submission(recard)}}>提交</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="danger"  onClick={(e)=>{e.stopPropagation;this.delectRow(recard)}}>删除</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="success" onClick={(e)=>{e.stopPropagation;this.release(recard,1)}}>刷新发布</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="danger" onClick={(e)=>{e.stopPropagation;this.release(recard,0)}}>撤销发布</Button>}
+                                   <Button type="primary" onClick={(e)=>{e.stopPropagation;this.tableRowClick(recard)}}>{recard.auditStatus=='1'||recard.auditStatus=='2'?'查看':'编辑'}</Button>
+                                   {recard.auditStatus!='1'&&recard.auditStatus!='2'&&<Button type="primary" style={{ background: "#3fcf9e", border: "none", color: "#fff" }} onClick={(e)=>{e.stopPropagation;this.submission(recard)}}>提交</Button>}
+                                   {recard.auditStatus!='1'&&recard.auditStatus!='2'&&<Button type="danger"  onClick={(e)=>{e.stopPropagation;this.delectRow(recard)}}>删除</Button>}
+                                   {recard.auditStatus!='1'&&recard.auditStatus=='2'&&<Button type="success" onClick={(e)=>{e.stopPropagation;this.release(recard,1)}}>刷新发布</Button>}
+                                   {recard.auditStatus!='1'&&recard.auditStatus=='2'&&<Button type="danger" onClick={(e)=>{e.stopPropagation;this.release(recard,0)}}>撤销发布</Button>}
                                 </div>
                                 </div>
                     }
                     }
                 }
                 }
@@ -252,14 +237,7 @@ const DemandList = React.createClass({
         this.loadData();
         this.loadData();
     },
     },
     reset() {
     reset() {
-        this.state.serialNumber = undefined;
-        this.state.auditStatus = undefined;
-        this.state.name = undefined;
-        this.state.keyword = undefined;
-        this.state.demandType = undefined;
-        this.state.username = undefined;
-        this.state.releaseStatusSearch = undefined;
-        this.state.validityPeriodDate = [];
+        this.state.name = '';
         this.state.releaseDate = [];
         this.state.releaseDate = [];
         this.loadData();
         this.loadData();
     },
     },
@@ -281,16 +259,16 @@ const DemandList = React.createClass({
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         const { RangePicker } = DatePicker;
         this.state.dataSource=[
         this.state.dataSource=[
-            {key:1,serialNumber:1,id:1,releaseStatus:'0'},
-            {key:2,serialNumber:2,id:24,releaseStatus:'1'},
-            {key:3,serialNumber:3,id:23,releaseStatus:'2'},
-            {key:4,serialNumber:4,id:22,releaseStatus:'3'},
-            {key:5,serialNumber:5,id:21,releaseStatus:'4'},
+            {key:1,serialNumber:1,id:1,auditStatus:'0'},
+            {key:2,serialNumber:2,id:24,auditStatus:'1'},
+            {key:3,serialNumber:3,id:23,auditStatus:'2'},
+            {key:4,serialNumber:4,id:22,auditStatus:'3'},
+            {key:5,serialNumber:5,id:21,auditStatus:'4'},
         ]
         ]
         return (
         return (
             <div className="user-content" >
             <div className="user-content" >
                 <div className="content-title">
                 <div className="content-title">
-                    <span>科技需求管理</span>
+                    <span>我的科技需求</span>
                     <div className="patent-addNew">
                     <div className="patent-addNew">
                         <Button type="primary" onClick={this.addClick}>发布需求<Icon type="plus" /></Button>
                         <Button type="primary" onClick={this.addClick}>发布需求<Icon type="plus" /></Button>
                     </div>
                     </div>
@@ -299,30 +277,6 @@ const DemandList = React.createClass({
                     <Input placeholder="需求名称"
                     <Input placeholder="需求名称"
                         value={this.state.name}
                         value={this.state.name}
                         onChange={(e) => { this.setState({ name: e.target.value }); }} />
                         onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Select placeholder="选择需求类型"
-                        style={{ width: 120 }}
-                        value={this.state.demandType}
-                        onChange={(e) => { this.setState({ demandType: e }) }}>
-                        {this.state.demandTypeOption}
-                    </Select>
-                    <Select placeholder="发布状态" style={{ width: 120 }}
-                        value={this.state.releaseStatusSearch}
-                        onChange={(e) => { this.setState({ releaseStatusSearch: e }) }}>
-                        <Select.Option value="0" >草稿</Select.Option>
-                        <Select.Option value="1" >发布审核</Select.Option>
-                        <Select.Option value="2" >已发布</Select.Option>
-                        <Select.Option value="3" >发布失败</Select.Option>
-                        <Select.Option value="4" >已撤销</Select.Option>
-                    </Select>
-                    <Select placeholder="解决状态" style={{ width: 160 }}
-                        value={this.state.auditStatus}
-                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                        <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                        <Select.Option value="1" >提交审核</Select.Option>
-                        <Select.Option value="2" >审核中</Select.Option>
-                        <Select.Option value="3" >审核通过</Select.Option>
-                        <Select.Option value="4" >审核未通过</Select.Option>
-                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>

File diff suppressed because it is too large
+ 0 - 1140
js/component/account/demand/techDemandDesc.jsx


+ 56 - 123
js/component/adminDemand/DemandExamine.jsx

@@ -6,6 +6,7 @@ import moment from 'moment';
 import './techDemand.less';
 import './techDemand.less';
 import TechDemandDesc from './demandDesc.jsx';
 import TechDemandDesc from './demandDesc.jsx';
 import { demandTypeList } from '@/dataDic.js';
 import { demandTypeList } from '@/dataDic.js';
+import { IndustryObject, getIndustryCategory } from '@/DicIndustryList.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
 
 
 const DemandList = React.createClass({
 const DemandList = React.createClass({
@@ -18,21 +19,17 @@ const DemandList = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/user/demand/list",
+            url: globalConfig.context + "/api/admin/demand/list",
             data: {
             data: {
                 pageNo: pageNo || 1,
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 pageSize: this.state.pagination.pageSize,
-                serialNumber: this.state.serialNumber,
-                name: this.state.name,
-                keyword: this.state.keyword,
-                demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
-                status: this.state.status ? Number(this.state.status) : undefined,
-                releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
-                validityPeriodStartDate: this.state.validityPeriodDate[0],
-                validityPeriodEndDate: this.state.validityPeriodDate[1],
-                releaseDateStartDate: this.state.releaseDate[0],
-                releaseDateEndDate: this.state.releaseDate[1],
-                auditStatus: this.state.auditStatus
+                employerName: this.state.employerNameSearch,//客户名称
+                name: this.state.nameSearch,
+                demandType: this.state.demandTypeSearch ? Number(this.state.demandTypeSearch) : undefined,
+                status: this.state.statusSearch ? Number(this.state.statusSearch) : undefined,
+                startDate: this.state.releaseDate[0],
+                endDate: this.state.releaseDate[1],
+                auditStatus: this.state.auditStatusSearch
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -47,18 +44,13 @@ const DemandList = React.createClass({
                             key: i,
                             key: i,
                             id: thisdata.id,
                             id: thisdata.id,
                             serialNumber: thisdata.serialNumber,
                             serialNumber: thisdata.serialNumber,
-                            dataCategory: thisdata.dataCategory,
+                            status: thisdata.status,
                             name: thisdata.name,
                             name: thisdata.name,
-                            keyword: thisdata.keyword,
-                            releaseDate: thisdata.releaseDate,
                             demandType: thisdata.demandType,
                             demandType: thisdata.demandType,
-                            validityPeriod: thisdata.validityPeriod,
-                            status: thisdata.status,
-                            releaseStatus: thisdata.releaseStatus,
-                            employerId: thisdata.employerId,
-                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
-                            validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
-                            auditStatus: thisdata.auditStatus
+                            createDate: thisdata.createDate,
+                            auditStatus: thisdata.auditStatus,
+                            isHot: thisdata.isHot,
+                            isUrgent: thisdata.isUrgent,
                         });
                         });
                     };
                     };
                 }
                 }
@@ -108,22 +100,30 @@ const DemandList = React.createClass({
                     title: '需求类型',
                     title: '需求类型',
                     dataIndex: 'demandType',
                     dataIndex: 'demandType',
                     key: 'demandType',
                     key: 'demandType',
-                    render: text => { return getDemandType(text); }
+                    render: (text) => { return getDemandType(text); }
                 },
                 },
                 {
                 {
-                    title: '发布状态',
-                    dataIndex: 'releaseStatus',
-                    key: 'releaseStatus',
-                    render: text => { return getReleaseStateList(text) }
-                }, {
-                    title: '发布时间',
-                    dataIndex: 'demandType1',
-                    key: 'demandType1'
+                    title: '是否热门',
+                    dataIndex: 'isHot',
+                    key: 'isHot',
+                    render: text => { return text?'热门':'非热门'; }
+                },
+                {
+                    title: '是否加急',
+                    dataIndex: 'isUrgent',
+                    key: 'isUrgent',
+                    render: text => { return text?'加急':'未加急' }
                 },
                 },
                 {
                 {
-                    title: '解决状态',
-                    dataIndex: 'demandType11',
-                    key: 'demandType11'
+                    title: '客户名称',
+                    dataIndex: 'employerName',
+                    key: 'employerName'
+                },
+                {
+                    title: '发布状态',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
+                    render: text => { return getReleaseStateList(text) }
                 },
                 },
                 {
                 {
                     title: '审核',
                     title: '审核',
@@ -131,11 +131,7 @@ const DemandList = React.createClass({
                     key: 'caozuo',
                     key: 'caozuo',
                     render:(text,recard) => {
                     render:(text,recard) => {
                         return  <div className="btnRight">
                         return  <div className="btnRight">
-                                   <Button type="primary" onClick={(e)=>{e.stopPropagation;this.tableRowClick(recard)}}>{recard.releaseStatus=='1'||recard.releaseStatus=='2'?'查看':'编辑'}</Button>
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="primary" style={{ background: "#3fcf9e", border: "none", color: "#fff" }} onClick={(e)=>{e.stopPropagation;this.submission(recard)}}>提交</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="danger"  onClick={(e)=>{e.stopPropagation;this.delectRow(recard)}}>删除</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="success" onClick={(e)=>{e.stopPropagation;this.release(recard,1)}}>刷新发布</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="danger" onClick={(e)=>{e.stopPropagation;this.release(recard,0)}}>撤销发布</Button>}
+                                   <Button type="primary" onClick={(e)=>{e.stopPropagation;this.tableRowClick(recard)}}>审核</Button>
                                 </div>
                                 </div>
                     }
                     }
                 }
                 }
@@ -144,58 +140,6 @@ const DemandList = React.createClass({
             searchTime: [,]
             searchTime: [,]
         };
         };
     },
     },
-    //提交审核
-    submission(record){
-        this.setState({
-            loading:true
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/user/demand/deletet",
-            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));
-    },
-    //刷新发布
-    release(recard,index){
-        let api = index?'/api/shuaxin':'/api/chexiao';
-        this.setState({
-            loading:true
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + api,
-            data: {
-                id: recard.id
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('操作成功');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
-    },
-    
     componentWillMount() {
     componentWillMount() {
         let theArr = [];
         let theArr = [];
         demandTypeList.map(function (item) {
         demandTypeList.map(function (item) {
@@ -209,7 +153,8 @@ const DemandList = React.createClass({
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;
         this.setState({
         this.setState({
-            showDesc: true
+            showDesc: true,
+            examineState:true
         });
         });
     },
     },
     delectRow(recard) {
     delectRow(recard) {
@@ -236,12 +181,6 @@ const DemandList = React.createClass({
             this.loadData();
             this.loadData();
         }.bind(this));
         }.bind(this));
     },
     },
-    addClick() {
-        this.state.RowData = {};
-        this.setState({
-            showDesc: true
-        });
-    },
     closeDesc(e, s) {
     closeDesc(e, s) {
         this.state.showDesc = e;
         this.state.showDesc = e;
         if (s) {
         if (s) {
@@ -252,14 +191,11 @@ const DemandList = React.createClass({
         this.loadData();
         this.loadData();
     },
     },
     reset() {
     reset() {
-        this.state.serialNumber = undefined;
+        this.state.nameSearch = '';
+        this.state.demandTypeSearch = undefined;
         this.state.auditStatus = undefined;
         this.state.auditStatus = undefined;
-        this.state.name = undefined;
-        this.state.keyword = undefined;
-        this.state.demandType = undefined;
-        this.state.username = undefined;
-        this.state.releaseStatusSearch = undefined;
-        this.state.validityPeriodDate = [];
+        this.state.statusSearch = undefined;
+        this.state.employerNameSearch='';
         this.state.releaseDate = [];
         this.state.releaseDate = [];
         this.loadData();
         this.loadData();
     },
     },
@@ -290,43 +226,39 @@ const DemandList = React.createClass({
         return (
         return (
             <div className="user-content" >
             <div className="user-content" >
                 <div className="content-title">
                 <div className="content-title">
-                    <span>科技需求管理</span>
-                    <div className="patent-addNew">
-                        <Button type="primary" onClick={this.addClick}>发布需求<Icon type="plus" /></Button>
-                    </div>
+                    <span>需求发布审核</span>
                 </div>
                 </div>
                 <div className="user-search">
                 <div className="user-search">
                     <Input placeholder="需求名称"
                     <Input placeholder="需求名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     <Select placeholder="选择需求类型"
                     <Select placeholder="选择需求类型"
                         style={{ width: 120 }}
                         style={{ width: 120 }}
-                        value={this.state.demandType}
-                        onChange={(e) => { this.setState({ demandType: e }) }}>
+                        value={this.state.demandTypeSearch}
+                        onChange={(e) => { this.setState({ demandTypeSearch: e }) }}>
                         {this.state.demandTypeOption}
                         {this.state.demandTypeOption}
                     </Select>
                     </Select>
                     <Select placeholder="发布状态" style={{ width: 120 }}
                     <Select placeholder="发布状态" style={{ width: 120 }}
-                        value={this.state.releaseStatusSearch}
-                        onChange={(e) => { this.setState({ releaseStatusSearch: e }) }}>
+                        value={this.state.auditStatus}
+                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
                         <Select.Option value="0" >草稿</Select.Option>
                         <Select.Option value="0" >草稿</Select.Option>
                         <Select.Option value="1" >发布审核</Select.Option>
                         <Select.Option value="1" >发布审核</Select.Option>
                         <Select.Option value="2" >已发布</Select.Option>
                         <Select.Option value="2" >已发布</Select.Option>
                         <Select.Option value="3" >发布失败</Select.Option>
                         <Select.Option value="3" >发布失败</Select.Option>
                         <Select.Option value="4" >已撤销</Select.Option>
                         <Select.Option value="4" >已撤销</Select.Option>
                     </Select>
                     </Select>
-                    <Select placeholder="解决状态" style={{ width: 160 }}
-                        value={this.state.auditStatus}
-                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                        <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                        <Select.Option value="1" >提交审核</Select.Option>
-                        <Select.Option value="2" >审核中</Select.Option>
-                        <Select.Option value="3" >审核通过</Select.Option>
-                        <Select.Option value="4" >审核未通过</Select.Option>
+                    <Select placeholder="需求状态" style={{ width: 160 }}
+                        value={this.state.statusSearch}
+                        onChange={(e) => { this.setState({ statusSearch: e }) }}>
+                        <Select.Option value="0" >进行中</Select.Option>
+                        <Select.Option value="1" >未解决</Select.Option>
+                        <Select.Option value="2" >已解决</Select.Option>
                     </Select>
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                        <Input style={{width:140,marginRight:10}} value={this.state.employerNameSearch} onChange={(e)=>{this.setState({employerNameSearch:e.target.value})}} placeholder="客户名称"/>
                         <span>发布时间 :</span>
                         <span>发布时间 :</span>
                         <RangePicker
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
@@ -346,6 +278,7 @@ const DemandList = React.createClass({
                 <TechDemandDesc
                 <TechDemandDesc
                     data={this.state.RowData}
                     data={this.state.RowData}
                     demandTypeOption={this.state.demandTypeOption}
                     demandTypeOption={this.state.demandTypeOption}
+                    examineState={this.state.examineState}
                     showDesc={this.state.showDesc}
                     showDesc={this.state.showDesc}
                     closeDesc={this.closeDesc} />
                     closeDesc={this.closeDesc} />
             </div >
             </div >

+ 11 - 20
js/component/adminDemand/demandDesc.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import React from 'react';
 import { Modal, Spin } from 'antd';
 import { Modal, Spin } from 'antd';
-import DemandForm from '@/account/demand/demandForm';
-import DemandDetaiel from '@/account/demand/demandDetaiel';
+import DemandForm from '@/adminDemand/demandForm';
+import DemandDetaiel from '@/adminDemand/demandDetaiel';
 
 
 class DemandDesc extends React.Component {
 class DemandDesc extends React.Component {
 	constructor(props) {
 	constructor(props) {
@@ -38,29 +38,20 @@ class DemandDesc extends React.Component {
 					onOk={this.handOk.bind(this)}
 					onOk={this.handOk.bind(this)}
 					onCancel={this.handleCancel.bind(this)}
 					onCancel={this.handleCancel.bind(this)}
 					width="1000px"
 					width="1000px"
-					title={!data.id ? '新建需求' : '修改需求'}
+					title='需求详情'
 					footer=""
 					footer=""
 					className="admin-desc-content"
 					className="admin-desc-content"
 				>
 				>
 					<div>
 					<div>
 						<div>
 						<div>
-								{data.releaseStatus=='1'||data.releaseStatus=='2'?
-									<DemandDetaiel
-									closeDesc={this.handleCancel.bind(this)}
-									data={this.props.data}
-									demandTypeOption={this.props.demandTypeOption}
-									visible={this.state.visible}
-									handOk={this.handOk.bind(this)}
-									/>
-									:
-									<DemandForm 
-										closeDesc={this.handleCancel.bind(this)}
-										data={this.props.data}
-										demandTypeOption={this.props.demandTypeOption}
-										visible={this.state.visible}
-										handOk={this.handOk.bind(this)}
-										/>
-								} 
+							<DemandDetaiel
+							    examineState={this.props.examineState}
+								closeDesc={this.handleCancel.bind(this)}
+								data={this.props.data}
+								demandTypeOption={this.props.demandTypeOption}
+								visible={this.state.visible}
+								handOk={this.handOk.bind(this)}
+							/>
 						</div>
 						</div>
 					</div>
 					</div>
 				</Modal>
 				</Modal>

+ 88 - 45
js/component/adminDemand/demandDetaiel.jsx

@@ -27,6 +27,7 @@ import { getTechField } from '@/DicTechFieldList.js';
 import {areaSelect,getProvince } from '@/NewDicProvinceList';
 import {areaSelect,getProvince } from '@/NewDicProvinceList';
 import { IndustryObject, getIndustryCategory } from '@/DicIndustryList.js';
 import { IndustryObject, getIndustryCategory } from '@/DicIndustryList.js';
 import {  splitUrl, companySearch, getDemandType, getAchievementCategory,getReleaseStateList,getReleasePositionList } from '@/tools.js';
 import {  splitUrl, companySearch, getDemandType, getAchievementCategory,getReleaseStateList,getReleasePositionList } from '@/tools.js';
+const FormItem = Form.Item;
 
 
 const DemandDetail = Form.create()(React.createClass({
 const DemandDetail = Form.create()(React.createClass({
     getInitialState() {
     getInitialState() {
@@ -47,7 +48,7 @@ const DemandDetail = Form.create()(React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context +  '/api/user/demand/orgDemandDetail' ,
+            url: globalConfig.context +  '/api/user/demand/demandDetail' ,
             data: {
             data: {
                 id: id
                 id: id
             },
             },
@@ -58,14 +59,20 @@ const DemandDetail = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
                     };
                     };
                     thisData = {};
                     thisData = {};
-                };
-                let ProvinceS = thisData.locationProvince, //getprovince
-				    citys = thisData.locationCity,
-				    Areas = thisData.locationArea,
-				    ProvinceCity = getProvince(ProvinceS, citys, Areas);
+				};
+				// let ProvinceCityArr = [];
+				// let ProvinceS = thisData.locationProvince; //getprovince
+				// let citys = thisData.locationCity;
+				// let Areas = thisData.locationArea;
+				// ProvinceCityArr.push(ProvinceS, citys, Areas);
                 this.setState({
                 this.setState({
-
-                    data: thisData,
+					//ProvinceCity:ProvinceCityArr,
+					id:thisData.id,
+					data: thisData,
+					isHot:thisData.isHot,
+					isUrgent:thisData.isUrgent,
+					status:thisData.status,
+					isHot:thisData.isHot,
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
                 });
             }.bind(this),
             }.bind(this),
@@ -75,41 +82,63 @@ const DemandDetail = Form.create()(React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
-    getTagsArr(e) {
-        this.setState({ tags: e });
-    },
     getPictureUrl(e) {
     getPictureUrl(e) {
         this.setState({ pictureUrl: e });
         this.setState({ pictureUrl: e });
     },
     },
 	cancelFun(){
 	cancelFun(){
 		this.props.closeDesc();
 		this.props.closeDesc();
     },
     },
-    //刷新发布-撤销发布
+    //审核通过/拒绝
     updateFun(index){
     updateFun(index){
         this.setState({
         this.setState({
             loading:true
             loading:true
         })
         })
-        let api = index?'/api/shuaxin':'/api/chexiao'
+        let api = index?'/api/tongghuo':'/api/jujue'
         $.ajax({
         $.ajax({
-            method: "POST",
-            dataType: "json",
+            method: "get",
+            dataType: "JSON",
             crossDomain: false,
             crossDomain: false,
             url: globalConfig.context +  api,
             url: globalConfig.context +  api,
             data: {
             data: {
-                ids: this.state.id
+                ids: this.state.id,
+                refuseValue:this.state.refuseValue
             }
             }
         }).done(function (data) {
         }).done(function (data) {
             if (!data.error.length) {
             if (!data.error.length) {
-                message.success('删除成功!');
+                message.success('操作成功!');
                 this.setState({
                 this.setState({
                     loading: false,
                     loading: false,
                 });
                 });
+                this.props.closeDesc(false,true)
             } else {
             } else {
                 message.warning(data.error[0].message);
                 message.warning(data.error[0].message);
             };
             };
             this.loadData();
             this.loadData();
         }.bind(this));
         }.bind(this));
     },
     },
+    //审核拒绝
+    refuse(){
+        this.setState({
+            refuseValue:'',
+            refuseVisible:true
+        })
+    },
+    refuseOk(){
+        if(!this.state.refuseValue){
+            message.warning('请填写拒绝原因。')
+            return;
+        }
+        this.setState({
+            refuseVisible:false
+        })
+        this.updateFun(0)
+    },
+    refuseCancel(){
+        this.setState({
+            refuseValue:'',
+            refuseVisible:false
+        })
+    },
     componentWillMount() {
     componentWillMount() {
         if (this.props.data.id) {
         if (this.props.data.id) {
             this.loadData(this.props.data.id);
             this.loadData(this.props.data.id);
@@ -147,7 +176,7 @@ const DemandDetail = Form.create()(React.createClass({
 			<div className='login'>
 			<div className='login'>
 			<Form layout="horizontal" id="demand-form">
 			<Form layout="horizontal" id="demand-form">
 				<Spin spinning={this.state.loading}>
 				<Spin spinning={this.state.loading}>
-					<div className="clearfix">
+                <div className="clearfix">
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="发个需求吧">
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="发个需求吧">
                             <span>{theData.problemDes}</span>
                             <span>{theData.problemDes}</span>
                         </FormItem>
                         </FormItem>
@@ -164,13 +193,13 @@ const DemandDetail = Form.create()(React.createClass({
 						</FormItem>
 						</FormItem>
 						{theData.demandType=='5'&&
 						{theData.demandType=='5'&&
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
 							<FormItem className="half-item" {...formItemLayout} label="人才需求酬劳">
-							     <span>{theData.demandType1} 元/月</span>
+							     <span>{theData.crowdCost} 元/月</span>
 						    </FormItem>}
 						    </FormItem>}
 						{theData.demandType=='3'&&<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
 						{theData.demandType=='3'&&<div className="clearfix"><FormItem className="half-item" {...formItemLayout} label="资金需求额度">
-                            <span>{theData.demandType2}万元</span>
+                            <span>{theData.budgetCost}万元</span>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
 						<FormItem className="half-item" {...formItemLayout} label="资金用途">
-							<span>{theData.yongtu?'扩大再生产':'研发'}</span>
+							<span>{theData.researchType?'扩大再生产':'研发'}</span>
 						</FormItem>
 						</FormItem>
 						</div>
 						</div>
 						}
 						}
@@ -178,29 +207,29 @@ const DemandDetail = Form.create()(React.createClass({
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<p style={{marginLeft:40,fontSize:18,marginBottom:15}}>您还可以说明</p>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="加急需求">
 						<FormItem className="half-item" {...formItemLayout} label="加急需求">
-                            <span>{theData.urgent?'加急':'非加急'}</span>
+                            <span>{theData.isUrgent?'加急':'非加急'}</span>
 						</FormItem>
 						</FormItem>
-						{theData.urgent?<FormItem className="half-item" {...formItemLayout} label="日期">
-							<span>{theData.urgentTime}</span>
-						</FormItem>:''}
-					</div>
-					<div className="clearfix">
-						<FormItem className="half-item" {...formItemLayout} label="悬赏需求">
-                            <span>{theData.offer?'悬赏':'未悬赏'}</span>
+						{theData.isUrgent?<div><FormItem className="half-item" {...formItemLayout} label="日期">
+							<span>{theData.urgentDays}</span>
+                        </FormItem>
+                        <FormItem className="half-item" {...formItemLayout} label="悬赏金额">
+							<span style={{ marginLeft: '20px' }}>{theData.urgentMoney}万元</span>
 						</FormItem>
 						</FormItem>
-						{theData.offer>=1&&<FormItem className="half-item" {...formItemLayout} label="悬赏金额">
-							<span style={{ marginLeft: '20px' }}>{theData.budgetCost}万元</span>
-						</FormItem>}
+                        </div>:''}
 					</div>
 					</div>
 					<div className="clearfix">
 					<div className="clearfix">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
 						<FormItem className="half-item" {...formItemLayout} label="热点需求">
-                            <span>{theData.hotDemand?'热点':'非热点'}</span>
+                            <span>{theData.isHot?'热点':'非热点'}</span>
 						</FormItem>
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="解决">
 						<FormItem className="half-item" {...formItemLayout} label="解决">
-                            <span>{theData.solve?'已解决':'未解决'}</span>
+                            <span>
+                                {theData.status=='0'&&'进行中'}
+                                {theData.status=='1'&&'未解决'}
+                                {theData.status=='2'&&'已解决'}
+                            </span>
 						</FormItem>
 						</FormItem>
 					</div>
 					</div>
-					<div className="clearfix">
+					{/* <div className="clearfix">
 						<FormItem
 						<FormItem
 							className="half-item"
 							className="half-item"
 							{...formItemLayout}
 							{...formItemLayout}
@@ -208,7 +237,7 @@ const DemandDetail = Form.create()(React.createClass({
 						>
 						>
 							{this.state.ProvinceCity}
 							{this.state.ProvinceCity}
 						</FormItem>  
 						</FormItem>  
-					</div>
+					</div> */}
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
 					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求文件(图片)">
                         <div className="clearfix">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                 <Upload className="demandDetailShow-upload"
@@ -232,23 +261,25 @@ const DemandDetail = Form.create()(React.createClass({
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
 						<FormItem className="half-item" {...formItemLayout} label="发布状态">
 							<span>{getReleaseStateList(theData.releaseState)}</span>
 							<span>{getReleaseStateList(theData.releaseState)}</span>
 						</FormItem>
 						</FormItem>
-						<FormItem className="half-item" {...formItemLayout} label="发布时间">
-                                <span>{theData.releaseTime}</span>
-						</FormItem>
 					</div>
 					</div>
                     <div>
                     <div>
                         <FormItem className="half-item" labelCol={{ span: 6 }}
                         <FormItem className="half-item" labelCol={{ span: 6 }}
 							wrapperCol={{ span: 18 }} label="发布位置">
 							wrapperCol={{ span: 18 }} label="发布位置">
-                                <span>{getReleasePositionList(theData.releasePosition)}</span>
+                                <span>{getReleasePositionList(theData.publishPages)}</span>
 						</FormItem>
 						</FormItem>
                     </div>
                     </div>
+                    <div className="clearfix">
+                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="审核信息">
+                                <span>{theData.auditInfo}</span>
+                            </FormItem>
+					</div>
 					<div className="clearfix">
 					<div className="clearfix">
-						{this.props.data.releaseStatus=='2'&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
+						{this.props.examineState&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >
-								刷新发布
+								审核通过
 							</Button>
 							</Button>
-							<Button type="danger" style={{marginRight:20}} onClick={(e)=>{this.updateFun(0)}}>
-								撤销发布
+							<Button type="danger" style={{marginRight:20}} onClick={(e)=>{this.refuse()}}>
+								审核拒绝
 							</Button>
 							</Button>
 							<Button className="set-submit" type="ghost" onClick={this.cancelFun}>
 							<Button className="set-submit" type="ghost" onClick={this.cancelFun}>
 								取消
 								取消
@@ -256,7 +287,19 @@ const DemandDetail = Form.create()(React.createClass({
 						</FormItem>}
 						</FormItem>}
 					</div>
 					</div>
 				</Spin>
 				</Spin>
-			</Form>    
+			</Form>   
+            <Modal
+                title="审核拒绝"
+                visible={this.state.refuseVisible}
+                onOk={this.refuseOk}
+                onCancel={this.refuseCancel}
+                >   
+                    <div>
+                        <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="拒绝原因">
+                            <Input type="textarea" rows={4} value={this.state.refuseValue} placeholder="输入拒绝原因" onChange={(e)=>{this.setState({refuseValue:e.target.value})}}/>
+                        </FormItem>
+                    </div>
+                </Modal> 
 		</div>
 		</div>
         )
         )
     }
     }

+ 54 - 78
js/component/adminDemand/techDemand.jsx

@@ -6,6 +6,7 @@ import moment from 'moment';
 import './techDemand.less';
 import './techDemand.less';
 import TechDemandDesc from './demandDesc.jsx';
 import TechDemandDesc from './demandDesc.jsx';
 import { demandTypeList } from '@/dataDic.js';
 import { demandTypeList } from '@/dataDic.js';
+import { IndustryObject, getIndustryCategory } from '@/DicIndustryList.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
 
 
 const DemandList = React.createClass({
 const DemandList = React.createClass({
@@ -18,21 +19,17 @@ const DemandList = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/user/demand/list",
+            url: globalConfig.context + "/api/admin/demand/list",
             data: {
             data: {
                 pageNo: pageNo || 1,
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 pageSize: this.state.pagination.pageSize,
-                serialNumber: this.state.serialNumber,
-                name: this.state.name,
-                keyword: this.state.keyword,
-                demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
-                status: this.state.status ? Number(this.state.status) : undefined,
-                releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
-                validityPeriodStartDate: this.state.validityPeriodDate[0],
-                validityPeriodEndDate: this.state.validityPeriodDate[1],
-                releaseDateStartDate: this.state.releaseDate[0],
-                releaseDateEndDate: this.state.releaseDate[1],
-                auditStatus: this.state.auditStatus
+                employerName: this.state.employerNameSearch,//客户名称
+                name: this.state.nameSearch,
+                demandType: this.state.demandTypeSearch ? Number(this.state.demandTypeSearch) : undefined,
+                status: this.state.statusSearch ? Number(this.state.statusSearch) : undefined,
+                startDate: this.state.releaseDate[0],
+                endDate: this.state.releaseDate[1],
+                auditStatus: this.state.auditStatusSearch
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -47,18 +44,13 @@ const DemandList = React.createClass({
                             key: i,
                             key: i,
                             id: thisdata.id,
                             id: thisdata.id,
                             serialNumber: thisdata.serialNumber,
                             serialNumber: thisdata.serialNumber,
-                            dataCategory: thisdata.dataCategory,
+                            status: thisdata.status,
                             name: thisdata.name,
                             name: thisdata.name,
-                            keyword: thisdata.keyword,
-                            releaseDate: thisdata.releaseDate,
                             demandType: thisdata.demandType,
                             demandType: thisdata.demandType,
-                            validityPeriod: thisdata.validityPeriod,
-                            status: thisdata.status,
-                            releaseStatus: thisdata.releaseStatus,
-                            employerId: thisdata.employerId,
-                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
-                            validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
-                            auditStatus: thisdata.auditStatus
+                            createDate: thisdata.createDate,
+                            auditStatus: thisdata.auditStatus,
+                            isHot: thisdata.isHot,
+                            isUrgent: thisdata.isUrgent,
                         });
                         });
                     };
                     };
                 }
                 }
@@ -108,36 +100,30 @@ const DemandList = React.createClass({
                     title: '需求类型',
                     title: '需求类型',
                     dataIndex: 'demandType',
                     dataIndex: 'demandType',
                     key: 'demandType',
                     key: 'demandType',
-                    render: text => { return getDemandType(text); }
+                    render: (text) => { return getDemandType(text); }
                 },
                 },
                 {
                 {
-                    title: '发布状态',
-                    dataIndex: 'releaseStatus',
-                    key: 'releaseStatus',
-                    render: text => { return getReleaseStateList(text) }
-                }, {
-                    title: '发布时间',
-                    dataIndex: 'demandType1',
-                    key: 'demandType1'
+                    title: '是否热门',
+                    dataIndex: 'isHot',
+                    key: 'isHot',
+                    render: text => { return text?'热门':'非热门'; }
                 },
                 },
                 {
                 {
-                    title: '解决状态',
-                    dataIndex: 'demandType11',
-                    key: 'demandType11'
+                    title: '是否加急',
+                    dataIndex: 'isUrgent',
+                    key: 'isUrgent',
+                    render: text => { return text?'加急':'未加急' }
                 },
                 },
                 {
                 {
-                    title: '审核',
-                    dataIndex: 'caozuo',
-                    key: 'caozuo',
-                    render:(text,recard) => {
-                        return  <div className="btnRight">
-                                   <Button type="primary" onClick={(e)=>{e.stopPropagation;this.tableRowClick(recard)}}>{recard.releaseStatus=='1'||recard.releaseStatus=='2'?'查看':'编辑'}</Button>
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="primary" style={{ background: "#3fcf9e", border: "none", color: "#fff" }} onClick={(e)=>{e.stopPropagation;this.submission(recard)}}>提交</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus!='2'&&<Button type="danger"  onClick={(e)=>{e.stopPropagation;this.delectRow(recard)}}>删除</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="success" onClick={(e)=>{e.stopPropagation;this.release(recard,1)}}>刷新发布</Button>}
-                                   {recard.releaseStatus!='1'&&recard.releaseStatus=='2'&&<Button type="danger" onClick={(e)=>{e.stopPropagation;this.release(recard,0)}}>撤销发布</Button>}
-                                </div>
-                    }
+                    title: '客户名称',
+                    dataIndex: 'employerName',
+                    key: 'employerName'
+                },
+                {
+                    title: '发布状态',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
+                    render: text => { return getReleaseStateList(text) }
                 }
                 }
             ],
             ],
             dataSource: [],
             dataSource: [],
@@ -209,7 +195,8 @@ const DemandList = React.createClass({
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;
         this.setState({
         this.setState({
-            showDesc: true
+            showDesc: true,
+            examineState:false
         });
         });
     },
     },
     delectRow(recard) {
     delectRow(recard) {
@@ -236,12 +223,6 @@ const DemandList = React.createClass({
             this.loadData();
             this.loadData();
         }.bind(this));
         }.bind(this));
     },
     },
-    addClick() {
-        this.state.RowData = {};
-        this.setState({
-            showDesc: true
-        });
-    },
     closeDesc(e, s) {
     closeDesc(e, s) {
         this.state.showDesc = e;
         this.state.showDesc = e;
         if (s) {
         if (s) {
@@ -252,14 +233,11 @@ const DemandList = React.createClass({
         this.loadData();
         this.loadData();
     },
     },
     reset() {
     reset() {
-        this.state.serialNumber = undefined;
+        this.state.nameSearch = '';
+        this.state.demandTypeSearch = undefined;
         this.state.auditStatus = undefined;
         this.state.auditStatus = undefined;
-        this.state.name = undefined;
-        this.state.keyword = undefined;
-        this.state.demandType = undefined;
-        this.state.username = undefined;
-        this.state.releaseStatusSearch = undefined;
-        this.state.validityPeriodDate = [];
+        this.state.statusSearch = undefined;
+        this.state.employerNameSearch='';
         this.state.releaseDate = [];
         this.state.releaseDate = [];
         this.loadData();
         this.loadData();
     },
     },
@@ -290,43 +268,39 @@ const DemandList = React.createClass({
         return (
         return (
             <div className="user-content" >
             <div className="user-content" >
                 <div className="content-title">
                 <div className="content-title">
-                    <span>科技需求管理</span>
-                    <div className="patent-addNew">
-                        <Button type="primary" onClick={this.addClick}>发布需求<Icon type="plus" /></Button>
-                    </div>
+                    <span>科技需求库</span>
                 </div>
                 </div>
                 <div className="user-search">
                 <div className="user-search">
                     <Input placeholder="需求名称"
                     <Input placeholder="需求名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     <Select placeholder="选择需求类型"
                     <Select placeholder="选择需求类型"
                         style={{ width: 120 }}
                         style={{ width: 120 }}
-                        value={this.state.demandType}
-                        onChange={(e) => { this.setState({ demandType: e }) }}>
+                        value={this.state.demandTypeSearch}
+                        onChange={(e) => { this.setState({ demandTypeSearch: e }) }}>
                         {this.state.demandTypeOption}
                         {this.state.demandTypeOption}
                     </Select>
                     </Select>
                     <Select placeholder="发布状态" style={{ width: 120 }}
                     <Select placeholder="发布状态" style={{ width: 120 }}
-                        value={this.state.releaseStatusSearch}
-                        onChange={(e) => { this.setState({ releaseStatusSearch: e }) }}>
+                        value={this.state.auditStatus}
+                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
                         <Select.Option value="0" >草稿</Select.Option>
                         <Select.Option value="0" >草稿</Select.Option>
                         <Select.Option value="1" >发布审核</Select.Option>
                         <Select.Option value="1" >发布审核</Select.Option>
                         <Select.Option value="2" >已发布</Select.Option>
                         <Select.Option value="2" >已发布</Select.Option>
                         <Select.Option value="3" >发布失败</Select.Option>
                         <Select.Option value="3" >发布失败</Select.Option>
                         <Select.Option value="4" >已撤销</Select.Option>
                         <Select.Option value="4" >已撤销</Select.Option>
                     </Select>
                     </Select>
-                    <Select placeholder="解决状态" style={{ width: 160 }}
-                        value={this.state.auditStatus}
-                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                        <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                        <Select.Option value="1" >提交审核</Select.Option>
-                        <Select.Option value="2" >审核中</Select.Option>
-                        <Select.Option value="3" >审核通过</Select.Option>
-                        <Select.Option value="4" >审核未通过</Select.Option>
+                    <Select placeholder="需求状态" style={{ width: 160 }}
+                        value={this.state.statusSearch}
+                        onChange={(e) => { this.setState({ statusSearch: e }) }}>
+                        <Select.Option value="0" >进行中</Select.Option>
+                        <Select.Option value="1" >未解决</Select.Option>
+                        <Select.Option value="2" >已解决</Select.Option>
                     </Select>
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                        <Input style={{width:140,marginRight:10}} value={this.state.employerNameSearch} onChange={(e)=>{this.setState({employerNameSearch:e.target.value})}} placeholder="客户名称"/>
                         <span>发布时间 :</span>
                         <span>发布时间 :</span>
                         <RangePicker
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
@@ -340,11 +314,13 @@ const DemandList = React.createClass({
                             dataSource={this.state.dataSource}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}
                             pagination={this.state.pagination}
+                            onRowClick={this.tableRowClick} />
                              />
                              />
                     </Spin>
                     </Spin>
                 </div>
                 </div>
                 <TechDemandDesc
                 <TechDemandDesc
                     data={this.state.RowData}
                     data={this.state.RowData}
+                    examineState={this.state.examineState}
                     demandTypeOption={this.state.demandTypeOption}
                     demandTypeOption={this.state.demandTypeOption}
                     showDesc={this.state.showDesc}
                     showDesc={this.state.showDesc}
                     closeDesc={this.closeDesc} />
                     closeDesc={this.closeDesc} />