yee 7 년 전
부모
커밋
6f204501ae

+ 1 - 1
js/component/account/achievement/techAchievementDesc.jsx

@@ -1004,7 +1004,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 };
                                 this.setState({ textFileList: info.fileList.slice(-1) });
                             }} >
-                            <Button><Icon type="upload" /> 上传需求文本文件 </Button>
+                            <Button><Icon type="upload" /> 上传成熟度证明文本 </Button>
                         </Upload>
                         <p style={{ marginTop: '10px' }}>{theData.maturityTextFileUrl ?
                             <span className="download-file">

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

@@ -294,6 +294,7 @@ const Contract = React.createClass({
                     <ContractDetail
                         data={this.state.RowData}
                         statusOption={this.state.statusOption}
+                        contactsList={this.state.contactsList}
                         showDesc={this.state.showDesc}
                         closeDesc={this.closeDesc} />
                 </div >

+ 5 - 3
js/component/account/services/contract/contractDetail.jsx

@@ -110,6 +110,8 @@ const ContractDetailForm = Form.create()(React.createClass({
                                 return '26-30个工作日';
                             case 35:
                                 return '31-35个工作日';
+                            default:
+                                return '不加急(45个工作日)';
                         }
                     },
                     width: 220
@@ -330,7 +332,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                         "contractId": item.contractId,  //合同ID
                         "copyrightName": item.copyrightName,  //项目名称
                         "serialNumber": item.serialNumber,
-                        "state": item.state,   //状态
+                        "status": item.status,   //状态
                         "inUrgent": item.inUrgent, //加急天数
                         "principal": item.principal,  //当前负责人(技术员)
                         "tableType": "copyright"
@@ -436,7 +438,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                     <FormItem className="half-item"
                         {...formItemLayout}
                         label="联系人" >
-                        <span>{this.state.contactsList ? this.state.contactsList[theData.contacts] : ''}</span>
+                        <span>{this.props.contactsList ? this.props.contactsList[theData.contacts] : ''}</span>
                     </FormItem>
                 </div>
                 <p style={{ fontSize: '14px', color: '#333' }}>状态流转记录: </p>
@@ -566,7 +568,7 @@ const ContractDetail = React.createClass({
                     <Spin spinning={this.state.loading} className='spin-box'>
                         <ContractDetailForm
                             visible={this.state.visible}
-                            authorOption={this.props.authorOption}
+                            contactsList={this.props.contactsList}
                             statusOption={this.props.statusOption}
                             data={this.props.data}
                             spinState={this.spinChange}

+ 3 - 1
js/component/account/services/copyright/comPatentChange.jsx

@@ -117,6 +117,8 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     id: detailData.id,
                     province: detailData.province,
                     unitName: detailData.unitName,
+                    postalAddress: detailData.postalAddress,
+                    orgCode: detailData.orgCode,
                     serialNumber: detailData.serialNumber,
                     createTime: detailData.createTime,
                     acceptTime: detailData.acceptTime,
@@ -219,7 +221,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">

+ 2 - 6
js/component/account/services/patent.jsx

@@ -114,17 +114,13 @@ const Patent = React.createClass({
                     key: 'patentNum',
                 }, {
                     title: '专利类型',
-                    dataIndex: 'patentType',
-                    key: 'patentType',
+                    dataIndex: 'patentCatagory',
+                    key: 'patentCatagory',
                 }, {
                     title: '专利名称',
                     dataIndex: 'patentName',
                     key: 'patentName',
                 }, {
-                    title: '专利类型',
-                    dataIndex: 'patentCatagory',
-                    key: 'patentCatagory',
-                }, {
                     title: '专利状态',
                     dataIndex: 'patentState',
                     key: 'patentState',

+ 1 - 1
js/component/account/services/patent.less

@@ -123,7 +123,7 @@
             }
         }
         .time-line {
-            width: 200px;
+            width: 240px;
             margin: 0 auto;
             .ant-timeline-item-content {
                 span {

+ 40 - 7
js/component/account/services/patentDesc.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Icon, Modal, message, Spin, Timeline, Button, Popconfirm } from 'antd';
-import { getPatentType, getPatentState, getTime, getPatentField, newDownloadFile, getStepList } from '../../tools.js';
+import { getPatentType, getPatentState, getTime, getPatentField, newDownloadFile } from '../../tools.js';
 import './patent.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -48,10 +48,43 @@ const PatentDesc = React.createClass({
             }.bind(this),
         });
     },
+    getStepList(thepid) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/user/patent/patentProcess',
+            data: {
+                pid: thepid || this.props.pid
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (var item in data.data) {
+                        theArr.push(
+                            <Timeline.Item key={item}>
+                                <span>{getPatentState(data.data[item].state)}</span>
+                                {data.data[item].recordTimeFormattedDate}
+                            </Timeline.Item>
+                        )
+                    };
+                };
+                this.setState({
+                    stepList: theArr
+                });
+            }.bind(this),
+        });
+    },
     componentWillReceiveProps(nextProps) {
-        if (nextProps.data && nextProps.data.pid !== null && !this.state.visible && nextProps.showDesc) {
-            this.state.stepList = getStepList(nextProps.data.pid, '/api/user/patent/patentProcess');
-            this.getPatentInfo(nextProps.data.pid);
+        if (!this.state.visible && nextProps.showDesc) {
+            if (nextProps.data && nextProps.data.pid) {
+                this.getStepList(nextProps.data.pid);
+                this.getPatentInfo(nextProps.data.pid);
+            };
         };
         this.state.visible = nextProps.showDesc;
     },
@@ -149,13 +182,13 @@ const PatentDesc = React.createClass({
                                 }
                             </div>
                             <div>
-                                <span>专利申请日:</span>{theData.startTime}
+                                <span>专利申请日:</span>{theData.patentApplicationFormattedDate}
                             </div>
                             <div>
-                                <span>专利授权日:</span>{theData.authorizedTime}
+                                <span>专利授权日:</span>{theData.authorizedFormattedDate}
                             </div>
                             <div>
-                                <span>每年年费缴费截止日:</span>{theData.endTime}
+                                <span>每年年费缴费截止日:</span>{getTime(theData.authorizedDate, 12)}
                             </div>
                             <div>
                                 <p>第一发明人:</p>

+ 3 - 3
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -646,7 +646,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
                             {...formItemLayout}
                             label="技术经纪人" >
                             {getFieldDecorator('techBroderId', {
-                                initialValue: theData.techBroderId
+                                initialValue: theData.techBrokerId
                             })(
                                 <Select style={{ width: 260 }}
                                     placeholder="请选择技术经纪人"
@@ -1142,7 +1142,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 };
                                 this.setState({ textFileList: info.fileList.slice(-1) });
                             }} >
-                            <Button><Icon type="upload" /> 上传需求文本文件 </Button>
+                            <Button><Icon type="upload" /> 上传成熟度证明文本 </Button>
                         </Upload>
                         <p style={{ marginTop: '10px' }}>{theData.maturityTextFileUrl ?
                             <span className="download-file">
@@ -1518,7 +1518,7 @@ const AchievementDetail = React.createClass({
                 let _me = this, theArr = [];
                 for (var item in data.data) {
                     theArr.push(
-                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                        <Select.Option key={item}>{data.data[item]}</Select.Option>
                     )
                 };
                 this.setState({

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

@@ -582,7 +582,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                             {...formItemLayout}
                             label="技术经纪人" >
                             {getFieldDecorator('techBroderId', {
-                                initialValue: theData.techBroderId
+                                initialValue: theData.techBrokerId
                             })(
                                 <Select style={{ width: 260 }}
                                     placeholder="请选择技术经纪人"
@@ -1293,7 +1293,7 @@ const DemandDetail = React.createClass({
                 let _me = this, theArr = [];
                 for (var item in data.data) {
                     theArr.push(
-                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                        <Select.Option key={item}>{data.data[item]}</Select.Option>
                     )
                 };
                 this.setState({

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

@@ -110,6 +110,8 @@ const ContractDetailForm = Form.create()(React.createClass({
                                 return '26-30个工作日';
                             case 35:
                                 return '31-35个工作日';
+                            default:
+                                return '不加急(45个工作日)';
                         }
                     },
                     width: 220
@@ -353,7 +355,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                         "contractId": item.contractId,  //合同ID
                         "copyrightName": item.copyrightName,  //项目名称
                         "serialNumber": item.serialNumber,
-                        "state": item.state,   //状态
+                        "status": item.status,   //状态
                         "inUrgent": item.inUrgent, //加急天数
                         "principal": item.principal,  //当前负责人(技术员)
                         "tableType": "copyright"

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

@@ -184,8 +184,8 @@ const Content = React.createClass({
         if (window.location.search) {
             let theUrl = window.location.search
             this.state.keyword = theUrl.substring(1, theUrl.length);
+            this.state.keyword = decodeURIComponent(this.state.keyword);
         };
-
         this.loadData();
     },
     industryChange(e) {

+ 1 - 1
js/component/portal/search/achievementDesc.jsx

@@ -351,7 +351,7 @@ const AchievementDetail = React.createClass({
                         </Row>
                         <Row>
                             <Col span={4}>成果所有人名称</Col>
-                            <Col span={8}>{theData.username || theData.unitName}</Col>
+                            <Col span={8}>{theData.ownerName}</Col>
                             <Col span={4}>合作方式</Col>
                             <Col span={8}>
                                 {(() => {

+ 1 - 0
js/component/portal/search/demand.jsx

@@ -162,6 +162,7 @@ const Content = React.createClass({
         if (window.location.search) {
             let theUrl = window.location.search
             this.state.keyword = theUrl.substring(1, theUrl.length);
+            this.state.keyword = decodeURIComponent(this.state.keyword);
         };
         this.loadData();
     },

+ 1 - 1
js/component/portal/search/demandDesc.jsx

@@ -325,7 +325,7 @@ const DemandDetail = React.createClass({
                         </Row>
                         <Row>
                             <Col span={4}>雇佣方名称</Col>
-                            <Col span={8}>{theData.username || theData.unitName}</Col>
+                            <Col span={8}>{theData.employerName}</Col>
                             <Col span={4}>固定周期</Col>
                             <Col span={8}>{theData.fixedCycle}</Col>
                         </Row>

+ 1 - 0
js/component/portal/search/subscriberOrg.jsx

@@ -110,6 +110,7 @@ const SubContent = React.createClass({
         if (window.location.search) {
             let theUrl = window.location.search
             this.state.searchName = theUrl.substring(1, theUrl.length);
+            this.state.searchName = decodeURIComponent(this.state.searchName);
         };
 
         this.loadData();

+ 1 - 0
js/component/portal/search/subscriberUser.jsx

@@ -107,6 +107,7 @@ const SubContent = React.createClass({
         if (window.location.search) {
             let theUrl = window.location.search
             this.state.searchName = theUrl.substring(1, theUrl.length);
+            this.state.searchName = decodeURIComponent(this.state.searchName);
         };
         this.loadData();
     },

+ 0 - 27
js/component/tools.js

@@ -295,33 +295,6 @@ module.exports = {
             return year + month + day;
         }
     },
-    getStepList(pid,url) {
-        let stepList = [];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            cache: false,
-            url: globalConfig.context + url + "?pid=" + pid,
-            success: function (data) {
-                if (!data.data) {
-                    if (data.error && data.error.length ) {
-                        return;
-                    };
-                };
-                for (var item in data.data) {
-                    stepList.push(
-                        <Timeline.Item key={item}> 
-                            <span>{module.exports.getPatentState(data.data[item].state)}</span> 
-                            {module.exports.getTime(data.data[item].recordTime)} 
-                        </Timeline.Item>
-                    )
-                };
-            }.bind(this),
-        });
-        return stepList;
-    },
-
 
     //各种通过接口获取下拉列表