yee 7 years ago
parent
commit
738aeb3d8d

+ 4 - 2
js/component/account/demand/techDemandDesc.jsx

@@ -935,9 +935,11 @@ const DemandDetail = React.createClass({
                     render: text => {
                         switch (text) {
                             case "0":
-                                return <span>个人需求</span>;
+                                return <span>成果</span>;
                             case "1":
-                                return <span>团体需求</span>;
+                                return <span>技术</span>;
+                            case "2":
+                                return <span>项目</span>;
                         }
                     }
                 }, {

+ 2 - 3
js/component/account/services/activity.jsx

@@ -146,7 +146,7 @@ const ActivityForm = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.state.mockData = nextProps.data.mockData;
             this.props.form.resetFields();
-            this.state.proofUrl = null;
+            this.state.proofUrl = undefined;
             this.state.fileList = [];
             if (nextProps.data.id) {
                 this.loadData(nextProps.data.id);
@@ -441,7 +441,6 @@ const ActivityDesc = React.createClass({
     },
 });
 
-
 const Activity = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -493,7 +492,7 @@ const Activity = React.createClass({
                         technicalField1: thisdata.technicalField1,
                         technicalField2: thisdata.technicalField2,
                         technicalField3: thisdata.technicalField3,
-                        technicalSource: thisdata.technicalSource && thisdata.technicalSource == 0 ? String(thisdata.technicalSource) : undefined,
+                        technicalSource: thisdata.technicalSource ? String(thisdata.technicalSource) : undefined,
                         intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
                         intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
                         budget: thisdata.budget,

+ 13 - 10
js/component/account/services/copyright/copyright.jsx

@@ -156,18 +156,21 @@ const copyright = React.createClass({
                     dataIndex: 'acceptTimeFormattedDate',
                     key: 'acceptTimeFormattedDate',
                 }, {
-                    title: '(预计)下证时间',
+                    title: '下证时间',
                     dataIndex: 'expectTime',
                     key: 'expectTime',
-                    render: (text) => {
-                        if (text[0]) {
-                            if (text[1]) {
-                                return getTime(getInUrgentTime(moment(text[0]), text[1], this.state.vacations))
-                            } else {
-                                return getTime(getInUrgentTime(moment(text[0]), 45, this.state.vacations))
-                            }
-                        };
-                        return;
+                    render: (text, record) => {
+                        if (record.authorizedDate) {
+                            return record.authorizedDateFormattedDate
+                        } else {
+                            if (text[0]) {
+                                if (text[1]) {
+                                    return getTime(getInUrgentTime(moment(text[0]), text[1], this.state.vacations))
+                                } else {
+                                    return getTime(getInUrgentTime(moment(text[0]), 45, this.state.vacations))
+                                }
+                            };
+                        }
                     }
                 }, {
                     title: '备注',

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

@@ -48,7 +48,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.props.form.resetFields();
             this.state.fileList = [];
-            this.state.enclosureUrl = null;
+            this.state.enclosureUrl = undefined;
         };
     },
     componentWillMount() {

+ 2 - 2
js/component/account/set/hrSituation.jsx

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

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

@@ -396,8 +396,8 @@ const DemandDetailShow = Form.create()(React.createClass({
                             </FormItem> : <FormItem className="half-item"
                                 {...formItemLayout}
                                 label="联系人" >
-                                <span>{theData.contactsName}</span>
-                            </FormItem>}
+                                    <span>{theData.contactsName}</span>
+                                </FormItem>}
                         </div>}
                     <div className="clearfix">
                         <FormItem className="half-item"
@@ -1284,9 +1284,11 @@ const DemandDetail = React.createClass({
                     render: text => {
                         switch (text) {
                             case "0":
-                                return <span>个人需求</span>;
+                                return <span>成果</span>;
                             case "1":
-                                return <span>团体需求</span>;
+                                return <span>技术</span>;
+                            case "2":
+                                return <span>项目</span>;
                         }
                     }
                 }, {

+ 18 - 16
js/component/manageCenter/idea/bannerManage/bannerManage.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Button, Spin, message, Table, Input, Modal, DatePicker, Upload, Select } from 'antd';
+import { Icon, Button, Spin, message, Table, Input, Modal, DatePicker, Upload, Select, Pagination } from 'antd';
 import { beforeUpload, getBase64 } from '../../../tools';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -61,13 +61,13 @@ const Lecture = React.createClass({
             },
             success: function (data) {
                 let theArr = [];
-                if (!data.data) {
+                if (!data.data || !data.data.list) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
                             id: thisdata.id, //主键
@@ -81,8 +81,8 @@ const Lecture = React.createClass({
                             endDate: thisdata.endDate //广告图结束时间
                         });
                     };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
+                    this.state.pagination.pageNo = pageNo || 1;
+                    this.state.pagination.total = data.data.total || 0;
                 };
                 this.setState({
                     tableData: theArr,
@@ -137,16 +137,9 @@ const Lecture = React.createClass({
             keysObj: {},
             RowData: {},
             pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
+                pageNo: 1,
                 pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
+                total: 0
             },
             columns: [
                 {
@@ -316,6 +309,7 @@ const Lecture = React.createClass({
             }
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
+        const { pageNo, pageSize, total } = this.state.pagination;
         return (
             <div className="admin-content" >
                 <div className="admin-content-title">广告图管理</div>
@@ -342,9 +336,17 @@ const Lecture = React.createClass({
                     <Spin spinning={this.state.loading}>
                         <Table className="no-all-select" columns={this.state.columns}
                             dataSource={this.state.tableData}
-                            pagination={this.state.pagination}
+                            pagination={false}
                             rowSelection={rowSelection}
                             onRowClick={this.tableRowClick} />
+                        <div className="clearfix">
+                            <Pagination style={{ marginTop: '10px', float: 'right' }}
+                                onChange={(e) => { this.loadData(e); }}
+                                total={total}
+                                showTotal={() => { return '共' + total + '条数据' }}
+                                current={pageNo}
+                                pageSize={pageSize} />
+                        </div>
                     </Spin>
                 </div>
                 <Modal title="广告图详情" width={1000}

+ 11 - 13
js/component/manageCenter/idea/bigShot/star.jsx

@@ -33,7 +33,7 @@ const Star = React.createClass({
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         theArr.push({
-                            key: i,
+                            key: thisdata.uid,
                             uid: thisdata.uid,
                             engagedField: thisdata.engagedField ? thisdata.engagedField.split(',') : [],
                             username: thisdata.username,
@@ -76,7 +76,7 @@ const Star = React.createClass({
                     for (let i = 0; i < data.data.length; i++) {
                         let thisdata = data.data[i];
                         theArr.push({
-                            key: i,
+                            key: thisdata.uid,
                             uid: thisdata.uid,
                             engagedField: thisdata.engagedField ? thisdata.engagedField.split(',') : [],
                             username: thisdata.username,
@@ -116,7 +116,7 @@ const Star = React.createClass({
                     for (let i = 0; i < data.data.length; i++) {
                         let thisdata = data.data[i];
                         theArr.push({
-                            key: i,
+                            key: thisdata.uid,
                             uid: thisdata.uid,
                             engagedField: thisdata.engagedField ? thisdata.engagedField.split(',') : [],
                             username: thisdata.username,
@@ -229,17 +229,16 @@ const Star = React.createClass({
     },
     addIndex(record) {
         let theBool = true;
+        if (this.state.hotTableData.length == 4) {
+            message.warning('大咖列表最多只能显示4条记录!');
+            theBool = false;
+        };
         this.state.hotTableData.map((item, i) => {
             if (item.uid == record.uid) {
                 message.warning('该条记录已经存在于大咖列表中!');
                 theBool = false;
                 return;
             };
-            if (i == 4) {
-                message.warning('大咖列表最多只能显示4条记录!');
-                theBool = false;
-                return;
-            };
         });
         if (theBool) {
             this.state.hotTableData.push(record);
@@ -248,17 +247,16 @@ const Star = React.createClass({
     },
     addStar(record) {
         let theBool = true;
+        if (this.state.starTableData.length == 6) {
+            message.warning('明星列表最多只能显示6条记录!');
+            theBool = false;
+        };
         this.state.starTableData.map((item, i) => {
             if (item.uid == record.uid) {
                 message.warning('该条记录已经存在于明星列表中!');
                 theBool = false;
                 return;
             };
-            if (i == 6) {
-                message.warning('明星列表最多只能显示6条记录!');
-                theBool = false;
-                return;
-            };
         });
         if (theBool) {
             this.state.starTableData.push(record);

+ 1 - 1
js/component/manageCenter/servicesManage/contract/contractDetail.jsx

@@ -356,7 +356,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                         "copyrightName": item.copyrightName,  //项目名称
                         "serialNumber": item.serialNumber,
                         "status": item.status,   //状态
-                        "inUrgent": item.inUrgent, //加急天数
+                        "inUrgent": item.inUrgent ? Number(item.inUrgent) : null, //加急天数
                         "principal": item.principal,  //当前负责人(技术员)
                         "tableType": "copyright"
                     });

+ 2 - 1
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -115,6 +115,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     province: detailData.province,
                     postalAddress: detailData.postalAddress,
                     unitName: detailData.unitName,
+                    orgCode: detailData.orgCode,
                     serialNumber: detailData.serialNumber,
                     createTime: detailData.createTime,
                     acceptTime: detailData.acceptTime,
@@ -222,7 +223,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     <FormItem className="half-item"
                         {...formItemLayout}
                         label="组织机构代码" >
-                        <span>{theData.unitNumber}</span>
+                        <span>{theData.orgCode}</span>
                     </FormItem>
                 </div>
                 <div className="clearfix">

+ 13 - 14
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -492,27 +492,26 @@ const copyright = React.createClass({
                 dataIndex: 'acceptTimeFormattedDate',
                 key: 'acceptTimeFormattedDate',
             }, {
-                title: '(预计)下证时间',
+                title: '下证时间',
                 dataIndex: 'expectTime',
                 key: 'expectTime',
-                render: (text) => {
-                    if (text[0]) {
-                        if (text[1]) {
-                            return getTime(getInUrgentTime(moment(text[0]), text[1], this.state.vacations))
-                        } else {
-                            return getTime(getInUrgentTime(moment(text[0]), 45, this.state.vacations))
-                        }
-                    };
-                    return;
+                render: (text, record) => {
+                    if (record.authorizedDate) {
+                        return record.authorizedDateFormattedDate
+                    } else {
+                        if (text[0]) {
+                            if (text[1]) {
+                                return getTime(getInUrgentTime(moment(text[0]), text[1], this.state.vacations)) + '(预计)'
+                            } else {
+                                return getTime(getInUrgentTime(moment(text[0]), 45, this.state.vacations)) + '(预计)'
+                            }
+                        };
+                    }
                 }
             }, {
                 title: '创建人',
                 dataIndex: 'founder',
                 key: 'founder'
-            }, {
-                title: '技术员',
-                dataIndex: 'techPrincipal',
-                key: 'techPrincipal',
             }
         ];
         const rowSelection = {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx

@@ -87,7 +87,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.props.form.resetFields();
             this.state.fileList = [];
-            this.state.enclosureUrl = null;
+            this.state.enclosureUrl = undefined;
         };
     },
     render() {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -499,7 +499,7 @@ const Activity = React.createClass({
                         technicalField1: thisdata.technicalField1,
                         technicalField2: thisdata.technicalField2,
                         technicalField3: thisdata.technicalField3,
-                        technicalSource: thisdata.technicalSource || thisdata.technicalSource == 0 ? String(thisdata.technicalSource) : undefined,
+                        technicalSource: thisdata.technicalSource ? String(thisdata.technicalSource) : undefined,
                         intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
                         intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
                         budget: thisdata.budget,

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx

@@ -718,7 +718,7 @@ const AnnualReport = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/deleteAnnualReport",
+            url: globalConfig.context + "/api/admin/deleteAnnualReport",
             data: {
                 ids: deletedIds
             }

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx

@@ -49,7 +49,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.props.form.resetFields();
             this.state.fileList = [];
-            this.state.enclosureUrl = null;
+            this.state.enclosureUrl = undefined;
         };
     },
     componentWillMount() {

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

@@ -82,6 +82,8 @@ const StandardDesc = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         if (!this.state.visible && nextProps.showDesc) {
+            this.state.fileList = [];
+            this.state.enclosureUrl = undefined;
             if (nextProps.data) {
                 this.state.standardName = nextProps.data.standardName;
                 this.state.standardNumber = nextProps.data.standardNumber;
@@ -90,8 +92,6 @@ const StandardDesc = React.createClass({
                 this.state.participateWay = nextProps.data.participateWay;
                 this.state.enclosureUrl = nextProps.data.enclosureUrl;
             };
-            this.state.fileList = [];
-            this.state.enclosureUrl = undefined;
         };
         this.state.visible = nextProps.showDesc;
     },

+ 1 - 1
js/component/manageCenter/userManage/orgDesc.jsx

@@ -83,7 +83,7 @@ const OrgShow = Form.create()(React.createClass({
                     paymentDateFormattedDate: thisData.paymentDateFormattedDate,
                     lastYearTaxReportUrl: thisData.lastYearTaxReportUrl,
                     auditStatus: thisData.auditStatus,
-                    level: thisData.level,
+                    level: thisData.lvl,
 
                     aid: thisData.aid,   //业务员ID
                     mid: thisData.mid  //客户经理ID

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

@@ -387,15 +387,13 @@
                 .logo {
                     height: 120px;
                     width: 120px;
-                    position: relative;
-                    padding-top: 120px;
                     margin: 0 auto;
+                    line-height: 120px;
+                    text-align: center;
                     img {
-                        height: 120px;
-                        width: auto;
-                        position: absolute;
-                        top: 0;
-                        left: 0;
+                        max-width: 120px;
+                        max-height: 120px;
+                        vertical-align: middle;
                     }
                 }
                 >div:not(:first-child) {

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

@@ -283,47 +283,47 @@ const Content = React.createClass({
                                             <img src={item.level ? certify : uncertify} alt="" />
                                         </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_5} alt="成果" />
                                         </span>
-                                        <span className="detial_sub_title">关键词: </span>
-                                        <span className="detial_sub_text">{item.keyword}</span>
+                                        <span className="detail_sub_title">关键词: </span>
+                                        <span className="detail_sub_text">{item.keyword}</span>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_2} alt="类型" />
                                         </span>
-                                        <span className="detial_sub_title">技术类型: </span>
-                                        <span className="detial_sub_text">{getAchievementCategory(item.category)}</span>
+                                        <span className="detail_sub_title">技术类型: </span>
+                                        <span className="detail_sub_text">{getAchievementCategory(item.category)}</span>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_1} alt="行业" />
                                         </span>
-                                        <span className="detial_sub_title">行业分类: </span>
-                                        <span className="detial_sub_text">{getIndustryCategory(item.fieldA, item.fieldB)}</span>
+                                        <span className="detail_sub_title">行业分类: </span>
+                                        <span className="detail_sub_text">{getIndustryCategory(item.fieldA, item.fieldB)}</span>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_3} alt="标价" />
                                         </span>
-                                        <span className="detial_sub_title">标价: </span>
+                                        <span className="detail_sub_title">标价: </span>
                                         <span className="money_text">{item.transferPrice ? (item.transferPrice + '万元') : '价格面议'}</span>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={achievement_ico_1} alt="交易方式" />
                                         </span>
-                                        <span className="detial_sub_title">交易方式: </span>
+                                        <span className="detail_sub_title">交易方式: </span>
                                         <span className="money_text">{getTransferMode(item.transferMode)}</span>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={achievement_ico_2} alt="成熟度" />
                                         </span>
-                                        <span className="detial_sub_title">技术成熟度: </span>
-                                        <span className="detial_sub_score" >
+                                        <span className="detail_sub_title">技术成熟度: </span>
+                                        <span className="detail_sub_score" >
                                             <span style={{ width: (item.maturity ? Number(item.maturity) * 20 : 0) + '%' }}>
                                                 <img src={score_ioc} alt={getMaturity(item.maturity)} />
                                             </span>

+ 5 - 7
js/component/subscriberDetail/detail.less

@@ -78,14 +78,12 @@
             height: 120px;
             width: 120px;
             margin: 0 auto;
-            padding-top: 120px;
-            position: relative;
+            line-height: 120px;
+            text-align: center;
             img {
-                position: absolute;
-                top: 0;
-                left: 0;
-                height: 120px;
-                width: auto;
+                max-width: 120px;
+                max-height: 120px;
+                vertical-align: middle;
             }
         }
         .interest {