Browse Source

v1.0.10 bug修复

yee 8 years ago
parent
commit
f6cfdc83e9

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

@@ -55,12 +55,15 @@ const copyright = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/techservice/cognizance/getContacts",
             success: function (data) {
-                if (data.error.length || !data.data) {
-                    return;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
                 };
                 this.state.contactsOption = [];
-                for (let item in data2[0].data) {
-                    let theData = data2[0].data[item];
+                for (let item in data.data) {
+                    let theData = data.data[item];
                     contactsOption.push(
                         <Select.Option value={item} key={theData}>{theData}</Select.Option>
                     );

+ 2 - 2
js/component/account/set/base.jsx

@@ -185,8 +185,8 @@ const BaseFrom = Form.create()(React.createClass({
                         initialValue: this.state.sex || null
                     })(
                         <RadioGroup>
-                            <Radio value="male">男</Radio>
-                            <Radio value="female">女</Radio>
+                            <Radio value="">男</Radio>
+                            <Radio value="">女</Radio>
                         </RadioGroup>
                         )}
                 </FormItem>

+ 27 - 21
js/component/account/set/edu.jsx

@@ -34,10 +34,10 @@ class Avatar extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            imageUrl: ''
+            imageUrl: '',
+            propsbool: true,
         }
     }
-
     handleChange(info) {
         if (info.file.status === 'done') {
             // Get this url from response in real world.
@@ -45,21 +45,27 @@ class Avatar extends React.Component {
             this.props.urlData(info.file.response.data);
         }
     }
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.picUrl && this.state.propsbool) {
+            this.state.imageUrl = globalConfig.avatarHost + "/upload" + nextProps.picUrl;
+            this.state.propsbool = false;
+        }
+    }
     render() {
         const imageUrl = this.state.imageUrl;
         return (
             <Upload
                 className="avatar-uploader"
-                name={this.props.name}
+                name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/api/user/identity/upload"}
+                action={globalConfig.context + "/api/user/avatar/uploadReplace"}
                 data={{ 'sign': this.props.name }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
-                >
+            >
                 {
                     imageUrl ?
-                        <img src={imageUrl} role="presentation" id={this.props.name} /> :
+                        <img src={imageUrl} role="presentation" className="avatar" /> :
                         <Icon type="plus" className="avatar-uploader-trigger" />
                 }
             </Upload>
@@ -95,8 +101,8 @@ const EduFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
-            xueweiPicUrl : '',
-            xueliPicUrl : ''
+            xueweiPicUrl: '',
+            xueliPicUrl: ''
         };
     },
     componentDidMount() {
@@ -136,7 +142,7 @@ const EduFrom = Form.create()(React.createClass({
         });
     },
     downloadPic(type) {
-        window.open(globalConfig.context + "/open/downLoadPicture?path="+type)
+        window.open(globalConfig.context + "/open/downLoadPicture?path=" + type)
     },
     handleyear(e) {
         this.state.graduationTimeYear = e;
@@ -165,7 +171,7 @@ const EduFrom = Form.create()(React.createClass({
                     labelCol={{ span: 4 }}
                     wrapperCol={{ span: 6 }}
                     label="学历"
-                    >
+                >
                     {getFieldDecorator('edulvl', {
                         initialValue: this.state.edulvl || null
                     })(
@@ -181,7 +187,7 @@ const EduFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="专业"
-                    >
+                >
                     {getFieldDecorator('edupfs')(
                         <EduPfsSelect defValue={this.state.eduPfs} Professional={this.professional} />
                     )}
@@ -189,7 +195,7 @@ const EduFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="毕业学校"
-                    >
+                >
                     {getFieldDecorator('schoolname', {
                         initialValue: this.state.schoolname || null
                     })(
@@ -201,7 +207,7 @@ const EduFrom = Form.create()(React.createClass({
                     labelCol={{ span: 4 }}
                     wrapperCol={{ span: 4 }}
                     label="毕业时间"
-                    >
+                >
                     {getFieldDecorator('graduationTimeYear')(
                         <YearSelect defValue={this.state.graduationTimeYear || null} handleyear={this.handleyear} />
                     )}
@@ -209,16 +215,16 @@ const EduFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="学历证书"
-                    >
+                >
                     {getFieldDecorator('xueliPic')(
-                        <Avatar name="xueliPic" urlData={this.xueliPicUrl} />
+                        <Avatar name="xueliPic" urlData={this.xueliPicUrl} picUrl={this.state.xueliPicUrl} />
                     )}
-                    <p>{ this.state.xueliPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.xueliPicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{this.state.xueliPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this, this.state.xueliPicUrl)}>下载证书</Button> : ""}</p>
                 </FormItem>
                 <FormItem
                     {...formItemLayout}
                     label="学历证书编号"
-                    >
+                >
                     {getFieldDecorator('edunum', {
                         initialValue: this.state.edunum || null
                     })(
@@ -229,16 +235,16 @@ const EduFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="学位证书"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('xueweiPic')(
-                        <Avatar name="xueweiPic" urlData={this.xueweiPicUrl} />
+                        <Avatar name="xueweiPic" urlData={this.xueweiPicUrl} picUrl={this.state.xueweiPicUrl} />
                     )}
-                    <p>{this.state.xueweiPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.xueweiPicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{this.state.xueweiPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this, this.state.xueweiPicUrl)}>下载证书</Button> : ""}</p>
                 </FormItem>
                 <FormItem
                     {...formItemLayout}
                     label="学位证书编号"
-                    >
+                >
                     {getFieldDecorator('degreenum', {
                         initialValue: this.state.degreenum || null
                     })(

+ 27 - 17
js/component/account/set/person.jsx

@@ -31,7 +31,8 @@ class Avatar extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            imageUrl: ''
+            imageUrl: '',
+            propsbool: true,
         }
     }
     handleChange(info) {
@@ -41,6 +42,12 @@ class Avatar extends React.Component {
             this.props.urlData(info.file.response.data);
         }
     }
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.picUrl && this.state.propsbool) {
+            this.state.imageUrl = globalConfig.avatarHost + "/upload" + nextProps.picUrl;
+            this.state.propsbool = false;
+        }
+    }
     render() {
         const imageUrl = this.state.imageUrl;
         return (
@@ -52,7 +59,7 @@ class Avatar extends React.Component {
                 data={{ 'sign': this.props.name }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
-                >
+            >
                 {
                     imageUrl ?
                         <img src={imageUrl} role="presentation" className="avatar" /> :
@@ -68,6 +75,7 @@ class PicturesWall extends React.Component {
         super(props);
         this.state = {
             previewVisible: false,
+            propsbool: true,
             previewImage: '',
             fileList: [],
         }
@@ -87,9 +95,10 @@ class PicturesWall extends React.Component {
         this.setState({ fileList });
         this.props.fileList(fileList);
     }
-    componentWillReceiveProps(nextProps){
-        if ( nextProps.lifePhotoList ) {
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.lifePhotoList && this.state.propsbool) {
             this.state.fileList = nextProps.lifePhotoList;
+            this.state.propsbool = false;
         }
     }
     render() {
@@ -108,7 +117,7 @@ class PicturesWall extends React.Component {
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange.bind(this)}
-                    >
+                >
                     {fileList.length >= 9 ? null : uploadButton}
                 </Upload>
                 <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
@@ -130,7 +139,7 @@ const PersonFrom = Form.create()(React.createClass({
                 if (data.data) {
                     addressInit('cmbProvince', 'cmbCity', 'cmbArea',
                         data.data.residenceProvince, data.data.residenceCity, data.data.residenceArea);
-                    let theArr = splitUrl(data.data.lifePhotoUrl, ',', globalConfig.staticHost + '/upload');
+                    let theArr = splitUrl(data.data.lifePhotoUrl, ',', globalConfig.avatarHost + '/upload');
                     this.setState({
                         nickname: data.data.nickname,
                         cmbP: data.data.residenceProvince,
@@ -142,6 +151,7 @@ const PersonFrom = Form.create()(React.createClass({
                         fixTel: data.data.fixedTel,
                         fixTelExtension: data.data.fixedTelExtension,
                         qq: data.data.qq,
+                        personPortraitUrl: data.data.personPortraitUrl,
                         address: data.data.postalAddress,
                         postcode: data.data.postcode,
                         lifePhotoList: theArr
@@ -245,7 +255,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="社区昵称"
-                    >
+                >
                     {getFieldDecorator('nickname', {
                         initialValue: this.state.nickname || null
                     })(
@@ -255,7 +265,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="居住地"
-                    >
+                >
                     {getFieldDecorator('province', {
                         initialValue: this.state.cmbA || null
                     })(
@@ -271,9 +281,9 @@ const PersonFrom = Form.create()(React.createClass({
                     label="个人头像"
                     labelCol={{ span: 3 }}
                     wrapperCol={{ span: 21 }}
-                    >
+                >
                     {getFieldDecorator('avatar')(
-                        <Avatar urlData={this.avatarUrl} name='personPortrait' />
+                        <Avatar urlData={this.avatarUrl} name='personPortrait' picUrl={this.state.personPortraitUrl} />
                     )}
                 </FormItem>
                 <div className="set-explain">
@@ -284,7 +294,7 @@ const PersonFrom = Form.create()(React.createClass({
                     labelCol={{ span: 3 }}
                     wrapperCol={{ span: 21 }}
                     label="生活照"
-                    >
+                >
                     {getFieldDecorator('livePic')(
                         <PicturesWall fileList={this.livePicFileList} lifePhotoList={this.state.lifePhotoList} />
                     )}
@@ -293,7 +303,7 @@ const PersonFrom = Form.create()(React.createClass({
                     labelCol={{ span: 3 }}
                     wrapperCol={{ span: 20 }}
                     label="个人简介"
-                    >
+                >
                     {getFieldDecorator('intro', {
                         initialValue: this.state.intro || null
                     })(
@@ -316,7 +326,7 @@ const PersonFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="电子邮箱"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('email', {
                         rules: [{
                             type: 'email', message: '请输入正确的邮箱地址!',
@@ -329,7 +339,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="固定电话"
-                    >
+                >
                     {getFieldDecorator('telephone')(
                         <p>
                             <Input value={this.state.fixTelArea} id="fixTelArea" onChange={this.fixTelAreaChange} /> - <Input value={this.state.fixTel} id="fixTel" onChange={this.fixTelChange} /> - <Input value={this.state.fixTelExtension} id="fixTelExtension" onChange={this.fixTelExtensionChange} />
@@ -339,7 +349,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="QQ"
-                    >
+                >
                     {getFieldDecorator('qq', {
                         initialValue: this.state.qq || null
                     })(
@@ -349,7 +359,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="通讯地址"
-                    >
+                >
                     {getFieldDecorator('address', {
                         initialValue: this.state.address || null
                     })(
@@ -359,7 +369,7 @@ const PersonFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="邮编"
-                    >
+                >
                     {getFieldDecorator('postcode', {
                         initialValue: this.state.postcode || null
                     })(

+ 34 - 27
js/component/account/set/pfs.jsx

@@ -33,10 +33,10 @@ class Avatar extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            imageUrl: ''
+            imageUrl: '',
+            propsbool: true,
         }
     }
-
     handleChange(info) {
         if (info.file.status === 'done') {
             // Get this url from response in real world.
@@ -44,21 +44,28 @@ class Avatar extends React.Component {
             this.props.urlData(info.file.response.data);
         }
     }
+    componentWillReceiveProps(nextProps) {
+        debugger
+        if (nextProps.picUrl && this.state.propsbool) {
+            this.state.imageUrl = globalConfig.avatarHost + "/upload" + nextProps.picUrl;
+            this.state.propsbool = false;
+        }
+    }
     render() {
         const imageUrl = this.state.imageUrl;
         return (
             <Upload
                 className="avatar-uploader"
-                name={this.props.name}
+                name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/api/user/identity/upload"}
-                data={{'sign': this.props.name}}
+                action={globalConfig.context + "/api/user/avatar/uploadReplace"}
+                data={{ 'sign': this.props.name }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
-                >
+            >
                 {
                     imageUrl ?
-                        <img src={imageUrl} role="presentation" id={this.props.name} /> :
+                        <img src={imageUrl} role="presentation" className="avatar" /> :
                         <Icon type="plus" className="avatar-uploader-trigger" />
                 }
             </Upload>
@@ -98,8 +105,8 @@ const PfsFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
-            zigePicUrl : '',
-            zhichengPicUrl :''
+            zigePicUrl: '',
+            zhichengPicUrl: ''
         };
     },
     componentWillMount() {
@@ -125,7 +132,7 @@ const PfsFrom = Form.create()(React.createClass({
                         "qualificationGettime": this.state.zigeyear,
                         "qualificationCertificateUrl": this.state.zigePicUrl,
                         "workUnit": values.danwei,
-                        "position": values.touxia,
+                        "position": values.touxian,
                         "experiences": values.jingli,
                         "achievement": values.chengjiu
                     }
@@ -180,7 +187,7 @@ const PfsFrom = Form.create()(React.createClass({
         }
     },
     downloadPic(type) {
-        window.open(globalConfig.context + "/open/downLoadPicture?path="+type)
+        window.open(globalConfig.context + "/open/downLoadPicture?path=" + type)
     },
     render() {
         const { getFieldDecorator } = this.props.form;
@@ -195,7 +202,7 @@ const PfsFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="从事领域"
                     help={'请输入所从事领域的名称,多个领域请以逗号隔开'}
-                    >
+                >
                     {getFieldDecorator('lingyu', {
                         initialValue: this.state.lingyu || null
                     })(
@@ -206,7 +213,7 @@ const PfsFrom = Form.create()(React.createClass({
                     labelCol={{ span: 3 }}
                     wrapperCol={{ span: 4 }}
                     label="从业工龄"
-                    >
+                >
                     {getFieldDecorator('gongling', {
                         initialValue: this.state.gongling
                     })(
@@ -217,7 +224,7 @@ const PfsFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="职称名字"
-                    >
+                >
                     {getFieldDecorator('zhichengname', {
                         initialValue: this.state.zhichengname || null
                     })(
@@ -229,7 +236,7 @@ const PfsFrom = Form.create()(React.createClass({
                     wrapperCol={{ span: 6 }}
                     label="取得时间"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('zhichengyear')(
                         <YearSelect defValue={this.state.zhichengyear} handleyear={this.zhichengyear} />
                     )}
@@ -238,19 +245,19 @@ const PfsFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="职称证书"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('zhichengPic')(
-                        <Avatar name="zhichengPic" urlData={this.zhichengPic} />
+                        <Avatar name="zhichengPic" urlData={this.zhichengPic} picUrl={this.state.zhichengPicUrl}/>
                     )}
                 </FormItem>
                 <div className="set-explain">
                     <p>要求2M 以下的jpg、jpeg格式的图片。该资料不会公开展示,仅作为审核材料使用。</p>
-                    <p>{ this.state.zhichengPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.zhichengPicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{this.state.zhichengPicUrl !== "" ? <Button onClick={this.downloadPic.bind(this, this.state.zhichengPicUrl)}>下载证书</Button> : ""}</p>
                 </div>
                 <FormItem
                     {...formItemLayout}
                     label="执业资格"
-                    >
+                >
                     {getFieldDecorator('zigename', {
                         initialValue: this.state.zigename
                     })(
@@ -262,7 +269,7 @@ const PfsFrom = Form.create()(React.createClass({
                     wrapperCol={{ span: 6 }}
                     label="取得时间"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('zigeyear')(
                         <YearSelect defValue={this.state.zigeyear} handleyear={this.zigeyear} />
                     )}
@@ -271,19 +278,19 @@ const PfsFrom = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="资格证明"
                     hasFeedback
-                    >
+                >
                     {getFieldDecorator('zigePic')(
-                        <Avatar name="zigePic" urlData={this.zigePic} />
+                        <Avatar name="zigePic" urlData={this.zigePic} picUrl={this.state.zigePicUrl}/>
                     )}
                 </FormItem>
                 <div className="set-explain">
                     <p>要求2M 以下的jpg、jpeg格式的图片。该资料不会公开展示,仅作为审核材料使用。</p>
-                    <p>{this.state.zigePicUrl !== "" ? <Button onClick={this.downloadPic.bind(this,this.state.zigePicUrl)}>下载证书</Button> : ""}</p>
+                    <p>{this.state.zigePicUrl !== "" ? <Button onClick={this.downloadPic.bind(this, this.state.zigePicUrl)}>下载证书</Button> : ""}</p>
                 </div>
                 <FormItem
                     {...formItemLayout}
                     label="工作单位"
-                    >
+                >
                     {getFieldDecorator('danwei', {
                         initialValue: this.state.danwei || null
                     })(
@@ -293,7 +300,7 @@ const PfsFrom = Form.create()(React.createClass({
                 <FormItem
                     {...formItemLayout}
                     label="职位头衔"
-                    >
+                >
                     {getFieldDecorator('touxian', {
                         initialValue: this.state.touxian || null
                     })(
@@ -329,7 +336,7 @@ const PfsFrom = Form.create()(React.createClass({
                         </div>
                     }
                     label=""
-                    >
+                >
                     {getFieldDecorator('jingli', {
                         initialValue: this.state.jingli || null
                     })(
@@ -366,7 +373,7 @@ const PfsFrom = Form.create()(React.createClass({
                         </div>
                     }
                     label=""
-                    >
+                >
                     {getFieldDecorator('chengjiu', {
                         initialValue: this.state.chengjiu || null
                     })(

+ 21 - 0
js/component/dataDic.js

@@ -2998,6 +2998,27 @@ module.exports = {
             key: "已认证"
         }
     ],
+    certifyStepList:[
+        {
+            value: "0",
+            key: "1-填写基本信息"
+        },{
+            value: "1",
+            key: "2-填写银行卡信息"
+        },{
+            value: "2",
+            key: "3-确认信息"
+        },{
+            value: "3",
+            key: "4-提交完成"
+        },{
+            value: "4",
+            key: "5-输入打款金额"
+        },{
+            value: "5",
+            key: "6-认证结果"
+        }
+    ],
     techFieldList: [
         {
             value:1,

+ 50 - 40
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Input, InputNumber, Button, Form, Icon, Spin, message, Table, Modal, Upload } from 'antd';
+import { Input, InputNumber, Button, Form, Icon, Spin, message, Table, Modal, Upload, Select } from 'antd';
 import { beforeUploadFile, downloadFile } from '../../../../tools.js';
 import './hrSituation.less'
 import ajax from 'jquery/src/ajax/xhr.js'
@@ -9,9 +9,20 @@ import $ from 'jquery/src/ajax';
 const HrSituationDescFrom = Form.create()(React.createClass({
     getInitialState() {
         return {
-            loading: false
+            loading: false,
+            yearOption: []
         };
     },
+    componentWillMount() {
+        let d = new Date();
+        let _me = this;
+        d = d.getFullYear();
+        for (let i = d; i > d - 20; i--) {
+            _me.state.yearOption.push(
+                <Select.Option value={i.toString()} key={i}>{i}</Select.Option>
+            )
+        }
+    },
     handleSubmit(e) {
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
@@ -112,16 +123,15 @@ const HrSituationDescFrom = Form.create()(React.createClass({
         return (
             <Form onSubmit={this.handleSubmit} className="hrSituation-form">
                 <div className="clearfix">
-                    <FormItem className="half-item"
-                        {...formItemLayout}
-                        label="年份"
-                    >
-                        {getFieldDecorator('year', {
-                            initialValue: this.props.data.year || null
-                        })(
-                            <InputNumber />
-                            )}
-                    </FormItem>
+                    <div className="activityCost-title"><span>年份: </span>
+                        {
+                            theData.year ? <span>{theData.year}</span> :
+                                <Select placeholder="请选择年份" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.year = e }}>
+                                    {this.state.yearOption}
+                                </Select>
+                        }
+                    </div>
                 </div>
                 <p className="hrSituation-title">总体情况</p>
                 <div className="clearfix">
@@ -131,7 +141,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmTotal', {
-                            initialValue: this.props.data.firmTotal || null
+                            initialValue: this.props.data.firmTotal || 0
                         })(
                             <InputNumber />
                             )}
@@ -141,7 +151,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techTotal', {
-                            initialValue: this.props.data.techTotal || null
+                            initialValue: this.props.data.techTotal || 0
                         })(
                             <InputNumber />
                             )}
@@ -162,7 +172,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmInService', {
-                            initialValue: this.props.data.firmInService || null
+                            initialValue: this.props.data.firmInService || 0
                         })(
                             <InputNumber />
                             )}
@@ -172,7 +182,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techInService', {
-                            initialValue: this.props.data.techInService || null
+                            initialValue: this.props.data.techInService || 0
                         })(
                             <InputNumber />
                             )}
@@ -183,7 +193,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmPartTime', {
-                            initialValue: this.props.data.firmPartTime || null
+                            initialValue: this.props.data.firmPartTime || 0
                         })(
                             <InputNumber />
                             )}
@@ -193,7 +203,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techPartTime', {
-                            initialValue: this.props.data.techPartTime || null
+                            initialValue: this.props.data.techPartTime || 0
                         })(
                             <InputNumber />
                             )}
@@ -204,7 +214,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmTemporary', {
-                            initialValue: this.props.data.firmTemporary || null
+                            initialValue: this.props.data.firmTemporary || 0
                         })(
                             <InputNumber />
                             )}
@@ -214,7 +224,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techTemporary', {
-                            initialValue: this.props.data.techTemporary || null
+                            initialValue: this.props.data.techTemporary || 0
                         })(
                             <InputNumber />
                             )}
@@ -225,7 +235,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmForeign', {
-                            initialValue: this.props.data.firmForeign || null
+                            initialValue: this.props.data.firmForeign || 0
                         })(
                             <InputNumber />
                             )}
@@ -235,7 +245,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techForeign', {
-                            initialValue: this.props.data.techForeign || null
+                            initialValue: this.props.data.techForeign || 0
                         })(
                             <InputNumber />
                             )}
@@ -246,7 +256,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmAbroad', {
-                            initialValue: this.props.data.firmAbroad || null
+                            initialValue: this.props.data.firmAbroad || 0
                         })(
                             <InputNumber />
                             )}
@@ -256,7 +266,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techAbroad', {
-                            initialValue: this.props.data.techAbroad || null
+                            initialValue: this.props.data.techAbroad || 0
                         })(
                             <InputNumber />
                             )}
@@ -267,7 +277,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="企业职工"
                     >
                         {getFieldDecorator('firmCore', {
-                            initialValue: this.props.data.firmCore || null
+                            initialValue: this.props.data.firmCore || 0
                         })(
                             <InputNumber />
                             )}
@@ -277,7 +287,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="科技人员"
                     >
                         {getFieldDecorator('techCore', {
-                            initialValue: this.props.data.techCore || null
+                            initialValue: this.props.data.techCore || 0
                         })(
                             <InputNumber />
                             )}
@@ -291,7 +301,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="博士"
                     >
                         {getFieldDecorator('doctor', {
-                            initialValue: this.props.data.doctor || null
+                            initialValue: this.props.data.doctor || 0
                         })(
                             <InputNumber />
                             )}
@@ -301,7 +311,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="硕士"
                     >
                         {getFieldDecorator('master', {
-                            initialValue: this.props.data.master || null
+                            initialValue: this.props.data.master || 0
                         })(
                             <InputNumber />
                             )}
@@ -311,7 +321,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="本科"
                     >
                         {getFieldDecorator('undergraduate', {
-                            initialValue: this.props.data.undergraduate || null
+                            initialValue: this.props.data.undergraduate || 0
                         })(
                             <InputNumber />
                             )}
@@ -321,7 +331,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="大专及以下"
                     >
                         {getFieldDecorator('college', {
-                            initialValue: this.props.data.college || null
+                            initialValue: this.props.data.college || 0
                         })(
                             <InputNumber />
                             )}
@@ -334,7 +344,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="高级职称"
                     >
                         {getFieldDecorator('seniorTitle', {
-                            initialValue: this.props.data.seniorTitle || null
+                            initialValue: this.props.data.seniorTitle || 0
                         })(
                             <InputNumber />
                             )}
@@ -344,7 +354,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="中级职称"
                     >
                         {getFieldDecorator('intermediateTitle', {
-                            initialValue: this.props.data.intermediateTitle || null
+                            initialValue: this.props.data.intermediateTitle || 0
                         })(
                             <InputNumber />
                             )}
@@ -354,7 +364,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="初级职称"
                     >
                         {getFieldDecorator('juniorTitle', {
-                            initialValue: this.props.data.juniorTitle || null
+                            initialValue: this.props.data.juniorTitle || 0
                         })(
                             <InputNumber />
                             )}
@@ -364,7 +374,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="高级技工"
                     >
                         {getFieldDecorator('seniorMechanic', {
-                            initialValue: this.props.data.seniorMechanic || null
+                            initialValue: this.props.data.seniorMechanic || 0
                         })(
                             <InputNumber />
                             )}
@@ -377,7 +387,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="30及以下"
                     >
                         {getFieldDecorator('belowThirty', {
-                            initialValue: this.props.data.belowThirty || null
+                            initialValue: this.props.data.belowThirty || 0
                         })(
                             <InputNumber />
                             )}
@@ -387,7 +397,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="31-34"
                     >
                         {getFieldDecorator('thirtyoneToThirtyfour', {
-                            initialValue: this.props.data.thirtyoneToThirtyfour || null
+                            initialValue: this.props.data.thirtyoneToThirtyfour || 0
                         })(
                             <InputNumber />
                             )}
@@ -397,7 +407,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="41-50"
                     >
                         {getFieldDecorator('fortyoneToFifty', {
-                            initialValue: this.props.data.fortyoneToFifty || null
+                            initialValue: this.props.data.fortyoneToFifty || 0
                         })(
                             <InputNumber />
                             )}
@@ -407,7 +417,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="50以上"
                     >
                         {getFieldDecorator('aboveFifty', {
-                            initialValue: this.props.data.aboveFifty || null
+                            initialValue: this.props.data.aboveFifty || 0
                         })(
                             <InputNumber />
                             )}
@@ -421,7 +431,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="新增就业人数"
                     >
                         {getFieldDecorator('newEmployment', {
-                            initialValue: this.props.data.newEmployment || null
+                            initialValue: this.props.data.newEmployment || 0
                         })(
                             <InputNumber />
                             )}
@@ -432,7 +442,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         label="高校应届毕业生人数"
                     >
                         {getFieldDecorator('graduateNumber', {
-                            initialValue: this.props.data.graduateNumber || null
+                            initialValue: this.props.data.graduateNumber || 0
                         })(
                             <InputNumber />
                             )}

+ 20 - 14
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -24,11 +24,11 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     url: globalConfig.context + "/techservice/cognizance/disposeCenterDetail",
                     data: {
                         id: this.props.data.id,
-                        uid: this.props.uid,
+                        cid: this.props.cid,
                         projectName: values.projectName,
-                        projectTimeFormattedDate: values.projectTime.format("YYYY-MM-DD"),
+                        projectTimeFormattedDate: values.projectTimeFormattedDate.format("YYYY-MM-DD"),
                         institution: values.institution,
-                        termTimeFormattedDate: values.termTime.format("YYYY-MM-DD"),
+                        termTimeFormattedDate: values.termTimeFormattedDate.format("YYYY-MM-DD"),
                         protocolUrl: this.state.protocolUrl
                     }
                 }).done(function (data) {
@@ -50,7 +50,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
         const { getFieldDecorator } = this.props.form;
         const theData = this.props.data;
         const formItemLayout = {
-            labelCol: { span: 4 },
+            labelCol: { span: 6 },
             wrapperCol: { span: 12 },
         };
         const _me = this;
@@ -126,7 +126,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传研发费用台账 </Button>
+                        <Button><Icon type="upload" /> 上传协议附件 </Button>
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.protocolUrl ? <a onClick={downloadFile.bind(null, theData.protocolUrl, theData.protocolDownloadFileName)}>{theData.protocolDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
@@ -180,8 +180,12 @@ const CenterListDesc = React.createClass({
                         width='800px'
                         footer=''
                     >
-                        <CenterListDescFrom data={this.props.data}
-                            spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
+                        <CenterListDescFrom
+                            cid={this.props.cid}
+                            data={this.props.data}
+                            spinState={this.spinChange}
+                            closeModal={this.handleCancel}
+                            clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -190,7 +194,7 @@ const CenterListDesc = React.createClass({
 });
 
 const CenterList = React.createClass({
-    loadOrgTechCenterDetail() {
+    loadOrgTechCenterDetail(uid) {
         this.setState({
             loading: true
         });
@@ -200,7 +204,7 @@ const CenterList = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/center",
             data: {
-                uid: this.props.data.uid
+                uid: uid || this.props.data.uid
             }
         }).done((data) => {
             let theData = data.data;
@@ -325,8 +329,7 @@ const CenterList = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         if (this.props.data.uid !== nextProps.data.uid) {
-            this.props.data.uid = nextProps.data.uid;
-            this.loadOrgTechCenterDetail();
+            this.loadOrgTechCenterDetail(nextProps.data.uid);
         };
     },
     tableRowClick(record, index) {
@@ -430,7 +433,7 @@ const CenterList = React.createClass({
                         <span>成立时间: </span>
                         <DatePicker
                             allowClear={false}
-                            value={moment(this.state.foundingTime)}
+                            value={this.state.foundingTime ? moment(this.state.foundingTime) : undefined}
                             onChange={(date, dateString) => { this.setState({ foundingTime: dateString }); }}
                         />
                         <span>负责人: </span>
@@ -507,8 +510,11 @@ const CenterList = React.createClass({
                             onRowClick={this.tableRowClick} />
                     </Spin>
                 </div>
-                <CenterListDesc data={this.state.RowData}
-                    showDesc={this.state.showDesc} closeDesc={this.closeDesc} />
+                <CenterListDesc
+                    cid={this.state.cid}
+                    data={this.state.RowData}
+                    showDesc={this.state.showDesc}
+                    closeDesc={this.closeDesc} />
             </div >
         );
     }

+ 17 - 4
js/component/manageCenter/userManage/orgCertify.jsx

@@ -4,7 +4,7 @@ import './userList.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { eduLevelList, auditStatusList } from '../../dataDic.js'
+import { eduLevelList, auditStatusList, certifyStepList } from '../../dataDic.js'
 import { addressInit } from '../../tools.js';
 
 const OrgCertify = Form.create()(React.createClass({
@@ -72,7 +72,7 @@ const OrgCertify = Form.create()(React.createClass({
                     paymentDateFormattedDate: thisData.paymentDateFormattedDate,
                     lastYearTaxReportUrl: thisData.lastYearTaxReportUrl,
                     auditStatus: thisData.auditStatus,
-                    process: thisData.process
+                    process: thisData.process ? String(thisData.process) : undefined
                 });
                 this.props.form.resetFields();
             }.bind(this),
@@ -89,12 +89,18 @@ const OrgCertify = Form.create()(React.createClass({
                 this.setState({
                     loading: true
                 });
+                //
                 let licenceA = document.getElementById('licenceArea').value;
                 let licenceC = document.getElementById('licenceCity').value;
                 let licenceP = document.getElementById('licenceProvince').value;
                 let locationA = document.getElementById('locationArea').value;
                 let locationC = document.getElementById('locationCity').value;
                 let locationP = document.getElementById('locationProvince').value;
+                //金额判断
+                if (values.amountMoney && values.amountMoney < 0 && values.amountMoney > 100 && /^\d+(\.\d{2})?$/.test(values.amountMoney)) {
+                    message.warning('请输入0-100以内的金额');
+                    return;
+                };
                 $.ajax({
                     method: "POST",
                     dataType: "json",
@@ -126,7 +132,7 @@ const OrgCertify = Form.create()(React.createClass({
                         validationAmount: values.validationAmount, //打款金额
                         paymentDateFormattedDate: values.paymentDateFormattedDate ? values.paymentDateFormattedDate.format("YYYY-MM-DD") : undefined,
                         auditStatus: values.auditStatus,
-                        process: values.process,
+                        process: this.state.process,
 
                         licenceArea: licenceA,
                         licenceCity: licenceC,
@@ -426,7 +432,14 @@ const OrgCertify = Form.create()(React.createClass({
                     {getFieldDecorator('process', {
                         initialValue: this.state.process
                     })(
-                        <Input />
+                        <Select placeholder="选择要修改的认证步骤" style={{ width: 200 }}
+                            onChange={(e) => { this.state.process = e }}>
+                            {
+                                certifyStepList.map(function (item, i) {
+                                    return <Select.Option key={i} value={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
                         )}
                 </FormItem>
                 <FormItem wrapperCol={{ span: 12, offset: 4 }}>

+ 8 - 2
js/component/manageCenter/userManage/orgList.jsx

@@ -15,6 +15,8 @@ const OrgAdd = React.createClass({
         };
     },
     showModal() {
+        this.state.mobile = undefined;
+        this.state.unitName = undefined;
         this.setState({
             visible: true,
         });
@@ -67,11 +69,15 @@ const OrgAdd = React.createClass({
                     className="admin-desc-content">
                     <div className='orgAdd-input'>
                         <span>用户手机号码:</span>
-                        <Input onChange={(e) => { this.state.mobile = e.target.value }} />
+                        <Input
+                            value={this.state.mobile}
+                            onChange={(e) => { this.setState({ mobile : e.target.value }); }} />
                     </div>
                     <div className='orgAdd-input'>
                         <span>公司名称:</span>
-                        <Input onChange={(e) => { this.state.unitName = e.target.value }} />
+                        <Input
+                            value={this.state.unitName}
+                            onChange={(e) => { this.setState({ unitName: e.target.value }); }} />
                     </div>
                 </Modal>
             </div>

+ 17 - 5
js/component/manageCenter/userManage/userDesc.jsx

@@ -5,7 +5,7 @@ import './userList.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { addressInit } from '../../tools.js';
-import { auditStatusList } from '../../dataDic.js';
+import { auditStatusList, certifyStepList } from '../../dataDic.js';
 
 const UserForm = Form.create()(React.createClass({
     getInitialState() {
@@ -57,7 +57,7 @@ const UserForm = Form.create()(React.createClass({
                     bankCardNumber: thisData.bankCardNumber,
                     amountMoney: thisData.amountMoney,
                     auditStatus: thisData.auditStatus,
-                    process: thisData.process,
+                    process: thisData.process ? String(thisData.process) : undefined,
                     paymentDateFormattedDate: thisData.paymentDateFormattedDate,
                     paymentDate: thisData.paymentDate
                 });
@@ -76,6 +76,11 @@ const UserForm = Form.create()(React.createClass({
             let cmbP = document.getElementById('cmbProvince').value;
             let cmbC = document.getElementById('cmbCity').value;
             let cmbA = document.getElementById('cmbArea').value;
+            //金额判断
+            if (values.amountMoney && values.amountMoney < 0 && values.amountMoney > 100 && /^\d+(\.\d{2})?$/.test(values.amountMoney)) {
+                message.warning('请输入0-100以内的金额');
+                return;
+            };
             if (!err) {
                 this.setState({
                     loading: true
@@ -104,7 +109,7 @@ const UserForm = Form.create()(React.createClass({
                         amountMoney: values.amountMoney,
                         auditStatus: values.auditStatus,
                         paymentDateFormattedDate: values.paymentDateFormattedDate ? values.paymentDateFormattedDate.format("YYYY-MM-DD") : undefined,
-                        process: values.process
+                        process: this.state.process
                     }
                 }).done(function (data) {
                     if (!data.error.length) {
@@ -283,7 +288,7 @@ const UserForm = Form.create()(React.createClass({
                     {getFieldDecorator('auditStatus', {
                         initialValue: this.state.auditStatus
                     })(
-                        <Select placeholder="选择认证状态" style={{ width: 200 }}
+                        <Select placeholder="选择要修改的认证状态" style={{ width: 200 }}
                             onChange={(e) => { this.state.auditStatus = e }}>
                             {
                                 auditStatusList.map(function (item, i) {
@@ -300,7 +305,14 @@ const UserForm = Form.create()(React.createClass({
                     {getFieldDecorator('process', {
                         initialValue: this.state.process
                     })(
-                        <Input />
+                        <Select placeholder="选择要修改的认证步骤" style={{ width: 200 }}
+                            onChange={(e) => { this.state.process = e }}>
+                            {
+                                certifyStepList.map(function (item, i) {
+                                    return <Select.Option key={i} value={item.value} >{item.key}</Select.Option>
+                                })
+                            }
+                        </Select>
                         )}
                 </FormItem>
                 <FormItem wrapperCol={{ span: 12, offset: 4 }}>

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

@@ -15,6 +15,7 @@ const OrgAdd = React.createClass({
         };
     },
     showModal() {
+        this.state.mobile;
         this.setState({
             visible: true,
         });
@@ -66,7 +67,9 @@ const OrgAdd = React.createClass({
                     className="admin-desc-content">
                     <div className='orgAdd-input'>
                         <span>用户手机号码:</span>
-                        <Input onChange={(e) => { this.state.mobile = e.target.value }} />
+                        <Input
+                            value={this.state.mobile}
+                            onChange={(e) => { this.setState({ mobile: e.target.value }); }} />
                     </div>
                 </Modal>
             </div>

+ 1 - 1
package.json

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