Browse Source

1.0.39 update

yee 7 years ago
parent
commit
d707be857d

+ 18 - 5
js/component/account/services/contract/contract.jsx

@@ -27,7 +27,7 @@ const Contract = React.createClass({
                 status: this.state.contractState,
                 serialNumber: this.state.serialNumber,
                 startDateFormattedDate: this.state.startDateFormattedDate[0],
-                endDateFormattedDate: this.state.endDateFormattedDate[1],
+                endDateFormattedDate: this.state.startDateFormattedDate[1],
                 completeStartDate: this.state.endDateFormattedDate[0],
                 completeEndDate: this.state.endDateFormattedDate[1]
             },
@@ -128,7 +128,13 @@ const Contract = React.createClass({
                     title: '合同状态',
                     dataIndex: 'status',
                     key: 'status',
-                    render: (text) => { return getContractState(text) }
+                    render: (text) => {
+                        if (text == '3') {
+                            return '已完成'
+                        } else {
+                            return getContractState(text)
+                        }
+                    }
                 }, {
                     title: '合同类型',
                     dataIndex: 'type',
@@ -160,9 +166,16 @@ const Contract = React.createClass({
             )
         });
         contractStateList.map(function (item) {
-            sArr.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
+            if (item.value == '3') {
+                sArr.push(
+                    <Select.Option value={item.value} key={item.key}>已完成</Select.Option>
+                )
+            } else {
+                sArr.push(
+                    <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
+                )
+            }
+
         });
         this.setState({
             typeOption: tArr,

+ 8 - 10
js/component/account/services/contract/contractDetail.jsx

@@ -92,23 +92,21 @@ const ContractDetailForm = Form.create()(React.createClass({
                     key: 'inUrgent',
                     render: (text) => {
                         switch (text) {
-                            case 0:
-                                return '不加急(45个工作日)';
-                            case 3:
+                            case '3':
                                 return '3个工作日';
-                            case 5:
+                            case '5':
                                 return '5个工作日';
-                            case 10:
+                            case '10':
                                 return '6-10个工作日';
-                            case 15:
+                            case '15':
                                 return '11-15个工作日';
-                            case 20:
+                            case '20':
                                 return '16-20个工作日';
-                            case 25:
+                            case '25':
                                 return '21-25个工作日';
-                            case 30:
+                            case '30':
                                 return '26-30个工作日';
-                            case 35:
+                            case '35':
                                 return '31-35个工作日';
                             default:
                                 return '不加急(45个工作日)';

+ 16 - 4
js/component/account/services/copyright/copyright.jsx

@@ -112,7 +112,13 @@ const copyright = React.createClass({
                     title: '认证状态',
                     dataIndex: 'status',
                     key: 'status',
-                    render: (text) => { return getCopyrightState(text) }
+                    render: (text) => {
+                        if (text == '9') {
+                            return '已完成'
+                        } else {
+                            return getCopyrightState(text)
+                        }
+                    }
                 }, {
                     title: '软著名称',
                     dataIndex: 'copyrightName',
@@ -184,9 +190,15 @@ const copyright = React.createClass({
     componentWillMount() {
         let _me = this;
         copyrightStateList.map(function (item) {
-            _me.state.stateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
+            if (item.value == '9') {
+                _me.state.stateOption.push(
+                    <Select.Option value={item.value} key={item.key}>已完成</Select.Option>
+                )
+            } else {
+                _me.state.stateOption.push(
+                    <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
+                )
+            }
         });
         getVacations((data) => { this.setState({ vacations: data }); });
         this.loadData();

+ 21 - 12
js/component/account/services/patent.jsx

@@ -44,7 +44,7 @@ const Patent = React.createClass({
                         patentNum: thisdata.patentNumber,
                         patentName: thisdata.patentName,
                         patentCatagory: thisdata.patentCatagory ? getPatentType(thisdata.patentCatagory) : '',
-                        patentState: getPatentState(thisdata.patentState == '13' ? '12' : thisdata.patentState),
+                        patentState: thisdata.patentState,
                         patentField: thisdata.patentField,
                         patentDes: thisdata.patentDes,
                         patentProryStatementUrl: thisdata.patentProryStatementUrl, //专利代理委托书
@@ -124,6 +124,13 @@ const Patent = React.createClass({
                     title: '专利状态',
                     dataIndex: 'patentState',
                     key: 'patentState',
+                    render: (text) => {
+                        if (text == '13') {
+                            return '已完成'
+                         } else {
+                            return getPatentState(text)
+                        }
+                    }
                 }, {
                     title: '申请日',
                     dataIndex: 'startTime',
@@ -145,9 +152,15 @@ const Patent = React.createClass({
             )
         });
         patentStateList.map(function (item) {
-            _me.state.patentStateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
+            if (item.value == '13') {
+                _me.state.patentStateOption.push(
+                    <Select.Option value={item.value} key={item.key}>已完成</Select.Option>
+                )
+            } else {
+                _me.state.patentStateOption.push(
+                    <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
+                )
+            }
         });
         this.loadData();
         this.state.contactsOption = setUserContactsList();
@@ -165,17 +178,13 @@ const Patent = React.createClass({
         };
     },
     search() {
-        this.state.searchNum;
-        this.state.searchName;
-        this.state.searchType;
-        this.state.searchState;
         this.loadData();
     },
     reset() {
-        this.state.searchNum = "";
-        this.state.searchName = "";
-        this.state.searchType = "";
-        this.state.searchState = "";
+        this.state.searchNum = undefined;
+        this.state.searchName = undefined;
+        this.state.searchType = undefined;
+        this.state.searchState = undefined;
         this.loadData();
     },
     render() {

+ 68 - 5
js/component/account/services/techProduct.jsx

@@ -8,6 +8,54 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
+if (!Array.prototype.includes) {
+    Object.defineProperty(Array.prototype, 'includes', {
+        value: function (searchElement, fromIndex) {
+
+            // 1. Let O be ? ToObject(this value).
+            if (this == null) {
+                throw new TypeError('"this" is null or not defined');
+            }
+
+            var o = Object(this);
+
+            // 2. Let len be ? ToLength(? Get(O, "length")).
+            var len = o.length >>> 0;
+
+            // 3. If len is 0, return false.
+            if (len === 0) {
+                return false;
+            }
+
+            // 4. Let n be ? ToInteger(fromIndex).
+            //    (If fromIndex is undefined, this step produces the value 0.)
+            var n = fromIndex | 0;
+
+            // 5. If n ≥ 0, then
+            //  a. Let k be n.
+            // 6. Else n < 0,
+            //  a. Let k be len + n.
+            //  b. If k < 0, let k be 0.
+            var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+
+            // 7. Repeat, while k < len
+            while (k < len) {
+                // a. Let elementK be the result of ? Get(O, ! ToString(k)).
+                // b. If SameValueZero(searchElement, elementK) is true, return true.
+                // c. Increase k by 1.
+                // NOTE: === provides the correct "SameValueZero" comparison needed here.
+                if (o[k] === searchElement) {
+                    return true;
+                }
+                k++;
+            }
+
+            // 8. Return false
+            return false;
+        }
+    });
+}
+
 const TechProductDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -155,7 +203,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                     })(
                         <Cascader
                             options={techFieldList}
-                            onChange={(value, selectedOptions) => { this.setState({ techField: value }); console.log(value) }}
+                            onChange={(value, selectedOptions) => { this.setState({ techField: value }); }}
                             placeholder="请选择"
                             showSearch
                         />
@@ -189,7 +237,7 @@ const TechProductDescFrom = 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 className="clearfix">
                     <FormItem className="half-item"
@@ -362,14 +410,17 @@ const TechProduct = React.createClass({
                 };
                 return;
             };
-            let theArr = [];
+            let theArr = [], theObj = {};
             for (let i = 0; i < intellectualList.data.list.length; i++) {
                 theArr.push({
-                    key: intellectualList.data.list[i].intellectualPropertyNumber,
+                    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.mockData = theArr;
+            this.state.mockDataObj = theObj;
             for (let i = 0; i < data.data.list.length; i++) {
                 let thisdata = data.data.list[i];
                 this.state.data.push({
@@ -378,6 +429,7 @@ const TechProduct = React.createClass({
                     uid: thisdata.uid,
 
                     mockData: this.state.mockData,
+                    mockDataObj: theObj,
 
                     serialNumber: thisdata.serialNumber,
                     productName: thisdata.productName,
@@ -422,6 +474,8 @@ const TechProduct = React.createClass({
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
+            mockData:[],
+            mockDataObj:{},
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -464,7 +518,16 @@ const TechProduct = React.createClass({
                 }, {
                     title: '知识产权编号',
                     dataIndex: 'PropertyNumber',
-                    key: 'PropertyNumber'
+                    key: 'PropertyNumber',
+                    render: (text) => {
+                        let arr = [], _me = this;
+                        if (text && text.split(',').length) {
+                            text.split(',').map((item) => {
+                                arr.push(_me.state.mockDataObj[item]);
+                            });
+                        };
+                        return arr.join(',');
+                    }
                 }
             ],
             dataSource: []

+ 3 - 4
js/component/account/services/technologyChange.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Icon, Form, Button, Input, Select, Spin, Table, message, Modal, Radio, Upload } from 'antd';
 import { cognizanceStateList } from '../../dataDic.js';
 import { getProvince } from '../../NewDicProvinceList';
-import { getCognizanceState, beforeUploadFile, downloadFile, companySearch } from '../../tools.js';
+import { getTechnologyState, beforeUploadFile, downloadFile, companySearch } from '../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
@@ -58,13 +58,12 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     message.warning(data.error[0].message);
                     return;
                 };
-                var myDate = new Date();
                 this.state.stateTable = [];
                 for (let i = 0; i < data.data.length; i++) {
                     this.state.stateTable.push({
                         key: i,
                         state: data.data[i].state,
-                        recordTime: myDate.toLocaleDateString(data.data[i].recordTime),
+                        recordTime: data.data[i].recordTimeFormattedDate,
                         principal: data.data[i].principal,
                         comment: data.data[i].comment
                     });
@@ -89,7 +88,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                 title: '科技项目状态',
                 dataIndex: 'state',
                 key: 'state',
-                render: (text) => { return getCognizanceState(text) }
+                render: (text) => { return getTechnologyState(text) }
             }, {
                 title: '处理时间',
                 dataIndex: 'recordTime',

+ 3 - 3
js/component/login/loginForm.jsx

@@ -30,7 +30,9 @@ const LoginForm = Form.create()(React.createClass({
                         "remember": values.remember
                     }
                 }).done(function (res) {
-                    if (!res.error.length) {
+                    if (res.error && res.error.length) {
+                        message.warning(res.error[0].message);
+                    } else {
                         let data = res.data;
                         if (data && data.requestURI) {
                             let path = globalConfig.context + data.requestURI
@@ -44,8 +46,6 @@ const LoginForm = Form.create()(React.createClass({
                         } else {
                             window.location.href = globalConfig.context + "/user/account/index.html";
                         }
-                    } else {
-                        message.warning(res.error[0].message);
                     }
                 }.bind(this)).always(function () {
                     this.props.spinState(false);

+ 9 - 2
js/component/manageCenter/idea/news/news.jsx

@@ -198,6 +198,12 @@ const News = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         if (this.props.newsType != nextProps.newsType) {
+            this.state.searchTitle = undefined;
+            this.state.searchAuthor = undefined;
+            this.state.startDate = undefined;
+            this.state.endDate = undefined;
+            this.state.searchSource = undefined;
+            this.state.searchHot = undefined;
             this.loadData(1, nextProps.newsType);
         };
     },
@@ -336,6 +342,7 @@ const News = React.createClass({
                             case 4: return <span>国家政策管理</span>;
                             case 5: return <span>地方政策管理</span>;
                             case 2: return <span>政府往来管理</span>;
+                            case 3: return <span>技淘动态管理</span>;
                         }
                     })()}
                     <Button type="primary" style={{ float: 'right' }}
@@ -354,13 +361,13 @@ const News = React.createClass({
                         <Input placeholder="来源" style={{ width: 100 }}
                             value={this.state.searchSource}
                             onChange={(e) => { this.setState({ searchSource: e.target.value }); }} />
-                        <Select placeholder="显示在首页"
+                        {this.props.newsType == 2 || this.props.newsType == 3 ? <Select placeholder="显示在首页"
                             style={{ width: 100 }}
                             value={this.state.searchHot}
                             onChange={(e) => { this.setState({ searchHot: e }) }}>
                             <Select.Option value="0" >不显示</Select.Option>
                             <Select.Option value="1" >显示</Select.Option>
-                        </Select>
+                        </Select> : <span></span>}
                         <span>发布时间</span>
                         <DatePicker style={{ width: 110 }}
                             format="YYYY-MM-DD"

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

@@ -238,7 +238,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                             <span className="download-file">
                                 <a onClick={newDownloadFile.bind(null, this.props.data.id, 'manuscript', '/api/admin/downloadManuscript', this.props.data.type)}>稿件下载</a>
                                 <a onClick={() => {
-                                    var newTab = window.open('about:blank'); getPreview(theData.pid, 'intellectualProperty', theData.type == 1 ? 'patent_writing' : 'copyright_apply', function (data) { console.log(data); newTab.location.href = data; });
+                                    var newTab = window.open('about:blank'); getPreview(theData.pid, 'intellectualProperty', theData.type == 1 ? 'patent_writing' : 'copyright_apply', function (data) { newTab.location.href = data; });
                                 }}><Icon style={{ fontSize: '16px' }} type="eye-o" /></a>
                             </span>
                             : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传稿件!</span>}

+ 69 - 5
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -7,6 +7,55 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
+if (!Array.prototype.includes) {
+    Object.defineProperty(Array.prototype, 'includes', {
+        value: function (searchElement, fromIndex) {
+
+            // 1. Let O be ? ToObject(this value).
+            if (this == null) {
+                throw new TypeError('"this" is null or not defined');
+            }
+
+            var o = Object(this);
+
+            // 2. Let len be ? ToLength(? Get(O, "length")).
+            var len = o.length >>> 0;
+
+            // 3. If len is 0, return false.
+            if (len === 0) {
+                return false;
+            }
+
+            // 4. Let n be ? ToInteger(fromIndex).
+            //    (If fromIndex is undefined, this step produces the value 0.)
+            var n = fromIndex | 0;
+
+            // 5. If n ≥ 0, then
+            //  a. Let k be n.
+            // 6. Else n < 0,
+            //  a. Let k be len + n.
+            //  b. If k < 0, let k be 0.
+            var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+
+            // 7. Repeat, while k < len
+            while (k < len) {
+                // a. Let elementK be the result of ? Get(O, ! ToString(k)).
+                // b. If SameValueZero(searchElement, elementK) is true, return true.
+                // c. Increase k by 1.
+                // NOTE: === provides the correct "SameValueZero" comparison needed here.
+                if (o[k] === searchElement) {
+                    return true;
+                }
+                k++;
+            }
+
+            // 8. Return false
+            return false;
+        }
+    });
+}
+
+
 const TechProductDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -155,7 +204,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                     })(
                         <Cascader
                             options={techFieldList}
-                            onChange={(value, selectedOptions) => { this.setState({ techField: value }); console.log(value) }}
+                            onChange={(value, selectedOptions) => { this.setState({ techField: value }); }}
                             placeholder="请选择"
                             showSearch
                         />
@@ -189,7 +238,7 @@ const TechProductDescFrom = 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 className="clearfix">
                     <FormItem className="half-item"
@@ -368,14 +417,17 @@ const TechProduct = React.createClass({
                 message.warning(intellectualList.error[0].message);
                 return;
             };
-            let theArr = [];
+            let theArr = [], theObj = {};
             for (let i = 0; i < intellectualList.data.list.length; i++) {
                 theArr.push({
-                    key: intellectualList.data.list[i].intellectualPropertyNumber,
+                    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.mockData = theArr;
+            this.state.mockDataObj = theObj;
             for (let i = 0; i < data.data.list.length; i++) {
                 let thisdata = data.data.list[i];
                 this.state.data.push({
@@ -384,6 +436,7 @@ const TechProduct = React.createClass({
                     uid: thisdata.uid,
 
                     mockData: this.state.mockData,
+                    mockDataObj: this.state.mockDataObj,
 
                     serialNumber: thisdata.serialNumber,
                     productName: thisdata.productName,
@@ -430,6 +483,8 @@ const TechProduct = React.createClass({
         return {
             selectedRowKeys: [],
             selectedRows: [],
+            mockData: [],
+            mockDataObj: {},
             loading: false,
             pagination: {
                 defaultCurrent: 1,
@@ -473,7 +528,16 @@ const TechProduct = React.createClass({
                 }, {
                     title: '知识产权编号',
                     dataIndex: 'PropertyNumber',
-                    key: 'PropertyNumber'
+                    key: 'PropertyNumber',
+                    render: (text) => {
+                        let arr = [], _me = this;
+                        if (text && text.split(',').length) {
+                            text.split(',').map((item) => {
+                                arr.push(_me.state.mockDataObj[item]);
+                            });
+                        };
+                        return arr.join(',');
+                    }
                 }
             ],
             dataSource: []

+ 47 - 11
js/component/manageCenter/servicesManage/highTech/highTechInfo.jsx

@@ -13,11 +13,21 @@ import './highTechFoster.less';
 
 
 const highTechInfo = React.createClass({
+    getIntellectualNumber(text) {
+        let arr = [], _me = this;
+        if (text && text.split(',').length) {
+            text.split(',').map((item) => {
+                arr.push(_me.state.intellectualObj[item]);
+            });
+        };
+        return arr.join(',');
+    },
     getInitialState() {
         return {
             loading: false,
             year: new Date().getFullYear() - 1,
             field: [],
+            intellectualObj: {},
             registerType: [],
             netAssetRate: 0,
             salesRevenueRate: 0,
@@ -98,7 +108,7 @@ const highTechInfo = React.createClass({
                 {
                     title: '知识产权编号',
                     dataIndex: 'intellectualPropertyNumber',
-                    key: 'intellectualPropertyNumber',
+                    key: 'intellectualPropertyNumber'
                 }, {
                     title: '知识产权名称',
                     dataIndex: 'intellectualPropertyName',
@@ -503,6 +513,7 @@ const highTechInfo = React.createClass({
             };
         }.bind(this)).always(function () {
             this.loadIntellectualListData(uid);
+            this.loadIntellectualObjectData(uid);
         }.bind(this));
     },
     loadIntellectualListData(uid) {
@@ -547,6 +558,31 @@ const highTechInfo = React.createClass({
             this.loadHRData(uid);
         }.bind(this));
     },
+    loadIntellectualObjectData(uid) {
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/intellectualList",
+            data: {
+                uid: uid
+            }
+        }).done(function (data) {
+            let theObj = {};
+            if (data.error && data.error.length) {
+                message.warning(data.error[0].message);
+            } else {
+                data.data.list.map(function (item) {
+                    theObj[item.id] = item.intellectualPropertyNumber;
+                });
+            };
+            this.setState({
+                intellectualObj: theObj
+            });
+        }.bind(this)).always(function () {
+            this.loadHRData(uid);
+        }.bind(this));
+    },
     //第三
     loadHRData(uid) {
         $.ajax({
@@ -609,7 +645,7 @@ const highTechInfo = React.createClass({
                 uid: uid
             }
         }).done(function (data) {
-            let theArr = [];
+            let theArr = [], _me = this;
             if (!data.data) {
                 if (data.error && data.error.length) {
                     message.warning(data.error[0].message);
@@ -640,7 +676,7 @@ const highTechInfo = React.createClass({
                                 </div>
                                 <div className="half-item">
                                     <span className="item-title">知识产权编号</span>
-                                    <span>{item.intellectualPropertyNumber}</span>
+                                    <span>{_me.getIntellectualNumber(item.intellectualPropertyNumber)}</span>
                                 </div>
                                 <div className="half-item">
                                     <span className="item-title">研发费用总预算</span>
@@ -892,7 +928,7 @@ const highTechInfo = React.createClass({
                 year: this.state.year
             }
         }).done(function (data) {
-            let theArr = [];
+            let theArr = [], _me = this;
             if (!data.data) {
                 if (data.error && data.error.length) {
                     message.warning(data.error[0].message);
@@ -926,7 +962,7 @@ const highTechInfo = React.createClass({
                                 </div>
                                 <div className="half-item">
                                     <span className="item-title">知识产权编号</span>
-                                    <span>{item.intellectualPropertyNumber}</span>
+                                    <span>{_me.getIntellectualNumber(item.intellectualPropertyNumber)}</span>
                                 </div>
                             </div>
                             <div className="all-item">
@@ -1027,7 +1063,7 @@ const highTechInfo = React.createClass({
         };
     },
     render() {
-        let theData = this.state;
+        const theData = this.state;
         return (
             <Spin spinning={theData.loading}>
                 <div id="Info-box">
@@ -1301,27 +1337,27 @@ const highTechInfo = React.createClass({
                         <div className="clearfix">
                             <div className="half-item">
                                 <span className="item-title">近三年研究开发费用总额</span>
-                                <span>{theData.researchCost}</span>
+                                <span>{theData.researchCost || 0}</span>
                                 <span> 万元</span>
                             </div>
                             <div className="half-item">
                                 <span className="item-title">在中国境内研发费用总和</span>
-                                <span>{theData.territory}</span>
+                                <span>{theData.territory || 0}</span>
                                 <span> 万元</span>
                             </div>
                             <div className="half-item">
                                 <span className="item-title">基础研究投入费用总额</span>
-                                <span>{theData.basicResearchCost}</span>
+                                <span>{theData.basicResearchCost || 0}</span>
                                 <span> 万元</span>
                             </div>
                             <div className="half-item">
                                 <span className="item-title">近一年企业总收入</span>
-                                <span>{theData.totalRevenue}</span>
+                                <span>{theData.totalRevenue || 0}</span>
                                 <span> 万元</span>
                             </div>
                             <div className="half-item">
                                 <span className="item-title">近一年高新技术产品收入</span>
-                                <span>{theData.lastYearRevenue}</span>
+                                <span>{theData.lastYearRevenue || 0}</span>
                                 <span> 万元</span>
                             </div>
                             <div className="half-item">

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

@@ -530,7 +530,7 @@ const ApplyChange = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -555,7 +555,7 @@ const ApplyChange = React.createClass({
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} />
+                            spinState={this.spinChange} closeModal={this.handleOk} />
                     </Spin>
                 </Modal>
             </div>

+ 4 - 2
js/component/manageCenter/servicesManage/technology/applyManage.jsx

@@ -393,9 +393,11 @@ const ApplyManage = React.createClass({
             this.loadData();
         }.bind(this));
     },
-    closeDesc(e) {
+    closeDesc(e, s) {
         this.state.showDesc = e;
-        this.loadData();
+        if (s) {
+            this.loadData();
+        }
     },
     closeAdd(e) {
         this.state.showAdd = e;

+ 1 - 0
js/component/manageCenter/userManage/customerList.jsx

@@ -202,6 +202,7 @@ const CustomerList = React.createClass({
                             email: thisdata.email,
                             createTime: thisdata.createTime,
                             aftUsername: thisdata.aftUsername,
+                            managerName: thisdata.managerName,
                             number: thisdata.number,
                             auditStatus: thisdata.type == 0 ? thisdata.userAuditStatus : thisdata.orgAuditStatus,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,

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

@@ -79,7 +79,7 @@ const HighTechSearch = React.createClass({
                     dataIndex: 'key',
                     key: 'key',
                 }, {
-                    title: '省份',
+                    title: '地区',
                     dataIndex: 'district',
                     key: 'district',
                     render: (text) => { return getProvince(text) }

+ 1 - 0
js/component/manageCenter/userManage/orgList.jsx

@@ -122,6 +122,7 @@ const OrgList = React.createClass({
                             email: thisdata.email,
                             createTime: thisdata.createTime,
                             aftUsername: thisdata.aftUsername,
+                            managerName: thisdata.managerName,
                             number: thisdata.number,
                             orgAuditStatus: thisdata.orgAuditStatus,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,

+ 1 - 0
js/component/manageCenter/userManage/userList.jsx

@@ -121,6 +121,7 @@ const UserList = React.createClass({
                             email: thisdata.email,
                             createTime: thisdata.createTime,
                             aftUsername: thisdata.aftUsername,
+                            managerName: thisdata.managerName,
                             username: thisdata.username,
                             number: thisdata.number,
                             auditStatus: thisdata.auditStatus,

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

@@ -106,7 +106,6 @@ const AchievementDetail = React.createClass({
                 this.setState({
                     dataSource: theArr
                 });
-                console.log(this.state.logsOrderStatus)
             }.bind(this),
         }).always(function () {
             this.setState({

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "",
   "main": "index.js",
   "scripts": {

+ 24 - 24
webpack.config.js

@@ -191,30 +191,30 @@ module.exports = (function () {
         }),
 
         //portal 门户
-        new HtmlWebpackPlugin({
-            title: '主页-需求搜索',
-            filename: 'portal/search/demand.html',
-            template: './template/template.html',
-            chunks: ['portal/search/demand', 'vendors']
-        }),
-        new HtmlWebpackPlugin({
-            title: '主页-科技成果搜索',
-            filename: 'portal/search/achievement.html',
-            template: './template/template.html',
-            chunks: ['portal/search/achievement', 'vendors']
-        }),
-        new HtmlWebpackPlugin({
-            title: '主页-行家搜索',
-            filename: 'portal/search/subscriberUser.html',
-            template: './template/template.html',
-            chunks: ['portal/search/subscriberUser', 'vendors']
-        }),
-        new HtmlWebpackPlugin({
-            title: '主页-伙伴搜索',
-            filename: 'portal/search/subscriberOrg.html',
-            template: './template/template.html',
-            chunks: ['portal/search/subscriberOrg', 'vendors']
-        })
+        // new HtmlWebpackPlugin({
+        //     title: '主页-需求搜索',
+        //     filename: 'portal/search/demand.html',
+        //     template: './template/template.html',
+        //     chunks: ['portal/search/demand', 'vendors']
+        // }),
+        // new HtmlWebpackPlugin({
+        //     title: '主页-科技成果搜索',
+        //     filename: 'portal/search/achievement.html',
+        //     template: './template/template.html',
+        //     chunks: ['portal/search/achievement', 'vendors']
+        // }),
+        // new HtmlWebpackPlugin({
+        //     title: '主页-行家搜索',
+        //     filename: 'portal/search/subscriberUser.html',
+        //     template: './template/template.html',
+        //     chunks: ['portal/search/subscriberUser', 'vendors']
+        // }),
+        // new HtmlWebpackPlugin({
+        //     title: '主页-伙伴搜索',
+        //     filename: 'portal/search/subscriberOrg.html',
+        //     template: './template/template.html',
+        //     chunks: ['portal/search/subscriberOrg', 'vendors']
+        // })
     ];
     if (!isDev) {
         //这个使用uglifyJs压缩你的js代码

+ 16 - 16
webpack/entry.config.js

@@ -141,21 +141,21 @@ module.exports = {
       './js/admin/servicesManage/technology.js'
     ],
     //portal  门户
-    'portal/search/demand': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/portal/search/demand.js'
-    ],
-    'portal/search/achievement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/portal/search/achievement.js'
-    ],
-    'portal/search/subscriberUser': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/portal/search/subscriberUser.js'
-    ],
-    'portal/search/subscriberOrg': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './js/portal/search/subscriberOrg.js'
-    ]
+    // 'portal/search/demand': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+    //   'webpack/hot/only-dev-server',
+    //   './js/portal/search/demand.js'
+    // ],
+    // 'portal/search/achievement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+    //   'webpack/hot/only-dev-server',
+    //   './js/portal/search/achievement.js'
+    // ],
+    // 'portal/search/subscriberUser': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+    //   'webpack/hot/only-dev-server',
+    //   './js/portal/search/subscriberUser.js'
+    // ],
+    // 'portal/search/subscriberOrg': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+    //   'webpack/hot/only-dev-server',
+    //   './js/portal/search/subscriberOrg.js'
+    // ]
   }
 }