yee 7 年 前
コミット
e8f9b8aed2

+ 0 - 1
js/component/account/services/activityCostList.jsx

@@ -104,7 +104,6 @@ const ActivityDescFrom = Form.create()(React.createClass({
                         accountUrl: this.state.accountUrl
                     }
                 }).done(function (data) {
-                    debugger
                     if (!data.error.length) {
                         message.success('保存成功!');
                     } else {

+ 2 - 1
js/component/account/services/techProduct.jsx

@@ -24,12 +24,13 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <Select.Option value={item.value} key={10000 + item.value}>{item.key}</Select.Option>
             )
         });
-        this.state.targetKeys = this.props.data.intellectualPropertyNumber;
+        this.state.targetKeys = this.props.data.intellectualPropertyNumber || [];
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible && nextProps.data) {
             this.state.targetKeys = nextProps.data.intellectualPropertyNumber || [];
             this.props.form.resetFields();
+            this.state.accountUrl = [];
             this.state.fileList = [];
         };
     },

+ 2 - 0
js/component/account/services/technologyChange.jsx

@@ -153,6 +153,8 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             this.loadData(nextProps.data.pid);
             this.getStateData(nextProps.data.pid);
             this.state.fileList = [];
+            this.state.approvalUrl = undefined;
+            this.state.subsidy = undefined;
             this.props.form.resetFields();
         };
     },

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

