Browse Source

v1.0.22 update

yee 8 years ago
parent
commit
55b5c8e2ff
26 changed files with 353 additions and 791 deletions
  1. 15 2
      js/component/account/services/activity.jsx
  2. 8 8
      js/component/groupCertify/personal.jsx
  3. 36 67
      js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx
  4. 127 5
      js/component/manageCenter/servicesManage/copyright/copyright.jsx
  5. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  6. 17 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  7. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  8. 0 22
      js/component/manageCenter/servicesManage/highTech/fosterDesc/companyDetail.jsx
  9. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx
  10. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx
  11. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  12. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/innovationAbility.jsx
  13. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx
  14. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx
  15. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  16. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx
  17. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  18. 36 36
      js/component/manageCenter/servicesManage/highTech/highTechApply.jsx
  19. 48 38
      js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx
  20. 6 3
      js/component/manageCenter/servicesManage/patent/comprehensive.jsx
  21. 3 2
      js/component/manageCenter/servicesManage/patent/comprehensive.less
  22. 42 41
      js/component/manageCenter/servicesManage/technology/applyChange.jsx
  23. 0 529
      js/component/manageCenter/userManage/orgCertify.jsx
  24. 1 21
      js/component/manageCenter/userManage/orgDesc.jsx
  25. 2 1
      js/component/tools.js
  26. 1 1
      package.json

+ 15 - 2
js/component/account/services/activity.jsx

