Browse Source

v1.0.20 update

yee 8 years ago
parent
commit
657a170bb8

+ 6 - 12
js/component/account/services/activity.jsx

@@ -44,7 +44,6 @@ const ActivityDesc = React.createClass({
                 implement: this.state.implement,
                 technologyInnovation: this.state.technologyInnovation,
                 achievement: this.state.achievement,
-                participant: this.state.participant,
                 proofUrl: this.state.proofUrl,
                 projectMode: this.state.projectMode
             }
@@ -157,11 +156,6 @@ const ActivityDesc = React.createClass({
                                 }
                             </Select>
                         </div>
-                        <div className="half-div">
-                            <p>参与人员:</p>
-                            <InputNumber value={this.state.participant}
-                                onChange={(e) => { this.setState({ participant: e }); }} />
-                        </div>
                         <div style={{ marginTop: '10px' }}>
                             <p>知识产权编号:</p>
                             <Transfer
@@ -193,18 +187,18 @@ const ActivityDesc = React.createClass({
                             </div>
                             <div className="half-div">
                                 <span>其中(前一年):</span>
-                                <InputNumber value={this.state.firstYearExpenditure}
-                                    onChange={(e) => { this.setState({ firstYearExpenditure: e }); }} />
+                                <span>{this.state.firstYearExpenditure}
+                                </span>
                             </div>
                             <div className="half-div">
                                 <span>其中(前二年):</span>
-                                <InputNumber value={this.state.secondYearExpenditure}
-                                    onChange={(e) => { this.setState({ secondYearExpenditure: e }); }} />
+                                <span>{this.state.secondYearExpenditure}
+                                </span>
                             </div>
                             <div className="half-div">
                                 <span>其中(前三年):</span>
-                                <InputNumber value={this.state.thirdYearExpenditure}
-                                    onChange={(e) => { this.setState({ thirdYearExpenditure: e }); }} />
+                                <span>{this.state.thirdYearExpenditure}
+                                </span>
                             </div>
                         </div>
                         <div className="clearfix">

File diff suppressed because it is too large
+ 865 - 685
js/component/account/services/companyDetail.jsx


+ 146 - 51
js/component/account/services/content.jsx

@@ -3,33 +3,161 @@ import '../content.less';
 import LeftTab from './leftTab.jsx';
 
 import Patent from './patent';
-import Intellectual from './intellectual';
-import Activity from './activity';
-import Standard from './standard';
-import ActivityCostList from './activityCostList';
-import TechProduct from './techProduct';
-import Ratepay from './ratepay';
-import Finance from './finance';
-import Achievement from './achievement';
-import HonorList from './honorList';
-import OrgTechCenter from './orgTechCenter';
-import AnnualReport from './annualReport';
-import Cognizance from './cognizance';
-import Copyright from './copyright/copyright';
-import Technology from './technology'
 
 const Content = React.createClass({
     getInitialState() {
         return {
             loading: false,
             leftKey: 'patent',
+            component: Patent,
             userType: '0'
         };
     },
     handlekey(key) {
-        this.setState({
-            leftKey: key,
-        });
+        switch (key) {
+            case 'patent':
+                this.setState({
+                    component: Patent,
+                    leftKey: 'patent'
+                });
+                break;
+            case 'cognizance':
+                require.ensure([], () => {
+                    const Cognizance = require('./cognizance').default;
+                    this.setState({
+                        component: Cognizance,
+                        leftKey: 'cognizance'
+                    });
+                });
+                break;
+            case 'copyright':
+                require.ensure([], () => {
+                    const Copyright = require('./copyright/copyright').default;
+                    this.setState({
+                        component: Copyright,
+                        leftKey: 'copyright'
+                    });
+                });
+                break;
+            case 'technology':
+                require.ensure([], () => {
+                    const Technology = require('./technology').default;
+                    this.setState({
+                        component: Technology,
+                        leftKey: 'technology'
+                    });
+                });
+                break;
+            case 'companyDetail':
+                require.ensure([], () => {
+                    const CompanyDetail = require('./companyDetail').default;
+                    this.setState({
+                        component: CompanyDetail,
+                        leftKey: 'companyDetail'
+                    });
+                });
+                break;
+            case 'orgTechCenter':
+                require.ensure([], () => {
+                    const OrgTechCenter = require('./orgTechCenter').default;
+                    this.setState({
+                        component: OrgTechCenter,
+                        leftKey: 'orgTechCenter'
+                    });
+                });
+                break;
+            case 'activity':
+                require.ensure([], () => {
+                    const Activity = require('./activity').default;
+                    this.setState({
+                        component: Activity,
+                        leftKey: 'activity'
+                    });
+                });
+                break;
+            case 'activityCostList':
+                require.ensure([], () => {
+                    const ActivityCostList = require('./activityCostList').default;
+                    this.setState({
+                        component: ActivityCostList,
+                        leftKey: 'activityCostList'
+                    });
+                });
+                break;
+            case 'techProduct':
+                require.ensure([], () => {
+                    const TechProduct = require('./techProduct').default;
+                    this.setState({
+                        component: TechProduct,
+                        leftKey: 'techProduct'
+                    });
+                });
+                break;
+            case 'intellectual':
+                require.ensure([], () => {
+                    const Intellectual = require('./intellectual').default;
+                    this.setState({
+                        component: Intellectual,
+                        leftKey: 'intellectual'
+                    });
+                });
+                break;
+            case 'achievement':
+                require.ensure([], () => {
+                    const Achievement = require('./achievement').default;
+                    this.setState({
+                        component: Achievement,
+                        leftKey: 'achievement'
+                    });
+                });
+                break;
+            case 'ratepay':
+                require.ensure([], () => {
+                    const Ratepay = require('./ratepay').default;
+                    this.setState({
+                        component: Ratepay,
+                        leftKey: 'ratepay'
+                    });
+                });
+                break;
+            case 'finance':
+                require.ensure([], () => {
+                    const Finance = require('./finance').default;
+                    this.setState({
+                        component: Finance,
+                        leftKey: 'finance'
+                    });
+                });
+                break;
+
+            case 'honorList':
+                require.ensure([], () => {
+                    const HonorList = require('./honorList').default;
+                    this.setState({
+                        component: HonorList,
+                        leftKey: 'honorList'
+                    });
+                });
+                break;
+            case 'standard':
+                require.ensure([], () => {
+                    const Standard = require('./standard').default;
+                    this.setState({
+                        component: Standard,
+                        leftKey: 'standard'
+                    });
+                });
+                break;
+            case 'annualReport':
+                require.ensure([], () => {
+                    const AnnualReport = require('./annualReport').default;
+                    this.setState({
+                        component: AnnualReport,
+                        leftKey: 'annualReport'
+                    });
+                });
+                break;
+        };
         window.location.hash = key;
     },
     componentWillMount() {
@@ -42,40 +170,7 @@ const Content = React.createClass({
             <div className="acc-content">
                 <LeftTab handlekey={this.handlekey} />
                 <div className="content-right">
-                    {(() => {
-                        switch (this.state.leftKey) {
-                            case 'patent':
-                                return <Patent />;
-                            case 'intellectual':
-                                return <Intellectual />;
-                            case 'activity':
-                                return <Activity />;
-                            case 'standard':
-                                return <Standard />;
-                            case 'activityCostList':
-                                return <ActivityCostList />;
-                            case 'techProduct':
-                                return <TechProduct />;
-                            case 'ratepay':
-                                return <Ratepay />;
-                            case 'finance':
-                                return <Finance />;
-                            case 'achievement':
-                                return <Achievement />;
-                            case 'honorList':
-                                return <HonorList />;
-                            case 'orgTechCenter':
-                                return <OrgTechCenter />;
-                            case 'annualReport':
-                                return <AnnualReport />;
-                            case 'cognizance':
-                                return <Cognizance />;
-                            case 'copyright':
-                                return <Copyright />;
-                            case 'technology':
-                                return <Technology />;
-                        };
-                    })()}
+                    <this.state.component />
                 </div>
             </div>
         )

+ 73 - 73
js/component/account/services/copyright/comPatentChange.jsx

@@ -79,72 +79,72 @@ const CopyrightDescForm = Form.create()(React.createClass({
         })).done((data1, data2, data3) => {
             let _me = this;
             //状态流转table
+            this.state.stateTable = [];
             if (data1[0].error && data1[0].error.length) {
                 message.warning(data1[0].error[0].message);
-                return;
-            };
-            this.state.stateTable = [];
-            data1[0].data.map(function (item, i) {
-                _me.state.stateTable.push({
-                    key: i,
-                    recordTimeFormattedDate: item.recordTimeFormattedDate,
-                    status: item.status,
-                    principal: item.principal,
-                    operator: item.operator,
-                    comment: item.comment
+            } else {
+                data1[0].data.map(function (item, i) {
+                    _me.state.stateTable.push({
+                        key: i,
+                        recordTimeFormattedDate: item.recordTimeFormattedDate,
+                        status: item.status,
+                        principal: item.principal,
+                        operator: item.operator,
+                        comment: item.comment
+                    });
                 });
-            });
+            };
             //获取联系人
+            this.state.contactsOption = [];
             if (data2[0].error && data2[0].error.length) {
                 message.warning(data2[0].error[0].message);
-                return;
-            };
-            this.state.contactsOption = [];
-            for (let item in data2[0].data) {
-                let theData = data2[0].data[item];
-                _me.state.contactsOption.push(
-                    <Select.Option value={item} key={theData}>{theData}</Select.Option>
-                );
+            } else {
+                for (let item in data2[0].data) {
+                    let theData = data2[0].data[item];
+                    _me.state.contactsOption.push(
+                        <Select.Option value={item} key={theData}>{theData}</Select.Option>
+                    );
+                };
             };
             //获取详细数据
             if (!data3[0].data && data3[0].error && data3[0].error.length) {
                 message.warning(data3[0].error[0].message);
-                return;
+            } else {
+                let detailData = data3[0].data;
+                this.setState({
+                    id: detailData.id,
+                    province: detailData.province,
+                    unitName: detailData.unitName,
+                    serialNumber: detailData.serialNumber,
+                    createTime: detailData.createTime,
+                    acceptTime: detailData.acceptTime,
+                    principal: detailData.principal,
+                    contact: detailData.contact,
+                    copyrightName: detailData.copyrightName,
+                    copyrightNumber: detailData.copyrightNumber,
+                    status: detailData.status,
+                    comment: detailData.comment,
+                    copyrightInfo: detailData.copyrightInfo,
+                    workIssue: detailData.workIssue,
+                    outsource: detailData.outsource,
+                    inUrgent: detailData.inUrgent,
+                    authorizedDate: detailData.authorizedDate,
+                    fisrtContact: detailData.fisrtContact,
+                    secondContact: detailData.secondContact,
+                    thirdContact: detailData.thirdContact,
+                    city: detailData.city,
+                    area: detailData.area,
+                    postcode: detailData.postcode,
+                    certificateUrl: detailData.certificateUrl,
+                    applicationUrl: detailData.applicationUrl,
+                    certificateUrlDownloadFileName: detailData.certificateUrlDownloadFileName,
+                    applicationUrlDownloadFileName: detailData.applicationUrlDownloadFileName,
+                    authorizedDateFormattedDate: detailData.authorizedDateFormattedDate,
+                    createTimeFormattedDate: detailData.createTimeFormattedDate,
+                    acceptTimeFormattedDate: detailData.acceptTimeFormattedDate,
+                    expectTime: [detailData.acceptTime, detailData.inUrgent]
+                });
             };
-            let detailData = data3[0].data;
-            this.setState({
-                id: detailData.id,
-                province: detailData.province,
-                unitName: detailData.unitName,
-                serialNumber: detailData.serialNumber,
-                createTime: detailData.createTime,
-                acceptTime: detailData.acceptTime,
-                principal: detailData.principal,
-                contact: detailData.contact,
-                copyrightName: detailData.copyrightName,
-                copyrightNumber: detailData.copyrightNumber,
-                status: detailData.status,
-                comment: detailData.comment,
-                copyrightInfo: detailData.copyrightInfo,
-                workIssue: detailData.workIssue,
-                outsource: detailData.outsource,
-                inUrgent: detailData.inUrgent,
-                authorizedDate: detailData.authorizedDate,
-                fisrtContact: detailData.fisrtContact,
-                secondContact: detailData.secondContact,
-                thirdContact: detailData.thirdContact,
-                city: detailData.city,
-                area: detailData.area,
-                postcode: detailData.postcode,
-                certificateUrl: detailData.certificateUrl,
-                applicationUrl: detailData.applicationUrl,
-                certificateUrlDownloadFileName: detailData.certificateUrlDownloadFileName,
-                applicationUrlDownloadFileName: detailData.applicationUrlDownloadFileName,
-                authorizedDateFormattedDate: detailData.authorizedDateFormattedDate,
-                createTimeFormattedDate: detailData.createTimeFormattedDate,
-                acceptTimeFormattedDate: detailData.acceptTimeFormattedDate,
-                expectTime: [detailData.acceptTime, detailData.inUrgent]
-            });
         }).always(function () {
             this.setState({
                 loading: false
@@ -206,16 +206,16 @@ const CopyrightDescForm = Form.create()(React.createClass({
         return (
             <Form onSubmit={this.handleSubmit} id="CopyrightDesc-form">
                 <Row className="express-desc-row">
-                    <Col span={3}>公司名称</Col>
-                    <Col span={6}>{theData.unitName}</Col>
+                    <Col span={4}>公司名称</Col>
+                    <Col span={8}>{theData.unitName}</Col>
                     <Col span={4}>组织机构代码</Col>
-                    <Col span={6}>{theData.unitNumber}</Col>
+                    <Col span={8}>{theData.unitNumber}</Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>公司地址</Col>
-                    <Col span={6}>{theData.province}/{theData.city}/{theData.area}</Col>
+                    <Col span={4}>公司地址</Col>
+                    <Col span={8}>{theData.province}/{theData.city}/{theData.area}</Col>
                     <Col span={4}>联系人</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('contact', {
                             rules: [{ required: true, message: '此项为必填项!' }],
                             initialValue: theData.contact
@@ -229,10 +229,10 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>编号</Col>
-                    <Col span={6}>{theData.serialNumber}</Col>
+                    <Col span={4}>编号</Col>
+                    <Col span={8}>{theData.serialNumber}</Col>
                     <Col span={4}>软著名称</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('copyrightName', {
                             initialValue: theData.copyrightName
                         })(
@@ -241,11 +241,11 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>软著编号</Col>
-                    <Col span={6}>{theData.copyrightNumber}</Col>
+                    <Col span={4}>软著编号</Col>
+                    <Col span={8}>{theData.copyrightNumber}</Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>软著简介</Col>
+                    <Col span={4}>软著简介</Col>
                     <Col span={16}>
                         {getFieldDecorator('copyrightInfo', {
                             initialValue: theData.copyrightInfo
@@ -257,12 +257,12 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>派单详情</Col>
+                    <Col span={4}>派单详情</Col>
                     <Col span={16}>{theData.workIssue}</Col>
                 </Row>
                 <Row className="express-desc-row">
-                    <Col span={3}>加急天数</Col>
-                    <Col span={6}>
+                    <Col span={4}>加急天数</Col>
+                    <Col span={8}>
                         {(() => {
                             switch (theData.inUrgent) {
                                 case 0:
@@ -288,11 +288,11 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Col>
                 </Row>
                 {theData.authorizedDateFormattedDate ? <Row className="express-desc-row">
-                    <Col span={3}>下证时间</Col>
-                    <Col span={6}>{theData.authorizedDateFormattedDate}</Col>
+                    <Col span={4}>下证时间</Col>
+                    <Col span={8}>{theData.authorizedDateFormattedDate}</Col>
                 </Row> :
                     <Row className="express-desc-row">
-                        <Col span={3}>下证时间(预计)</Col>
+                        <Col span={4}>下证时间(预计)</Col>
                         <Col span={6}>
                             {(() => {
                                 if (theData.expectTime && theData.expectTime[0]) {

+ 3 - 0
js/component/account/services/copyright/comprehensive.less

@@ -4,6 +4,9 @@
         line-height: 30px;
         margin-bottom: 10px;
     }
+    .ant-form-item-label {
+        text-align: left;
+    }
     .ant-form-item-control {
         .ant-checkbox-wrapper {
             margin-left: 34px;

+ 4 - 1
js/component/account/services/leftTab.jsx

@@ -12,7 +12,7 @@ const LeftTab = React.createClass({
             subKey: 'sub1',
             keyList: [
                 { key: 'sub1', value: ['patent', 'copyright', 'intellectual'] },
-                { key: 'sub2', value: ['standard', 'activity', 'activityCostList', 'orgTechCenter', 'techProduct', 'ratepay', 'finance', 'achievement', 'honorList','annualReport','cognizance'] },
+                { key: 'sub2', value: ['standard', 'activity', 'activityCostList', 'orgTechCenter', 'techProduct', 'ratepay', 'finance', 'achievement', 'honorList','annualReport','cognizance','companyDetail'] },
                 { key: 'sub3', value: ['technology'] }
             ]
         };
@@ -61,6 +61,9 @@ const LeftTab = React.createClass({
                     <Menu.Item key="cognizance">
                         高企申请管理
                     </Menu.Item>
+                    <Menu.Item key="companyDetail">
+                        企业基本信息
+                    </Menu.Item>
                     <Menu.Item key="standard">
                         标准制定情况
                     </Menu.Item>

+ 17 - 0
js/component/account/services/techProduct.less

@@ -30,4 +30,21 @@
     display: inline-block;
     margin-top: 10px;
     margin-bottom: 20px;
+}
+
+.company-detail-form {
+    background: #fff;
+    padding:20px;
+    .content-title {
+        font-size: 16px;
+    }
+    .table-title {
+        >span {
+            font-size: 14px;
+            margin-left: 20px;
+        }
+        >button {
+            margin-left: 10px;
+        }
+    }
 }

+ 11 - 11
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -240,15 +240,15 @@ const CopyrightDescForm = Form.create()(React.createClass({
             <Form onSubmit={this.handleSubmit} id="CopyrightDesc-form">
                 <Row className="express-desc-row">
                     <Col span={4}>公司名称</Col>
-                    <Col span={6}>{theData.unitName}</Col>
+                    <Col span={8}>{theData.unitName}</Col>
                     <Col span={4}>组织机构代码</Col>
-                    <Col span={6}>{theData.unitNumber}</Col>
+                    <Col span={8}>{theData.unitNumber}</Col>
                 </Row>
                 <Row className="express-desc-row">
                     <Col span={4}>公司地址</Col>
-                    <Col span={6}>{theData.postalAddress}</Col>
+                    <Col span={8}>{theData.postalAddress}</Col>
                     <Col span={4}>联系人</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('contact', {
                             rules: [{ required: true, message: '此项为必填项!' }],
                             initialValue: theData.contact
@@ -263,9 +263,9 @@ const CopyrightDescForm = Form.create()(React.createClass({
                 </Row>
                 <Row className="express-desc-row">
                     <Col span={4}>编号</Col>
-                    <Col span={6}>{theData.serialNumber}</Col>
+                    <Col span={8}>{theData.serialNumber}</Col>
                     <Col span={4}>外包公司</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('outsource', {
                             initialValue: theData.outsource
                         })(
@@ -275,7 +275,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                 </Row>
                 <Row className="express-desc-row">
                     <Col span={4}>软著名称</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('copyrightName', {
                             initialValue: theData.copyrightName
                         })(
@@ -283,7 +283,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                             )}
                     </Col>
                     <Col span={4}>软著编号</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('copyrightNumber', {
                             initialValue: theData.copyrightNumber
                         })(
@@ -293,7 +293,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                 </Row>
                 <Row className="express-desc-row">
                     <Col span={4}>加急天数</Col>
-                    <Col span={6}>
+                    <Col span={8}>
                         {getFieldDecorator('inUrgent', {
                             initialValue: theData.inUrgent ? String(theData.inUrgent) : '0'
                         })(
@@ -314,11 +314,11 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Col>
                 </Row>
                 {theData.authorizedDateFormattedDate ? <Row className="express-desc-row">
-                    <Col span={3}>下证时间</Col>
+                    <Col span={4}>下证时间</Col>
                     <Col span={6}>{theData.authorizedDateFormattedDate}</Col>
                 </Row> :
                     <Row className="express-desc-row">
-                        <Col span={3}>下证时间(预计)</Col>
+                        <Col span={4}>下证时间(预计)</Col>
                         <Col span={6}>
                             {(() => {
                                 if (theData.expectTime && theData.expectTime[0]) {

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

@@ -44,7 +44,6 @@ const ActivityDesc = React.createClass({
                 implement: this.state.implement,
                 technologyInnovation: this.state.technologyInnovation,
                 achievement: this.state.achievement,
-                participant: this.state.participant,
                 proofUrl: this.state.proofUrl
             },
             success: function (data) {
@@ -179,11 +178,6 @@ const ActivityDesc = React.createClass({
                                 }
                             </Select>
                         </div>
-                        <div className="half-div">
-                            <p>参与人员:</p>
-                            <InputNumber value={this.state.participant}
-                                onChange={(e) => { this.setState({ participant: e }); }} />
-                        </div>
                         <div style={{ marginTop: '10px' }}>
                             <p>知识产权编号:</p>
                             <Transfer
@@ -209,27 +203,24 @@ const ActivityDesc = React.createClass({
                             <p>研发经费近三年总支出(万元):</p>
                             <div className="half-div">
                                 <span>总计(万元):</span>
-                                <InputNumber value={
+                                <span>{
                                     (this.state.firstYearExpenditure || 0) +
                                     (this.state.secondYearExpenditure || 0) +
                                     (this.state.thirdYearExpenditure || 0)
-                                } />
-                                <span>(自动计算)</span>
+                                }</span>
                             </div>
                             <div className="half-div">
                                 <span>其中(前一年):</span>
-                                <InputNumber value={this.state.firstYearExpenditure || 0}
-                                    onChange={(e) => { this.setState({ firstYearExpenditure: e || 0 }); }} />
+                                <span>{this.state.firstYearExpenditure}
+                                </span>
                             </div>
                             <div className="half-div">
                                 <span>其中(前二年):</span>
-                                <InputNumber value={this.state.secondYearExpenditure || 0}
-                                    onChange={(e) => { this.setState({ secondYearExpenditure: e || 0 }); }} />
+                                <span>{this.state.secondYearExpenditure}</span>
                             </div>
                             <div className="half-div">
                                 <span>其中(前三年):</span>
-                                <InputNumber value={this.state.thirdYearExpenditure || 0}
-                                    onChange={(e) => { this.setState({ thirdYearExpenditure: e || 0 }); }} />
+                                <span>{this.state.thirdYearExpenditure}</span>
                             </div>
                         </div>
                         <div className="clearfix">

+ 12 - 12
js/component/manageCenter/servicesManage/highTech/fosterDesc/companyDetail.jsx

@@ -142,12 +142,12 @@ const CompanyDetail = Form.create()(React.createClass({
                     uid: item.uid,
                     type: item.type,
                     name: item.name,
-                    idNumber: item.idNumber,
+                    orgCode: item.idNumber,
                     investment: item.investment
                 });
             });
             this.setState({
-                humanLegalData: theTableData
+                legalTableData: theTableData
             });
         }.bind(this)).always(function () {
             this.setState({
@@ -343,11 +343,11 @@ const CompanyDetail = Form.create()(React.createClass({
                 url: globalConfig.context + '/api/admin/basic/deleteNature',
                 method: 'post',
                 data: {
-                    data: JSON.stringify(deletedIds)
+                    ids: deletedIds
                 }
             }).done((res) => {
                 if (!res.error.length) {
-                    Message.success("删除成功");
+                    message.success("删除成功");
                     this.state.humanSelectedRowKeys.sort((a, b) => { return b - a });
                     for (let idx = 0; idx < this.state.humanSelectedRowKeys.length; idx++) {
                         let dataIndex = this.state.humanSelectedRowKeys[idx];
@@ -358,7 +358,7 @@ const CompanyDetail = Form.create()(React.createClass({
                         humanSelectedRowKeys: []
                     });
                 } else {
-                    Message.error(res.error[0].message);
+                    message.error(res.error[0].message);
                 }
             }).always(() => {
                 this.setState({
@@ -418,11 +418,11 @@ const CompanyDetail = Form.create()(React.createClass({
                 url: globalConfig.context + '/api/admin/basic/deleteLegalPerson',
                 method: 'post',
                 data: {
-                    data: JSON.stringify(deletedIds)
+                    ids: deletedIds
                 }
             }).done((res) => {
                 if (!res.error.length) {
-                    Message.success("删除成功");
+                    message.success("删除成功");
                     this.state.legalSelectedRowKeys.sort((a, b) => { return b - a });
                     for (let idx = 0; idx < this.state.legalSelectedRowKeys.length; idx++) {
                         let dataIndex = this.state.legalSelectedRowKeys[idx];
@@ -433,7 +433,7 @@ const CompanyDetail = Form.create()(React.createClass({
                         legalSelectedRowKeys: []
                     });
                 } else {
-                    Message.error(res.error[0].message);
+                    message.error(res.error[0].message);
                 }
             }).always(() => {
                 this.setState({
@@ -490,8 +490,8 @@ const CompanyDetail = Form.create()(React.createClass({
             selectedRowKeys: this.state.humanSelectedRowKeys,
             onChange: (selectedRowKeys, selectedRows) => {
                 this.setState({
-                    humanSelectedRows: humanSelectedRows,
-                    humanSelectedRowKeys: humanSelectedRowKeys
+                    humanSelectedRows: selectedRows,
+                    humanSelectedRowKeys: selectedRowKeys
                 });
             }
         };
@@ -501,8 +501,8 @@ const CompanyDetail = Form.create()(React.createClass({
             selectedRowKeys: this.state.legalSelectedRowKeys,
             onChange: (selectedRowKeys, selectedRows) => {
                 this.setState({
-                    legalSelectedRows: legalSelectedRows,
-                    legalSelectedRowKeys: legalSelectedRowKeys
+                    legalSelectedRows: selectedRows,
+                    legalSelectedRowKeys: selectedRowKeys
                 });
             }
         };

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -692,7 +692,7 @@ const CognizanceAdd = React.createClass({
                             <span>选择公司:  </span>
                             <Select
                                 placeholder="请选择公司"
-                                style={{ width: 200 }}
+                                style={{ width: 260 }}
                                 showSearch
                                 filterOption={companySearch}
                                 value={this.state.uid}

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

@@ -163,7 +163,7 @@ const ApplyAdd = React.createClass({
                             <span className="item-title">选择公司:  </span>
                             <Select
                                 placeholder="请选择公司"
-                                style={{ width: 200 }}
+                                style={{ width: 260 }}
                                 showSearch
                                 filterOption={companySearch}
                                 onSelect={(e, n) => { this.state.uid = e; this.getContactsList(e); this.getDepartmentList(e); }}>
@@ -183,7 +183,7 @@ const ApplyAdd = React.createClass({
                             <span className="item-title">申报科技部门:  </span>
                             <Select
                                 placeholder="请填写申报部门"
-                                style={{ width: '200px' }}
+                                style={{ width: 260 }}
                                 onChange={(e) => { this.state.department = e; }}>
                                 {this.state.departmentOption}
                             </Select>

+ 1 - 1
package.json

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