yee hace 7 años
padre
commit
891e790a58

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

@@ -418,7 +418,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="固定人数" >
-                            <span>{theData.peopleNumber} 人</span>
+                            <span>{theData.peopleNumber || 0} 人</span>
                         </FormItem>
                     </div>
                     <FormItem
@@ -431,7 +431,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="预算费用" >
-                            <span>{theData.budgetCost} 万元</span>
+                            <span>{theData.budgetCost || 0} 万元</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}

+ 5 - 2
js/component/account/index/normal.jsx

@@ -92,14 +92,17 @@ const Content = React.createClass({
                     </div>
                     <div className="index-record">
                         <p className="acc-title">我的轨迹</p>
-                        <ul className="record-list clearfix">
+                        {this.state.type ? <ul className="record-list clearfix">
                             <li>专利:<a href={globalConfig.context + "/user/account/services.html#patent"}>{this.state.patentNum || 0}</a> 项</li>
                             <li>软著:<a href={globalConfig.context + "/user/account/services.html#copyright"}>{this.state.copyrightNum || 0}</a> 项</li>
                             <li>知识产权:<a href={globalConfig.context + "/user/account/services.html#intellectual"}>{this.state.intellectualPropertyNum || 0}</a> 项</li>
                             <li>科技项目:<a href={globalConfig.context + "/user/account/services.html#technology"}>{this.state.techProjectNum || 0}</a> 项</li>
                             <li>技术成果:<a href={globalConfig.context + "/user/account/achievement.html#techAchievement"}>{this.state.achievementNum || 0}</a> 项</li>
                             <li>发布需求:<a href={globalConfig.context + "/user/account/demand.html#techDemand"}>{this.state.demandNum || 0}</a> 项</li>
-                        </ul>
+                        </ul> : <ul className="record-list clearfix">
+                                <li>技术成果:<a href={globalConfig.context + "/user/account/achievement.html#techAchievement"}>{this.state.achievementNum || 0}</a> 项</li>
+                                <li>发布需求:<a href={globalConfig.context + "/user/account/demand.html#techDemand"}>{this.state.demandNum || 0}</a> 项</li>
+                            </ul>}
                     </div>
                     <div className="index-activity">
                         <Collection />

+ 75 - 62
js/component/account/services/activity.jsx

@@ -229,7 +229,7 @@ const ActivityForm = Form.create()(React.createClass({
                                 selectedKeys={this.state.selectedKeys}
                                 onChange={this.intellectualChange}
                                 onSelectChange={this.intellectualSelectChange}
-                                render={item => `${item.name}-${item.key}`}
+                                render={item => `${item.name}-${item.number}`}
                             />
                         </div>
                         <FormItem className="half-div"
@@ -422,74 +422,77 @@ const Activity = React.createClass({
         })).done((data1, data2) => {
             let data = data1[0];
             let intellectualList = data2[0];
+            let theArr = [], theObj = {};
             if (data.error.length || !data.data || !data.data.list) {
                 message.warning(data.error[0].message);
-                return;
+            } else {
+                for (let i = 0; i < data.data.list.length; i++) {
+                    let thisdata = data.data.list[i];
+                    this.state.data.push({
+                        key: i,
+                        id: thisdata.id,
+                        uid: thisdata.uid,
+                        activityNumber: thisdata.activityNumber,
+                        activityName: thisdata.activityName,
+                        startDate: thisdata.startDate,
+                        endDate: thisdata.endDate,
+
+                        mockData: this.state.mockData,
+
+                        techField: [thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3],
+                        technicalField: getTechField(thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3),
+                        technicalField1: thisdata.technicalField1,
+                        technicalField2: thisdata.technicalField2,
+                        technicalField3: thisdata.technicalField3,
+                        technicalSource: thisdata.technicalSource && thisdata.technicalSource == 0 ? String(thisdata.technicalSource) : undefined,
+                        intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
+                        intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
+                        budget: thisdata.budget,
+                        firstYearExpenditure: thisdata.firstYearExpenditure,
+                        secondYearExpenditure: thisdata.secondYearExpenditure,
+                        thirdYearExpenditure: thisdata.thirdYearExpenditure,
+                        implement: thisdata.implement,
+                        technologyInnovation: thisdata.technologyInnovation,
+                        achievement: thisdata.achievement,
+                        internalLaborCost: thisdata.internalLaborCost,
+                        internalDirectCost: thisdata.internalDirectCost,
+                        internalDepreciationCost: thisdata.internalDepreciationCost,
+                        internalAmortizationCost: thisdata.internalAmortizationCost,
+                        internalDesignCost: thisdata.internalDesignCost,
+                        internalEquipmentCost: thisdata.internalEquipmentCost,
+                        internalOtherCost: thisdata.internalOtherCost,
+                        externalTotalCost: thisdata.externalTotalCost,
+                        externalAbroadCost: thisdata.externalAbroadCost,
+                        enterpriseFiller: thisdata.enterpriseFiller,
+                        signDate: thisdata.signDate,
+                        sortNumber: thisdata.sortNumber,
+                        startDateFormattedDate: thisdata.startDateFormattedDate,
+                        endDateFormattedDate: thisdata.endDateFormattedDate,
+                        projectMode: thisdata.projectMode,
+                        proofUrl: thisdata.proofUrl,
+                        proofDownloadFileName: thisdata.proofDownloadFileName
+                    });
+                };
+                this.state.pagination.current = data.data.pageNo;
+                this.state.pagination.total = data.data.totalCount;
             };
             if (intellectualList.error.length || !intellectualList.data || !intellectualList.data.list) {
                 message.warning(intellectualList.error[0].message);
-                return;
-            };
-            let theArr = [];
-            for (let i = 0; i < intellectualList.data.list.length; i++) {
-                theArr.push({
-                    key: intellectualList.data.list[i].intellectualPropertyNumber,
-                    name: intellectualList.data.list[i].intellectualPropertyName
-                });
-            };
-            this.state.mockData = theArr;
-            for (let i = 0; i < data.data.list.length; i++) {
-                let thisdata = data.data.list[i];
-                this.state.data.push({
-                    key: i,
-                    id: thisdata.id,
-                    uid: thisdata.uid,
-                    activityNumber: thisdata.activityNumber,
-                    activityName: thisdata.activityName,
-                    startDate: thisdata.startDate,
-                    endDate: thisdata.endDate,
-
-                    mockData: this.state.mockData,
-
-                    techField: [thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3],
-                    technicalField: getTechField(thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3),
-                    technicalField1: thisdata.technicalField1,
-                    technicalField2: thisdata.technicalField2,
-                    technicalField3: thisdata.technicalField3,
-                    technicalSource: String(thisdata.technicalSource),
-                    intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
-                    intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
-                    budget: thisdata.budget,
-                    firstYearExpenditure: thisdata.firstYearExpenditure,
-                    secondYearExpenditure: thisdata.secondYearExpenditure,
-                    thirdYearExpenditure: thisdata.thirdYearExpenditure,
-                    implement: thisdata.implement,
-                    technologyInnovation: thisdata.technologyInnovation,
-                    achievement: thisdata.achievement,
-                    internalLaborCost: thisdata.internalLaborCost,
-                    internalDirectCost: thisdata.internalDirectCost,
-                    internalDepreciationCost: thisdata.internalDepreciationCost,
-                    internalAmortizationCost: thisdata.internalAmortizationCost,
-                    internalDesignCost: thisdata.internalDesignCost,
-                    internalEquipmentCost: thisdata.internalEquipmentCost,
-                    internalOtherCost: thisdata.internalOtherCost,
-                    externalTotalCost: thisdata.externalTotalCost,
-                    externalAbroadCost: thisdata.externalAbroadCost,
-                    enterpriseFiller: thisdata.enterpriseFiller,
-                    signDate: thisdata.signDate,
-                    sortNumber: thisdata.sortNumber,
-                    startDateFormattedDate: thisdata.startDateFormattedDate,
-                    endDateFormattedDate: thisdata.endDateFormattedDate,
-                    projectMode: thisdata.projectMode,
-                    proofUrl: thisdata.proofUrl,
-                    proofDownloadFileName: thisdata.proofDownloadFileName
-                });
+            } else {
+                for (let i = 0; i < intellectualList.data.list.length; i++) {
+                    theArr.push({
+                        key: intellectualList.data.list[i].id,
+                        number: intellectualList.data.list[i].intellectualPropertyNumber,
+                        name: intellectualList.data.list[i].intellectualPropertyName
+                    });
+                    theObj[intellectualList.data.list[i].id] = intellectualList.data.list[i].intellectualPropertyNumber;
+                };
             };
-            this.state.pagination.current = data.data.pageNo;
-            this.state.pagination.total = data.data.totalCount;
             this.setState({
                 dataSource: this.state.data,
-                pagination: this.state.pagination
+                pagination: this.state.pagination,
+                mockData: theArr,
+                mockDataObj: theObj
             });
         }).always(function () {
             this.setState({
@@ -500,6 +503,7 @@ const Activity = React.createClass({
     getInitialState() {
         return {
             mockData: [],
+            mockDataObj: {},
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
@@ -536,7 +540,16 @@ const Activity = React.createClass({
                 }, {
                     title: '知识产权编号',
                     dataIndex: 'intellectualPropertyNumberText',
-                    key: 'intellectualPropertyNumberText'
+                    key: 'intellectualPropertyNumberText',
+                    render: (text) => {
+                        let arr = [], _me = this;
+                        if (text && text.split(',').length) {
+                            text.split(',').map((item) => {
+                                arr.push(_me.state.mockDataObj[item]);
+                            });
+                        };
+                        return arr.join(',');
+                    }
                 }, {
                     title: '开始时间',
                     dataIndex: 'startDateFormattedDate',

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

@@ -54,7 +54,7 @@ const Patent = React.createClass({
                         confirmState: thisdata.confirmState, //稿件确认状态
                         authorizedTime: getTime(thisdata.authorizedDate),
                         startTime: getTime(thisdata.patentApplicationDate),
-                        endTime: getTime(thisdata.patentApplicationDate, 2),
+                        endTime: getTime(thisdata.patentApplicationDate, 12),
                         firstInventorName: thisdata.firstInventorName,
                         firstInventorNationality: thisdata.firstInventorNationality, //国籍
                         firstInventorIdNumber: thisdata.firstInventorIdNumber,   //id

+ 3 - 3
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 } from '../../tools.js';
+import { getPatentType, getPatentState, getTime, getIndustryType, newDownloadFile } from '../../tools.js';
 import './patent.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -140,7 +140,7 @@ const PatentDesc = React.createClass({
                             </div>
                             <div>
                                 <p className="widthHalf"><span>专利状态:</span>{getPatentState(theData.patentState)}</p>
-                                <p className="widthHalf"><span>专利领域:</span>{getPatentField(theData.patentField)}</p>
+                                <p className="widthHalf"><span>所属行业:</span>{getIndustryType(theData.patentField)}</p>
                             </div>
                             <div>
                                 <span>简介:</span>{theData.patentDes}
@@ -188,7 +188,7 @@ const PatentDesc = React.createClass({
                                 <span>专利授权日:</span>{theData.authorizedFormattedDate}
                             </div>
                             <div>
-                                <span>每年年费缴费截止日:</span>{getTime(theData.authorizedDate, 12)}
+                                <span>每年年费缴费截止日:</span>{getTime(theData.patentApplicationDate, 12)}
                             </div>
                             <div>
                                 <p>第一发明人:</p>

+ 3 - 0
js/component/dataDic.js

@@ -50,6 +50,9 @@ module.exports = {
         },{
             value: "2",
             key: "电学"
+        },{
+            value: "3",
+            key: "材料学"
         }
     ],
     //知识产权类型

+ 54 - 51
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -516,57 +516,60 @@ const AchievementDetailShow = Form.create()(React.createClass({
                         label="成熟度证明材料(视频地址)" >
                         <span>{theData.maturityVideoUrl}</span>
                     </FormItem>
-                    <div className="clearfix" >
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="成果所有人名称" >
-                            <span>{theData.iOwnerName}</span>
-                        </FormItem>
-                        {this.state.switchValue ?
-                            <div className="clearfix" >
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="联系电话" >
-                                    <span>{theData.ownerMobile}</span>
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="证件号" >
-                                    <span>{theData.ownerIdNumber}</span>
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="电子邮箱" >
-                                    <span>{theData.ownerEmail}</span>
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="通讯地址" >
-                                    <span>{theData.ownerPostalAddress}</span>
-                                </FormItem>
-                            </div> : <div className="clearfix" >
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="联系电话" >
-                                    {theData.ownerType == "1" ? <span>{this.state.contactsObj[theData.contacts]}</span> : <span>{theData.iOwnerMobile}</span>}
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="证件号" >
-                                    <span>{theData.iOwnerIdNumber}</span>
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="电子邮箱" >
-                                    <span>{theData.iOwnerEmail}</span>
-                                </FormItem>
-                                <FormItem className="half-item"
-                                    {...formItemLayout}
-                                    label="通讯地址" >
-                                    <span>{theData.iOwnerPostalAddress}</span>
-                                </FormItem>
-                            </div>}
-                    </div>
+                    {this.state.switchValue ?
+                        <div className="clearfix" >
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="成果所有人名称" >
+                                <span>{theData.ownerName}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="联系电话" >
+                                <span>{theData.ownerMobile}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="证件号" >
+                                <span>{theData.ownerIdNumber}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="电子邮箱" >
+                                <span>{theData.ownerEmail}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="通讯地址" >
+                                <span>{theData.ownerPostalAddress}</span>
+                            </FormItem>
+                        </div> : <div className="clearfix" >
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="成果所有人名称" >
+                                <span>{theData.iOwnerName}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="联系电话" >
+                                {theData.ownerType == "1" ? <span>{this.state.contactsObj[theData.contacts]}</span> : <span>{theData.iOwnerMobile}</span>}
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="证件号" >
+                                <span>{theData.iOwnerIdNumber}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="电子邮箱" >
+                                <span>{theData.iOwnerEmail}</span>
+                            </FormItem>
+                            <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="通讯地址" >
+                                <span>{theData.iOwnerPostalAddress}</span>
+                            </FormItem>
+                        </div>}
                     <div className="clearfix">
                         <FormItem className="half-item"
                             {...formItemLayout}

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

@@ -151,7 +151,7 @@ const DemandDetail = React.createClass({
                 <div className="patent-desc">
                     <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.checkPatentProcess} onCancel={this.handleCancel}
-                        width='800px'
+                        width='900px'
                         footer={null}
                         title="订单详情"
                         className="demand-order-content">

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

@@ -225,7 +225,6 @@ const DemandDetailShow = Form.create()(React.createClass({
     },
     modifyBroker() {
         this.props.form.validateFields((err, values) => {
-            debugger
             if (!err) {
                 this.setState({
                     loading: true
@@ -327,14 +326,14 @@ const DemandDetailShow = Form.create()(React.createClass({
     },
     componentWillMount() {
         this.loadData(this.props.data.id, this.props.detailApiUrl);
-        if (this.props.data.employerId) {
+        if (this.props.data.employerId && this.props.data.dataCategory) {
             this.getContactsList(this.props.data.employerId);
         };
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.loadData(nextProps.data.id, nextProps.detailApiUrl);
-            if (nextProps.data.employerId) {
+            if (nextProps.data.employerId && nextProps.data.dataCategory) {
                 this.getContactsList(nextProps.data.employerId);
             };
             this.props.form.resetFields();
@@ -390,11 +389,11 @@ const DemandDetailShow = Form.create()(React.createClass({
                                 label="雇主名称" >
                                 <span>{theData.username}</span>
                             </FormItem>
-                            <FormItem className="half-item"
+                            {this.props.data.dataCategory ? <FormItem className="half-item"
                                 {...formItemLayout}
                                 label="联系人" >
                                 <span>{this.state.contactsObj[theData.contacts]}</span>
-                            </FormItem>
+                            </FormItem> : <div></div>}
                         </div>}
                     <div className="clearfix">
                         <FormItem className="half-item"
@@ -566,7 +565,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="固定人数" >
-                            <span>{theData.peopleNumber} 人</span>
+                            <span>{theData.peopleNumber || 0} 人</span>
                         </FormItem>
                     </div>
                     <FormItem
@@ -579,7 +578,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                         <FormItem className="half-item"
                             {...formItemLayout}
                             label="预算费用" >
-                            <span>{theData.budgetCost} 万元</span>
+                            <span>{theData.budgetCost || 0} 万元</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}

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

@@ -226,7 +226,7 @@ const ActivityForm = Form.create()(React.createClass({
                                 selectedKeys={this.state.selectedKeys}
                                 onChange={this.intellectualChange}
                                 onSelectChange={this.intellectualSelectChange}
-                                render={item => `${item.name}-${item.key}`}
+                                render={item => `${item.name}-${item.number}`}
                             />
                         </div>
                         <FormItem className="half-div"
@@ -428,74 +428,77 @@ const Activity = React.createClass({
         })).done((data1, data2) => {
             let data = data1[0];
             let intellectualList = data2[0];
+            let theArr = [], theObj = {};
             if (data.error.length || !data.data || !data.data.list) {
                 message.warning(data.error[0].message);
-                return;
+            } else {
+                for (let i = 0; i < data.data.list.length; i++) {
+                    let thisdata = data.data.list[i];
+                    this.state.data.push({
+                        key: i,
+                        id: thisdata.id,
+                        uid: thisdata.uid,
+                        activityNumber: thisdata.activityNumber,
+                        activityName: thisdata.activityName,
+                        startDate: thisdata.startDate,
+                        endDate: thisdata.endDate,
+
+                        mockData: this.state.mockData,
+
+                        techField: [thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3],
+                        technicalField: getTechField(thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3),
+                        technicalField1: thisdata.technicalField1,
+                        technicalField2: thisdata.technicalField2,
+                        technicalField3: thisdata.technicalField3,
+                        technicalSource: thisdata.technicalSource || thisdata.technicalSource == 0 ? String(thisdata.technicalSource) : undefined,
+                        intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
+                        intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
+                        budget: thisdata.budget,
+                        firstYearExpenditure: thisdata.firstYearExpenditure,
+                        secondYearExpenditure: thisdata.secondYearExpenditure,
+                        thirdYearExpenditure: thisdata.thirdYearExpenditure,
+                        implement: thisdata.implement,
+                        technologyInnovation: thisdata.technologyInnovation,
+                        achievement: thisdata.achievement,
+                        internalLaborCost: thisdata.internalLaborCost,
+                        internalDirectCost: thisdata.internalDirectCost,
+                        internalDepreciationCost: thisdata.internalDepreciationCost,
+                        internalAmortizationCost: thisdata.internalAmortizationCost,
+                        internalDesignCost: thisdata.internalDesignCost,
+                        internalEquipmentCost: thisdata.internalEquipmentCost,
+                        internalOtherCost: thisdata.internalOtherCost,
+                        externalTotalCost: thisdata.externalTotalCost,
+                        externalAbroadCost: thisdata.externalAbroadCost,
+                        enterpriseFiller: thisdata.enterpriseFiller,
+                        signDate: thisdata.signDate,
+                        sortNumber: thisdata.sortNumber,
+                        startDateFormattedDate: thisdata.startDateFormattedDate,
+                        endDateFormattedDate: thisdata.endDateFormattedDate,
+                        projectMode: thisdata.projectMode,
+                        proofUrl: thisdata.proofUrl,
+                        proofDownloadFileName: thisdata.proofDownloadFileName
+                    });
+                };
+                this.state.pagination.current = data.data.pageNo;
+                this.state.pagination.total = data.data.totalCount;
             };
             if (intellectualList.error.length || !intellectualList.data || !intellectualList.data.list) {
                 message.warning(intellectualList.error[0].message);
-                return;
-            };
-            let theArr = [];
-            for (let i = 0; i < intellectualList.data.list.length; i++) {
-                theArr.push({
-                    key: intellectualList.data.list[i].intellectualPropertyNumber,
-                    name: intellectualList.data.list[i].intellectualPropertyName
-                });
-            };
-            this.state.mockData = theArr;
-            for (let i = 0; i < data.data.list.length; i++) {
-                let thisdata = data.data.list[i];
-                this.state.data.push({
-                    key: i,
-                    id: thisdata.id,
-                    uid: thisdata.uid,
-                    activityNumber: thisdata.activityNumber,
-                    activityName: thisdata.activityName,
-                    startDate: thisdata.startDate,
-                    endDate: thisdata.endDate,
-
-                    mockData: this.state.mockData,
-
-                    techField: [thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3],
-                    technicalField: getTechField(thisdata.technicalField1, thisdata.technicalField2, thisdata.technicalField3),
-                    technicalField1: thisdata.technicalField1,
-                    technicalField2: thisdata.technicalField2,
-                    technicalField3: thisdata.technicalField3,
-                    technicalSource: thisdata.technicalSource ? String(thisdata.technicalSource) : undefined,
-                    intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
-                    intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
-                    budget: thisdata.budget,
-                    firstYearExpenditure: thisdata.firstYearExpenditure,
-                    secondYearExpenditure: thisdata.secondYearExpenditure,
-                    thirdYearExpenditure: thisdata.thirdYearExpenditure,
-                    implement: thisdata.implement,
-                    technologyInnovation: thisdata.technologyInnovation,
-                    achievement: thisdata.achievement,
-                    internalLaborCost: thisdata.internalLaborCost,
-                    internalDirectCost: thisdata.internalDirectCost,
-                    internalDepreciationCost: thisdata.internalDepreciationCost,
-                    internalAmortizationCost: thisdata.internalAmortizationCost,
-                    internalDesignCost: thisdata.internalDesignCost,
-                    internalEquipmentCost: thisdata.internalEquipmentCost,
-                    internalOtherCost: thisdata.internalOtherCost,
-                    externalTotalCost: thisdata.externalTotalCost,
-                    externalAbroadCost: thisdata.externalAbroadCost,
-                    enterpriseFiller: thisdata.enterpriseFiller,
-                    signDate: thisdata.signDate,
-                    sortNumber: thisdata.sortNumber,
-                    startDateFormattedDate: thisdata.startDateFormattedDate,
-                    endDateFormattedDate: thisdata.endDateFormattedDate,
-                    projectMode: thisdata.projectMode,
-                    proofUrl: thisdata.proofUrl,
-                    proofDownloadFileName: thisdata.proofDownloadFileName
-                });
+            } else {
+                for (let i = 0; i < intellectualList.data.list.length; i++) {
+                    theArr.push({
+                        key: intellectualList.data.list[i].id,
+                        number: intellectualList.data.list[i].intellectualPropertyNumber,
+                        name: intellectualList.data.list[i].intellectualPropertyName
+                    });
+                    theObj[intellectualList.data.list[i].id] = intellectualList.data.list[i].intellectualPropertyNumber;
+                };
             };
-            this.state.pagination.current = data.data.pageNo;
-            this.state.pagination.total = data.data.totalCount;
             this.setState({
                 dataSource: this.state.data,
-                pagination: this.state.pagination
+                pagination: this.state.pagination,
+                mockData: theArr,
+                mockDataObj: theObj
             });
         }).always(function () {
             this.setState({
@@ -508,6 +511,7 @@ const Activity = React.createClass({
     getInitialState() {
         return {
             mockData: [],
+            mockDataObj: {},
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
@@ -544,7 +548,16 @@ const Activity = React.createClass({
                 }, {
                     title: '知识产权编号',
                     dataIndex: 'intellectualPropertyNumberText',
-                    key: 'intellectualPropertyNumberText'
+                    key: 'intellectualPropertyNumberText',
+                    render: (text) => {
+                        let arr = [], _me = this;
+                        if (text && text.split(',').length) {
+                            text.split(',').map((item) => {
+                                arr.push(_me.state.mockDataObj[item]);
+                            });
+                        };
+                        return arr.join(',');
+                    }
                 }, {
                     title: '开始时间',
                     dataIndex: 'startDateFormattedDate',

+ 2 - 5
js/component/manageCenter/userManage/customerSearch.jsx

@@ -15,8 +15,8 @@ const CustomerSearch = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/supervise/findUser",
             data: {
-                "name": this.state.searchName,
-                "mobile": this.state.searchMobile,
+                "name": this.state.searchName || undefined,
+                "mobile": this.state.searchMobile || undefined,
                 "type": Number(this.state.searchType)
             },
             success: function (data) {
@@ -43,9 +43,6 @@ const CustomerSearch = React.createClass({
     search() {
         this.loadData();
     },
-    reset() {
-        this.loadData();
-    },
     render() {
         return (
             <div className="user-content" >