dengzhiguo 7 years ago
parent
commit
777af57bbb

+ 1 - 1
js/component/manageCenter/achievement/techAchievement.jsx

@@ -212,9 +212,9 @@ const AchievementList = React.createClass({
         };
         };
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
-        this.state.RowData = record;
         if(index!=undefined){
         if(index!=undefined){
         	this.setState({
         	this.setState({
+        		RowData:record,
             	showDesc: true
             	showDesc: true
         	});
         	});
         }
         }

+ 12 - 10
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -147,7 +147,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
             businessPlanFileList: []
             businessPlanFileList: []
         };
         };
     },
     },
-    loadData(id, detailApiUrl) {
+    loadData(id, detailApiUrl,ownerType) {
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -159,7 +159,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                ownerType:this.props.data.ownerType
+                ownerType:ownerType?ownerType:this.props.data.ownerType
             },
             },
             success: function (data) {
             success: function (data) {
                 let thisData = data.data;
                 let thisData = data.data;
@@ -237,6 +237,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
                     } else {
                     } else {
                         message.success('保存成功!');
                         message.success('保存成功!');
                         this.props.handleOk();
                         this.props.handleOk();
+                        
                     };
                     };
                 }.bind(this));
                 }.bind(this));
             }
             }
@@ -351,8 +352,9 @@ const AchievementDetailShow = Form.create()(React.createClass({
         };
         };
     },
     },
     render() {
     render() {
-        const theData = this.state.data || {};
-        const { getFieldDecorator } = this.props.form;
+    	const theData = this.state.data || {};
+    	console.log(theData);
+    	const { getFieldDecorator } = this.props.form;
         const FormItem = Form.Item
         const FormItem = Form.Item
         const formItemLayout = {
         const formItemLayout = {
             labelCol: { span: 8 },
             labelCol: { span: 8 },
@@ -809,7 +811,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             dataSource: [],
             dataSource: [],
         };
         };
     },
     },
-    loadData(id, detailApiUrl) {
+    loadData(id, detailApiUrl,ownerType) {
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -820,7 +822,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                ownerType:this.props.data.ownerType
+                ownerType:ownerType?ownerType:this.props.data.ownerType
             },
             },
             success: function (data) {
             success: function (data) {
                 let thisData = data.data;
                 let thisData = data.data;
@@ -1079,9 +1081,9 @@ const AchievementDetailForm = Form.create()(React.createClass({
         };
         };
     },
     },
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
-        if (!this.props.visible && nextProps.visible) {
+    	if (!this.props.visible && nextProps.visible) {
             if (nextProps.data && nextProps.data.id) {
             if (nextProps.data && nextProps.data.id) {
-                this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+                this.loadData(nextProps.data.id, nextProps.detailApiUrl,nextProps.data.ownerType);
             };
             };
             this.state.data = {};
             this.state.data = {};
             this.state.tags = [];
             this.state.tags = [];
@@ -1099,13 +1101,13 @@ const AchievementDetailForm = Form.create()(React.createClass({
     },
     },
     render() {
     render() {
         const theData = this.state.data || {};
         const theData = this.state.data || {};
+        console.log(theData);
         const { getFieldDecorator } = this.props.form;
         const { getFieldDecorator } = this.props.form;
         const FormItem = Form.Item
         const FormItem = Form.Item
         const formItemLayout = {
         const formItemLayout = {
             labelCol: { span: 8 },
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
             wrapperCol: { span: 14 },
         };
         };
-        console.log(this.state.orgDisplay)
         return (
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
                 <Spin spinning={this.state.loading}>
@@ -1880,4 +1882,4 @@ const AchievementDetail = React.createClass({
     },
     },
 });
 });
 
 
-export default AchievementDetail;
+export default AchievementDetail;

+ 2 - 0
js/component/manageCenter/achievement/techAchievementQueryDesc.jsx

@@ -237,6 +237,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
                     } else {
                     } else {
                         message.success('保存成功!');
                         message.success('保存成功!');
                         this.props.handleOk();
                         this.props.handleOk();
+                        this.componentWillMount();
                     };
                     };
                 }.bind(this));
                 }.bind(this));
             }
             }
