yee 7 years ago
parent
commit
571a791ec3
41 changed files with 660 additions and 667 deletions
  1. 7 8
      js/component/account/services/achievement.jsx
  2. 1 0
      js/component/account/services/activity.jsx
  3. 24 18
      js/component/account/services/activityCostList.jsx
  4. 39 38
      js/component/account/services/annualReport.jsx
  5. 29 28
      js/component/account/services/cognizance.jsx
  6. 8 9
      js/component/account/services/contract/contractAdd.jsx
  7. 7 8
      js/component/account/services/contract/contractDetail.jsx
  8. 8 9
      js/component/account/services/copyright/comPatentAdd.jsx
  9. 7 8
      js/component/account/services/copyright/comPatentChange.jsx
  10. 7 8
      js/component/account/services/finance.jsx
  11. 7 7
      js/component/account/services/honorList.jsx
  12. 12 17
      js/component/account/services/intellectualDesc.jsx
  13. 7 7
      js/component/account/services/orgTechCenter.jsx
  14. 7 8
      js/component/account/services/patentAdd.jsx
  15. 7 8
      js/component/account/services/ratepay.jsx
  16. 9 10
      js/component/account/services/techProduct.jsx
  17. 66 64
      js/component/account/services/technologyAdd.jsx
  18. 7 8
      js/component/account/services/technologyChange.jsx
  19. 8 9
      js/component/manageCenter/servicesManage/contract/contractAdd.jsx
  20. 8 9
      js/component/manageCenter/servicesManage/contract/contractDetail.jsx
  21. 8 9
      js/component/manageCenter/servicesManage/copyright/comPatentAdd.jsx
  22. 10 11
      js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx
  23. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  24. 1 0
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  25. 13 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  26. 39 38
      js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx
  27. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx
  28. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx
  29. 8 9
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  30. 9 14
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx
  31. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx
  32. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  33. 7 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  34. 62 62
      js/component/manageCenter/servicesManage/highTech/highTechApply.jsx
  35. 7 8
      js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx
  36. 7 8
      js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx
  37. 79 78
      js/component/manageCenter/servicesManage/technology/applyAdd.jsx
  38. 7 8
      js/component/manageCenter/servicesManage/technology/applyChange.jsx
  39. 31 30
      js/component/manageCenter/servicesManage/technology/websiteAdd.jsx
  40. 53 54
      js/component/manageCenter/servicesManage/technology/websiteChange.jsx
  41. 9 1
      js/component/manageCenter/userManage/customerList.jsx

+ 7 - 8
js/component/account/services/achievement.jsx

@@ -232,19 +232,18 @@ const AchievementDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="科技成果转化" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="科技成果转化" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <AchievementDescFrom
                         <AchievementDescFrom
                             data={this.props.data}
                             data={this.props.data}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             activityNumberList={this.props.activityNumberList}
                             activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 1 - 0
js/component/account/services/activity.jsx

