yee 7 years ago
parent
commit
0e22fe6996
26 changed files with 930 additions and 883 deletions
  1. 11 6
      css/base.less
  2. 4 9
      js/component/account/achievement/techAchievement.jsx
  3. 1 1
      js/component/account/achievement/techAchievementDesc.jsx
  4. 2 2
      js/component/account/demand/techDemandDesc.jsx
  5. 2 3
      js/component/account/index/content.less
  6. 1 1
      js/component/account/index/normal.jsx
  7. 1 1
      js/component/account/services/activity.jsx
  8. 9 9
      js/component/account/services/activityCostList.jsx
  9. 12 8
      js/component/account/services/annualReport.jsx
  10. 2 1
      js/component/account/services/cognizance.jsx
  11. 5 5
      js/component/account/services/companyDetail.jsx
  12. 12 12
      js/component/account/services/finance.jsx
  13. 9 9
      js/component/account/services/ratepay.jsx
  14. 1 1
      js/component/account/services/techProduct.jsx
  15. 12 2
      js/component/account/set/changePassword.jsx
  16. 3 2
      js/component/manageCenter/achievement/batchImport.jsx
  17. 789 761
      js/component/manageCenter/achievement/techAchievementDesc.jsx
  18. 2 0
      js/component/manageCenter/demand/techDemand.jsx
  19. 1 1
      js/component/manageCenter/demand/techDemandDesc.jsx
  20. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  21. 9 9
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  22. 8 8
      js/component/manageCenter/servicesManage/highTech/fosterDesc/annualReport.jsx
  23. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/companyDetail.jsx
  24. 9 9
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  25. 1 1
      js/component/manageCenter/servicesManage/highTech/highTechApply.jsx
  26. 20 18
      js/component/portal/search/achievementDesc.jsx

+ 11 - 6
css/base.less

@@ -2,6 +2,12 @@ body {
     color: #333;
     font-size: 14px;
     background: #f0f0f0;
+    .ant-input-number,
+    .ant-input-number-lg {
+        .ant-input-number-handler-wrap {
+            display: none;
+        }
+    }
 }
 
 #root {