@@ -1061,6 +1062,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     if (!data.error.length) {
                     if (!data.error.length) {
                         message.success('保存成功!');
                         message.success('保存成功!');
                         this.props.handleOk();
                         this.props.handleOk();
+                        this.componentWillMount();
                     } else {
                     } else {
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
                     }
                     }

+ 1 - 0
js/component/manageCenter/demand/myTechDemand.jsx

@@ -341,6 +341,7 @@ const DemandList = React.createClass({
         };
         };
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
+    	console.log(record);
         this.state.RowData = record;
         this.state.RowData = record;
         if(index!=undefined){
         if(index!=undefined){
         	this.setState({
         	this.setState({

+ 15 - 6
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -145,7 +145,8 @@ const DemandDetailShow = Form.create()(React.createClass({
             coverImg: []           
             coverImg: []           
         };
         };
     },
     },
-    loadData(id, detailApiUrl) {
+    loadData(id, detailApiUrl,dataCategory) {
+    	console.log(dataCategory);
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -156,7 +157,7 @@ const DemandDetailShow = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                dataCategory:this.props.data.dataCategory
+                dataCategory:dataCategory?dataCategory:this.props.data.dataCategory
             },
             },
             success: function (data) {
             success: function (data) {
             	
             	
@@ -337,7 +338,7 @@ const DemandDetailShow = Form.create()(React.createClass({
     },
     },
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
         if (!this.props.visible && nextProps.visible) {
-            this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+            this.loadData(nextProps.data.id, nextProps.detailApiUrl,nextProps.data.dataCategory);
             if (nextProps.data.employerId && nextProps.data.dataCategory) {
             if (nextProps.data.employerId && nextProps.data.dataCategory) {
                 this.getContactsList(nextProps.data.employerId);
                 this.getContactsList(nextProps.data.employerId);
             };
             };
@@ -786,7 +787,8 @@ const DemandDetailForm = Form.create()(React.createClass({
             }.bind(this),
             }.bind(this),
         });
         });
     },
     },
-    loadData(id, detailApiUrl) {
+    loadData(id, detailApiUrl,dataCategory) {
+    	console.log(this.props.data);
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -797,7 +799,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                dataCategory:this.props.data.dataCategory
+                dataCategory:dataCategory?dataCategory:this.props.data.dataCategory
             },
             },
             success: function (data) {
             success: function (data) {
                 let thisData = data.data;
                 let thisData = data.data;
@@ -837,6 +839,10 @@ const DemandDetailForm = Form.create()(React.createClass({
     },
     },
     handleSubmit(e) {
     handleSubmit(e) {
         e.preventDefault();
         e.preventDefault();
+        if(!this.state.dataCategory){
+    		message.warning('请选择需求类别');
+    		return false;
+    	}
         this.props.form.validateFields((err, values) => {
         this.props.form.validateFields((err, values) => {
             //keyword长度判断
             //keyword长度判断
             if ((this.state.tags ? this.state.tags.length : this.props.tags.length) < 3) {
             if ((this.state.tags ? this.state.tags.length : this.props.tags.length) < 3) {
@@ -924,6 +930,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                     if (!data.error.length) {
                     if (!data.error.length) {
                         message.success('保存成功!');
                         message.success('保存成功!');
                         this.props.handleOk();
                         this.props.handleOk();
+                        this.componentWillMount();
                     } else {
                     } else {
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
                     };
                     };
@@ -998,7 +1005,7 @@ const DemandDetailForm = Form.create()(React.createClass({
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
         if (!this.props.visible && nextProps.visible) {
             if (nextProps.data && nextProps.data.id) {
             if (nextProps.data && nextProps.data.id) {
-                this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+                this.loadData(nextProps.data.id, nextProps.detailApiUrl,nextProps.data.dataCategory);
             };
             };
             this.state.contactsOption = [];
             this.state.contactsOption = [];
             this.state.data = {};
             this.state.data = {};
@@ -1212,6 +1219,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             tagsArr={this.getTagsArr}
                             tagsArr={this.getTagsArr}
                             visible={this.props.visible} />
                             visible={this.props.visible} />
                     </FormItem>
                     </FormItem>
+                    
                     <FormItem
                     <FormItem
                         labelCol={{ span: 3 }}
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 20 }}
                         wrapperCol={{ span: 20 }}
@@ -1222,6 +1230,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             <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>
                         </Select>
+                        
                     </FormItem>
                     </FormItem>
                     <FormItem
                     <FormItem
                         labelCol={{ span: 3 }}
                         labelCol={{ span: 3 }}

+ 2 - 2
js/component/manageCenter/demand/techDemandQueryDesc.jsx

@@ -156,7 +156,7 @@ const DemandDetailShow = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                ownerType:this.props.data.ownerType
+                dataCategory:this.state.dataCategory
             },
             },
             success: function (data) {
             success: function (data) {
             	
             	
@@ -778,7 +778,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             url: globalConfig.context + detailApiUrl,
             url: globalConfig.context + detailApiUrl,
             data: {
             data: {
                 id: id,
                 id: id,
-                ownerType:this.props.data.ownerType
+                dataCategory:this.state.dataCategory
             },
             },
             success: function (data) {
             success: function (data) {
                 let thisData = data.data;
                 let thisData = data.data;

+ 30 - 1
js/component/manageCenter/idea/policy/inquiry.jsx

@@ -370,6 +370,35 @@ const Inquiry=React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
+    clearCache() {
+        if (!this.state.searchKey) {
+            message.warning('必须选择一个位置!');
+            return;
+        };
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/banners/clearCache',
+            data: {
+                key: this.state.searchKey  // 位置标示,必填
+            },
+            success: function (data) {
+                if (data.error && data.error.length) {
+                    message.warning(data.error[0].message);
+                } else {
+                    message.success('更新缓存成功!');
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
 	render(){
 	render(){
 		const rowSelection = {
 		const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
             selectedRowKeys: this.state.selectedRowKeys,
@@ -419,7 +448,7 @@ const Inquiry=React.createClass({
 	                    }} />
 	                    }} />
 	                <Button type="primary" onClick={() => { this.loadData(1,this.state.callnub) }} style={{marginRight:'10px'}}>搜索</Button>
 	                <Button type="primary" onClick={() => { this.loadData(1,this.state.callnub) }} style={{marginRight:'10px'}}>搜索</Button>
 	                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
 	                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-	                
+	                <Button type="ghost" onClick={this.clearCache}>清除缓存</Button>
 	            </div>
 	            </div>
 				<div className="clearfix" style={{marginLeft:'20px'}}>
 				<div className="clearfix" style={{marginLeft:'20px'}}>
 				    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
 				    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>

+ 4 - 0
js/component/manageCenter/idea/policy/manage.jsx

@@ -441,6 +441,10 @@ const Manage=React.createClass({
 	                <Button type='danger' disabled={!hasSelected} onClick={this.delectRow} style={{marginRight:'10px'}}>
 	                <Button type='danger' disabled={!hasSelected} onClick={this.delectRow} style={{marginRight:'10px'}}>
 	                    删除<Icon type="minus" />
 	                    删除<Icon type="minus" />
 	                </Button>
 	                </Button>
+	                <Button type="primary" onClick={() => { this.cleanCache('news_list_cache_key'); }}>清除策源地缓存</Button>
+                    <Button type="primary" onClick={() => { this.cleanCache('news_portal_list_cache_key'); }}>清除列表页缓存</Button>
+                    <Button type="primary" onClick={() => { this.cleanCache('news_index_list_cache_key'); }}>清除首页缓存</Button> 
+                    
 	            </div>
 	            </div>
 				<div className="clearfix" style={{marginLeft:'20px'}}>
 				<div className="clearfix" style={{marginLeft:'20px'}}>
 				    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
 				    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>

+ 1 - 0
package.json

@@ -13,6 +13,7 @@
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
+
     "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
     "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   },
   "repository": {
   "repository": {