yee 8 years ago
parent
commit
9c82e0269a

File diff suppressed because it is too large
+ 277 - 277
js/component/DicProvinceList.js


+ 8 - 2
js/component/certify/audit.jsx

@@ -35,7 +35,10 @@ const Content = Form.create()(React.createClass({
             }
         }.bind(this));
     },
-    componentWillMount() {
+    loadDate(){
+        this.setState({
+                loading:true
+            });
         $.ajax({
             method: "get",
             dataType: "json",
@@ -49,7 +52,7 @@ const Content = Form.create()(React.createClass({
                 };
             }.bind(this),
         }).done(function (data) {
-            if (data.error.length) {
+            if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
             };
             this.setState({
@@ -57,6 +60,9 @@ const Content = Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    componentWillMount() {
+        this.loadDate();
+    },
     render() {
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;

+ 1 - 1
js/component/certify/bank.jsx

@@ -18,7 +18,7 @@ const Content = Form.create()(React.createClass({
                 if (data.data) {
                     this.setState({
                         username: data.data.username,
-                        bankName: data.data.username,
+                        bankName: data.data.bankName,
                         bankAccount: data.data.bankAccount,
                         bankCardNumber: data.data.bankCardNumber
                     })

+ 7 - 6
js/component/certify/certify.less

@@ -10,18 +10,18 @@
                     margin: 0 auto;
                     padding: 10px 0;
                     .logo {
-                        width: 12%;
+                        width: 120px;
                         padding-top: 60px;
                         float: left;
-                        margin-left: 40px;
+                        margin-left: 4%;
                         position: relative;
                         overflow: hidden;
                         img {
                             position: absolute;
                             top: 0;
-                            left: 0;
+                            right: 0;
                             height: 60px;
-                            width: 120px;
+                            width: 60px;
                         }
                     }
                     .certify-text {
@@ -29,6 +29,7 @@
                         float: left;
                         line-height: 60px;
                         font-size: 24px;
+                        margin-left: 20px;
                         .text {
                             border-left: 1px solid #999999;
                         }
@@ -46,7 +47,7 @@
                             }
                         }
                         span {
-                            padding-left: 10px;
+                            padding-left: 20px;
                         }
                     }
                 }
@@ -248,7 +249,7 @@
                                 left: 0;
                             }
                             p {
-                                line-height: 24px;
+                                line-height: 40px;
                             }
                             button {
                                 margin-top: 10px;

+ 8 - 4
js/component/certify/confirm.jsx

@@ -29,9 +29,9 @@ const Content = Form.create()(React.createClass({
                 };
             }.bind(this),
         }).done(function (data) {
-            if (data.error.length) {
+            if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
-            }
+            };
         }.bind(this)).always(function () {
             this.setState({
                 loading: false
@@ -62,6 +62,10 @@ const Content = Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             }
+        }.bind(this)).always(function () {
+            this.setState({
+                loading: false
+            });
         }.bind(this));
     },
     componentWillMount() {
@@ -80,7 +84,7 @@ const Content = Form.create()(React.createClass({
         const _me = this;
         return (
             <Spin spinning={this.state.loading} className="certify-spin">
-                <Form horizontal onSubmit={this.handleSubmit} className="certify-form">
+                <Form horizontal className="certify-form">
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                         <p className="certify-title">请确认个人信息</p>
                     </FormItem>
@@ -151,7 +155,7 @@ const Content = Form.create()(React.createClass({
                         </span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        <Button className="set-submit" type="primary" htmlType="submit">下一步</Button>
+                        <Button className="set-submit" type="primary" onClick={_me.handleSubmit}>下一步</Button>
                         <Button className="exit" type="ghost" onClick={_me.changeStep}>返回修改</Button>
                     </FormItem>
                 </Form >

+ 16 - 24
js/component/certify/personal.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Input, Button, Form, Upload, Icon, Spin, message, Row, Col } from 'antd';
+import { Input, Button, Form, Upload, Icon, Spin, message, Row, Col ,Cascader} from 'antd';
 import './certify.less';
-import { addressInit, getBase64, beforeUpload } from '../tools.js';
+import { getBase64, beforeUpload,provinceSelect } from '../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
@@ -57,11 +57,10 @@ const Content = Form.create()(React.createClass({
             url: globalConfig.context + "/api/user/userPro",
             success: function (data) {
                 if (data.data) {
-                    addressInit('cmbProvince', 'cmbCity', 'cmbArea',
-                        data.data.province, data.data.city, data.data.area);
                     this.setState({
                         positiveIdUrl: data.data.positiveIdUrl,
                         oppositeIdUrl: data.data.oppositeIdUrl,
+                        address:[data.data.province,data.data.city,data.data.area],
                         aftUsername: data.data.aftUsername,
                         username: data.data.username,
                         idNumber: data.data.idNumber,
@@ -87,14 +86,6 @@ const Content = Form.create()(React.createClass({
     handleSubmit(e) {
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
-            //地址值
-            let cmbP = document.getElementById('cmbProvince').value;
-            let cmbC = document.getElementById('cmbCity').value;
-            let cmbA = document.getElementById('cmbArea').value;
-            if (!cmbP || !cmbC || !cmbA) {
-                message.warning("请选择所在地!");
-                return;
-            };
             if (!this.state.positiveIdUrl || !this.state.oppositeIdUrl) {
                 message.warning("请上传身份证!");
                 return;
@@ -115,9 +106,9 @@ const Content = Form.create()(React.createClass({
                         idNumber: values.idNumber,
                         positiveIdUrl: this.state.positiveIdUrl,
                         oppositeIdUrl: this.state.oppositeIdUrl,
-                        province: cmbP,
-                        city: cmbC,
-                        area: cmbA,
+                        province: values.address[0],
+                        city: values.address[1],
+                        area: values.address[2],
                         contactMobile: values.contactMobile,
                         process: 1
                     }
@@ -164,8 +155,7 @@ const Content = Form.create()(React.createClass({
     getIdCardUrl2(e) {
         this.state.oppositeIdUrl = e;
     },
-    componentDidMount() {
-        addressInit('cmbProvince', 'cmbCity', 'cmbArea');
+    componentWillMount() {
         this.getData();
     },
     reloadVCode(e) {
@@ -210,12 +200,11 @@ const Content = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="所在地"
                     >
-                        {getFieldDecorator('address')(
-                            <div>
-                                <select id="cmbProvince" name="cmbProvince"></select>
-                                <select id="cmbCity" name="cmbCity"></select>
-                                <select id="cmbArea" name="cmbArea"></select>
-                            </div>
+                        {getFieldDecorator('address',{
+                            initialValue: this.state.address || null,
+                            rules: [{type:'array', required: true, message: '请选择地址!' }]
+                        })(
+                            <Cascader options={provinceSelect()} placeholder="请选择" />
                         )}
                     </FormItem>
                     <FormItem
@@ -293,7 +282,10 @@ const Content = Form.create()(React.createClass({
                             </Col>
                             <Col span={8}>
                                 <div className="getVcode">
-                                    <img id="VCode" src={globalConfig.context + '/open/getVCode'} alt="" onClick={this.reloadVCode} />
+                                    <img id="VCode" 
+                                    src={globalConfig.context + '/open/getVCode'} 
+                                    alt="看不清楚点击切换" 
+                                    onClick={this.reloadVCode} />
                                 </div>
                             </Col>
                         </Row>

+ 1 - 2
js/component/certify/result.jsx

@@ -44,7 +44,7 @@ const Content = Form.create()(React.createClass({
                 };
             }.bind(this),
         }).done(function (data) {
-            if (data.error.length) {
+            if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
             };
             this.setState({
@@ -66,7 +66,6 @@ const Content = Form.create()(React.createClass({
                                 <div className="certify-result-state">
                                     <Icon type="check" />
                                     <p>您已通过了实名认证</p>
-                                    <p>建议您下载数字证书,保障您的支付安全。</p>
                                 </div>
                             </div>;
                         case 4:

+ 2 - 1
js/component/certify/top.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import './certify.less';
+import logo from '../../../image/logo.jpg';
 
 const LoginTop = React.createClass({
     render() {
@@ -7,7 +8,7 @@ const LoginTop = React.createClass({
             <div className="certify-header">
                 <div className="certify-logo clearfix">
                     <div className="logo">
-                        <img src="" alt="" />
+                        <img src={logo} alt="" />
                     </div>
                     <div className="certify-text">
                         <span className="text">实名认证</span>

+ 12 - 22
js/component/groupCertify/bank.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { Input, Button, Form, Icon, Spin, message, } from 'antd';
-import { addressInit } from '../tools.js';
+import { Input, Button, Form, Icon, Spin, message,Cascader } from 'antd';
+import { provinceSelect } from '../tools.js';
 import './certify.less';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
@@ -17,11 +17,10 @@ const Content = Form.create()(React.createClass({
             url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
-                    addressInit('cmbProvince', 'cmbCity', 'cmbArea',
-                        data.data.locationProvince, data.data.locationCity, data.data.locationArea);
                     this.setState({
                         contactMobile: data.data.contactMobile,
                         bankAccount: data.data.bankAccount,
+                        address:[data.data.locationProvince,data.data.locationCity,data.data.locationArea],
                         banks: data.data.banks,
                         bankBranch: data.data.bankBranch,
                         bankCardNumber: data.data.bankCardNumber,
@@ -46,13 +45,6 @@ const Content = Form.create()(React.createClass({
     handleSubmit(e) {
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
-            let cmbP = document.getElementById('cmbProvince').value;
-            let cmbC = document.getElementById('cmbCity').value;
-            let cmbA = document.getElementById('cmbArea').value;
-            if (!cmbP || !cmbC || !cmbA) {
-                message.warning("请选择所在地!");
-                return;
-            };
             if (!err) {
                 this.setState({
                     loading: true
@@ -67,9 +59,9 @@ const Content = Form.create()(React.createClass({
                         banks: values.banks,
                         bankBranch: values.bankBranch,
                         bankCardNumber: values.bankCardNumber,
-                        locationProvince: cmbP,
-                        locationCity: cmbC,
-                        locationArea: cmbA,
+                        locationProvince: values.address[0],
+                        locationCity: values.address[1],
+                        locationArea: values.address[2],
                         process: 2
                     }
                 }).done(function (data) {
@@ -93,8 +85,7 @@ const Content = Form.create()(React.createClass({
             callback();
         }
     },
-    componentDidMount() {
-        addressInit('cmbProvince', 'cmbCity', 'cmbArea');
+    componentWillMount() {
         this.getData();
     },
     changeStep() {
@@ -142,12 +133,11 @@ const Content = Form.create()(React.createClass({
                         {...formItemLayout}
                         label="开户银行所在地"
                     >
-                        {getFieldDecorator('address')(
-                            <div>
-                                <select id="cmbProvince" name="cmbProvince"></select>
-                                <select id="cmbCity" name="cmbCity"></select>
-                                <select id="cmbArea" name="cmbArea"></select>
-                            </div>
+                        {getFieldDecorator('address',{
+                            initialValue: this.state.address || null,
+                            rules: [{type:'array', required: true, message: '请选择地址!' }]
+                        })(
+                            <Cascader options={provinceSelect()} placeholder="请选择地址" />
                         )}
                     </FormItem>
                     <FormItem

+ 6 - 5
js/component/groupCertify/certify.less

@@ -10,16 +10,16 @@
                     margin: 0 auto;
                     padding: 10px 0;
                     .logo {
-                        width: 6%;
+                        width: 120px;
                         padding-top: 60px;
                         float: left;
-                        margin-left: 100px;
+                        margin-left: 4%;
                         position: relative;
                         overflow: hidden;
                         img {
                             position: absolute;
                             top: 0;
-                            left: 0;
+                            right: 0;
                             height: 60px;
                             width: 60px;
                         }
@@ -29,6 +29,7 @@
                         float: left;
                         line-height: 60px;
                         font-size: 24px;
+                        margin-left: 20px;
                         .text {
                             border-left: 1px solid #999999;
                         }
@@ -46,7 +47,7 @@
                             }
                         }
                         span {
-                            padding-left: 10px;
+                            padding-left: 20px;
                         }
                     }
                 }
@@ -245,7 +246,7 @@
                                 left: 0;
                             }
                             p {
-                                line-height: 24px;
+                                line-height: 40px;
                             }
                             button {
                                 margin-top: 10px;

+ 2 - 2
js/component/groupCertify/confirm.jsx

@@ -88,7 +88,7 @@ const Content = Form.create()(React.createClass({
         const _me = this;
         return (
             <Spin spinning={this.state.loading} className="certify-spin">
-                <Form horizontal onSubmit={this.handleSubmit} className="certify-form">
+                <Form horizontal className="certify-form">
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <p className="certify-title">请确认提交的企业信息</p>
                     </FormItem>
@@ -202,7 +202,7 @@ const Content = Form.create()(React.createClass({
                         </span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>
-                        <Button className="set-submit" type="primary" htmlType="submit">下一步</Button>
+                        <Button className="set-submit" type="primary" onClick={_me.handleSubmit}>下一步</Button>
                         <Button className="exit" type="ghost" onClick={_me.changeStep}>返回修改</Button>
                     </FormItem>
                 </Form >

+ 14 - 25
js/component/groupCertify/personal.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Input, Button, Form, Upload, Icon, Spin, message, Row, Col, DatePicker, Select, Radio } from 'antd';
+import { Input, Button, Form, Upload, Icon, Spin, message, Row, Col, DatePicker, Select, Radio, Cascader } from 'antd';
 import './certify.less';
-import { addressInit, getBase64, beforeUpload, beforeUploadFile } from '../tools.js';
+import { getBase64, beforeUpload, beforeUploadFile,provinceSelect } from '../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -57,8 +57,6 @@ const Content = Form.create()(React.createClass({
             url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
-                    addressInit('cmbProvince', 'cmbCity', 'cmbArea',
-                        data.data.licenceProvince, data.data.licenceCity, data.data.licenceArea);
                     this.setState({
                         contacts: data.data.contacts,
                         contactMobile: data.data.contactMobile,
@@ -66,6 +64,7 @@ const Content = Form.create()(React.createClass({
                         unitName: data.data.unitName,
                         registeredCapital: data.data.registeredCapital,
                         licenceNumber: data.data.licenceNumber,
+                        licenceAddress:[data.data.licenceProvince,data.data.licenceCity,data.data.licenceArea],
                         orgCode: data.data.orgCode,
                         legalPerson: data.data.legalPerson,
                         legalPersonIdCard: data.data.legalPersonIdCard,
@@ -99,14 +98,6 @@ const Content = Form.create()(React.createClass({
     handleSubmit(e) {
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
-            //地址值
-            let cmbP = document.getElementById('cmbProvince').value;
-            let cmbC = document.getElementById('cmbCity').value;
-            let cmbA = document.getElementById('cmbArea').value;
-            if (!cmbP || !cmbC || !cmbA) {
-                message.warning("请选择所在地!");
-                return;
-            };
             if (!this.state.licenceScanningUrl) {
                 message.warning("请上传营业执照副本!");
                 return;
@@ -141,9 +132,9 @@ const Content = Form.create()(React.createClass({
                         unitName: values.unitName,
                         registeredCapital: values.registeredCapital,
                         licenceNumber: values.licenceNumber,
-                        licenceProvince: cmbP,
-                        licenceCity: cmbC,
-                        licenceArea: cmbA,
+                        licenceProvince: values.address[0],
+                        licenceCity: values.address[1],
+                        licenceArea: values.address[2],
                         licenceScanningUrl: this.state.licenceScanningUrl,
                         orgCode: values.orgCode,
                         orgCodeUrl: this.state.orgCodeUrl,
@@ -211,8 +202,7 @@ const Content = Form.create()(React.createClass({
     getLastYearTaxReportUrl(e) {
         this.state.lastYearTaxReportUrl = e;
     },
-    componentDidMount() {
-        addressInit('cmbProvince', 'cmbCity', 'cmbArea');
+    componentWillMount() {
         this.getData();
     },
     reloadVCode() {
@@ -372,12 +362,11 @@ const Content = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="营业执照所在地"
                     >
-                        {getFieldDecorator('address')(
-                            <div>
-                                <select id="cmbProvince" name="cmbProvince"></select>
-                                <select id="cmbCity" name="cmbCity"></select>
-                                <select id="cmbArea" name="cmbArea"></select>
-                            </div>
+                        {getFieldDecorator('address',{
+                            initialValue: this.state.address || null,
+                            rules: [{type:'array', required: true, message: '请选择地址!' }]
+                        })(
+                            <Cascader options={provinceSelect()} placeholder="请选择地址" />
                         )}
                     </FormItem>
                     <FormItem
@@ -426,8 +415,8 @@ const Content = Form.create()(React.createClass({
                         <div className="hrSituation-roster">
                             <Upload
                                 name="ratepay"
-                                action={globalConfig.context + "/api/user/cognizance/upload"}
-                                data={{ 'sign': 'ratepay_' + (new Date().getFullYear() - 1) }}
+                                action={globalConfig.context + "/api/user/cognizance/uploadRatepay"}
+                                data={{ 'sign': 'ratepay' }}
                                 beforeUpload={beforeUploadFile}
                                 showUploadList={false}
                                 onChange={(info) => {

+ 0 - 1
js/component/groupCertify/result.jsx

@@ -70,7 +70,6 @@ const Content = Form.create()(React.createClass({
                                 <div className="certify-result-state">
                                     <Icon type="check" />
                                     <p>您已通过了实名认证</p>
-                                    <p>建议您下载数字证书,保障您的支付安全。</p>
                                 </div>
                             </div>;
                         case "4":

+ 7 - 6
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -81,13 +81,13 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    getContactsList() {
+    getContactsList(id) {
         $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/getContacts",
-            data: { "uid": this.props.data.uid },
+            data: { "uid": id || this.props.data.uid },
             success: function (data) {
                 let theOption = [];
                 if (!data.data) {
@@ -103,8 +103,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     );
                 };
                 this.setState({
-                    contactsOption: theOption,
-                    contacts: data.data[this.state.data.contacts]
+                    contactsOption: theOption
                 });
             }.bind(this),
         });
@@ -200,6 +199,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
         this.loadData();
         this.getOptionList();
         this.getStateData();
+        this.getContactsList();
         this.getDepartmentList();
     },
     handleSubmit(e) {
@@ -255,7 +255,8 @@ const ApplyChangeFrom = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
             this.loadData(nextProps.data.pid);
             this.getStateData(nextProps.data.pid);
-            this.getDepartmentList(nextProps.data.pid);
+            this.getContactsList(nextProps.data.uid);
+            this.getDepartmentList(nextProps.data.uid);
         };
     },
     subsidyCheck(e) {
@@ -302,7 +303,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                                 label="联系人:"
                             >
                                 {getFieldDecorator('contacts', {
-                                    initialValue: this.state.contacts
+                                    initialValue: this.state.data.contacts
                                 })(
                                     <Select>{this.state.contactsOption}</Select>
                                     )}

+ 6 - 17
js/component/manageCenter/servicesManage/technology/websiteAdd.jsx

@@ -73,7 +73,7 @@ const WebsiteAdd = React.createClass({
             <div className="cognizance-add">
                 <Modal title="添加科技部门网址" visible={this.state.visible}
                     onOk={this.handleOk} onCancel={this.handleCancel}
-                    width='800px'
+                    width='400px'
                     footer={[
                         <Button key="submit" type="primary" loading={this.state.loading} onClick={this.handleOk}>
                             确认
@@ -83,8 +83,7 @@ const WebsiteAdd = React.createClass({
                             </Button>,
                     ]}
                 >
-                    <div className="clearfix" style={{ marginBottom: '10px' }}>
-                        <div className="half-item">
+                        <div>
                             <span className="item-title">选择公司:  </span>
                             <Select
                                 placeholder="请选择公司"
@@ -95,32 +94,22 @@ const WebsiteAdd = React.createClass({
                                 {this.props.companyAddOption}
                             </Select>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                    	<div className="half-item">
+                    	<div>
                             <span className="item-title">科技部门名称:  </span>
                             <Input value={this.state.department} onChange={(e) => { this.setState({ department: e.target.value }); }} style={{ width: 200 }} />
                         </div>
-                    </div>
-
-                    <div className="clearfix">
-	                 	<div className="half-item">
+	                 	<div>
 	                   		<span className="item-title">网址:  </span>
 	                     	<Input value={this.state.website} onChange={(e) => { this.setState({ website: e.target.value }); }} style={{ width: 200 }} />
 	                	</div>
-                    </div>
-                    <div className="clearfix">
-                    	<div className="half-item">
+                    	<div>
 	                   		<span className="item-title">账号:  </span>
 	                     	<Input value={this.state.accountNumber} onChange={(e) => { this.setState({ accountNumber: e.target.value }); }} style={{ width: 200 }} />
 	                	</div>
-	                </div>
-	                <div className="clearfix">
-                    	<div className="half-item">
+                    	<div>
 	                   		<span className="item-title">密码:  </span>
 	                     	<Input value={this.state.password} onChange={(e) => { this.setState({ password: e.target.value }); }} style={{ width: 200 }} />
 	                	</div>
-	                </div>
                 </Modal>
             </div>
         );

+ 5 - 16
js/component/manageCenter/servicesManage/technology/websiteChange.jsx

@@ -105,23 +105,19 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
         const { getFieldDecorator } = this.props.form;
         const theData = this.state.data;
         const formItemLayout = {
-            labelCol: { span: 4 },
-            wrapperCol: { span: 6 },
+            labelCol: { span: 8 },
+            wrapperCol: { span: 16 },
         };
         const _me = this;
         if (this.state.data) {
             return (
                 <Form onSubmit={this.handleSubmit} id="highTechApply-form">
-                    <div className="half-item">
                         <FormItem
-                            labelCol={{ span: 8 }}
-                            wrapperCol={{ span: 12 }}
-                            label="选择公司:"
+                            {...formItemLayout}
+                            label="公司名称:"
                         >
                             <span>{theData.unitName}</span>
                         </FormItem>
-                    </div>
-                    <div className="clearfix">
                         <FormItem
                             {...formItemLayout}
                             label="科技部门名称:"
@@ -132,8 +128,6 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
                                 <Input />
                                 )}
                         </FormItem>
-                    </div>
-                    <div className="clearfix">
                         <FormItem
                             {...formItemLayout}
                             label="网址:"
@@ -144,8 +138,6 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
                                 <Input />
                                 )}
                         </FormItem>
-                    </div>
-                    <div className="clearfix">
                         <FormItem
                             {...formItemLayout}
                             label="账号:"
@@ -156,8 +148,6 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
                                 <Input />
                                 )}
                         </FormItem>
-                    </div>
-                    <div className="clearfix">
                         <FormItem
                             {...formItemLayout}
                             label="密码:"
@@ -168,7 +158,6 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
                                 <Input />
                                 )}
                         </FormItem>
-                    </div>
                     <FormItem style={{ marginTop: '20px' }}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
@@ -219,7 +208,7 @@ const WebsiteChange = React.createClass({
                 <Spin spinning={this.state.loading} className='spin-box'>
                     <Modal title="编辑科技部门网址" visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
+                        width='400px'
                         footer=''
                     >
                         <WebsiteChangeFrom

+ 1 - 17
js/component/manageCenter/servicesManage/technology/websiteManage.jsx

@@ -23,7 +23,6 @@ const Cognizance = React.createClass({
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                province: this.state.province,
                 unitName: this.state.unitName,
             },
             success: function (data) {
@@ -65,7 +64,7 @@ const Cognizance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -136,12 +135,6 @@ const Cognizance = React.createClass({
         };
     },
     componentWillMount() {
-        let _me = this;
-        provinceArr.map(function (item) {
-            _me.state.provinceOption.push(
-                <Select.Option value={item} key={item}>{item}</Select.Option>
-            )
-        });
         this.loadData();
         this.getCompanyList();
     },
@@ -200,7 +193,6 @@ const Cognizance = React.createClass({
         this.loadData();
     },
     reset() {
-        this.state.province = undefined;
         this.state.unitName = undefined;
         this.loadData();
     },
@@ -228,14 +220,6 @@ const Cognizance = React.createClass({
                 </div>
                 
                 <div className="foster-query">
-                    <Select placeholder="选择省份"
-                        style={{ width: 200 }}
-                        value={this.state.province}
-                        showSearch
-                        filterOption={companySearch}
-                        onChange={(e) => { this.setState({ province: e }) }}>
-                        {this.state.provinceOption}
-                    </Select>
                     <Select placeholder="选择公司"
                         style={{ width: 200 }}
                         value={this.state.unitName}

+ 2 - 2
js/component/manageCenter/userManage/leftTab.jsx

@@ -29,10 +29,10 @@ const LeftTab = React.createClass({
                 mode="vertical"
                 className="account-left"
             >
-                <Menu.Item style={{ display: window.showCustomer ? 'none' : 'block' }} key="userList">
+                <Menu.Item style={{ display: window.showUserList ? 'block' : 'none' }} key="userList">
                     个人用户列表
                 </Menu.Item>
-                <Menu.Item style={{ display: window.showCustomer ? 'none' : 'block' }} key="orgList">
+                <Menu.Item style={{ display: window.showOrgList ? 'block' : 'none' }} key="orgList">
                     组织用户列表
                 </Menu.Item>
                 <Menu.Item style={{ display: window.showCustomer ? 'block' : 'none' }} key="customerList">

+ 21 - 20
js/component/manageCenter/userManage/orgCertify.jsx

@@ -72,7 +72,7 @@ const OrgCertify = Form.create()(React.createClass({
                     paymentDateFormattedDate: thisData.paymentDateFormattedDate,
                     lastYearTaxReportUrl: thisData.lastYearTaxReportUrl,
                     auditStatus: thisData.auditStatus,
-                    process: thisData.process ? String(thisData.process) : undefined
+                    //process: thisData.process ? String(thisData.process) : undefined
                 });
                 this.props.form.resetFields();
             }.bind(this),
@@ -132,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: this.state.process,
+                        //process: this.state.process,
 
                         licenceArea: licenceA,
                         licenceCity: licenceC,
@@ -425,23 +425,6 @@ const OrgCertify = Form.create()(React.createClass({
                         </Select>
                         )}
                 </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="认证步骤"
-                >
-                    {getFieldDecorator('process', {
-                        initialValue: this.state.process
-                    })(
-                        <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 }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                     <Button className="set-submit" type="ghost" onClick={this.handleCancel} >取消</Button>
@@ -451,4 +434,22 @@ const OrgCertify = Form.create()(React.createClass({
     }
 }));
 
-export default OrgCertify;
+export default OrgCertify;
+
+                // <FormItem
+                //     {...formItemLayout}
+                //     label="认证步骤"
+                // >
+                //     {getFieldDecorator('process', {
+                //         initialValue: this.state.process
+                //     })(
+                //         <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>

+ 20 - 19
js/component/manageCenter/userManage/userDesc.jsx

@@ -109,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: this.state.process
+                        //process: this.state.process
                     }
                 }).done(function (data) {
                     if (!data.error.length) {
@@ -298,23 +298,6 @@ const UserForm = Form.create()(React.createClass({
                         </Select>
                         )}
                 </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="认证步骤"
-                >
-                    {getFieldDecorator('process', {
-                        initialValue: this.state.process
-                    })(
-                        <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 }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                 </FormItem>
@@ -375,4 +358,22 @@ const PatentDesc = React.createClass({
     },
 });
 
-export default PatentDesc;
+export default PatentDesc;
+
+//                 <FormItem
+//                     {...formItemLayout}
+//                     label="认证步骤"
+//                 >
+//                     {getFieldDecorator('process', {
+//                         initialValue: this.state.process
+//                     })(
+//                         <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>

+ 40 - 0
js/component/tools.js

@@ -72,6 +72,46 @@ module.exports = {
         changeProvince();
         cmbProvince.onchange = changeProvince;
     },
+    provinceSelect() {
+        let option = [];
+        provinceList.map(function (item, i) {
+            if ( item.cityList.length ) {
+                let cityArr = [];
+                item.cityList.map(function(city,n){
+                    if ( city.areaList.length ) {
+                        let areaArr = [];
+                        city.areaList.map(function(area,j){
+                            areaArr.push({
+                                value:area,
+                                label:area
+                            });
+                        });
+                        cityArr.push({
+                            value:city.name,
+                            label:city.name,
+                            children:areaArr
+                        });
+                    } else {
+                        cityArr.push({
+                            value:city.name,
+                            label:city.name
+                        });
+                    };
+                });
+                option.push({
+                    value:item.name,
+                    label:item.name,
+                    children:cityArr
+                });
+            } else {
+                option.push({
+                    value:item.name,
+                    label:item.name
+                });
+            };
+        });
+        return option;
+    },
     splitUrl: function (string, i, url) {
         let theList = [];
         let theArr = [];