@@ -36,6 +42,7 @@ body {
 .footer {
     border-top: 1px solid #d8d8d8;
 }
+
 // .ant-modal-content {
 //     .ant-modal-body {
 //         .ant-form {
@@ -47,10 +54,8 @@ body {
 //         }
 //     }
 // }
-@font-face {font-family: 'myiconfont';
+@font-face {
+    font-family: 'myiconfont';
     src: url('./iconfont/iconfont.eot');
-    src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'),
-    url('./iconfont/iconfont.woff') format('woff'),
-    url('./iconfont/iconfont.ttf') format('truetype'),
-    url('./iconfont/iconfont.svg#myiconfont') format('svg');
-}
+    src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'), url('./iconfont/iconfont.woff') format('woff'), url('./iconfont/iconfont.ttf') format('truetype'), url('./iconfont/iconfont.svg#myiconfont') format('svg');
+}

+ 4 - 9
js/component/account/achievement/techAchievement.jsx

@@ -26,7 +26,6 @@ const AchievementList = React.createClass({
                 name: this.state.name, //名称
                 keyword: this.state.keyword, // 关键词
                 category: this.state.category, //类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
-                ownerType: this.state.ownerType, //所有人类型(0-个人,1-组织)
                 releaseDateStartDate: this.state.releaseDate[0],
                 releaseDateEndDate: this.state.releaseDate[1],
                 releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined, //是否发布(0--未发布,1--已发布)
@@ -227,6 +226,9 @@ const AchievementList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    downLoadFile() {
+        window.open(globalConfig.context + '/api/user/achievement/downloadTemplate?sign=achievement_template')
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -244,7 +246,7 @@ const AchievementList = React.createClass({
                 <div className="content-title">
                     <span>科技成果管理</span>
                     <div className="patent-addNew">
-                        <Button onClick={() => { window.open(globalConfig.context + '/api/user/achievement/downloadTemplate?sign=achievement_template') }}>下载批量导入模板</Button>
+                        <Button onClick={this.downLoadFile}>下载批量导入模板</Button>
                         <Button className="addButton" type="primary" onClick={this.addClick}>发布成果<Icon type="plus" /></Button>
                     </div>
                 </div>
@@ -282,13 +284,6 @@ const AchievementList = React.createClass({
                         onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <Select placeholder="选择所有人类型"
-                            style={{ width: 120 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
                         <span>发布时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 1 - 1
js/component/account/achievement/techAchievementDesc.jsx

@@ -1057,7 +1057,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             {getFieldDecorator('transferPrice', {
                                 initialValue: theData.transferPrice
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01}/>
                                 )}
                             <span style={{ marginLeft: '20px' }}>万元</span>
                         </FormItem>

+ 2 - 2
js/component/account/demand/techDemandDesc.jsx

@@ -835,7 +835,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             {getFieldDecorator('peopleNumber', {
                                 initialValue: theData.peopleNumber
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={1}/>
                                 )}
                             <span style={{ marginLeft: '20px' }}>人</span>
                         </FormItem>
@@ -857,7 +857,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             {getFieldDecorator('budgetCost', {
                                 initialValue: theData.budgetCost
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01}/>
                                 )}
                             <span style={{ marginLeft: '20px' }}>万元</span>
                         </FormItem>

+ 2 - 3
js/component/account/index/content.less

@@ -6,9 +6,8 @@
             font-size: 16px;
             margin-bottom: 10px;
             span {
-                font-size: 12px;
-                color: #999;
-                margin-left: 10px;
+                font-size: 18px;
+                color: @a-color;
             }
         }
         .index-userdata {

+ 1 - 1
js/component/account/index/normal.jsx

@@ -66,7 +66,7 @@ const Content = React.createClass({
             <Spin spinning={this.state.loading} className='spin-box'>
                 <div className="index-content">
                     <div className="index-userdata clearfix">
-                        <p className="acc-title">欢迎, {this.state.number}</p>
+                        <p className="acc-title">欢迎, No.<span>{this.state.number}</span>     </p>
                         <div className="userdata-img">
                             <img src={globalConfig.avatarHost + "/upload" + (this.state.type == 0 ? this.state.personPortraitUrl : this.state.logoUrl)} alt="" />
                         </div>

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

@@ -239,7 +239,7 @@ const ActivityForm = Form.create()(React.createClass({
                             {getFieldDecorator('budget', {
                                 initialValue: theData.budget
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01}/>
                                 )}
                             <span>万元</span>
                         </FormItem>

+ 9 - 9
js/component/account/services/activityCostList.jsx

@@ -143,7 +143,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalLaborCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -154,7 +154,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDirectCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -165,7 +165,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDepreciationCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -176,7 +176,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalAmortizationCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -187,7 +187,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDesignCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -198,7 +198,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalEquipmentCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -209,7 +209,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalOtherCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                 </div>
@@ -223,7 +223,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.externalTotalCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01}/>
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -234,7 +234,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.externalAbroadCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={999999} step={0.01} />
                             )}
                     </FormItem>
                 </div>

+ 12 - 8
js/component/account/services/annualReport.jsx

@@ -263,8 +263,9 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: this.props.data.totalTax
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01} />
                                 )}
+                            <span>万元</span>
                         </FormItem>
                     </div>
                     <div className="four-item">
@@ -276,8 +277,9 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: this.props.data.incomeTaxRelief
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01} />
                                 )}
+                            <span>万元</span>
                         </FormItem>
                     </div>
                     <div className="four-item">
@@ -289,8 +291,9 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: this.props.data.totalExportVolume
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01} />
                                 )}
+                            <span>万元</span>
                         </FormItem>
                     </div>
                     <div className="four-item">
@@ -302,8 +305,9 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: this.props.data.basicResearchCost
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01} />
                                 )}
+                            <span>万元</span>
                         </FormItem>
                     </div>
                 </div>
@@ -540,22 +544,22 @@ const AnnualReportAdd = React.createClass({
                     <div className="clearfix">
                         <div className="half-item">
                             <span>纳税总额:  </span>
-                            <InputNumber onChange={(e) => { this.state.totalTax = e; }} />
+                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
                             <span> (万元)</span>
                         </div>
                         <div className="half-item">
                             <span>高企所得税减免额:  </span>
-                            <InputNumber onChange={(e) => { this.state.incomeTaxRelief = e; }} />
+                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
                             <span> (万元)</span>
                         </div>
                         <div className="half-item">
                             <span>出口创汇总额(人民币):  </span>
-                            <InputNumber onChange={(e) => { this.state.totalExportVolume = e; }} />
+                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
                             <span> (万元)</span>
                         </div>
                         <div className="half-item">
                             <span>基础研究投入费用:  </span>
-                            <InputNumber onChange={(e) => { this.state.basicResearchCost = e; }} />
+                            <InputNumber min={0} max={999999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
                             <span> (万元)</span>
                         </div>
                     </div>

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

@@ -301,8 +301,9 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                                         rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                         initialValue: theData.basicResearchCost
                                     })(
-                                        <InputNumber />
+                                        <InputNumber min={0} max={999999} step={0.01} />
                                         )}
+                                        <span>万元</span>
                                 </FormItem>
                             </div>
                         </div>

+ 5 - 5
js/component/account/services/companyDetail.jsx

@@ -184,7 +184,7 @@ const CompanyDetail = Form.create()(React.createClass({
                     dataIndex: 'investment',
                     key: 'investment',
                     render: (text, record, index) => {
-                        return <InputNumber value={record.investment} onChange={(e) => { record.investment = e; this.setState({ humanTableData: this.state.humanTableData }); }} />
+                        return <InputNumber min={0} max={999999} step={0.01} value={record.investment} onChange={(e) => { record.investment = e; this.setState({ humanTableData: this.state.humanTableData }); }} />
                     }
                 }
             ],
@@ -219,7 +219,7 @@ const CompanyDetail = Form.create()(React.createClass({
                     dataIndex: 'investment',
                     key: 'investment',
                     render: (text, record, index) => {
-                        return <InputNumber value={record.investment} onChange={(e) => { record.investment = e; this.setState({ legalTableData: this.state.legalTableData }); }} />
+                        return <InputNumber min={0} max={999999} step={0.01} value={record.investment} onChange={(e) => { record.investment = e; this.setState({ legalTableData: this.state.legalTableData }); }} />
                     }
                 }
             ],
@@ -638,7 +638,7 @@ const CompanyDetail = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: theData.registeredCapital
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={999999} step={0.01} />
                                 )}
                             <span>万元</span>
                         </FormItem>
@@ -932,7 +932,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('firmTotal', {
                                 initialValue: theData.firmTotal || 0
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={1} />
                                 )}
                         </FormItem>
                         <FormItem className="half-item"
@@ -942,7 +942,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('techTotal', {
                                 initialValue: theData.techTotal || 0
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={1} />
                                 )}
                             <span>其中科技人员占比
                         {(() => {

+ 12 - 12
js/component/account/services/finance.jsx

@@ -152,7 +152,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.mainBusinessIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -163,7 +163,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.managementCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.managementCost && this.state.managementCost != this.props.form.getFieldValue('managementCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -178,7 +178,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                                 }],
                             initialValue: theData.researchCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.researchCost && this.state.researchCost != this.props.form.getFieldValue('researchCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -190,7 +190,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.operatingProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.operatingProfit && this.state.operatingProfit != this.props.form.getFieldValue('operatingProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -202,7 +202,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.variousTax
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -213,7 +213,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.currentAsset
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -224,7 +224,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.netFixedAsset
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -235,7 +235,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.totalAsset
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -246,7 +246,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.netAsset
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -257,7 +257,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.grossProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.grossProfit && this.state.grossProfit != this.props.form.getFieldValue('grossProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -269,7 +269,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.netProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -280,7 +280,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.salesRevenue
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                 </div>

+ 9 - 9
js/component/account/services/ratepay.jsx

@@ -140,7 +140,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.operatingIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -151,7 +151,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.managementCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.managementCost && this.state.managementCost != this.props.form.getFieldValue('managementCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -163,7 +163,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.operatingProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.operatingProfit && this.state.operatingProfit != this.props.form.getFieldValue('operatingProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -175,7 +175,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.nonOperatingIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -186,7 +186,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.nonTaxableIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -197,7 +197,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.taxExemptIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -208,7 +208,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.subsidyIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -219,7 +219,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.grossProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.grossProfit && this.state.grossProfit != this.props.form.getFieldValue('grossProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -231,7 +231,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.researchCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.researchCost && this.state.researchCost != this.props.form.getFieldValue('researchCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>

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

@@ -139,7 +139,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.lastYearRevenue ? Number(theData.lastYearRevenue) : 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                 </div>

+ 12 - 2
js/component/account/set/changePassword.jsx

@@ -13,6 +13,15 @@ const ChangePw = React.createClass({
             visible: true,
         });
     },
+    logOut() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/login",
+        }).done(function (data) {
+            window.location.href = globalConfig.context + "/user/login.html"
+        });
+    },
     handleOk() {
         if (this.state.newPw.length < 6 || this.state.newPw.length > 20) {
             message.warning('请使用长度为6-20位的密码!');
@@ -34,6 +43,7 @@ const ChangePw = React.createClass({
                     this.setState({
                         visible: false,
                     });
+                    this.logOut();
                 } else {
                     message.warning(data.error[0].message);
                 }
@@ -56,7 +66,7 @@ const ChangePw = React.createClass({
     },
     render() {
         return (
-            <div style={{ 'float': 'left','marginTop':'0' }}>
+            <div style={{ 'float': 'left', 'marginTop': '0' }}>
                 <Button type="primary" onClick={this.showModal}>修改密码</Button>
                 <Modal maskClosable={false} className="change-modal" title="设置新密码" visible={this.state.visible}
                     onOk={this.handleOk} onCancel={this.handleCancel}
@@ -65,7 +75,7 @@ const ChangePw = React.createClass({
                         <Button key="submit" type="primary" size="large" loading={this.state.loading} onClick={this.handleOk}>确认</Button>,
                         <Button key="back" type="ghost" size="large" onClick={this.handleCancel}>取消</Button>
                     ]}
-                    >
+                >
                     <p className="modal-intro"><Icon type="info-circle" />密码长度为6-20个字符,区分大小写</p>
                     <p><span>原密码:</span><Input type="password" onChange={this.oldPwChange} /></p>
                     <p><span>新密码:</span><Input type="password" onChange={this.newPwChange} /></p>

+ 3 - 2
js/component/manageCenter/achievement/batchImport.jsx

@@ -87,7 +87,7 @@ const BatchImport = React.createClass({
         if (!rowsArr.length) {
             return;
         };
-        let columnLength = 11;//定义数据正常长度
+        let columnLength = 12;//定义数据正常长度
         for (let i = 0; i < rowsArr.length; i++) {
             if (_me.state.error) {
                 this.state.error = false;
@@ -106,7 +106,8 @@ const BatchImport = React.createClass({
                     ownerMobile: theArr[7],
                     ownerEmail: theArr[8],
                     ownerPostalAddress: theArr[9],
-                    cooperationMode: _me.getCooperationMode(theArr[10], i + 1)
+                    cooperationMode: _me.getCooperationMode(theArr[10], i + 1),
+                    introduction: theArr[11],
                 });
             } else if (rowsArr[i].replace(/(^\s+)|(\s+$)/g, "").length) {
                 message.warning("第" + (i + 1) + "行数据长度错误!");

File diff suppressed because it is too large
+ 789 - 761
js/component/manageCenter/achievement/techAchievementDesc.jsx


+ 2 - 0
js/component/manageCenter/demand/techDemand.jsx

@@ -417,6 +417,8 @@ const DemandList = React.createClass({
                         onChange={(e) => { this.setState({ infoSources: e }) }}>
                         <Select.Option value="0" >平台采集</Select.Option>
                         <Select.Option value="1" >客户发布</Select.Option>
+                        <Select.Option value="2" >批量导入</Select.Option>
+                        <Select.Option value="3" >三方对接</Select.Option>
                     </Select>
                     <Select placeholder="选择需求类型"
                         style={{ width: 120 }}

+ 1 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -863,7 +863,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         {getFieldDecorator('budgetCost', {
                             initialValue: theData.budgetCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         <span style={{ marginLeft: '20px' }}>万元</span>
                     </FormItem>

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

@@ -236,7 +236,7 @@ const ActivityForm = Form.create()(React.createClass({
                             {getFieldDecorator('budget', {
                                 initialValue: theData.budget
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={0.01} />
                                 )}
                             <span>万元</span>
                         </FormItem>

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

@@ -143,7 +143,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalLaborCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -154,7 +154,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDirectCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -165,7 +165,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDepreciationCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -176,7 +176,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalAmortizationCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -187,7 +187,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalDesignCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -198,7 +198,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalEquipmentCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -209,7 +209,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.internalOtherCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                 </div>
@@ -223,7 +223,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.externalTotalCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -234,7 +234,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                             rules: [{ type: "number", required: true, message: '此项为必填项!' }],
                             initialValue: theData.externalAbroadCost || 0
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                 </div>

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

@@ -263,7 +263,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                     rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                     initialValue: this.props.data.totalTax
                                 })(
-                                    <InputNumber />
+                                    <InputNumber min={0} max={9999} step={0.01} />
                                     )}
                             </FormItem>
                         </div>
@@ -276,7 +276,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                     rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                     initialValue: this.props.data.incomeTaxRelief
                                 })(
-                                    <InputNumber />
+                                    <InputNumber min={0} max={9999} step={0.01} />
                                     )}
                             </FormItem>
                         </div>
@@ -289,7 +289,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                     rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                     initialValue: this.props.data.totalExportVolume
                                 })(
-                                    <InputNumber />
+                                    <InputNumber min={0} max={9999} step={0.01} />
                                     )}
                             </FormItem>
                         </div>
@@ -302,7 +302,7 @@ const AnnualReportDescFrom = Form.create()(React.createClass({
                                     rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                     initialValue: this.props.data.basicResearchCost
                                 })(
-                                    <InputNumber />
+                                    <InputNumber min={0} max={9999} step={0.01} />
                                     )}
                             </FormItem>
                         </div>
@@ -548,22 +548,22 @@ const AnnualReportAdd = React.createClass({
                     <div className="clearfix">
                         <div className="half-item">
                             <span>纳税总额: </span>
-                            <InputNumber onChange={(e) => { this.state.totalTax = e; }} />
+                            <InputNumber min={0} max={9999} step={0.01} onChange={(e) => { this.state.totalTax = e; }} />
                             <span>(万元)</span>
                         </div>
                         <div className="half-item">
                             <span>高企所得税减免额: </span>
-                            <InputNumber onChange={(e) => { this.state.incomeTaxRelief = e; }} />
+                            <InputNumber min={0} max={9999} step={0.01} onChange={(e) => { this.state.incomeTaxRelief = e; }} />
                             <span>(万元)</span>
                         </div>
                         <div className="half-item">
                             <span>出口创汇总额(人民币): </span>
-                            <InputNumber onChange={(e) => { this.state.totalExportVolume = e; }} />
+                            <InputNumber min={0} max={9999} step={0.01} onChange={(e) => { this.state.totalExportVolume = e; }} />
                             <span>(万元)</span>
                         </div>
                         <div className="half-item">
                             <span>基础研究投入费用: </span>
-                            <InputNumber onChange={(e) => { this.state.basicResearchCost = e; }} />
+                            <InputNumber min={0} max={9999} step={0.01} onChange={(e) => { this.state.basicResearchCost = e; }} />
                             <span>(万元)</span>
                         </div>
                     </div>

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

@@ -657,7 +657,7 @@ const CompanyDetail = Form.create()(React.createClass({
                                 rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                 initialValue: theData.registeredCapital
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={0.01} />
                                 )}
                             <span>万元</span>
                         </FormItem>
@@ -949,7 +949,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('firmTotal', {
                                 initialValue: theData.firmTotal || 0
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={0.01} />
                                 )}
                         </FormItem>
                         <FormItem className="half-item"
@@ -959,7 +959,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('techTotal', {
                                 initialValue: theData.techTotal || 0
                             })(
-                                <InputNumber />
+                                <InputNumber min={0} max={9999} step={0.01} />
                                 )}
                             <span>其中科技人员占比
                         {(() => {

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

@@ -142,7 +142,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.operatingIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -153,7 +153,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.managementCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.managementCost && this.state.managementCost != this.props.form.getFieldValue('managementCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -165,7 +165,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.operatingProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.operatingProfit && this.state.operatingProfit != this.props.form.getFieldValue('operatingProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -177,7 +177,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.nonOperatingIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -188,7 +188,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.nonTaxableIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -199,7 +199,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.taxExemptIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -210,7 +210,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.subsidyIncome
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                     </FormItem>
                     <FormItem className="half-item"
@@ -221,7 +221,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.grossProfit
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.grossProfit && this.state.grossProfit != this.props.form.getFieldValue('grossProfit') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>
@@ -233,7 +233,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.researchCost
                         })(
-                            <InputNumber />
+                            <InputNumber min={0} max={9999} step={0.01} />
                             )}
                         {this.state.researchCost && this.state.researchCost != this.props.form.getFieldValue('researchCost') ? <span style={{ color: '#f50' }}>与财务报表不一致!</span> : <span></span>}
                     </FormItem>

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

@@ -537,7 +537,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                                             rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                                             initialValue: theData.basicResearchCost
                                         })(
-                                            <InputNumber />
+                                            <InputNumber min={0} max={9999} step={0.01} />
                                             )}
                                     </FormItem>
                                 </div>

+ 20 - 18
js/component/portal/search/achievementDesc.jsx

@@ -33,7 +33,8 @@ const AchievementDetail = React.createClass({
                     dataIndex: 'comment',
                     key: 'comment',
                 }
-            ]
+            ],
+            logsOrderStatus: 0
         };
     },
     handleCancel(e) {
@@ -85,7 +86,7 @@ const AchievementDetail = React.createClass({
                 achievementOrderId: id
             },
             success: function (data) {
-                let thisData = data.data, theArr = [];
+                let thisData = data.data, theArr = [], _me = this;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -98,7 +99,8 @@ const AchievementDetail = React.createClass({
                             recordTimeFormattedDate: item.recordTimeFormattedDate,
                             status: item.status,
                             comment: item.comment
-                        })
+                        });
+                        _me.state.logsOrderStatus = item.status;
                     });
                 };
                 this.setState({
@@ -449,22 +451,22 @@ const AchievementDetail = React.createClass({
                                         message.warning("请先登录!");
                                     }
                                 }}>我要购买</Button>}
-                            <Modal maskClosable={false}
-                                title="我要购买"
-                                width={600}
-                                style={{ 'top': '160px' }}
-                                visible={this.state.orderVisible}
-                                footer={null}
-                                onCancel={() => { this.setState({ orderVisible: false }); }}>
-                                <Row>
-                                    <Col span={2}>备注 : </Col>
-                                    <Col span={22}>
-                                        <Input type="textarea" rows={4} onChange={(e) => { this.state.comment = e.target.value }} />
-                                    </Col>
-                                </Row>
-                                <Button loading={this.state.buttonLoading} style={{ marginTop: '20px' }} type="primary" onClick={this.handleSubmit}>提交</Button>
-                            </Modal>
                         </div>
+                        <Modal maskClosable={false}
+                            title="我要购买"
+                            width={600}
+                            style={{ 'top': '160px' }}
+                            visible={this.state.orderVisible}
+                            footer={null}
+                            onCancel={() => { this.setState({ orderVisible: false }); }}>
+                            <Row>
+                                <Col span={2}>备注 : </Col>
+                                <Col span={22}>
+                                    <Input type="textarea" rows={4} onChange={(e) => { this.state.comment = e.target.value }} />
+                                </Col>
+                            </Row>
+                            <Button loading={this.state.buttonLoading} style={{ marginTop: '20px' }} type="primary" onClick={this.handleSubmit}>提交</Button>
+                        </Modal>
                     </Spin>
                 </Modal>
             );