@@ -97,6 +97,7 @@ const ActivityForm = Form.create()(React.createClass({
         if (!this.props.visible && nextProps.visible) {
         if (!this.props.visible && nextProps.visible) {
             this.state.mockData = nextProps.data.mockData;
             this.state.mockData = nextProps.data.mockData;
             this.props.form.resetFields();
             this.props.form.resetFields();
+            this.state.proofUrl = null;
             this.state.fileList = [];
             this.state.fileList = [];
             if (nextProps.data.id) {
             if (nextProps.data.id) {
                 this.loadData(nextProps.data.id);
                 this.loadData(nextProps.data.id);

+ 24 - 18
js/component/account/services/activityCostList.jsx

@@ -23,15 +23,16 @@ const ActivityDescFrom = Form.create()(React.createClass({
         };
         };
         this.state.yearOption = theArr;
         this.state.yearOption = theArr;
     },
     },
-    allCostCount() {
-        this.state.internalAllCost = this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
-            this.props.form.getFieldValue('internalDepreciationCost') + this.props.form.getFieldValue('internalAmortizationCost') +
-            this.props.form.getFieldValue('internalDesignCost') + this.props.form.getFieldValue('internalEquipmentCost') +
-            this.props.form.getFieldValue('internalOtherCost');
-        this.state.allCost = this.props.form.getFieldValue('internalLaborCost') + this.props.form.getFieldValue('internalDirectCost') +
-            this.props.form.getFieldValue('internalDepreciationCost') + this.props.form.getFieldValue('internalAmortizationCost') +
-            this.props.form.getFieldValue('internalDesignCost') + this.props.form.getFieldValue('internalEquipmentCost') +
-            this.props.form.getFieldValue('internalOtherCost') + this.props.form.getFieldValue('externalTotalCost');
+    allCostCount(formData) {
+        let theData = formData || this.props.form;
+        this.state.internalAllCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
+            theData.getFieldValue('internalDepreciationCost') + theData.getFieldValue('internalAmortizationCost') +
+            theData.getFieldValue('internalDesignCost') + theData.getFieldValue('internalEquipmentCost') +
+            theData.getFieldValue('internalOtherCost');
+        this.state.allCost = theData.getFieldValue('internalLaborCost') + theData.getFieldValue('internalDirectCost') +
+            theData.getFieldValue('internalDepreciationCost') + theData.getFieldValue('internalAmortizationCost') +
+            theData.getFieldValue('internalDesignCost') + theData.getFieldValue('internalEquipmentCost') +
+            theData.getFieldValue('internalOtherCost') + theData.getFieldValue('externalTotalCost');
     },
     },
     componentDidMount() {
     componentDidMount() {
         this.allCostCount();
         this.allCostCount();
@@ -52,7 +53,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
         }
         }
     },
     },
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
-        this.allCostCount();
+        this.allCostCount(nextProps.form);
         let _me = this;
         let _me = this;
         if (!this.props.visible && nextProps.visible && nextProps.activityNumberList) {
         if (!this.props.visible && nextProps.visible && nextProps.activityNumberList) {
             _me.state.activityNumberOption = [];
             _me.state.activityNumberOption = [];
@@ -64,6 +65,11 @@ const ActivityDescFrom = Form.create()(React.createClass({
             });
             });
             this.state.fileList = [];
             this.state.fileList = [];
             this.state.accountUrl = undefined;
             this.state.accountUrl = undefined;
+            this.state.internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
+                nextProps.data.internalDepreciationCost + nextProps.data.internalAmortizationCost +
+                nextProps.data.internalDesignCost + nextProps.data.internalEquipmentCost +
+                nextProps.data.internalOtherCost;
+            this.state.allCost = this.state.internalAllCost + nextProps.data.externalTotalCost;
         };
         };
     },
     },
     handleSubmit(e) {
     handleSubmit(e) {
@@ -98,6 +104,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                         accountUrl: this.state.accountUrl
                         accountUrl: this.state.accountUrl
                     }
                     }
                 }).done(function (data) {
                 }).done(function (data) {
+                    debugger
                     if (!data.error.length) {
                     if (!data.error.length) {
                         message.success('保存成功!');
                         message.success('保存成功!');
                     } else {
                     } else {
@@ -357,20 +364,19 @@ const ActivityDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业研究开发费用结构明细" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业研究开发费用结构明细" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ActivityDescFrom data={this.props.data}
                         <ActivityDescFrom data={this.props.data}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             activityNumberList={this.props.activityNumberList}
                             activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 39 - 38
js/component/account/services/annualReport.jsx

@@ -424,18 +424,17 @@ const AnnualReportDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业年报详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业年报详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <AnnualReportDescFrom
                         <AnnualReportDescFrom
                             data={this.props.data}
                             data={this.props.data}
                             detailData={this.state.detailData}
                             detailData={this.state.detailData}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },
@@ -494,7 +493,7 @@ const AnnualReportAdd = React.createClass({
         }).done(function (data) {
         }).done(function (data) {
             this.setState({
             this.setState({
                 loading: false
                 loading: false
-            }); 
+            });
             if (!data.error.length) {
             if (!data.error.length) {
                 message.success('保存成功!');
                 message.success('保存成功!');
                 this.setState({
                 this.setState({
@@ -532,37 +531,39 @@ const AnnualReportAdd = React.createClass({
                             </Button>,
                             </Button>,
                     ]}
                     ]}
                 >
                 >
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>选择申请年份: </span>
-                            <Select placeholder="请选择年份" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.year = e }}>
-                                {this.state.yearOption}
-                            </Select>
-                        </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>纳税总额:  </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
-                            <span> (万元)</span>
-                        </div>
-                        <div className="half-item">
-                            <span>高企所得税减免额:  </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
-                            <span> (万元)</span>
-                        </div>
-                        <div className="half-item">
-                            <span>出口创汇总额(人民币):  </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
-                            <span> (万元)</span>
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>选择申请年份: </span>
+                                <Select placeholder="请选择年份" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.year = e }}>
+                                    {this.state.yearOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                        <div className="half-item">
-                            <span>基础研究投入费用:  </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
-                            <span> (万元)</span>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>纳税总额:  </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
+                                <span> (万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>高企所得税减免额:  </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
+                                <span> (万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>出口创汇总额(人民币):  </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
+                                <span> (万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>基础研究投入费用:  </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
+                                <span> (万元)</span>
+                            </div>
                         </div>
                         </div>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

+ 29 - 28
js/component/account/services/cognizance.jsx

@@ -380,12 +380,11 @@ const CognizanceDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="高企管理" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="高企管理" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CognizanceDescFrom
                         <CognizanceDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             contactsOption={this.props.contactsOption}
                             contactsOption={this.props.contactsOption}
@@ -393,8 +392,8 @@ const CognizanceDesc = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }
@@ -496,28 +495,30 @@ const CognizanceAdd = React.createClass({
                             </Button>,
                             </Button>,
                     ]}
                     ]}
                 >
                 >
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>选择申请年份: </span>
-                            <Select placeholder="请选择年份" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.year = e }}>
-                                {this.state.yearOption}
-                            </Select>
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>选择申请年份: </span>
+                                <Select placeholder="请选择年份" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.year = e }}>
+                                    {this.state.yearOption}
+                                </Select>
+                            </div>
+                            <div className="half-item">
+                                <span>选择联系人: </span>
+                                <Select placeholder="请选择联系人" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.contacts = e }}>
+                                    {this.props.contactsOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                        <div className="half-item">
-                            <span>选择联系人: </span>
-                            <Select placeholder="请选择联系人" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.contacts = e }}>
-                                {this.props.contactsOption}
-                            </Select>
+                        <div>
+                            <p>备注: </p>
+                            <p>
+                                <Input type="textarea" rows={6} onChange={(e) => { this.state.comment = e.target.value; }} />
+                            </p>
                         </div>
                         </div>
-                    </div>
-                    <div>
-                        <p>备注: </p>
-                        <p>
-                            <Input type="textarea" rows={6} onChange={(e) => { this.state.comment = e.target.value; }} />
-                        </p>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

+ 8 - 9
js/component/account/services/contract/contractAdd.jsx