@@ -368,7 +368,7 @@ const DemandOrderList = React.createClass({
                     dataIndex: 'demandSerialNumber',
                     key: 'demandSerialNumber',
                 }, {
-                    title: '雇主编号',
+                    title: '雇主名称',
                     dataIndex: 'theName',
                     key: 'theName',
                 }, {
@@ -584,7 +584,7 @@ const DemandOrderList = React.createClass({
                         dataSource={this.state.searchData}
                         style={{ width: 200 }}
                         onSearch={this.state.therottleSearch}
-                        placeholder="输入成果所有人"
+                        placeholder="输入雇主名称"
                         onSelect={(e) => {
                             this.state.searchName = e;
                         }} />

+ 2 - 0
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -112,6 +112,8 @@ const HrSituationDescFrom = Form.create()(React.createClass({
             this.props.form.resetFields();
             this.state.fileList_roster = [];
             this.state.fileList_social_security = [];
+            this.state.rosterUrl = undefined;
+            this.state.socialSecurityUrl = undefined;
         };
     },
     render() {

+ 3 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -29,6 +29,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible && nextProps.data && this.props.resetForm) {
             this.state.targetKeys = nextProps.data.intellectualPropertyNumber || [];
             this.props.form.resetFields();
+            this.state.accountUrl = undefined;
             this.state.fileList = [];
         };
     },
@@ -180,8 +181,8 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <Transfer
                     dataSource={this.props.mockData}
                     listStyle={{
-                        width: 200,
-                        height: 200,
+                        width: 300,
+                        height: 300,
                     }}
                     titles={['未选择', '已选择']}
                     targetKeys={this.state.targetKeys}

+ 2 - 3
js/component/manageCenter/servicesManage/patent/correction.jsx

@@ -41,7 +41,6 @@ const Correction = React.createClass({
                         patentType: thisdata.patentCatagory,
                         patentName: thisdata.patentName,
                         patentState: thisdata.patentState,
-                        province: thisdata.locationProvince,
                         endData: [thisdata.patentCatagory, thisdata.authorizedDate],
                         author: thisdata.author,
                         authorizedDate: thisdata.authorizedDate
@@ -111,8 +110,8 @@ const Correction = React.createClass({
                     key: 'office',
                 }, {
                     title: '省份',
-                    dataIndex: 'province',
-                    key: 'province',
+                    dataIndex: 'locationProvince',
+                    key: 'locationProvince',
                     render: text => { return getProvince(text) }
 
                 }, {

+ 2 - 0
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -263,6 +263,8 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             this.getStateData(nextProps.data.id);
             this.getContactsList(nextProps.data.uid);
             this.getDepartmentList(nextProps.data.uid);
+            this.state.approvalUrl = undefined;
+            this.state.subsidy = undefined;
             this.props.form.resetFields();
         };
     },

+ 5 - 0
js/component/portal/portal.less

@@ -118,6 +118,7 @@
             >button {
                 position: absolute;
                 right: 0;
+                vertical-align: middle;
                 border-top-left-radius: 0;
                 border-bottom-left-radius: 0;
                 border-top-right-radius: 14px;
@@ -125,6 +126,9 @@
                 border: none;
                 height: 28px;
                 background: #58a3ff;
+                >img {
+                    vertical-align: middle;
+                }
             }
         }
     }
@@ -318,6 +322,7 @@
     }
     .interest_list_name {
         position: relative;
+        height: 24px;
         >p {
             font-size: 16px;
             text-align: right;

+ 2 - 2
js/component/portal/search/achievement.jsx

@@ -105,7 +105,7 @@ const Content = React.createClass({
                         });
                     };
                 };
-                this.state.pagination.defaultCurrent = data.data.pageNo;
+                this.state.pagination.pageNo = data.data.pageNo;
                 this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: theArr,
@@ -130,7 +130,7 @@ const Content = React.createClass({
             transferPrice: 999,
             pagination: {
                 pageNo: 1,
-                pageSize: 15,
+                pageSize: 12,
                 total: 0
             },
             dataSource: []

+ 2 - 2
js/component/portal/search/demand.jsx

@@ -102,7 +102,7 @@ const Content = React.createClass({
                         });
                     };
                 };
-                this.state.pagination.defaultCurrent = data.data.pageNo;
+                this.state.pagination.pageNo = data.data.pageNo;
                 this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: theArr,
@@ -130,7 +130,7 @@ const Content = React.createClass({
             budgetCostUpper: null,
             pagination: {
                 pageNo: 1,
-                pageSize: 15,
+                pageSize: 10,
                 total: 0
             },
             dataSource: []

+ 13 - 1
js/component/subscriberDetail/content.jsx

@@ -79,6 +79,7 @@ const Content = React.createClass({
                             serialNumber: thisdata.serialNumber,
                             dataCategory: thisdata.dataCategory,
                             name: thisdata.name,
+                            transferPrice:thisdata.transferPrice,
                             fieldA: thisdata.fieldA,
                             fieldB: thisdata.fieldB,
                             bargainingMode: thisdata.bargainingMode,
@@ -132,10 +133,14 @@ const Content = React.createClass({
                             id: thisdata.id,
                             serialNumber: thisdata.serialNumber,
                             dataCategory: thisdata.dataCategory,
+                            problemDes:thisdata.problemDes,
+                            budgetCost:thisdata.budgetCost,
                             name: thisdata.name,
                             keyword: thisdata.keyword,
                             releaseDate: thisdata.releaseDate,
                             demandType: thisdata.demandType,
+                            industryCategoryA:thisdata.industryCategoryA,
+                            industryCategoryB:thisdata.industryCategoryB,
                             validityPeriod: thisdata.validityPeriod,
                             validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
                             releaseDateFormattedDate: thisdata.releaseDateFormattedDate
@@ -398,7 +403,14 @@ const Content = React.createClass({
                                     <span className="detial_sub_icon">
                                         <img src={demand_ico_5} alt="需求" />
                                     </span>
-                                    <span className="detial_sub_title">需求: </span>
+                                    <span className="detial_sub_title">关键词: </span>
+                                    <span className="detial_sub_text">{item.keyword}</span>
+                                </div>
+                                <div className="detial_sub">
+                                    <span className="detial_sub_icon">
+                                        <img src={demand_ico_5} alt="需求" />
+                                    </span>
+                                    <span className="detial_sub_title">需求描述: </span>
                                     <span className="detial_sub_text">{item.problemDes}</span>
                                 </div>
                                 <div className="detial_sub">