yee 7 years ago
parent
commit
3b2196c88d

+ 5 - 0
js/component/account/index/collection.jsx

@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import DemandDesc from '../../portal/search/demandDesc';
 import AchievementDesc from '../../portal/search/achievementDesc';
+import { getProvince } from '../../NewDicProvinceList';
 
 import avatarImg from '../../../../image/avatarImg.png';
 
@@ -299,6 +300,7 @@ const Content = React.createClass({
                     title: '地区',
                     dataIndex: 'province',
                     key: 'province',
+                    render: (text) => { return getProvince(text); }
                 }, {
                     title: '类型',
                     dataIndex: 'type',
@@ -355,6 +357,9 @@ const Content = React.createClass({
             });
         };
     },
+    subscriberRowClick(record, index) {
+        window.open(globalConfig.context + '/user/subscriberDetail.html?rid=' + record.uid + '&type=' + record.type);
+    },
     demandCloseDesc(e) {
         this.setState({
             demandShowDesc: e

+ 1 - 1
js/component/account/services/contract/contract.jsx

@@ -273,7 +273,7 @@ const Contract = React.createClass({
                                 value={[this.state.startDateFormattedDate[0] ? moment(this.state.startDateFormattedDate[0]) : null,
                                 this.state.startDateFormattedDate[1] ? moment(this.state.startDateFormattedDate[1]) : null]}
                                 onChange={(date, dateString) => { this.setState({ startDateFormattedDate: dateString }) }} />
-                            <span>结束时间:</span>
+                            <span>完成时间:</span>
                             <RangePicker style={{ width: '240px' }}
                                 allowClear={false}
                                 value={[this.state.endDateFormattedDate[0] ? moment(this.state.endDateFormattedDate[0]) : null,

+ 3 - 3
js/component/account/set/company.jsx

@@ -96,13 +96,13 @@ class PicturesWall extends React.Component {
                     action={globalConfig.context + "/api/user/avatar/upload"}
                     listType="picture-card"
                     fileList={fileList}
-                    onPreview={this.handlePreview}
+                    onPreview={this.handlePreview.bind(this)}
                     onChange={this.handleChange.bind(this)}
                 >
                     {fileList.length >= 9 ? null : uploadButton}
                 </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
+                    <img alt="" style={{ width: '100%' }} src={previewImage} />
                 </Modal>
             </div>
         );

+ 3 - 3
js/component/account/set/person.jsx

@@ -98,13 +98,13 @@ class PicturesWall extends React.Component {
                     action={globalConfig.context + "/api/user/avatar/upload"}
                     listType="picture-card"
                     fileList={fileList}
-                    onPreview={this.handlePreview}
+                    onPreview={this.handlePreview.bind(this)}
                     onChange={this.handleChange.bind(this)}
                 >
                     {fileList.length >= 9 ? null : uploadButton}
                 </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
+                    <img alt="" style={{ width: '100%' }} src={previewImage} />
                 </Modal>
             </div>
         );

+ 0 - 8
js/component/manageCenter/achievement/techAchievement.jsx

@@ -27,7 +27,6 @@ const AchievementList = React.createClass({
                 name: this.state.name, //名称
                 keyword: this.state.keyword, // 关键词
                 category: this.state.category, //类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
-                ownerType: this.state.ownerType, //所有人类型(0-个人,1-组织)
                 releaseDateStartDate: this.state.releaseDate[0],
                 releaseDateEndDate: this.state.releaseDate[1],
                 releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined, //是否发布(0--未发布,1--已发布)
@@ -322,13 +321,6 @@ const AchievementList = React.createClass({
                         onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <Select placeholder="选择所有人类型"
-                            style={{ width: 140 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
                         <span>发布时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,