@@ -12,6 +12,7 @@ import $ from 'jquery/src/ajax';
 const ActivityForm = Form.create()(React.createClass({
     getInitialState() {
         return {
+            loading: false,
             targetKeys: [],
             selectedKeys: []
         };
@@ -84,13 +85,25 @@ const ActivityForm = Form.create()(React.createClass({
         });
     },
     componentWillMount() {
-        this.loadData();
+        if (this.props.data.id) {
+            this.loadData();
+        } else {
+            this.state.data = {};
+            this.state.targetKeys = [];
+            this.state.techField = undefined;
+        };
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.state.mockData = nextProps.data.mockData;
-            this.loadData(nextProps.data.id);
             this.props.form.resetFields();
+            if (nextProps.data.id) {
+                this.loadData(nextProps.data.id);
+            } else {
+                this.state.data = {};
+                this.state.targetKeys = [];
+                this.state.techField = undefined;
+            };
         };
     },
     intellectualChange(nextTargetKeys, direction, moveKeys) {

+ 8 - 8
js/component/groupCertify/personal.jsx

@@ -58,8 +58,8 @@ const Content = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        contacts: data.data.contacts,
-                        contactMobile: data.data.contactMobile,
+                        firstContacts: data.data.firstContacts,
+                        firstMobile: data.data.firstMobile,
                         aftUsername: data.data.aftUsername,
                         unitName: data.data.unitName,
                         registeredCapital: data.data.registeredCapital,
@@ -126,8 +126,8 @@ const Content = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/orgNextPro",
                     data: {
-                        contacts: values.contacts,
-                        contactMobile: values.contactMobile,
+                        firstContacts: values.firstContacts,
+                        firstMobile: values.firstMobile,
                         aftUsername: values.aftUsername,
                         unitName: values.unitName,
                         registeredCapital: values.registeredCapital,
@@ -301,8 +301,8 @@ const Content = Form.create()(React.createClass({
                         {...formItemLayout}
                         label="联系人"
                     >
-                        {getFieldDecorator('contacts', {
-                            initialValue: this.state.contacts || null,
+                        {getFieldDecorator('firstContacts', {
+                            initialValue: this.state.firstContacts || null,
                             rules: [{ required: true, message: '请输入联系人姓名!' }]
                         })(
                             <Input />
@@ -313,8 +313,8 @@ const Content = Form.create()(React.createClass({
                         label="联系方式"
                         extra={<span><Icon type="exclamation-circle" /> 请填写联系人手机号码,我们会将重要进度以短信形式通知您</span>}
                     >
-                        {getFieldDecorator('contactMobile', {
-                            initialValue: this.state.contactMobile || null,
+                        {getFieldDecorator('firstMobile', {
+                            initialValue: this.state.firstMobile || null,
                             rules: [{ validator: this.checkPhone }]
                         })(
                             <Input placeholder="建议使用常用手机" />

+ 36 - 67
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -40,37 +40,6 @@ const CopyrightDescForm = Form.create()(React.createClass({
     },
     componentWillMount() {
         this.loadData();
-        this.getOptionList();
-    },
-    getOptionList() {
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/copyright/status",
-            success: function (data) {
-                let _me = this;
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                        return;
-                    };
-                };
-                _me.state.stateOption = [];
-                for (var item in data.data) {
-                    _me.state.stateOption.push(
-                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
-                    )
-                };
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
     },
     loadData(uid, id) {
         this.setState({
@@ -266,6 +235,41 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     pagination={false}
                     dataSource={this.state.stateTable}
                     columns={this.state.stateColumns} />
+                <div className="clearfix">
+                    <FormItem className="third-item"
+                        {...formItemLayout}
+                        label="状态流转"
+                    >
+                        {getFieldDecorator('status')(
+                            <Select placeholder="选择一个状态">{this.props.statusOption}</Select>
+                        )}
+                    </FormItem>
+                    <FormItem className="third-item"
+                        labelCol={{ span: 6 }}
+                        wrapperCol={{ span: 12 }}
+                        label="处理时间"
+                    >
+                        {getFieldDecorator('recordTime')(
+                            <DatePicker />
+                        )}
+                    </FormItem>
+                    <FormItem className="third-item"
+                        {...formItemLayout}
+                        label="负责人"
+                    >
+                        {getFieldDecorator('principal')(
+                            <Select placeholder="选择负责人">{this.props.authorOption}</Select>
+                        )}
+                    </FormItem>
+                </div>
+                <FormItem
+                    labelCol={{ span: 2 }}
+                    wrapperCol={{ span: 12 }}
+                    label="备注">
+                    {getFieldDecorator('comment')(
+                        <Input />
+                    )}
+                </FormItem>
                 <Row className="express-desc-row">
                     <Col span={4}>编号</Col>
                     <Col span={8}>{theData.serialNumber}</Col>
@@ -392,42 +396,6 @@ const CopyrightDescForm = Form.create()(React.createClass({
                     </Upload>
                     <p style={{ margin: '10px 0' }}>{theData.certificateUrl ? <a onClick={copyrightDownloadFile.bind(null, theData.id, 'copyright_auth', '/api/admin/copyright/download')}>软著证书</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
-                <div className="clearfix">
-                    <FormItem className="third-item"
-                        {...formItemLayout}
-                        label="状态流转"
-                    >
-                        {getFieldDecorator('status')(
-                            <Select placeholder="选择一个状态">{this.state.stateOption}</Select>
-                        )}
-                    </FormItem>
-                    <FormItem className="third-item"
-                        labelCol={{ span: 6 }}
-                        wrapperCol={{ span: 12 }}
-                        label="处理时间"
-                    >
-                        {getFieldDecorator('recordTime')(
-                            <DatePicker />
-                        )}
-                    </FormItem>
-                    <FormItem className="third-item"
-                        {...formItemLayout}
-                        label="负责人"
-                    >
-                        {getFieldDecorator('principal')(
-                            <Select placeholder="选择负责人">{this.props.authorOption}</Select>
-                        )}
-                    </FormItem>
-                </div>
-                <FormItem
-                    labelCol={{ span: 2 }}
-                    wrapperCol={{ span: 12 }}
-                    label="备注"
-                >
-                    {getFieldDecorator('comment')(
-                        <Input />
-                    )}
-                </FormItem>
                 <FormItem style={{ marginTop: '20px' }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                     <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
@@ -481,6 +449,7 @@ const CopyrightDesc = React.createClass({
                         <CopyrightDescForm
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
+                            statusOption={this.props.statusOption}
                             data={this.props.data}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}

+ 127 - 5
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon, Button, Input, Select, Spin, Table, DatePicker, message, Cascader, Switch } from 'antd';
+import { Icon, Button, Input, Select, Spin, Table, DatePicker, message, Cascader, Switch, Modal } from 'antd';
 import { provinceArr, copyrightStateList } from '../../../dataDic.js';
 import { getTime, companySearch, getCopyrightState, getInUrgentTime, getSearchUrl } from '../../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -27,7 +27,7 @@ const copyright = React.createClass({
                 province: this.state.province,
                 uid: this.state.unitName,
                 copyrightName: this.state.copyrightName,
-                status: this.state.status,
+                status: this.state.searchStatus,
                 createTime: this.state.createTime,
                 acceptTime: this.state.acceptTime,
                 authTime: this.state.authTime
@@ -136,6 +136,36 @@ const copyright = React.createClass({
             });
         }.bind(this));
     },
+    getStateList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/copyright/status",
+            success: function (data) {
+                let _me = this;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
+                };
+                _me.state.statusOption = [];
+                for (var item in data.data) {
+                    _me.state.statusOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     getInitialState() {
         return {
             visible: false,
@@ -268,6 +298,7 @@ const copyright = React.createClass({
         this.loadData();
         this.getAuthorList();
         this.getCompanyList();
+        this.getStateList();
         if (window.location.search) {
             let theArr = getSearchUrl(window.location.search);
             let theObj = {};
@@ -345,12 +376,61 @@ const copyright = React.createClass({
         this.state.province = undefined;
         this.state.unitName = undefined;
         this.state.copyrightName = undefined;
-        this.state.status = undefined;
+        this.state.searchStatus = undefined;
         this.state.createTime = [];
         this.state.acceptTime = [];
         this.state.authTime = [];
         this.loadData();
     },
+    circulation() {
+        let deletedIds = [];
+        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
+            let rowItem = this.state.selectedRows[idx];
+            if (rowItem.id) {
+                deletedIds.push(rowItem.id)
+            }
+        }
+        this.setState({
+            selectedRowKeys: [],
+            loading: deletedIds.length > 0
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/copyright/circulation",
+            data: {
+                ids: deletedIds,
+                principal: this.state.principal,
+                status: this.state.status,
+                comment: this.state.comment,
+                recordTimeFormattedDate: this.state.recordTime
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('保存成功!');
+                this.setState({
+                    loading: false,
+                    visible: false
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    showModal() {
+        this.setState({
+            visible: true,
+            principal: undefined,
+            status: undefined,
+            comment: undefined,
+            recordTime: undefined
+        });
+    },
+    handleCancel() {
+        this.setState({ visible: false });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -395,8 +475,8 @@ const copyright = React.createClass({
                             value={this.state.copyrightName}
                             onChange={(e) => { this.setState({ copyrightName: e.target.value }); }} />
                         <Select style={{ width: 120 }}
-                            value={this.state.status}
-                            onChange={(e) => { this.setState({ status: e }) }}
+                            value={this.state.searchStatus}
+                            onChange={(e) => { this.setState({ searchStatus: e }) }}
                             placeholder="选择一个状态">{this.state.stateOption}</Select>
                         <span>更多搜索  <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                         <Button type="primary" onClick={this.search}>搜索</Button>
@@ -404,6 +484,8 @@ const copyright = React.createClass({
                         <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
                             disabled={!hasSelected}
                             onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                        <Button disabled={!hasSelected} style={{ marginTop: '10px' }}
+                            type="ghost" onClick={this.showModal}>软著批量流转<Icon type="retweet" /></Button>
                         <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                             <span>派单时间:</span>
                             <RangePicker style={{ width: '240px' }}
@@ -437,8 +519,48 @@ const copyright = React.createClass({
                     <PatentChange
                         data={this.state.RowData}
                         authorOption={this.state.authorOption}
+                        statusOption={this.state.statusOption}
                         showDesc={this.state.showDesc}
                         closeDesc={this.closeDesc} />
+                    <Modal title="软著批量流转" visible={this.state.visible}
+                        onCancel={this.handleCancel}
+                        width='800px'
+                        footer={[
+                            <Button key="submit" type="primary" size="large" onClick={this.circulation}>保存</Button>,
+                            <Button key="back" type="ghost" size="large" onClick={this.handleCancel}>取消</Button>,
+                        ]} className="patent-desc-content">
+                        <div className="clearfix">
+                            <div className="widthThird">
+                                <span>状态流转:</span>
+                                <Select placeholder='请选择状态'
+                                    value={this.state.status}
+                                    style={{ width: 150 }}
+                                    onChange={(e) => { this.setState({ status: e }); }}>
+                                    {this.state.statusOption}
+                                </Select>
+                            </div>
+                            <p className="widthThird">
+                                <span>处理时间:</span>
+                                <DatePicker
+                                    value={this.state.recordTime ? moment(this.state.recordTime) : undefined}
+                                    format="YYYY-MM-DD HH:mm:ss"
+                                    onChange={(data, dataString) => { this.setState({ recordTime: dataString }); }} />
+                            </p>
+                            <div className="widthThird">
+                                <span>负责人:</span>
+                                <Select placeholder='请填写负责人'
+                                    value={this.state.principal}
+                                    style={{ width: 150 }}
+                                    onChange={(e) => { this.setState({ principal: e }); }}>
+                                    {this.state.authorOption}
+                                </Select>
+                            </div>
+                        </div>
+                        <div>
+                            <span>备注:</span>
+                            <Input value={this.state.comment} placeholder='请填写备注' style={{ width: 400 }} onChange={(e) => { this.setState({ comment: e.target.value }); }} />
+                        </div>
+                    </Modal>
                 </div >
             </div>
         );

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

@@ -441,7 +441,7 @@ const Achievement = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.achievement = 1 : this.state.proportion.achievement = 0;
-                            saveProportion(this.state.proportion.id, 'achievement', this.state.proportion.achievement);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'achievement', this.state.proportion.achievement);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -10,6 +10,7 @@ import $ from 'jquery/src/ajax';
 const ActivityForm = Form.create()(React.createClass({
     getInitialState() {
         return {
+            loading: false,
             targetKeys: [],
             selectedKeys: []
         };
@@ -81,13 +82,25 @@ const ActivityForm = Form.create()(React.createClass({
         });
     },
     componentWillMount() {
-        this.loadData();
+        if (this.props.data.id) {
+            this.loadData();
+        } else {
+            this.state.data = {};
+            this.state.targetKeys = [];
+            this.state.techField = undefined;
+        };
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.state.mockData = nextProps.data.mockData;
-            this.loadData(nextProps.data.id);
             this.props.form.resetFields();
+            if (nextProps.data.id) {
+                this.loadData(nextProps.data.id);
+            } else {
+                this.state.data = {};
+                this.state.targetKeys = [];
+                this.state.techField = undefined;
+            };
         };
     },
     intellectualChange(nextTargetKeys, direction, moveKeys) {
@@ -441,7 +454,7 @@ const Activity = React.createClass({
                     technicalField3: thisdata.technicalField3,
                     technicalSource: thisdata.technicalSource ? String(thisdata.technicalSource) : undefined,
                     intellectualPropertyNumber: thisdata.intellectualPropertyNumber ? thisdata.intellectualPropertyNumber.split(",") : [],
-                    intellectualPropertyNumberText:thisdata.intellectualPropertyNumber,
+                    intellectualPropertyNumberText: thisdata.intellectualPropertyNumber,
                     budget: thisdata.budget,
                     firstYearExpenditure: thisdata.firstYearExpenditure,
                     secondYearExpenditure: thisdata.secondYearExpenditure,
@@ -614,7 +627,7 @@ const Activity = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.activity = 1 : this.state.proportion.activity = 0;
-                            saveProportion(this.state.proportion.id, 'activity', this.state.proportion.activity);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'activity', this.state.proportion.activity);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -624,7 +624,7 @@ const Activity = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.activityCost = 1 : this.state.proportion.activityCost = 0;
-                            saveProportion(this.state.proportion.id, 'activityCost', this.state.proportion.activityCost);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'activityCost', this.state.proportion.activityCost);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -563,28 +563,6 @@ const CompanyDetail = Form.create()(React.createClass({
                         <p className="content-title">联系人信息</p>
                         <FormItem className="half-item"
                             {...formItemLayout}
-                            label="姓名"
-                        >
-                            {getFieldDecorator('contacts', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.contacts
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="手机"
-                        >
-                            {getFieldDecorator('contactMobile', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.contactMobile
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
                             label="电话"
                         >
                             {getFieldDecorator('contactsFixedTel', {

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

@@ -569,7 +569,7 @@ const Finance = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.finance = 1 : this.state.proportion.finance = 0;
-                            saveProportion(this.state.proportion.id, 'finance', this.state.proportion.finance);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'finance', this.state.proportion.finance);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -371,7 +371,7 @@ const HonorList = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.honorDatum = 1 : this.state.proportion.honorDatum = 0;
-                            saveProportion(this.state.proportion.id, 'honorDatum', this.state.proportion.honorDatum);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'honorDatum', this.state.proportion.honorDatum);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -779,7 +779,7 @@ const HrSituation = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.humanResource = 1 : this.state.proportion.humanResource = 0;
-                            saveProportion(this.state.proportion.id, 'humanResource', this.state.proportion.humanResource);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'humanResource', this.state.proportion.humanResource);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -91,7 +91,7 @@ const Base = React.createClass({
                                 unCheckedChildren={'未完成'}
                                 onChange={(e) => {
                                     e ? this.state.proportion.ability = 1 : this.state.proportion.ability = 0;
-                                    saveProportion(this.state.proportion.id, 'ability', this.state.proportion.ability);
+                                    saveProportion(this.state.proportion.id, this.props.data.uid, 'ability', this.state.proportion.ability);
                                     this.setState({ proportion: this.state.proportion });
                                 }} />
                         </p>

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

@@ -194,7 +194,7 @@ const Intellectual = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.intellectualProperty = 1 : this.state.proportion.intellectualProperty = 0;
-                            saveProportion(this.state.proportion.id, 'intellectualProperty', this.state.proportion.intellectualProperty);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'intellectualProperty', this.state.proportion.intellectualProperty);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -439,7 +439,7 @@ const CenterList = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.institution = 1 : this.state.proportion.institution = 0;
-                            saveProportion(this.state.proportion.id, 'institution', this.state.proportion.institution);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'institution', this.state.proportion.institution);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -510,7 +510,7 @@ const Ratepay = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.ratepay = 1 : this.state.proportion.ratepay = 0;
-                            saveProportion(this.state.proportion.id, 'ratepay', this.state.proportion.ratepay);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'ratepay', this.state.proportion.ratepay);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -363,7 +363,7 @@ const Standard = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.standard = 1 : this.state.proportion.standard = 0;
-                            saveProportion(this.state.proportion.id, 'standard', this.state.proportion.standard);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'standard', this.state.proportion.standard);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -544,7 +544,7 @@ const TechProduct = React.createClass({
                         unCheckedChildren={'未完成'}
                         onChange={(e) => {
                             e ? this.state.proportion.techProject = 1 : this.state.proportion.techProject = 0;
-                            saveProportion(this.state.proportion.id, 'techProject', this.state.proportion.techProject);
+                            saveProportion(this.state.proportion.id, this.props.data.uid, 'techProject', this.state.proportion.techProject);
                             this.setState({ proportion: this.state.proportion });
                         }} />
                 </div>

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

@@ -251,6 +251,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                         state: values.state,
                         principal: values.principal,
                         comment: values.comment,
+                        year: this.state.data.year
                     }
                 }).done(function (data) {
                     if (!data.error.length) {
@@ -313,6 +314,41 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                             dataSource={this.state.stateTable}
                             columns={this.state.stateColumns} />
                         <div className="clearfix">
+                            <FormItem className="third-item"
+                                {...formItemLayout}
+                                label="状态流转"
+                            >
+                                {getFieldDecorator('state')(
+                                    <Select placeholder="选择一个状态">{this.state.stateOption}</Select>
+                                )}
+                            </FormItem>
+                            <FormItem className="third-item"
+                                labelCol={{ span: 6 }}
+                                wrapperCol={{ span: 12 }}
+                                label="处理时间"
+                            >
+                                {getFieldDecorator('recordTime')(
+                                    <DatePicker />
+                                )}
+                            </FormItem>
+                            <FormItem className="third-item"
+                                {...formItemLayout}
+                                label="负责人"
+                            >
+                                {getFieldDecorator('principal')(
+                                    <Select placeholder="选择负责人">{this.props.authorOption}</Select>
+                                )}
+                            </FormItem>
+                        </div>
+                        <FormItem
+                            labelCol={{ span: 2 }}
+                            wrapperCol={{ span: 12 }}
+                            label="备注">
+                            {getFieldDecorator('comment')(
+                                <Input />
+                            )}
+                        </FormItem>
+                        <div className="clearfix">
                             <FormItem className="half-item"
                                 labelCol={{ span: 3 }}
                                 wrapperCol={{ span: 14 }}
@@ -456,42 +492,6 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                                 </Radio.Group>
                                 )}
                         </FormItem>
-                        <div className="clearfix">
-                            <FormItem className="third-item"
-                                {...formItemLayout}
-                                label="状态流转"
-                            >
-                                {getFieldDecorator('state')(
-                                    <Select placeholder="选择一个状态">{this.state.stateOption}</Select>
-                                )}
-                            </FormItem>
-                            <FormItem className="third-item"
-                                labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 12 }}
-                                label="处理时间"
-                            >
-                                {getFieldDecorator('recordTime')(
-                                    <DatePicker />
-                                )}
-                            </FormItem>
-                            <FormItem className="third-item"
-                                {...formItemLayout}
-                                label="负责人"
-                            >
-                                {getFieldDecorator('principal')(
-                                    <Select placeholder="选择负责人">{this.props.authorOption}</Select>
-                                )}
-                            </FormItem>
-                        </div>
-                        <FormItem
-                            labelCol={{ span: 2 }}
-                            wrapperCol={{ span: 12 }}
-                            label="备注"
-                        >
-                            {getFieldDecorator('comment')(
-                                <Input />
-                            )}
-                        </FormItem>
                         <FormItem style={{ marginTop: '20px' }}>
                             <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                             <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>

+ 48 - 38
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -4,7 +4,7 @@ import './comprehensive.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import moment from 'moment';
 import $ from 'jquery/src/ajax';
-import { patentTypeList, patentFieldList, patentStateList } from '../../../dataDic.js';
+import { patentTypeList, patentStateList, industryList } from '../../../dataDic.js';
 import { getBase64, beforeUpload, getPatentState, getTime, newDownloadFile } from '../../../tools.js';
 
 class Avatar extends React.Component {
@@ -53,6 +53,7 @@ const PatentDesc = React.createClass({
             loading: false,
             patentTypeOption: [],
             patentFieldOption: [],
+            industryOption: [],
             stateTable: [],
             stateColumns: [{
                 title: '申请状态',
@@ -167,14 +168,14 @@ const PatentDesc = React.createClass({
     getOption() {
         let _me = this;
         _me.state.patentTypeOption = [];
-        _me.state.patentFieldOption = [];
+        _me.state.industryOption = [];
         patentTypeList.map(function (item) {
             _me.state.patentTypeOption.push(
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
         });
-        patentFieldList.map(function (item) {
-            _me.state.patentFieldOption.push(
+        industryList.map(function (item) {
+            _me.state.industryOption.push(
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
         });
@@ -305,6 +306,37 @@ const PatentDesc = React.createClass({
                                 pagination={false}
                                 dataSource={this.state.stateTable}
                                 columns={this.state.stateColumns} />
+                            <div className="clearfix">
+                                <div className="widthThird">
+                                    <span>状态流转:</span>
+                                    <Select placeholder='请选择状态'
+                                        value={this.state.patentStateAdd}
+                                        style={{ width: 150 }}
+                                        onChange={(e) => { this.setState({ patentStateAdd: e }); }}>
+                                        {this.props.patentStateOption}
+                                    </Select>
+                                </div>
+                                <p className="widthThird">
+                                    <span>处理时间:</span>
+                                    <DatePicker
+                                        value={this.state.recordTime ? moment(this.state.recordTime) : undefined}
+                                        format="YYYY-MM-DD HH:mm:ss"
+                                        onChange={(data, dataString) => { this.setState({ recordTime: dataString }); }} />
+                                </p>
+                                <div className="widthThird">
+                                    <span>负责人:</span>
+                                    <Select placeholder='请填写负责人'
+                                        value={this.state.adminName}
+                                        style={{ width: 150 }}
+                                        onChange={(e) => { this.setState({ adminName: e }); }}>
+                                        {this.props.adminOption}
+                                    </Select>
+                                </div>
+                            </div>
+                            <div>
+                                <span>备注:</span>
+                                <Input value={this.state.comment} placeholder='请填写备注' style={{ width: 400 }} onChange={(e) => { this.setState({ comment: e.target.value }); }} />
+                            </div>
                             <div>
                                 <p className="widthHalf"><span>事务所:</span><Input value={this.state.office} onChange={(e) => { this.setState({ office: e.target.value }); }} /></p>
                             </div>
@@ -315,13 +347,22 @@ const PatentDesc = React.createClass({
                             <div>
                                 <p className="widthHalf"><span>专利名称:</span><Input value={this.state.patentName} onChange={(e) => { this.setState({ patentName: e.target.value }); }} /></p>
                                 <div className="widthHalf"><span>专利类型:</span>
-                                    <Select value={this.state.patentCatagory} style={{ width: 200 }} onChange={(e) => { this.setState({ patentCatagory: e }); }}>{this.state.patentTypeOption}</Select>
+                                    <Select value={this.state.patentCatagory}
+                                        style={{ width: 260 }}
+                                        onChange={(e) => { this.setState({ patentCatagory: e }); }}>
+                                        {this.state.patentTypeOption}
+                                    </Select>
                                 </div>
                             </div>
                             <div>
                                 <p className="widthHalf"><span>专利状态:</span>{getPatentState(theData.patentState)}</p>
-                                <div className="widthHalf"><span>专利领域:</span>
-                                    <Select value={this.state.patentField} style={{ width: 200 }} onChange={(e) => { this.setState({ patentField: e }); }}>{this.state.patentFieldOption}</Select>
+                                <div className="widthHalf"><span>所属行业:</span>
+                                    <Select
+                                        value={this.state.patentField}
+                                        style={{ width: 260 }}
+                                        onChange={(e) => { this.setState({ patentField: e }); }}>
+                                        {this.state.industryOption}
+                                    </Select>
                                 </div>
                             </div>
                             <div>
@@ -389,37 +430,6 @@ const PatentDesc = React.createClass({
                                 <Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid} id={theData.id} />
                             </div>
                             <div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
-                            <div className="clearfix">
-                                <div className="widthThird">
-                                    <span>状态流转:</span>
-                                    <Select placeholder='请选择状态'
-                                        value={this.state.patentStateAdd}
-                                        style={{ width: 150 }}
-                                        onChange={(e) => { this.setState({ patentStateAdd: e }); }}>
-                                        {this.props.patentStateOption}
-                                    </Select>
-                                </div>
-                                <p className="widthThird">
-                                    <span>处理时间:</span>
-                                    <DatePicker
-                                        value={this.state.recordTime ? moment(this.state.recordTime) : undefined}
-                                        format="YYYY-MM-DD HH:mm:ss"
-                                        onChange={(data, dataString) => { this.setState({ recordTime: dataString }); }} />
-                                </p>
-                                <div className="widthThird">
-                                    <span>负责人:</span>
-                                    <Select placeholder='请填写负责人'
-                                        value={this.state.adminName}
-                                        style={{ width: 150 }}
-                                        onChange={(e) => { this.setState({ adminName: e }); }}>
-                                        {this.props.adminOption}
-                                    </Select>
-                                </div>
-                            </div>
-                            <div>
-                                <span>备注:</span>
-                                <Input value={this.state.comment} placeholder='请填写备注' style={{ width: 400 }} onChange={(e) => { this.setState({ comment: e.target.value }); }} />
-                            </div>
                         </Modal>
                     </Spin>
                 </div>

+ 6 - 3
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -482,13 +482,16 @@ const Patent = React.createClass({
                     <Input value={this.state.searchValue} style={{ width: 160 }} onChange={this.searchSelect} />
                     <Select placeholder="专利状态" value={this.state.patentState} style={{ width: 160 }} onChange={(e) => { this.setState({ patentState: e }); }}>{this.state.patentStateOption}</Select>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button style={{ marginLeft: '20px' }}
+                        type="primary"
+                        onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button type="ghost" onClick={this.exportComposite}>导出</Button>
                     <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
                         disabled={!hasSelected}
                         onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    <Button type="ghost" onClick={this.showModal}>专利批量流转<Icon type="retweet" /></Button>
+                    <Button disabled={!hasSelected} style={{ marginTop: '10px' }}
+                        type="ghost" onClick={this.showModal}>专利批量流转<Icon type="retweet" /></Button>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <div>
                             <span>派单日:</span>
@@ -506,7 +509,7 @@ const Patent = React.createClass({
                             <Select placeholder="选择省份"
                                 showSearch
                                 filterOption={companySearch}
-                                style={{ width: 200 }}
+                                style={{ width: 100 }}
                                 onChange={(e) => { this.state.province = e }}>
                                 {this.state.provinceOption}
                             </Select>

+ 3 - 2
js/component/manageCenter/servicesManage/patent/comprehensive.less

@@ -39,7 +39,7 @@
             margin-right: 20px;
         }
         button {
-            margin-left: 20px;
+            margin-right: 20px;
         }
         >span {
             margin-left: 20px;
@@ -49,12 +49,13 @@
         }
         .search-more {
             >div {
-                margin-top: 10px;
                 >span {
                     margin-right: 10px;
+                    margin-top: 10px;
                 }
                 >div {
                     margin-right: 20px;
+                    margin-top: 10px;
                 }
             }
         }

+ 42 - 41
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -315,11 +315,48 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                             </FormItem>
                         </div>
                     </div>
-                    <div className="item-title">状态流转记录: </div>
-                    <Table style={{ background: "#eee" }}
-                        pagination={false}
-                        dataSource={this.state.stateTable}
-                        columns={this.state.stateColumns} />
+                    <div>
+                        <div className="item-title">状态流转记录: </div>
+                        <Table style={{ background: "#eee",margin:"10px 0" }}
+                            pagination={false}
+                            dataSource={this.state.stateTable}
+                            columns={this.state.stateColumns} />
+                        <div className="clearfix">
+                            <FormItem className="third-item"
+                                {...formItemLayout}
+                                label="状态流转"
+                            >
+                                {getFieldDecorator('state')(
+                                    <Select placeholder="选择一个状态">{this.state.stateOption}</Select>
+                                )}
+                            </FormItem>
+                            <FormItem className="third-item"
+                                labelCol={{ span: 6 }}
+                                wrapperCol={{ span: 12 }}
+                                label="处理时间"
+                            >
+                                {getFieldDecorator('recordTime')(
+                                    <DatePicker />
+                                )}
+                            </FormItem>
+                            <FormItem className="third-item"
+                                {...formItemLayout}
+                                label="负责人"
+                            >
+                                {getFieldDecorator('principal')(
+                                    <Select placeholder="选择负责人">{this.props.authorOption}</Select>
+                                )}
+                            </FormItem>
+                        </div>
+                        <FormItem
+                            labelCol={{ span: 2 }}
+                            wrapperCol={{ span: 12 }}
+                            label="备注">
+                            {getFieldDecorator('comment')(
+                                <Input />
+                            )}
+                        </FormItem>
+                    </div>
                     <div className="clearfix">
                         <FormItem className="third-item"
                             {...formItemLayout}
@@ -437,42 +474,6 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         </Upload>
                         <p style={{ marginTop: '10px' }}>{theData.approvalUrl ? <a onClick={techDownloadFile.bind(null, "/api/admin/techproject/download", this.state.data.id)}>项目材料</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                     </div>
-                    <div className="clearfix">
-                        <FormItem className="third-item"
-                            {...formItemLayout}
-                            label="状态流转"
-                        >
-                            {getFieldDecorator('state')(
-                                <Select placeholder="选择一个状态">{this.state.stateOption}</Select>
-                            )}
-                        </FormItem>
-                        <FormItem className="third-item"
-                            labelCol={{ span: 6 }}
-                            wrapperCol={{ span: 12 }}
-                            label="处理时间"
-                        >
-                            {getFieldDecorator('recordTime')(
-                                <DatePicker />
-                            )}
-                        </FormItem>
-                        <FormItem className="third-item"
-                            {...formItemLayout}
-                            label="负责人"
-                        >
-                            {getFieldDecorator('principal')(
-                                <Select placeholder="选择负责人">{this.props.authorOption}</Select>
-                            )}
-                        </FormItem>
-                    </div>
-                    <FormItem
-                        labelCol={{ span: 2 }}
-                        wrapperCol={{ span: 12 }}
-                        label="备注"
-                    >
-                        {getFieldDecorator('comment')(
-                            <Input />
-                        )}
-                    </FormItem>
                     <FormItem style={{ marginTop: '20px' }}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>

+ 0 - 529
js/component/manageCenter/userManage/orgCertify.jsx

@@ -1,529 +0,0 @@
-import React from 'react';
-import { Icon, message, Input, Select, Button, Form, DatePicker } from 'antd';
-import './userList.less';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import moment from 'moment';
-import { eduLevelList, auditStatusList, certifyStepList } from '../../dataDic.js'
-import { addressInit } from '../../tools.js';
-
-const OrgCertify = Form.create()(React.createClass({
-    getInitialState() {
-        return {
-            visible: false,
-            loading: false,
-            eduLvlOption: [],
-            auditStatusOption: []
-        };
-    },
-    loadData(uid) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/orgDetail",
-            data: {
-                uid: uid
-            },
-            success: function (data) {
-                let thisData = data.data;
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                addressInit('licenceProvince', 'licenceCity', 'licenceArea',
-                    thisData.licenceProvince, thisData.licenceCity, thisData.licenceArea);
-                addressInit('locationProvince', 'locationCity', 'locationArea',
-                    thisData.locationProvince, thisData.locationCity, thisData.locationArea);
-                this.setState({
-                    id: thisData.id,
-                    contacts: thisData.contacts,
-                    contactMobile: thisData.contactMobile,
-                    fixedTel: thisData.fixedTel,
-                    qq: thisData.qq,
-                    postalAddress: thisData.postalAddress,
-                    postcode: thisData.postcode,
-                    aftUsername: thisData.aftUsername,
-                    unitName: thisData.unitName,
-                    identityType: thisData.identityType, //组织性质
-                    registeredCapital: thisData.registeredCapital, //注册资金
-
-                    firstContacts: thisData.firstContacts,
-                    firstMobile: thisData.firstMobile,
-                    secondContacts: thisData.secondContacts,
-                    secondMobile: thisData.secondMobile,
-                    thirdContacts: thisData.thirdContacts,
-                    thirdMobile: thisData.thirdMobile,
-
-                    legalPerson: thisData.legalPerson,
-                    legalPersonIdCard: thisData.legalPersonIdCard,
-
-                    licenceNumber: thisData.licenceNumber,
-                    licenceScanningUrl: thisData.licenceScanningUrl,
-                    orgCode: thisData.orgCode,
-                    orgCodeUrl: thisData.orgCodeUrl,
-
-                    bankAccount: thisData.bankAccount,
-                    banks: thisData.banks,
-                    bankBranch: thisData.bankBranch,
-                    bankCardNumber: thisData.bankCardNumber,
-
-                    validationAmount: thisData.validationAmount, //打款金额
-                    paymentDate: thisData.paymentDate,
-                    paymentDateFormattedDate: thisData.paymentDateFormattedDate,
-                    lastYearTaxReportUrl: thisData.lastYearTaxReportUrl,
-                    auditStatus: thisData.auditStatus,
-                    //process: thisData.process ? String(thisData.process) : undefined
-                });
-                this.props.form.resetFields();
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-    handleSubmit(e) {
-        e.preventDefault();
-        this.props.form.validateFields((err, values) => {
-            if (!err) {
-                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",
-                    crossDomain: false,
-                    url: globalConfig.context + "/api/admin/updateOrgDetail",
-                    data: {
-                        uid: this.props.uid,
-                        id: this.state.id,
-                        contacts: values.contacts,
-                        contactMobile: values.contactMobile,
-                        postalAddress: values.postalAddress,
-                        postcode: values.postcode,
-                        aftUsername: values.aftUsername,
-                        unitName: values.unitName,
-                        identityType: values.identityType, //组织性质
-                        registeredCapital: values.registeredCapital, //注册资金
-
-                        legalPerson: values.legalPerson,
-                        legalPersonIdCard: values.legalPersonIdCard,
-
-                        licenceNumber: values.licenceNumber,
-                        orgCode: values.orgCode,
-
-                        firstContacts: values.firstContacts,
-                        firstMobile: values.firstMobile,
-                        secondContacts: values.secondContacts,
-                        secondMobile: values.secondMobile,
-                        thirdContacts: values.thirdContacts,
-                        thirdMobile: values.thirdMobile,
-
-                        bankAccount: values.bankAccount,
-                        banks: values.banks,
-                        bankBranch: values.bankBranch,
-                        bankCardNumber: values.bankCardNumber,
-
-                        validationAmount: values.validationAmount, //打款金额
-                        paymentDateFormattedDate: values.paymentDateFormattedDate ? values.paymentDateFormattedDate.format("YYYY-MM-DD") : undefined,
-                        auditStatus: values.auditStatus,
-                        //process: this.state.process,
-
-                        licenceArea: licenceA,
-                        licenceCity: licenceC,
-                        licenceProvince: licenceP,
-                        locationArea: locationA,
-                        locationCity: locationC,
-                        locationProvince: locationP
-                    }
-                }).done(function (data) {
-                    if (!data.error.length) {
-                        message.success('保存成功!');
-                        this.props.handleOk();
-                    } else {
-                        message.warning(data.error[0].message);
-                    };
-                }.bind(this)).always(function () {
-                    this.setState({
-                        visible: false,
-                    });
-                }.bind(this));
-            }
-        });
-    },
-    handleCancel() {
-        this.props.closeDesc(false);
-    },
-    componentWillMount() {
-        let _me = this;
-        eduLevelList.map(function (item, i) {
-            _me.state.eduLvlOption.push(
-                <Select.Option key={item.key} value={item.value} >{item.key}</Select.Option>
-            );
-        });
-        auditStatusList.map(function (item, i) {
-            _me.state.auditStatusOption.push(
-                <Select.Option key={item.key} value={item.value} >{item.key}</Select.Option>
-            );
-        });
-    },
-    componentDidMount() {
-        addressInit('licenceProvince', 'licenceCity', 'licenceArea');
-        addressInit('locationProvince', 'locationCity', 'locationArea');
-        this.loadData(this.props.uid);
-    },
-    componentWillReceiveProps(nextProps) {
-        if (!this.props.visible && nextProps.visible) {
-            this.loadData(nextProps.uid);
-        };
-    },
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        const FormItem = Form.Item
-        const formItemLayout = {
-            labelCol: { span: 6 },
-            wrapperCol: { span: 12 },
-        };
-        return (
-            <Form horizontal onSubmit={this.handleSubmit} className="person-form">
-                <FormItem
-                    {...formItemLayout}
-                    label="公司名称"
-                >
-                    {getFieldDecorator('unitName', {
-                        initialValue: this.state.unitName
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="认证名称"
-                >
-                    {getFieldDecorator('aftUsername', {
-                        initialValue: this.state.aftUsername
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="身份类型"
-                >
-                    {getFieldDecorator('identityType', {
-                        initialValue: this.state.identityType
-                    })(
-                        <Select placeholder="身份类型" style={{ width: 200 }}
-                            onChange={(e) => { this.state.identityType = e }}>
-                            {this.state.eduLvlOption}
-                        </Select>
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="联系人"
-                >
-                    {getFieldDecorator('contacts', {
-                        initialValue: this.state.contacts
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="联系人电话"
-                >
-                    {getFieldDecorator('contactMobile', {
-                        initialValue: this.state.contactMobile
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第一联系人"
-                >
-                    {getFieldDecorator('firstContacts', {
-                        initialValue: this.state.firstContacts
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第一联系人电话"
-                >
-                    {getFieldDecorator('firstMobile', {
-                        initialValue: this.state.firstMobile
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第二联系人"
-                >
-                    {getFieldDecorator('secondContacts', {
-                        initialValue: this.state.secondContacts
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第二联系人电话"
-                >
-                    {getFieldDecorator('secondMobile', {
-                        initialValue: this.state.secondMobile
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第三联系人"
-                >
-                    {getFieldDecorator('thirdContacts', {
-                        initialValue: this.state.thirdContacts
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="第三联系人电话"
-                >
-                    {getFieldDecorator('thirdMobile', {
-                        initialValue: this.state.thirdMobile
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="法人"
-                >
-                    {getFieldDecorator('legalPerson', {
-                        initialValue: this.state.legalPerson
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="法人身份证号"
-                >
-                    {getFieldDecorator('legalPersonIdCard', {
-                        initialValue: this.state.legalPersonIdCard
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="注册资金"
-                >
-                    {getFieldDecorator('registeredCapital', {
-                        initialValue: this.state.registeredCapital
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="营业执照编号"
-                >
-                    {getFieldDecorator('licenceNumber', {
-                        initialValue: this.state.licenceNumber
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{ span: 18 }}
-                    label="营业执照所在地"
-                >
-                    {getFieldDecorator('licenceAddress')(
-                        <div>
-                            <select id="licenceProvince" name="licenceProvince"></select>
-                            <select id="licenceCity" name="licenceCity"></select>
-                            <select id="licenceArea" name="licenceArea"></select>
-                        </div>
-                    )}
-                </FormItem>
-                <FormItem
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{ span: 18 }}
-                    label="营业执照图片"
-                >
-                    <div className="idcard-img clearfix">
-                        {this.state.licenceScanningUrl ? <div>
-                            <div className="idcard-imgbox">
-                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.licenceScanningUrl} alt="点击查看大图"
-                                    onClick={(e) => { window.open(e.target.src) }} />
-                            </div>
-                        </div> : <div><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</div>}
-                    </div>
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="组织机构代码"
-                >
-                    {getFieldDecorator('orgCode', {
-                        initialValue: this.state.orgCode
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{ span: 18 }}
-                    label="组织机构代码证图片"
-                >
-                    <div className="idcard-img clearfix">
-                        {this.state.orgCodeUrl ? <div>
-                            <div className="idcard-imgbox">
-                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.orgCodeUrl} alt="点击查看大图"
-                                    onClick={(e) => { window.open(e.target.src) }} />
-                            </div>
-                        </div> : <div><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</div>}
-                    </div>
-                </FormItem>
-                <FormItem
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{ span: 18 }}
-                    label="上年度纳税报表"
-                >
-                    <div className="idcard-img clearfix">
-                        {this.state.lastYearTaxReportUrl ? <div>
-                            <div className="idcard-imgbox">
-                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.lastYearTaxReportUrl} alt="点击查看大图"
-                                    onClick={(e) => { window.open(e.target.src) }} />
-                            </div>
-                        </div> : <div><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</div>}
-                    </div>
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="开户银行"
-                >
-                    {getFieldDecorator('banks', {
-                        initialValue: this.state.banks
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="开户银行支行"
-                >
-                    {getFieldDecorator('bankBranch', {
-                        initialValue: this.state.bankBranch
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="银行卡号"
-                >
-                    {getFieldDecorator('bankCardNumber', {
-                        initialValue: this.state.bankCardNumber
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    labelCol={{ span: 6 }}
-                    wrapperCol={{ span: 18 }}
-                    label="开户行所在地"
-                >
-                    {getFieldDecorator('locationAddress')(
-                        <div>
-                            <select id="locationProvince" name="locationProvince"></select>
-                            <select id="locationCity" name="locationCity"></select>
-                            <select id="locationArea" name="locationArea"></select>
-                        </div>
-                    )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="打款金额"
-                >
-                    {getFieldDecorator('validationAmount', {
-                        initialValue: this.state.validationAmount
-                    })(
-                        <Input />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="打款日期"
-                >
-                    {getFieldDecorator('paymentDateFormattedDate', {
-                        initialValue: this.state.paymentDate ? moment(this.state.paymentDate) : null
-                    })(
-                        <DatePicker />
-                        )}
-                </FormItem>
-                <FormItem
-                    {...formItemLayout}
-                    label="认证状态"
-                >
-                    {getFieldDecorator('auditStatus', {
-                        initialValue: this.state.auditStatus
-                    })(
-                        <Select placeholder="选择认证状态" style={{ width: 200 }}
-                            onChange={(e) => { this.state.auditStatus = e }}>
-                            {this.state.auditStatusOption}
-                        </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>
-                </FormItem>
-            </Form >
-        );
-    }
-}));
-
-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>

+ 1 - 21
js/component/manageCenter/userManage/orgDesc.jsx

@@ -230,26 +230,6 @@ const OrgCertify = Form.create()(React.createClass({
                         </FormItem>
                         <FormItem
                             {...formItemLayout}
-                            label="联系人"
-                        >
-                            {getFieldDecorator('contacts', {
-                                initialValue: this.state.contacts
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="联系人电话"
-                        >
-                            {getFieldDecorator('contactMobile', {
-                                initialValue: this.state.contactMobile
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
                             label="第一联系人"
                         >
                             {getFieldDecorator('firstContacts', {
@@ -300,7 +280,7 @@ const OrgCertify = Form.create()(React.createClass({
                         </FormItem>
                         <FormItem
                             {...formItemLayout}
-                            label="联系人电话"
+                            label="第三联系人电话"
                         >
                             {getFieldDecorator('thirdMobile', {
                                 initialValue: this.state.thirdMobile

+ 2 - 1
js/component/tools.js

@@ -507,7 +507,7 @@ module.exports = {
             }
         });
     },
-    saveProportion(id,sign,status){
+    saveProportion(id,uid,sign,status){
         $.ajax({
             method: "post",
             dataType: "json",
@@ -515,6 +515,7 @@ module.exports = {
             url: globalConfig.context + '/api/admin/confirmProportion',
             data:{ 
                 "id": id,
+                "uid":uid,
                 "sign":sign,
                 "status":status
             },

+ 1 - 1
package.json

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