@@ -277,13 +277,12 @@ const ContractAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.props.onClick}>申请合同<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.props.onClick}>申请合同<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="合同详情"
-                        visible={this.state.visible}
-                        onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="合同详情"
+                    visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ContractAddFrom
                         <ContractAddFrom
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
@@ -292,8 +291,8 @@ const ContractAdd = React.createClass({
                             okClick={() => { this.props.closeAdd(false, true) }}
                             okClick={() => { this.props.closeAdd(false, true) }}
                             typeOption={this.props.typeOption}
                             typeOption={this.props.typeOption}
                             contactsOption={this.props.contactsOption} />
                             contactsOption={this.props.contactsOption} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 8
js/component/account/services/contract/contractDetail.jsx

@@ -559,12 +559,11 @@ const ContractDetail = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="合同详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="合同详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ContractDetailForm
                         <ContractDetailForm
                             visible={this.state.visible}
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
@@ -573,8 +572,8 @@ const ContractDetail = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 8 - 9
js/component/account/services/copyright/comPatentAdd.jsx

@@ -196,20 +196,19 @@ const PatentAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新软著<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新软著<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="申请新软著"
-                        visible={this.state.visible}
-                        onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="申请新软著"
+                    visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <PatentAddFrom
                         <PatentAddFrom
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             okClick={() => { this.props.closeAdd(false, true) }} />
                             okClick={() => { this.props.closeAdd(false, true) }} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 8
js/component/account/services/copyright/comPatentChange.jsx

@@ -427,12 +427,11 @@ const CopyrightDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="软著详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="软著详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CopyrightDescForm
                         <CopyrightDescForm
                             visible={this.state.visible}
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
@@ -440,8 +439,8 @@ const CopyrightDesc = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 7 - 8
js/component/account/services/finance.jsx

@@ -357,18 +357,17 @@ const FinanceDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="财务报表信息" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="财务报表信息" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <FinanceDescFrom
                         <FinanceDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 7
js/component/account/services/honorList.jsx

@@ -185,19 +185,19 @@ const HonorListDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业荣誉及其他证明材料" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer='' >
+                <Modal maskClosable={false} title="企业荣誉及其他证明材料" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <HonorListDescFrom
                         <HonorListDescFrom
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 12 - 17
js/component/account/services/intellectualDesc.jsx

@@ -9,9 +9,7 @@ import moment from 'moment';
 
 
 const IntellectualDescFrom = Form.create()(React.createClass({
 const IntellectualDescFrom = Form.create()(React.createClass({
     loadData(id, type) {
     loadData(id, type) {
-        this.setState({
-            loading: true
-        });
+        this.props.spinState(true);
         $.ajax({
         $.ajax({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
@@ -19,7 +17,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
             url: globalConfig.context + "/api/user/cognizance/intellectualDetail",
             url: globalConfig.context + "/api/user/cognizance/intellectualDetail",
             data: {
             data: {
                 id: id ? id : this.props.data.id,
                 id: id ? id : this.props.data.id,
-                type: type ? type : this.props.data.type
+                type: type != undefined && type != null ? type : this.props.data.type
             }
             }
         }).done((data) => {
         }).done((data) => {
             if (!data.data) {
             if (!data.data) {
@@ -29,9 +27,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 this.state.data = {};
                 this.state.data = {};
             } else { this.state.data = data.data };
             } else { this.state.data = data.data };
         }).always(function () {
         }).always(function () {
-            this.setState({
-                loading: false
-            });
+            this.props.spinState(false);
         }.bind(this));
         }.bind(this));
     },
     },
     getInitialState() {
     getInitialState() {
@@ -76,7 +72,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                         obtainWay: values.obtainWay,
                         obtainWay: values.obtainWay,
                         sortNumber: values.sortNumber,
                         sortNumber: values.sortNumber,
                         authorizationNumber: values.authorizationNumber,
                         authorizationNumber: values.authorizationNumber,
-                        authorizationDateFormattedDate: values.authorizationDate._i || this.state.authorizationDateFormattedDate,
+                        authorizationDateFormattedDate: values.authorizationDate ? values.authorizationDate.format('YYYY-MM-DD') : null,
                         propertyRightUrl: this.state.propertyRightUrl
                         propertyRightUrl: this.state.propertyRightUrl
                     }
                     }
                 }).done(function (data) {
                 }).done(function (data) {
@@ -198,7 +194,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 >
                 >
                     {getFieldDecorator('authorizationDate', {
                     {getFieldDecorator('authorizationDate', {
                         rules: [{ type: 'object', required: true, message: '请选择,授权日期不能为空!' }],
                         rules: [{ type: 'object', required: true, message: '请选择,授权日期不能为空!' }],
-                        initialValue: !theData.authorizationDateFormattedDate ? null : moment(theData.authorizationDateFormattedDate, 'YYYY/MM/DD')
+                        initialValue: theData.authorizationDateFormattedDate ? moment(theData.authorizationDateFormattedDate, 'YYYY/MM/DD') : null
                     })(
                     })(
                         <DatePicker style={{ width: 200 }}
                         <DatePicker style={{ width: 200 }}
                             onChange={(data, dataString) => { this.state.authorizationDateFormattedDate = dataString }} />
                             onChange={(data, dataString) => { this.state.authorizationDateFormattedDate = dataString }} />
@@ -281,20 +277,19 @@ const intellectualDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="知识产权详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='600px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="知识产权详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='600px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <IntellectualDescFrom
                         <IntellectualDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 7
js/component/account/services/orgTechCenter.jsx

@@ -182,11 +182,11 @@ const CenterListDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="产学研情况详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='840px'
-                        footer='' >
+                <Modal maskClosable={false} title="产学研情况详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='840px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CenterListDescFrom
                         <CenterListDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             data={this.props.data}
                             data={this.props.data}
@@ -194,8 +194,8 @@ const CenterListDesc = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 7 - 8
js/component/account/services/patentAdd.jsx

@@ -222,15 +222,14 @@ const PatentAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button disabled={this.props.ButtonDisabled} className="patent-addNew" type="primary" onClick={this.showModal}>申请新专利<Icon type="plus" /></Button>
                 <Button disabled={this.props.ButtonDisabled} className="patent-addNew" type="primary" onClick={this.showModal}>申请新专利<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="新专利申请" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='720px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="新专利申请" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='720px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                         <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 8
js/component/account/services/ratepay.jsx

@@ -309,18 +309,17 @@ const RatepayDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="所得税纳税申报信息" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="所得税纳税申报信息" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <RatepayDescFrom
                         <RatepayDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 9 - 10
js/component/account/services/techProduct.jsx

@@ -180,8 +180,8 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <Transfer
                 <Transfer
                     dataSource={this.props.mockData}
                     dataSource={this.props.mockData}
                     listStyle={{
                     listStyle={{
-                        width: 200,
-                        height: 200,
+                        width: 300,
+                        height: 300,
                     }}
                     }}
                     titles={['未选择', '已选择']}
                     titles={['未选择', '已选择']}
                     targetKeys={this.state.targetKeys}
                     targetKeys={this.state.targetKeys}
@@ -301,12 +301,11 @@ const TechProductDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="上年度高新技术产品(服务)情况表" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="上年度高新技术产品(服务)情况表" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer=''   >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <TechProductDescFrom
                         <TechProductDescFrom
                             data={this.props.data}
                             data={this.props.data}
                             mockData={this.props.mockData}
                             mockData={this.props.mockData}
@@ -314,8 +313,8 @@ const TechProductDesc = React.createClass({
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 66 - 64
js/component/account/services/technologyAdd.jsx

@@ -99,80 +99,82 @@ const ApplyAdd = React.createClass({
                             </Button>,
                             </Button>,
                     ]}
                     ]}
                 >
                 >
-                    <div className="clearfix" style={{ marginBottom: '10px' }}>
-                        <div className="half-item">
-                            <span className="item-title">选择联系人:  </span>
-                            <Select placeholder="请选择联系人" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.contacts = e }}>
-                                {this.props.contactsOption}
-                            </Select>
-                        </div>
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix" style={{ marginBottom: '10px' }}>
+                            <div className="half-item">
+                                <span className="item-title">选择联系人:  </span>
+                                <Select placeholder="请选择联系人" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.contacts = e }}>
+                                    {this.props.contactsOption}
+                                </Select>
+                            </div>
 
 
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">申报科技部门:  </span>
-                            <Select placeholder="请选择申报部门" style={{ width: 300 }}
-                                notFoundContent="未获取到申报部门列表"
-                                showSearch
-                                filterOption={companySearch}
-                                onSelect={(e, n) => { this.state.department = e }}>
-                                {this.props.departmentOption}
-                            </Select>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div>
-                            <span className="item-title">派单信息:  </span>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">申报科技部门:  </span>
+                                <Select placeholder="请选择申报部门" style={{ width: 300 }}
+                                    notFoundContent="未获取到申报部门列表"
+                                    showSearch
+                                    filterOption={companySearch}
+                                    onSelect={(e, n) => { this.state.department = e }}>
+                                    {this.props.departmentOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                        <Input type="textarea" rows={6} onChange={(e) => { this.state.dispatchInfo = e.target.value; }} />
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">项目名称:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
+                        <div className="clearfix">
+                            <div>
+                                <span className="item-title">派单信息:  </span>
+                            </div>
+                            <Input type="textarea" rows={6} onChange={(e) => { this.state.dispatchInfo = e.target.value; }} />
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">项目类型:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">项目名称:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">技术领域:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">项目类型:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div>
-                            <span className="item-title">项目介绍:  </span>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">技术领域:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                        <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">立项/后补助: </span>
-                            <Radio.Group onChange={this.subsidyCheck}>
-                                <Radio value={1}>立项</Radio>
-                                <Radio value={2}>后补助</Radio>
-                            </Radio.Group>
+                        <div className="clearfix">
+                            <div>
+                                <span className="item-title">项目介绍:  </span>
+                            </div>
+                            <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
                         </div>
                         </div>
-                        <div className="half-item">
-                            <span className="item-title">金额: </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }} />
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">立项/后补助: </span>
+                                <Radio.Group onChange={this.subsidyCheck}>
+                                    <Radio value={1}>立项</Radio>
+                                    <Radio value={2}>后补助</Radio>
+                                </Radio.Group>
+                            </div>
+                            <div className="half-item">
+                                <span className="item-title">金额: </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">选择负责人:  </span>
-                            <Select placeholder="请选择负责人" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.consultant = e }}>
-                                {this.props.authorOption}
-                            </Select>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">选择负责人:  </span>
+                                <Select placeholder="请选择负责人" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.consultant = e }}>
+                                    {this.props.authorOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

+ 7 - 8
js/component/account/services/technologyChange.jsx

@@ -381,12 +381,11 @@ const ApplyChange = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="编辑科技项目" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="编辑科技项目" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ApplyChangeFrom
                         <ApplyChangeFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             data={this.props.data}
                             data={this.props.data}
@@ -394,8 +393,8 @@ const ApplyChange = React.createClass({
                             departmentOption={this.props.departmentOption}
                             departmentOption={this.props.departmentOption}
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel} />
                             closeModal={this.handleCancel} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 8 - 9
js/component/manageCenter/servicesManage/contract/contractAdd.jsx

@@ -425,13 +425,12 @@ const ContractAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请合同<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请合同<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="合同详情"
-                        visible={this.state.visible}
-                        onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="合同详情"
+                    visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ContractAddFrom
                         <ContractAddFrom
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
@@ -441,8 +440,8 @@ const ContractAdd = React.createClass({
                             companyOption={this.props.companyOption}
                             companyOption={this.props.companyOption}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
                             typeOption={this.props.typeOption} />
                             typeOption={this.props.typeOption} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 8 - 9
js/component/manageCenter/servicesManage/contract/contractDetail.jsx

@@ -505,7 +505,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                         "cid": this.props.data.id,
                         "cid": this.props.data.id,
                         "comment": values.comment,
                         "comment": values.comment,
                         "status": values.status,
                         "status": values.status,
-                        "recordTimeFormattedDate":values.recordTime.format("YYYY-MM-DD HH:mm:ss"),
+                        "recordTimeFormattedDate": values.recordTime.format("YYYY-MM-DD HH:mm:ss"),
                         "principals": values.principals //流转分发人
                         "principals": values.principals //流转分发人
                     }
                     }
                 }).done(function (data) {
                 }).done(function (data) {
@@ -759,12 +759,11 @@ const ContractDetail = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="合同详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="合同详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ContractDetailForm
                         <ContractDetailForm
                             visible={this.state.visible}
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
@@ -773,8 +772,8 @@ const ContractDetail = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

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

@@ -214,13 +214,12 @@ const PatentAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新软著<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新软著<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="申请新软著"
-                        visible={this.state.visible}
-                        onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="申请新软著"
+                    visible={this.state.visible}
+                    onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <PatentAddFrom
                         <PatentAddFrom
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
@@ -228,8 +227,8 @@ const PatentAdd = React.createClass({
                             companyOption={this.props.companyOption}
                             companyOption={this.props.companyOption}
                             salesmanOption={this.props.salesmanOption}
                             salesmanOption={this.props.salesmanOption}
                             consultantOption={this.props.consultantOption} />
                             consultantOption={this.props.consultantOption} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -15,7 +15,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
             stateOption: [],
             stateOption: [],
             stateTable: [],
             stateTable: [],
             contactsOption: [],
             contactsOption: [],
-            vacations:[],
+            vacations: [],
             stateColumns: [{
             stateColumns: [{
                 title: '申请状态',
                 title: '申请状态',
                 dataIndex: 'status',
                 dataIndex: 'status',
@@ -354,9 +354,9 @@ const CopyrightDescForm = Form.create()(React.createClass({
                             {(() => {
                             {(() => {
                                 if (theData.expectTime && theData.expectTime[0]) {
                                 if (theData.expectTime && theData.expectTime[0]) {
                                     if (theData.expectTime[1]) {
                                     if (theData.expectTime[1]) {
-                                        return getTime(getInUrgentTime(moment(theData.expectTime[0]), theData.expectTime[1],this.state.vacations))
+                                        return getTime(getInUrgentTime(moment(theData.expectTime[0]), theData.expectTime[1], this.state.vacations))
                                     } else {
                                     } else {
-                                        return getTime(getInUrgentTime(moment(theData.expectTime[0]), 45,this.state.vacations))
+                                        return getTime(getInUrgentTime(moment(theData.expectTime[0]), 45, this.state.vacations))
                                     };
                                     };
                                 };
                                 };
                             })()}
                             })()}
@@ -479,12 +479,11 @@ const CopyrightDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="软著详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="软著详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CopyrightDescForm
                         <CopyrightDescForm
                             visible={this.state.visible}
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
@@ -493,8 +492,8 @@ const CopyrightDesc = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

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

@@ -247,20 +247,19 @@ const AchievementDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="科技成果转化" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="科技成果转化" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <AchievementDescFrom
                         <AchievementDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             activityNumberList={this.props.activityNumberList}
                             activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -95,6 +95,7 @@ const ActivityForm = Form.create()(React.createClass({
             this.state.mockData = nextProps.data.mockData;
             this.state.mockData = nextProps.data.mockData;
             this.props.form.resetFields();
             this.props.form.resetFields();
             this.state.fileList = [];
             this.state.fileList = [];
+            this.state.proofUrl = undefined;
             if (nextProps.data.id) {
             if (nextProps.data.id) {
                 this.loadData(nextProps.data.id);
                 this.loadData(nextProps.data.id);
             } else {
             } else {

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

@@ -41,6 +41,12 @@ const ActivityDescFrom = Form.create()(React.createClass({
             this.state.allCost = nextProps.data.allCost;
             this.state.allCost = nextProps.data.allCost;
             nextProps.form.resetFields();
             nextProps.form.resetFields();
             this.state.fileList = [];
             this.state.fileList = [];
+            this.state.accountUrl = undefined;
+            this.state.internalAllCost = nextProps.data.internalLaborCost + nextProps.data.internalDirectCost +
+                nextProps.data.internalDepreciationCost + nextProps.data.internalAmortizationCost +
+                nextProps.data.internalDesignCost + nextProps.data.internalEquipmentCost +
+                nextProps.data.internalOtherCost;
+            this.state.allCost = this.state.internalAllCost + nextProps.data.externalTotalCost
         } else {
         } else {
             this.allCostCount();
             this.allCostCount();
         };
         };
@@ -342,12 +348,11 @@ const ActivityDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业研究开发费用结构明细" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业研究开发费用结构明细" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ActivityDescFrom
                         <ActivityDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             visible={this.state.visible}
                             visible={this.state.visible}
@@ -355,8 +360,8 @@ const ActivityDesc = React.createClass({
                             data={this.props.data}
                             data={this.props.data}
                             activityNumberList={this.props.activityNumberList}
                             activityNumberList={this.props.activityNumberList}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 39 - 38
js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx

@@ -426,19 +426,18 @@ const AnnualReportDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业年报信息" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业年报信息" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <AnnualReportDescFrom
                         <AnnualReportDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
                             detailData={this.state.detailData}
                             detailData={this.state.detailData}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },
@@ -535,37 +534,39 @@ const AnnualReportAdd = React.createClass({
                             返回
                             返回
                             </Button>,
                             </Button>,
                     ]} >
                     ]} >
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>选择申请年份: </span>
-                            <Select placeholder="请选择年份" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.year = e }}>
-                                {this.state.yearOption}
-                            </Select>
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>选择申请年份: </span>
+                                <Select placeholder="请选择年份" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.year = e }}>
+                                    {this.state.yearOption}
+                                </Select>
+                            </div>
+                        </div>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>纳税总额: </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
+                                <span>(万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>高企所得税减免额: </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
+                                <span>(万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>出口创汇总额(人民币): </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
+                                <span>(万元)</span>
+                            </div>
+                            <div className="half-item">
+                                <span>基础研究投入费用: </span>
+                                <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
+                                <span>(万元)</span>
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>纳税总额: </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
-                            <span>(万元)</span>
-                        </div>
-                        <div className="half-item">
-                            <span>高企所得税减免额: </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
-                            <span>(万元)</span>
-                        </div>
-                        <div className="half-item">
-                            <span>出口创汇总额(人民币): </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
-                            <span>(万元)</span>
-                        </div>
-                        <div className="half-item">
-                            <span>基础研究投入费用: </span>
-                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
-                            <span>(万元)</span>
-                        </div>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

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

@@ -365,19 +365,18 @@ const FinanceDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="财务报表信息" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="财务报表信息" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer=''  >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <FinanceDescFrom
                         <FinanceDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -193,12 +193,11 @@ const HonorListDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业荣誉及其他证明材料" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业荣誉及其他证明材料" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <HonorListDescFrom
                         <HonorListDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
@@ -206,8 +205,8 @@ const HonorListDesc = React.createClass({
                             visible={this.state.visible}
                             visible={this.state.visible}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -521,7 +521,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                                 var newTab = window.open('about:blank'); getPreview(theData.id, 'humanResource', 'social_security', function (data) { newTab.location.href = data; });
                                 var newTab = window.open('about:blank'); getPreview(theData.id, 'humanResource', 'social_security', function (data) { newTab.location.href = data; });
                             }}><Icon style={{ fontSize: '16px' }} type="eye-o" /></a>
                             }}><Icon style={{ fontSize: '16px' }} type="eye-o" /></a>
                         </span>
                         </span>
-                         : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
+                        : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
                 </div>
                 <div>
                 <div>
                     <span style={{ color: "red" }}>提示</span>
                     <span style={{ color: "red" }}>提示</span>
@@ -572,12 +572,11 @@ const HrSituationDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="人力资源状况" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1200px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="人力资源状况" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1200px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <HrSituationDescFrom
                         <HrSituationDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
@@ -585,8 +584,8 @@ const HrSituationDesc = React.createClass({
                             visible={this.state.visible}
                             visible={this.state.visible}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 9 - 14
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx

@@ -8,9 +8,7 @@ import moment from 'moment';
 
 
 const IntellectualDescFrom = Form.create()(React.createClass({
 const IntellectualDescFrom = Form.create()(React.createClass({
     loadData(id, type) {
     loadData(id, type) {
-        this.setState({
-            loading: true
-        });
+        this.props.spinState(true);
         $.ajax({
         $.ajax({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
@@ -28,9 +26,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 this.state.data = {};
                 this.state.data = {};
             } else { this.state.data = data.data };
             } else { this.state.data = data.data };
         }).always(function () {
         }).always(function () {
-            this.setState({
-                loading: false
-            });
+            this.props.spinState(true);
         }.bind(this));
         }.bind(this));
     },
     },
     getInitialState() {
     getInitialState() {
@@ -292,12 +288,11 @@ const intellectualDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="知识产权详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='600px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="知识产权详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='600px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <IntellectualDescFrom
                         <IntellectualDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
@@ -305,8 +300,8 @@ const intellectualDesc = React.createClass({
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -190,12 +190,11 @@ const CenterListDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="产学研情况详情" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="产学研情况详情" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer=''>
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CenterListDescFrom
                         <CenterListDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             cid={this.props.cid}
                             cid={this.props.cid}
@@ -204,8 +203,8 @@ const CenterListDesc = React.createClass({
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             clickOk={this.handleOk} />
                             clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -318,19 +318,18 @@ const RatepayDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="企业所得税纳税申报信息" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="企业所得税纳税申报信息" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <RatepayDescFrom
                         <RatepayDescFrom
                             uid={this.props.uid}
                             uid={this.props.uid}
                             data={this.props.data}
                             data={this.props.data}
                             visible={this.state.visible}
                             visible={this.state.visible}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -311,12 +311,11 @@ const TechProductDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="上年度高新技术产品(服务)情况表" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="上年度高新技术产品(服务)情况表" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer=''  >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <TechProductDescFrom
                         <TechProductDescFrom
                             data={this.props.data}
                             data={this.props.data}
                             uid={this.props.uid}
                             uid={this.props.uid}
@@ -324,8 +323,8 @@ const TechProductDesc = React.createClass({
                             resetForm={this.state.resetForm}
                             resetForm={this.state.resetForm}
                             mockData={this.props.mockData}
                             mockData={this.props.mockData}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

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

@@ -614,20 +614,19 @@ const CognizanceDesc = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="高企管理" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="高企管理" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <CognizanceDescFrom
                         <CognizanceDescFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             contactsOption={this.props.contactsOption}
                             contactsOption={this.props.contactsOption}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                             spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }
@@ -773,65 +772,66 @@ const CognizanceAdd = React.createClass({
                         <Button key="back" onClick={this.handleCancel}>
                         <Button key="back" onClick={this.handleCancel}>
                             返回
                             返回
                             </Button>,
                             </Button>,
-                    ]}
-                >
-                    <div className="clearfix" style={{ marginBottom: '10px' }}>
-                        <div className="half-item">
-                            <span>选择公司:  </span>
-                            <Select
-                                placeholder="请选择公司"
-                                style={{ width: 260 }}
-                                showSearch
-                                filterOption={companySearch}
-                                value={this.state.uid}
-                                onSelect={(e, n) => { this.setState({ uid: e }); this.getContactsList(e); }}>
-                                {this.props.companyOption}
-                            </Select>
-                        </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span>选择申请年份:  </span>
-                            <Select placeholder="请选择年份" style={{ width: 200 }}
-                                value={this.state.year}
-                                onSelect={(e, n) => { this.setState({ year: e }); }}>
-                                {this.state.yearOption}
-                            </Select>
-                        </div>
-                        <div className="half-item">
-                            <span>订单金额超过十万:  </span>
-                            <Radio.Group onChange={(e) => { this.state.largeOrder = e.target.value }}>
-                                <Radio value="0">否</Radio>
-                                <Radio value="1">是</Radio>
-                            </Radio.Group>
+                    ]} >
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix" style={{ marginBottom: '10px' }}>
+                            <div className="half-item">
+                                <span>选择公司:  </span>
+                                <Select
+                                    placeholder="请选择公司"
+                                    style={{ width: 260 }}
+                                    showSearch
+                                    filterOption={companySearch}
+                                    value={this.state.uid}
+                                    onSelect={(e, n) => { this.setState({ uid: e }); this.getContactsList(e); }}>
+                                    {this.props.companyOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                        <div className="half-item">
-                            <span>选择联系人:  </span>
-                            <Select placeholder="请选择联系人" style={{ width: 200 }}
-                                value={this.state.contacts}
-                                onSelect={(e, n) => { this.setState({ contacts: e }); }}>
-                                {this.state.contactsOption}
-                            </Select>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span>选择申请年份:  </span>
+                                <Select placeholder="请选择年份" style={{ width: 200 }}
+                                    value={this.state.year}
+                                    onSelect={(e, n) => { this.setState({ year: e }); }}>
+                                    {this.state.yearOption}
+                                </Select>
+                            </div>
+                            <div className="half-item">
+                                <span>订单金额超过十万:  </span>
+                                <Radio.Group onChange={(e) => { this.state.largeOrder = e.target.value }}>
+                                    <Radio value="0">否</Radio>
+                                    <Radio value="1">是</Radio>
+                                </Radio.Group>
+                            </div>
+                            <div className="half-item">
+                                <span>选择联系人:  </span>
+                                <Select placeholder="请选择联系人" style={{ width: 200 }}
+                                    value={this.state.contacts}
+                                    onSelect={(e, n) => { this.setState({ contacts: e }); }}>
+                                    {this.state.contactsOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div>
                         <div>
                         <div>
-                            <span>派单详情:  </span>
-                            <Input type="textarea" rows={6}
-                                value={this.state.comment}
-                                onChange={(e) => { this.setState({ comment: e.target.value }); }} />
+                            <div>
+                                <span>派单详情:  </span>
+                                <Input type="textarea" rows={6}
+                                    value={this.state.comment}
+                                    onChange={(e) => { this.setState({ comment: e.target.value }); }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix" style={{ marginTop: 20 }}>
-                        <div className="half-item">
-                            <span>选择营销员:  </span>
-                            <Select placeholder="请选择营销员" style={{ width: 200 }}
-                                value={this.state.salesman}
-                                onSelect={(e, n) => { this.setState({ salesman: e }); }}>
-                                {this.props.salesmanOption}
-                            </Select>
+                        <div className="clearfix" style={{ marginTop: 20 }}>
+                            <div className="half-item">
+                                <span>选择营销员:  </span>
+                                <Select placeholder="请选择营销员" style={{ width: 200 }}
+                                    value={this.state.salesman}
+                                    onSelect={(e, n) => { this.setState({ salesman: e }); }}>
+                                    {this.props.salesmanOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

+ 7 - 8
js/component/manageCenter/servicesManage/patent/clientInputPatent.jsx

@@ -242,15 +242,14 @@ const PatentAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>新专利添加<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>新专利添加<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="新专利添加" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='720px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="新专利添加" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='720px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                         <PatentAddFrom spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 7 - 8
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -363,19 +363,18 @@ const PatentAdd = React.createClass({
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新专利<Icon type="plus" /></Button>
                 <Button className="patent-addNew" type="primary" onClick={this.showModal}>申请新专利<Icon type="plus" /></Button>
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="新专利申请" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='800px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="新专利申请" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='800px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <PatentAddFrom
                         <PatentAddFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             spinState={this.spinChange}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             okClick={() => { this.props.closeDesc(false, true) }} />
                             okClick={() => { this.props.closeDesc(false, true) }} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     },
     },

+ 79 - 78
js/component/manageCenter/servicesManage/technology/applyAdd.jsx

@@ -164,93 +164,94 @@ const ApplyAdd = React.createClass({
                         <Button key="back" onClick={this.handleCancel}>
                         <Button key="back" onClick={this.handleCancel}>
                             取消
                             取消
                             </Button>,
                             </Button>,
-                    ]}
-                >
-                    <div className="clearfix" style={{ marginBottom: '10px' }}>
-                        <div className="half-item">
-                            <span className="item-title">选择公司:  </span>
-                            <Select
-                                placeholder="请选择公司"
-                                style={{ width: 260 }}
-                                showSearch
-                                filterOption={companySearch}
-                                onSelect={(e, n) => { this.state.uid = e; this.getContactsList(e); this.getDepartmentList(e); }}>
-                                {this.props.companyAddOption}
-                            </Select>
+                    ]} >
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div className="clearfix" style={{ marginBottom: '10px' }}>
+                            <div className="half-item">
+                                <span className="item-title">选择公司:  </span>
+                                <Select
+                                    placeholder="请选择公司"
+                                    style={{ width: 260 }}
+                                    showSearch
+                                    filterOption={companySearch}
+                                    onSelect={(e, n) => { this.state.uid = e; this.getContactsList(e); this.getDepartmentList(e); }}>
+                                    {this.props.companyAddOption}
+                                </Select>
+                            </div>
+                            <div className="half-item">
+                                <span className="item-title">选择联系人:  </span>
+                                <Select placeholder="请选择联系人" style={{ width: 200 }}
+                                    onSelect={(e, n) => { this.state.contacts = e }}>
+                                    {this.state.contactsOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                        <div className="half-item">
-                            <span className="item-title">选择联系人:  </span>
-                            <Select placeholder="请选择联系人" style={{ width: 200 }}
-                                onSelect={(e, n) => { this.state.contacts = e }}>
-                                {this.state.contactsOption}
-                            </Select>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">申报科技部门:  </span>
+                                <Select
+                                    placeholder="请填写申报部门"
+                                    style={{ width: 260 }}
+                                    onChange={(e) => { this.state.department = e; }}>
+                                    {this.state.departmentOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">申报科技部门:  </span>
-                            <Select
-                                placeholder="请填写申报部门"
-                                style={{ width: 260 }}
-                                onChange={(e) => { this.state.department = e; }}>
-                                {this.state.departmentOption}
-                            </Select>
+                        <div className="clearfix">
+                            <div>
+                                <span className="item-title">派单信息:  </span>
+                            </div>
+                            <Input type="textarea" rows={6} onChange={(e) => { this.state.dispatchInfo = e.target.value; }} />
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div>
-                            <span className="item-title">派单信息:  </span>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">项目名称:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                        <Input type="textarea" rows={6} onChange={(e) => { this.state.dispatchInfo = e.target.value; }} />
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">项目名称:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectName = e.target.value; }} />
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">项目类型:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">项目类型:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectCatagory = e.target.value; }} />
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">技术领域:  </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
+                            </div>
                         </div>
                         </div>
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">技术领域:  </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.techField = e.target.value; }} />
-                        </div>
-                    </div>
-                    <div className="clearfix">
-                        <div>
-                            <span className="item-title">项目介绍:  </span>
-                        </div>
-                        <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
-                    </div>
-                    <div className="clearfix">
-                        <div className="half-item">
-                            <span className="item-title">立项/后补助: </span>
-                            <Radio.Group onChange={this.subsidyCheck}>
-                                <Radio value={1}>立项</Radio>
-                                <Radio value={2}>后补助</Radio>
-                            </Radio.Group>
+                        <div className="clearfix">
+                            <div>
+                                <span className="item-title">项目介绍:  </span>
+                            </div>
+                            <Input type="textarea" rows={6} onChange={(e) => { this.state.projectDes = e.target.value; }} />
                         </div>
                         </div>
+                        <div className="clearfix">
+                            <div className="half-item">
+                                <span className="item-title">立项/后补助: </span>
+                                <Radio.Group onChange={this.subsidyCheck}>
+                                    <Radio value={1}>立项</Radio>
+                                    <Radio value={2}>后补助</Radio>
+                                </Radio.Group>
+                            </div>
 
 
-                        <div className="half-item">
-                            <span className="item-title">金额: </span>
-                            <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }} />
-                            <span>万元</span>
-                        </div>
-                        <div className="half-item">
-                            <span className="item-title">营销员:  </span>
-                            <Select
-                                placeholder="请填写营销员"
-                                style={{ width: 260 }}
-                                onChange={(e) => { this.state.salesman = e; }}>
-                                {this.props.salesmanOption}
-                            </Select>
+                            <div className="half-item">
+                                <span className="item-title">金额: </span>
+                                <Input style={{ width: 200 }} onChange={(e) => { this.state.projectApproval = e.target.value; }} />
+                                <span>万元</span>
+                            </div>
+                            <div className="half-item">
+                                <span className="item-title">营销员:  </span>
+                                <Select
+                                    placeholder="请填写营销员"
+                                    style={{ width: 260 }}
+                                    onChange={(e) => { this.state.salesman = e; }}>
+                                    {this.props.salesmanOption}
+                                </Select>
+                            </div>
                         </div>
                         </div>
-                    </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

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

@@ -544,19 +544,18 @@ const ApplyChange = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="编辑科技项目" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="编辑科技项目" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <ApplyChangeFrom
                         <ApplyChangeFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             authorOption={this.props.authorOption}
                             authorOption={this.props.authorOption}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
                             spinState={this.spinChange} closeModal={this.handleCancel} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 31 - 30
js/component/manageCenter/servicesManage/technology/websiteAdd.jsx

@@ -89,36 +89,37 @@ const WebsiteAdd = React.createClass({
                         <Button key="back" onClick={this.handleCancel}>
                         <Button key="back" onClick={this.handleCancel}>
                             取消
                             取消
                             </Button>,
                             </Button>,
-                    ]}
-                >
-                    <div>
-                        <span className="item-title">选择公司:  </span>
-                        <Select
-                            placeholder="请选择公司"
-                            style={{ width: 200 }}
-                            value={this.state.unitName}
-                            showSearch
-                            filterOption={companySearch}
-                            onChange={(e) => { this.setState({ unitName: e }); }}>
-                            {this.props.companyAddOption}
-                        </Select>
-                    </div>
-                    <div>
-                        <span className="item-title">科技部门名称:  </span>
-                        <Input value={this.state.department} onChange={(e) => { this.setState({ department: e.target.value }); }} style={{ width: 200 }} />
-                    </div>
-                    <div>
-                        <span className="item-title">网址:  </span>
-                        <Input value={this.state.website} onChange={(e) => { this.setState({ website: e.target.value }); }} style={{ width: 200 }} />
-                    </div>
-                    <div>
-                        <span className="item-title">账号:  </span>
-                        <Input value={this.state.accountNumber} onChange={(e) => { this.setState({ accountNumber: e.target.value }); }} style={{ width: 200 }} />
-                    </div>
-                    <div>
-                        <span className="item-title">密码:  </span>
-                        <Input value={this.state.password} onChange={(e) => { this.setState({ password: e.target.value }); }} style={{ width: 200 }} />
-                    </div>
+                    ]} >
+                    <Spin spinning={this.state.loading} className='spin-box'>
+                        <div>
+                            <span className="item-title">选择公司:  </span>
+                            <Select
+                                placeholder="请选择公司"
+                                style={{ width: 200 }}
+                                value={this.state.unitName}
+                                showSearch
+                                filterOption={companySearch}
+                                onChange={(e) => { this.setState({ unitName: e }); }}>
+                                {this.props.companyAddOption}
+                            </Select>
+                        </div>
+                        <div>
+                            <span className="item-title">科技部门名称:  </span>
+                            <Input value={this.state.department} onChange={(e) => { this.setState({ department: e.target.value }); }} style={{ width: 200 }} />
+                        </div>
+                        <div>
+                            <span className="item-title">网址:  </span>
+                            <Input value={this.state.website} onChange={(e) => { this.setState({ website: e.target.value }); }} style={{ width: 200 }} />
+                        </div>
+                        <div>
+                            <span className="item-title">账号:  </span>
+                            <Input value={this.state.accountNumber} onChange={(e) => { this.setState({ accountNumber: e.target.value }); }} style={{ width: 200 }} />
+                        </div>
+                        <div>
+                            <span className="item-title">密码:  </span>
+                            <Input value={this.state.password} onChange={(e) => { this.setState({ password: e.target.value }); }} style={{ width: 200 }} />
+                        </div>
+                    </Spin>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );

+ 53 - 54
js/component/manageCenter/servicesManage/technology/websiteChange.jsx

@@ -111,52 +111,52 @@ const WebsiteChangeFrom = Form.create()(React.createClass({
         if (this.state.data) {
         if (this.state.data) {
             return (
             return (
                 <Form onSubmit={this.handleSubmit} id="highTechApply-form">
                 <Form onSubmit={this.handleSubmit} id="highTechApply-form">
-                        <FormItem
-                            {...formItemLayout}
-                            label="公司名称:"
-                        >
-                            <span>{theData.unitName}</span>
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="科技部门名称:"
-                        >
-                            {getFieldDecorator('department', {
-                                initialValue: theData.department
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="网址:"
-                        >
-                            {getFieldDecorator('website', {
-                                initialValue: theData.website
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="账号:"
-                        >
-                            {getFieldDecorator('accountNumber', {
-                                initialValue: theData.accountNumber
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem
-                            {...formItemLayout}
-                            label="密码:"
-                        >
-                            {getFieldDecorator('password', {
-                                initialValue: theData.password
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="公司名称:"
+                    >
+                        <span>{theData.unitName}</span>
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="科技部门名称:"
+                    >
+                        {getFieldDecorator('department', {
+                            initialValue: theData.department
+                        })(
+                            <Input />
+                            )}
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="网址:"
+                    >
+                        {getFieldDecorator('website', {
+                            initialValue: theData.website
+                        })(
+                            <Input />
+                            )}
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="账号:"
+                    >
+                        {getFieldDecorator('accountNumber', {
+                            initialValue: theData.accountNumber
+                        })(
+                            <Input />
+                            )}
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="密码:"
+                    >
+                        {getFieldDecorator('password', {
+                            initialValue: theData.password
+                        })(
+                            <Input />
+                            )}
+                    </FormItem>
                     <FormItem style={{ marginTop: '20px' }}>
                     <FormItem style={{ marginTop: '20px' }}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
                         <Button type="ghost" style={{ marginLeft: '20px' }} onClick={this.props.closeModal}>取消</Button>
@@ -204,19 +204,18 @@ const WebsiteChange = React.createClass({
     render() {
     render() {
         return (
         return (
             <div className="patent-addNew">
             <div className="patent-addNew">
-                <Spin spinning={this.state.loading} className='spin-box'>
-                    <Modal maskClosable={false} title="编辑科技部门网址" visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='500px'
-                        footer=''
-                    >
+                <Modal maskClosable={false} title="编辑科技部门网址" visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='500px'
+                    footer='' >
+                    <Spin spinning={this.state.loading} className='spin-box'>
                         <WebsiteChangeFrom
                         <WebsiteChangeFrom
                             visible={this.state.visible}
                             visible={this.state.visible}
                             companyOption={this.props.companyOption}
                             companyOption={this.props.companyOption}
                             data={this.props.data}
                             data={this.props.data}
                             spinState={this.spinChange} closeModal={this.handleCancel} />
                             spinState={this.spinChange} closeModal={this.handleCancel} />
-                    </Modal>
-                </Spin>
+                    </Spin>
+                </Modal>
             </div>
             </div>
         );
         );
     }
     }

+ 9 - 1
js/component/manageCenter/userManage/customerList.jsx

@@ -94,7 +94,8 @@ const UserAdd = React.createClass({
         };
         };
     },
     },
     showModal() {
     showModal() {
-        this.state.mobile;
+        this.state.mobile = undefined;
+        this.state.username = undefined;
         this.setState({
         this.setState({
             visible: true,
             visible: true,
         });
         });
@@ -115,6 +116,7 @@ const UserAdd = React.createClass({
             url: globalConfig.context + "/api/admin/addNewUser",
             url: globalConfig.context + "/api/admin/addNewUser",
             data: {
             data: {
                 mobile: this.state.mobile,
                 mobile: this.state.mobile,
+                username: this.state.username,
                 type: 0
                 type: 0
             }
             }
         }).done(function (data) {
         }).done(function (data) {
@@ -150,6 +152,12 @@ const UserAdd = React.createClass({
                             value={this.state.mobile}
                             value={this.state.mobile}
                             onChange={(e) => { this.setState({ mobile: e.target.value }); }} />
                             onChange={(e) => { this.setState({ mobile: e.target.value }); }} />
                     </div>
                     </div>
+                    <div className='orgAdd-input'>
+                        <span>用户名称:</span>
+                        <Input
+                            value={this.state.username}
+                            onChange={(e) => { this.setState({ username: e.target.value }); }} />
+                    </div>
                 </Modal>
                 </Modal>
             </div>
             </div>
         );
         );