|
@@ -44,7 +44,8 @@ import {getMaterialStatus,
|
|
|
getProjectName} from '@/tools'
|
|
|
import { taskStatus, projectStatus, cuiJieDian,projectStatusCascader } from '@/dataDic.js'
|
|
|
import ShowModalDiv from '@/showModal.jsx';
|
|
|
-import NowProjectStatus from '../../../common/nowProjectStatus'
|
|
|
+import NowProjectStatus from '../../../common/nowProjectStatus';
|
|
|
+import DeclarationProgress from '../../../../component/common/declarationProgress';
|
|
|
|
|
|
import CheckProject from '../../components/checkProject';
|
|
|
import NewSupplier from './newSupplier';
|
|
@@ -4231,50 +4232,16 @@ const Task = React.createClass({
|
|
|
/>
|
|
|
</div> :
|
|
|
<div>
|
|
|
- <div style={{display:'flex',flexFlow:'row wrap',marginLeft: '11px',marginTop:'20px'}}>
|
|
|
- {this.state.startDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>启动时间:</span>
|
|
|
- <span>{this.state.startDate}</span>
|
|
|
- </div> : null}
|
|
|
-
|
|
|
- {/*旧数据处理*/}
|
|
|
- {/* endDate 完成时间 对应已提交时间 4*/}
|
|
|
- {/* acceptDate 受理时间 对应已推荐时间 6*/}
|
|
|
- {/* publicityDate 公示时间 对应已拟公示时间 8*/}
|
|
|
- {/* licenceDate 发证时间 对应已下证时间 10*/}
|
|
|
- {/* setUpAmount 立项金额 18*/}
|
|
|
- {
|
|
|
- this.state.timeRecordparse && Object.keys(this.state.timeRecordparse).map(v=>(
|
|
|
- <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>{this.state.timeRecordparse[v]['title']}:</span>
|
|
|
- <span>
|
|
|
- {v === '18' ?
|
|
|
- this.state.timeRecordparse[v]['setUpAmount']:
|
|
|
- v === '10' ?
|
|
|
- this.state.timeRecordparse[v]['certificateNumber']:
|
|
|
- this.state.timeRecordparse[v]['date']
|
|
|
- }
|
|
|
- </span>
|
|
|
- </div>
|
|
|
- ))
|
|
|
- }
|
|
|
- {
|
|
|
- [
|
|
|
- {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
- {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
- {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
- {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
- {id:18,name:'立项金额',value:this.state.setUpAmount}
|
|
|
- ].map(v=>(
|
|
|
- !this.state.timeRecordparse[parseInt(v.id)] && v.value && <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>{v.name}:</span>
|
|
|
- <span>{v.value}</span>
|
|
|
- </div>
|
|
|
- ))
|
|
|
- }
|
|
|
- </div>
|
|
|
-
|
|
|
-
|
|
|
+ <DeclarationProgress
|
|
|
+ timeRecordparse={this.state.timeRecordparse}
|
|
|
+ startDate={this.state.startDate}
|
|
|
+ list={[
|
|
|
+ {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
+ {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
+ {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
+ {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
+ {id:15,name:'立项金额',value:this.state.setUpAmount}
|
|
|
+ ]}/>
|
|
|
{/*高新显示 bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
|
|
|
{this.state.bpType === 5 ? <FormItem
|
|
|
className="half-item"
|
|
@@ -5807,48 +5774,16 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
<h3 className="sub-title">项目申报进度</h3>
|
|
|
- <div style={{display:'flex',flexFlow:'row wrap',marginLeft: '11px',marginTop:'20px'}}>
|
|
|
- {this.state.startDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>启动时间:</span>
|
|
|
- <span>{this.state.startDate}</span>
|
|
|
- </div> : null}
|
|
|
-
|
|
|
- {/*旧数据处理*/}
|
|
|
- {/* endDate 完成时间 对应已提交时间 4*/}
|
|
|
- {/* acceptDate 受理时间 对应已推荐时间 6*/}
|
|
|
- {/* publicityDate 公示时间 对应已拟公示时间 8*/}
|
|
|
- {/* licenceDate 发证时间 对应已下证时间 10*/}
|
|
|
- {/* setUpAmount 立项金额 18*/}
|
|
|
- {
|
|
|
- this.state.timeRecordparse && Object.keys(this.state.timeRecordparse).map(v=>(
|
|
|
- <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>{this.state.timeRecordparse[v]['title']}:</span>
|
|
|
- <span>
|
|
|
- {v === '18' ?
|
|
|
- this.state.timeRecordparse[v]['setUpAmount']:
|
|
|
- v === '10' ?
|
|
|
- this.state.timeRecordparse[v]['certificateNumber']:
|
|
|
- this.state.timeRecordparse[v]['date']
|
|
|
- }
|
|
|
- </span>
|
|
|
- </div>
|
|
|
- ))
|
|
|
- }
|
|
|
- {
|
|
|
- [
|
|
|
- {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
- {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
- {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
- {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
- {id:18,name:'立项金额',value:this.state.setUpAmount}
|
|
|
- ].map(v=>(
|
|
|
- !this.state.timeRecordparse[parseInt(v.id)] && v.value && <div style={{marginRight:'30px',marginBottom:'15px'}}>
|
|
|
- <span style={{marginRight:'15px'}}>{v.name}:</span>
|
|
|
- <span>{v.value}</span>
|
|
|
- </div>
|
|
|
- ))
|
|
|
- }
|
|
|
- </div>
|
|
|
+ <DeclarationProgress
|
|
|
+ timeRecordparse={this.state.timeRecordparse}
|
|
|
+ startDate={this.state.startDate}
|
|
|
+ list={[
|
|
|
+ {id:4,name:'完成时间',value:this.state.endDate},
|
|
|
+ {id:6,name:'受理时间',value:this.state.acceptDate},
|
|
|
+ {id:8,name:'公示时间',value:this.state.publicityDate},
|
|
|
+ {id:10,name:'发证时间',value:this.state.licenceDate},
|
|
|
+ {id:15,name:'立项金额',value:this.state.setUpAmount}
|
|
|
+ ]}/>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|