Browse Source

4.2.doc 完成

yee 8 years ago
parent
commit
91a89c4a43

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

@@ -107,7 +107,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                 dataIndex: 'salesRevenue',
                 key: 'salesRevenue',
             }, {
-                title: '利润总',
+                title: '利润总',
                 dataIndex: 'grossProfit',
                 key: 'grossProfit',
             }],

+ 8 - 8
js/component/manageCenter/servicesManage/copyright/comPatentAdd.jsx

@@ -146,14 +146,14 @@ const PatentAddFrom = Form.create()(React.createClass({
                         <Select
                             placeholder="请选择加急时间"
                             style={{ width: 120 }}>
-                            <Select.Option value="0">不加急</Select.Option>
-                            <Select.Option value="3">3</Select.Option>
-                            <Select.Option value="5">5</Select.Option>
-                            <Select.Option value="10">6-10</Select.Option>
-                            <Select.Option value="15">11-15</Select.Option>
-                            <Select.Option value="20">16-20</Select.Option>
-                            <Select.Option value="25">21-25</Select.Option>
-                            <Select.Option value="30">26-30</Select.Option>
+                            <Select.Option value="0">不加急(45个工作日)</Select.Option>
+                            <Select.Option value="3">3个工作日</Select.Option>
+                            <Select.Option value="5">5个工作日</Select.Option>
+                            <Select.Option value="10">6-10个工作日</Select.Option>
+                            <Select.Option value="15">11-15个工作日</Select.Option>
+                            <Select.Option value="20">16-20个工作日</Select.Option>
+                            <Select.Option value="25">21-25个工作日</Select.Option>
+                            <Select.Option value="30">26-30个工作日</Select.Option>
                         </Select>
                     )}
                 </FormItem>

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

@@ -311,14 +311,14 @@ const CopyrightDescForm = Form.create()(React.createClass({
                             <Select
                                 placeholder="请选择加急时间"
                                 style={{ width: 160 }}>
-                                <Select.Option value="0">不加急</Select.Option>
-                                <Select.Option value="3">3</Select.Option>
-                                <Select.Option value="5">5</Select.Option>
-                                <Select.Option value="10">6-10</Select.Option>
-                                <Select.Option value="15">11-15</Select.Option>
-                                <Select.Option value="20">16-20</Select.Option>
-                                <Select.Option value="25">21-25</Select.Option>
-                                <Select.Option value="30">26-30</Select.Option>
+                                <Select.Option value="0">不加急(45个工作日)</Select.Option>
+                                <Select.Option value="3">3个工作日</Select.Option>
+                                <Select.Option value="5">5个工作日</Select.Option>
+                                <Select.Option value="10">6-10个工作日</Select.Option>
+                                <Select.Option value="15">11-15个工作日</Select.Option>
+                                <Select.Option value="20">16-20个工作日</Select.Option>
+                                <Select.Option value="25">21-25个工作日</Select.Option>
+                                <Select.Option value="30">26-30个工作日</Select.Option>
                             </Select>
                             )}
                     </Col>

+ 8 - 8
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -198,21 +198,21 @@ const copyright = React.createClass({
                     render: (text) => {
                         switch (text) {
                             case 0:
-                                return '不加急';
+                                return '不加急(45个工作日)';
                             case 3:
-                                return '3';
+                                return '3个工作日';
                             case 5:
-                                return '5';
+                                return '5个工作日';
                             case 10:
-                                return '6-10';
+                                return '6-10个工作日';
                             case 15:
-                                return '11-15';
+                                return '11-15个工作日';
                             case 20:
-                                return '16-20';
+                                return '16-20个工作日';
                             case 25:
-                                return '21-25';
+                                return '21-25个工作日';
                             case 30:
-                                return '26-30';
+                                return '26-30个工作日';
                         }
                     }
                 }, {

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { Icon, Button, Upload, Input, Spin, Table, message, Select, Modal, DatePicker, Cascader, Transfer, InputNumber } from 'antd';
 import { technicalSourceList } from '../../../../dataDic.js';
 import { techFieldList } from '../../../../DicTechFieldList.js';
-import { getTechField, getTechnicalSource, beforeUploadFile, downloadFile } from '../../../../tools.js';
+import { getTechField, getTechnicalSource, beforeUploadFile, newDownloadFile } from '../../../../tools.js';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -567,7 +567,7 @@ const Activity = React.createClass({
                             onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     </p>
                 </div>
-                <div className="patent-table">
+                <div className="patent-table" >
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}

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

@@ -161,7 +161,7 @@ const Content = React.createClass({
                                 <Radio.Button value="techProduct">高新技术产品</Radio.Button>
                                 <Radio.Button value="intellectual">知识产权</Radio.Button>
                                 <Radio.Button value="achievement">科技成果转化</Radio.Button>
-                                <Radio.Button value="ratepay">企业纳税申报</Radio.Button>
+                                <Radio.Button value="ratepay">企业所得税纳税申报</Radio.Button>
                                 <Radio.Button value="finance">财务报表</Radio.Button>
                                 <Radio.Button value="hrSituation">企业人员情况</Radio.Button>
                                 <Radio.Button value="honorList">企业荣誉及其他证明材料</Radio.Button>

+ 3 - 0
js/component/manageCenter/servicesManage/highTech/fosterDesc/content.less

@@ -92,6 +92,9 @@
             margin-bottom: 10px;
         }
     }
+    .patent-table {
+        margin-top: 20px;
+    }
 }
 
 .admin-desc-content {

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

@@ -119,7 +119,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传企业荣誉附件 </Button>
+                        <Button><Icon type="upload" /> 上传企业相关资质证书 </Button>
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.enclosureUrl ? <a onClick={newDownloadFile.bind(null, this.props.data.id, 'honor', '/api/admin/downloadHonor')}>{theData.enclosureDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>

+ 18 - 13
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -28,7 +28,8 @@ const CenterListDescFrom = Form.create()(React.createClass({
                         projectName: values.projectName,
                         projectTimeFormattedDate: values.projectTimeFormattedDate.format("YYYY-MM-DD"),
                         institution: values.institution,
-                        termTimeFormattedDate: values.termTimeFormattedDate.format("YYYY-MM-DD"),
+                        termStartTimeFormattedDate: values.termTimeFormattedDate[0].format("YYYY-MM-DD"),
+                        termEndTimeFormattedDate: values.termTimeFormattedDate[1].format("YYYY-MM-DD"),
                         protocolUrl: this.state.protocolUrl
                     }
                 }).done(function (data) {
@@ -48,6 +49,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
     render() {
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;
+        const { RangePicker } = DatePicker;
         const theData = this.props.data;
         const formItemLayout = {
             labelCol: { span: 6 },
@@ -84,15 +86,15 @@ const CenterListDescFrom = Form.create()(React.createClass({
                         label="期限"
                     >
                         {getFieldDecorator('termTimeFormattedDate', {
-                            rules: [{ type: 'object', required: true, message: '此项为必填项!' }],
-                            initialValue: theData.termTimeFormattedDate ? moment(theData.termTimeFormattedDate) : null
+                            rules: [{ type: 'array', required: true, message: '此项为必填项!' }],
+                            initialValue: theData.termStartTimeFormattedDate && theData.termEndTimeFormattedDate ? [moment(theData.termStartTimeFormattedDate), moment(theData.termEndTimeFormattedDate)] : [null, null]
                         })(
-                            <DatePicker />
+                            <RangePicker />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
                         {...formItemLayout}
-                        label="大学机构"
+                        label="科研院所"
                     >
                         {getFieldDecorator('institution', {
                             rules: [{ required: true, message: '此项为必填项!' }],
@@ -106,7 +108,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/api/admin/uploadProtocol"}
-                        data={{ 'sign': 'protocol','uid': this.props.uid }}
+                        data={{ 'sign': 'protocol', 'uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -236,8 +238,8 @@ const CenterList = React.createClass({
             loading: true
         });
         let page = pageNo || 1,
-        pageSize = this.state.pagination.pageSize,
-        cid = this.state.cid;
+            pageSize = this.state.pagination.pageSize,
+            cid = this.state.cid;
         $.ajax({
             method: "get",
             dataType: "json",
@@ -262,7 +264,7 @@ const CenterList = React.createClass({
                     protocolUrl: thisdata.protocolUrl,
                     protocol: [thisdata.id, thisdata.protocolDownloadFileName],
                     institution: thisdata.institution,
-                    termTimeFormattedDate: thisdata.termTimeFormattedDate
+                    termTimeFormattedDate: [thisdata.termStartTimeFormattedDate, thisdata.termEndTimeFormattedDate]
                 });
             };
             this.state.pagination.current = data.data.pageNo;
@@ -300,15 +302,18 @@ const CenterList = React.createClass({
                     dataIndex: 'projectTimeFormattedDate',
                     key: 'projectTimeFormattedDate'
                 }, {
-                    title: '名称',
+                    title: '项目名称',
                     dataIndex: 'projectName',
                     key: 'projectName'
                 }, {
                     title: '期限',
                     dataIndex: 'termTimeFormattedDate',
-                    key: 'termTimeFormattedDate'
+                    key: 'termTimeFormattedDate',
+                    render: (text) => {
+                        return text[0] + ' - ' + text[1];
+                    }
                 }, {
-                    title: '大学机构',
+                    title: '科研院所',
                     dataIndex: 'institution',
                     key: 'institution'
                 }, {
@@ -462,7 +467,7 @@ const CenterList = React.createClass({
                         <Upload
                             name="ratepay"
                             action={globalConfig.context + "/api/admin/uploadInstitution"}
-                            data={{ 'sign': 'institution','uid': this.props.data.uid }}
+                            data={{ 'sign': 'institution', 'uid': this.props.data.uid }}
                             beforeUpload={beforeUploadFile}
                             showUploadList={false}
                             onChange={(info) => {

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

@@ -264,7 +264,7 @@ const RatepayDesc = React.createClass({
         return (
             <div className="patent-addNew">
                 <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal title="纳税申报信息" visible={this.state.visible}
+                    <Modal title="企业所得税纳税申报信息" visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='800px'
                         footer=''
@@ -452,7 +452,7 @@ const Ratepay = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>纳税申信息</span>
+                    <span>企业所得税纳税申信息</span>
                 </div>
                 <div className="user-search">
                     <p>

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

@@ -49,6 +49,9 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                     salesRevenue: data.data.salesRevenue3,
                     grossProfit: data.data.grossProfit3
                 }];
+                this.state.netAssetRate = 1 / 2 * (data.data.netAsset2 / data.data.netAsset3 + data.data.netAsset1 / data.data.netAsset2) - 1;
+                this.state.salesRevenueRate = 1 / 2 * (data.data.salesRevenue2 / data.data.salesRevenue3 + data.data.salesRevenue1 / data.data.salesRevenue2) - 1;
+                console.log(this.state.netAssetRate, this.state.salesRevenueRate);
             }.bind(this),
         }).always(function () {
             this.setState({
@@ -164,7 +167,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                 dataIndex: 'salesRevenue',
                 key: 'salesRevenue',
             }, {
-                title: '利润总',
+                title: '利润总',
                 dataIndex: 'grossProfit',
                 key: 'grossProfit',
             }],
@@ -347,6 +350,16 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                     <div className="form-title">近三年经营状况(万元): </div>
                     <Table pagination={false} dataSource={this.state.moneyTable} columns={this.state.moneyColumns} />
                     <div className="clearfix">
+                        <div className="half-item">
+                            <span className="item-title">净资产增长率: </span>
+                            <span>{isNaN(this.state.netAssetRate) ? '数据错误无法计算' : (this.state.netAssetRate * 100).toFixed(2) + '%'}</span>
+                        </div>
+                        <div className="half-item">
+                            <span className="item-title">销售收入增长率: </span>
+                            <span>{isNaN(this.state.salesRevenueRate) ? '数据错误无法计算' : (this.state.salesRevenueRate * 100).toFixed(2) + '%'}</span>
+                        </div>
+                    </div>
+                    <div className="clearfix">
                         <div><span className="form-title">近三年研究开发费用总额(万元): </span></div>
                         <div className="third-item">
                             <div className="item-title">近三年研究开发费用总额</div>

+ 41 - 72
js/component/manageCenter/servicesManage/technology/applyAdd.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Input, Select, message, Modal, Checkbox } from 'antd';
+import { Button, Input, Select, message, Modal, Checkbox, Radio } from 'antd';
 import { companySearch } from '../../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -33,28 +33,6 @@ const ApplyAdd = React.createClass({
                 });
             }.bind(this),
         });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/techproject/getDepartment?uid=" + theUid,
-            success: function (data) {
-                if (data.error.length || !data.data) {
-                    message.warning(data.error[0].message);
-                    return;
-                };
-                let theOption = [];
-                for (var item in data.data) {
-                    theOption.push(
-                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
-                    );
-                };
-                this.setState({
-                    departmentOption: theOption
-                })
-                
-            }.bind(this),
-        });
     },
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showAdd
@@ -69,8 +47,8 @@ const ApplyAdd = React.createClass({
             loading: true
         });
         if (!this.state.uid) {
-             message.warning('请选择公司!');
-             this.setState({
+            message.warning('请选择公司!');
+            this.setState({
                 loading: false
             });
             return;
@@ -127,19 +105,15 @@ const ApplyAdd = React.createClass({
             loading: e
         });
     },
-    projectEstablishmentCheck(e) {
-        if (e.target.checked == true) {
-            this.state.projectMode = 1;
-        } else if (e.target.checked == false) {
-            this.state.projectMode = 0;
-        };
-    },
     subsidyCheck(e) {
-        if (e.target.checked == true) {
+        if (e.target.value == 1) {
             this.state.subsidy = 1;
-        } else if (e.target.checked == false) {
-            this.state.subsidy = 0;
+        } else if (e.target.value == 2) {
+            this.state.projectMode = 1;
         };
+        this.setState({
+            moneyType: e.target.value
+        });
     },
     render() {
         return (
@@ -175,68 +149,63 @@ const ApplyAdd = React.createClass({
                                 {this.state.contactsOption}
                             </Select>
                         </div>
-                        
+
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
-                            <span className="item-title">选择申报科技部门:  </span>
-                            <Select 
-                                placeholder="请选择申报部门" 
-                                style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.department = e; }}>
-                                {this.state.departmentOption}
-                            </Select>
+                            <span className="item-title">申报科技部门:  </span>
+                            <Input
+                                placeholder="请填写申报部门"
+                                style={{ width: '200px' }}
+                                onChange={(e) => { this.state.department = e.target.value; }}
+                            />
                         </div>
                     </div>
                     <div className="clearfix">
-                    	<div>
+                        <div>
                             <span className="item-title">派单信息:  </span>
                         </div>
                         <Input type="textarea" rows={6} onChange={(e) => { this.state.dispatchInfo = e.target.value; }} />
                     </div>
                     <div className="clearfix">
-	                 	<div className="half-item">
-	                   		<span className="item-title">项目名称:  </span>
-	                     	<Input  style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
-	                	</div>
+                        <div className="half-item">
+                            <span className="item-title">项目名称:  </span>
+                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
+                        </div>
                     </div>
                     <div className="clearfix">
-                    	<div className="half-item">
-	                   		<span className="item-title">项目类型:  </span>
-	                     	<Input  style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
-	                	</div>
-	                </div>
-	                <div className="clearfix">
-                    	<div className="half-item">
-	                   		<span className="item-title">技术领域:  </span>
-	                     	<Input  style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
-	                	</div>
-	                </div>
-	                <div className="clearfix">
-                    	<div>
-                            <span className="item-title">项目介绍:  </span>
+                        <div className="half-item">
+                            <span className="item-title">项目类型:  </span>
+                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
                         </div>
-                        <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
                     </div>
-                    
                     <div className="clearfix">
                         <div className="half-item">
-                            <span className="item-title">是否立项: </span>
-                            <Checkbox onChange={this.projectEstablishmentCheck}></Checkbox>
+                            <span className="item-title">技术领域:  </span>
+                            <Input style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
                         </div>
-                        <div className="half-item">
-                        	<span className="item-title">立项金额: </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }}  />
+                    </div>
+                    <div className="clearfix">
+                        <div>
+                            <span className="item-title">项目介绍:  </span>
                         </div>
+                        <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
-                            <span className="item-title">是否后补助: </span>
-                            <Checkbox onChange={this.subsidyCheck}></Checkbox>
+                            <span className="item-title">立项/后补助: </span>
+                            <Radio.Group onChange={this.subsidyCheck}>
+                                <Radio value={1}>立项</Radio>
+                                <Radio value={2}>后补助</Radio>
+                            </Radio.Group>
+                        </div>
+                        <div className="half-item">
+                            <span className="item-title">{this.state.moneyType !== 2 ? '立项' : '后补助'}金额: </span>
+                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }} />
                         </div>
                     </div>
                     <div className="clearfix">
-                    	<div className="half-item">
+                        <div className="half-item">
                             <span className="item-title">选择咨询师:  </span>
                             <Select placeholder="请选择咨询师" style={{ width: 200 }}
                                 onSelect={(e, n) => { this.state.consultant = e }}>

+ 19 - 65
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Form, Button, Input, Select, Spin, Table, DatePicker, message, Modal, Checkbox, Upload } from 'antd';
+import { Icon, Form, Button, Input, Select, Spin, Table, DatePicker, message, Modal, Upload, Radio } from 'antd';
 import { technologyStateList } from '../../../dataDic.js';
 import { getTechnologyState, beforeUpload, beforeUploadFile, techDownloadFile } from '../../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -25,15 +25,15 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     return;
                 };
                 this.state.data = data.data;
+                this.state.moneyType = undefined;
                 if (data.data.projectMode == 1) {
                     this.state.projectMode = data.data.projectMode;
-                    this.setState({ projectModeState: true });
+                    this.setState({ moneyType: 2 });
                 }
                 if (data.data.subsidy == 1) {
                     this.state.subsidy = data.data.subsidy;
-                    this.setState({ subsidyState: true });
+                    this.setState({ moneyType: 1 });
                 }
-                this.getDepartmentList();
                 this.getContactsList();
             }.bind(this),
         }).always(function () {
@@ -77,34 +77,6 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    getDepartmentList() {
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/techproject/getDepartment?uid=" + this.props.data.uid,
-            success: function (data) {
-                this.state.departmentOption = [];
-                if (data.error.length || !data.data) {
-                    message.warning(data.error[0].message);
-                    return;
-                };
-                for (var item in data.data) {
-                    this.state.departmentOption.push(
-                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
-                    )
-                };
-                this.setState({ department: data.data[this.state.data.department] });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
     getContactsList() {
         $.ajax({
             method: "get",
@@ -163,7 +135,6 @@ const ApplyChangeFrom = Form.create()(React.createClass({
         return {
             loading: false,
             stateOption: [],
-            departmentOption: [],
             projectDes: '',
             projectMode: 0,
             subsidy: 0,
@@ -252,23 +223,17 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             this.getStateData(nextProps.data.pid);
         };
     },
-    projectEstablishmentCheck(e) {
-        if (e.target.checked == true) {
-            this.setState({ projectModeState: true })
-            this.state.projectMode = 1;
-        } else if (e.target.checked == false) {
-            this.setState({ projectModeState: false })
-            this.state.projectMode = 0;
-        };
-    },
     subsidyCheck(e) {
-        if (e.target.checked == true) {
-            this.setState({ subsidyState: true })
+        if (e.target.value == 1) {
             this.state.subsidy = 1;
-        } else if (e.target.checked == false) {
-            this.setState({ subsidyState: false })
+            this.state.projectMode = 0;
+        } else if (e.target.value == 2) {
             this.state.subsidy = 0;
+            this.state.projectMode = 1;
         };
+        this.setState({
+            moneyType: e.target.value
+        });
     },
     render() {
         const FormItem = Form.Item;
@@ -317,7 +282,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                             {getFieldDecorator('department', {
                                 initialValue: this.state.department
                             })(
-                                <Select>{this.state.departmentOption}</Select>
+                                <Input placeholder='请输入科技部门' />
                                 )}
                         </FormItem>
                     </div>
@@ -384,37 +349,26 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
-                            <span className="item-title">是否立项: </span>
-                            <Checkbox
-                                onChange={this.projectEstablishmentCheck}
-                                checked={this.state.projectModeState}
-                            >
-                            </Checkbox>
+                            <span className="item-title">立项/后补助: </span>
+                            <Radio.Group value={this.state.moneyType} onChange={this.subsidyCheck}>
+                                <Radio value={1}>立项</Radio>
+                                <Radio value={2}>后补助</Radio>
+                            </Radio.Group>
                         </div>
                         <div className="half-item">
                             <FormItem
                                 {...formItemLayout}
-                                label="立项金额"
+                                label={this.state.moneyType !== 2 ? '立项金额' : '后补助金额'}
                             >
                                 {getFieldDecorator('projectApproval', {
                                     initialValue: theData.projectApproval
                                 })(
-                                    <Input style={{ width: 150, marginRight: 10 }} />
+                                    <Input style={{ width: 200 }} />
                                     )}
                                 <span>万元</span>
                             </FormItem>
                         </div>
                     </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">是否后补助: </span>
-                            <Checkbox
-                                onChange={this.subsidyCheck}
-                                checked={this.state.subsidyState}
-                            >
-                            </Checkbox>
-                        </div>
-                    </div>
                     <div className="hrSituation-roster">
                         <Upload
                             name="avatar"