Browse Source

项目状态

HW 4 years ago
parent
commit
60a0bfbf91

+ 58 - 0
js/component/common/declarationProgress/index.jsx

@@ -0,0 +1,58 @@
+import React,{Component} from 'react';
+
+class DeclarationProgress extends Component{
+    constructor(props) {
+        super(props);
+    }
+
+    render() {
+        return (
+            <div style={{display:'flex',flexFlow:'row wrap',marginLeft: '11px',marginTop:'20px'}}>
+                {this.props.startDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
+                    <span style={{marginRight:'15px'}}>启动时间:</span>
+                    <span>{this.props.startDate}</span>
+                </div> : null}
+                {/*旧数据处理*/}
+                {/* endDate           完成时间      对应已提交时间     4*/}
+                {/* acceptDate        受理时间      对应已推荐时间     6*/}
+                {/* publicityDate     公示时间      对应已拟公示时间   8*/}
+                {/* licenceDate       发证时间      对应已下证时间     10*/}
+                {/* setUpAmount       立项金额                      15*/}
+                {/*数据处理*/}
+                {/* 拨款金额   18   appropriation*/}
+                {
+                    this.props.timeRecordparse && Object.keys(this.props.timeRecordparse).map(v=>(
+                        <div style={{marginBottom:'15px'}}>
+                            <span style={{marginRight:'8px'}}>{this.props.timeRecordparse[v]['title']}:</span>
+                            <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['date']}</span>
+                            <span>
+                                {
+                                    v === '18' ? <span style={{marginBottom:'15px'}}>
+                                        <span style={{marginRight:'8px'}}>拨款金额(万元):</span>
+                                        <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['appropriation']}</span>
+                                    </span> : null
+                                }
+                                {
+                                    v === '15' ? <span style={{marginBottom:'15px'}}>
+                                        <span style={{marginRight:'8px'}}>立项金额(万元):</span>
+                                        <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['setUpAmount']}</span>
+                                    </span> : null
+                                }
+                            </span>
+                        </div>
+                    ))
+                }
+                {
+                    this.props.list.map(v=>(
+                        !this.props.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>
+        )
+    }
+}
+
+export default DeclarationProgress;

+ 43 - 18
js/component/common/nowProjectStatus/index.jsx

@@ -94,7 +94,7 @@ class NowProjectStatus extends Component{
         * acceptDate        受理时间      对应已推荐时间     6
         * publicityDate     公示时间      对应已拟公示时间   8
         * licenceDate       发证时间      对应已下证时间     10
-        * setUpAmount       立项金额                      18
+        * setUpAmount       立项金额                      15
         * */
         const {endDate,acceptDate,publicityDate,licenceDate,setUpAmount} = this.props.oldData;
         if((!this.props.projectTypeJSON[4]) && endDate){
@@ -113,9 +113,9 @@ class NowProjectStatus extends Component{
             this.state.dataInfor[10]={title:'发证时间'};
             this.state.dataInfor[10]['date'] = licenceDate;
         }
-        if((!this.props.projectTypeJSON[18]) && setUpAmount){
-            this.state.dataInfor[18]={title:'立项金额'};
-            this.state.dataInfor[18]['setUpAmount'] = setUpAmount;
+        if((!this.props.projectTypeJSON[15]) && setUpAmount){
+            this.state.dataInfor[15]={title:'立项金额'};
+            this.state.dataInfor[15]['setUpAmount'] = setUpAmount;
         }
         this.setState({
             dataInfor: this.state.dataInfor,
@@ -171,34 +171,59 @@ class NowProjectStatus extends Component{
                                         {
                                             (v.valueType || []).map(d=>(
                                                 parseInt(this.state.projectStatus) !== parseInt(v.id) ?
-                                                    <span style={{marginRight:'15px'}}>{this.state.dataInfor[v.id] && this.state.dataInfor[v.id][d]}</span> :
-                                                d === 'date' ?
+                                                    <span style={{marginRight:'15px'}}>
+                                                        {
+                                                            d === 'appropriation' ? '拨款金额(万元):' :
+                                                                d === 'certificateNumber' ? '已出高新证书编号,编号:' :
+                                                                    d === 'setUpAmount' ? '立项金额(万元):' : ''
+                                                        }
+                                                        {
+                                                            this.state.dataInfor[v.id] && this.state.dataInfor[v.id][d]
+                                                        }
+                                                    </span>
+                                                :d === 'date' ?
                                                 <DatePicker
                                                     style={{ marginRight: '5px',width:'120px' }}
                                                     showTime
                                                     format="YYYY-MM-DD"
                                                     onOk={() => {}}
                                                     value={
-                                                        this.state.dataInfor[v.id][d] ? moment(this.state.dataInfor[v.id][d]) : null
+                                                        this.state.dataInfor[v.id] && this.state.dataInfor[v.id][d] ? moment(this.state.dataInfor[v.id][d]) : null
                                                     }
                                                     onChange={(data, dataString) => {
+                                                        console.log(dataString)
+                                                        if(!this.state.dataInfor[v.id]){
+                                                            this.state.dataInfor[v.id] = {};
+                                                        }
                                                         this.state.dataInfor[v.id][d] = dataString;
                                                         this.setState({
                                                             dataInfor:this.state.dataInfor,
                                                         })
                                                     }}
                                                 /> :
-                                                d === 'setUpAmount' || d === 'certificateNumber'? <Input
-                                                    placeholder={v.placeholder}
-                                                    value={this.state.dataInfor[v.id][d]}
-                                                    style={{ width: '120px',marginRight: '5px', }}
-                                                    onChange={(e) => {
-                                                        this.state.dataInfor[v.id][d] = e.target.value;
-                                                        this.setState({
-                                                            dataInfor:this.state.dataInfor,
-                                                        })
-                                                    }}
-                                                /> : null
+                                                    d === 'setUpAmount' || d === 'certificateNumber' || d === 'appropriation' ? <span>
+                                                        <span>
+                                                            {
+                                                                d === 'appropriation' ? '拨款金额(万元)' :
+                                                                    d === 'certificateNumber' ? '已出高新证书编号,编号' :
+                                                                        d === 'setUpAmount' ? '立项金额(万元)' : ''
+                                                            }
+                                                        </span>
+                                                        <Input
+                                                            placeholder={v.placeholder}
+                                                            value={this.state.dataInfor[v.id] ? this.state.dataInfor[v.id][d] : ''}
+                                                            style={{ width: '120px',marginRight: '5px', }}
+                                                            onChange={(e) => {
+                                                                if(!this.state.dataInfor[v.id]){
+                                                                    this.state.dataInfor[v.id] = {};
+                                                                }
+                                                                this.state.dataInfor[v.id][d] = e.target.value;
+                                                                this.setState({
+                                                                    dataInfor:this.state.dataInfor,
+                                                                })
+                                                            }}
+                                                        />
+                                                    </span> : null
                                             ))
                                         }
                                         <span style={{color:'#f00',marginLeft:'15px'}}>{v.explain}</span>

+ 5 - 5
js/component/common/nowProjectStatus/type.jsx

@@ -114,9 +114,9 @@ const highTechColumns =[
     },
     {
         id:10,
-        name:'已下证,已出高新证书编号,编号',
+        name:'已下证',
         label:'下证时间',
-        valueType:['certificateNumber','date'],
+        valueType:['date','certificateNumber'],
         placeholder:'请输入编号'
     },
     {
@@ -175,7 +175,7 @@ const science = [
     {
         id:15,
         name:'已立项',
-        valueType:['date'],
+        valueType:['date','setUpAmount'],
     },
     {
         id:16,
@@ -189,8 +189,8 @@ const science = [
     },
     {
         id:18,
-        name:'已拨款,金额(万元)',
-        valueType:['setUpAmount','date'],
+        name:'已拨款',
+        valueType:['date','appropriation'],
     },
     {
         id:11,

+ 1 - 1
js/component/dataDic.js

@@ -3038,7 +3038,7 @@ module.exports = {
         },
         {
           value:18,
-          label:'已拨款,金额(万元)',
+          label:'已拨款',
         },
         {
           value:11,

+ 21 - 84
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -17,6 +17,7 @@ import {
 } from "@/tools";
 import OrderRiZi from "@/orderRiZi.jsx";
 import $ from "jquery";
+import DeclarationProgress from "../../../common/declarationProgress";
 
 const FormItem =Form.Item;
 const {TabPane} = Tabs;
@@ -1239,48 +1240,16 @@ class ProjectDetails extends Component{
                                         {this.state.isSoftware ?
                                             <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}
@@ -1309,48 +1278,16 @@ class ProjectDetails extends Component{
                                             </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}
+                                                    ]}/>
                                             {
                                                 this.state.bpType === 1 || this.state.bpType === 6 ?
                                                     <div>

+ 22 - 87
js/component/manageCenter/project/task/myTask.jsx

@@ -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}

+ 13 - 76
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -29,6 +29,7 @@ import {
 } from "@/tools.js";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
+import DeclarationProgress from "../../../common/declarationProgress";
 
 const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
@@ -1576,48 +1577,16 @@ const MyTaskCount = Form.create()(
                   </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>
-                        ))
-                      }
-                      {
-                        [
+                    <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: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>
+                          {id:15,name:'立项金额',value:this.state.setUpAmount}
+                        ]}/>
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -2129,48 +2098,16 @@ const MyTaskCount = Form.create()(
             </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>
-                  ))
-                }
-                {
-                  [
+              <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: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>
+                    {id:15,name:'立项金额',value:this.state.setUpAmount}
+                  ]}/>
               <FormItem
                 className="half-item"
                 {...formItemLayout}

+ 13 - 76
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -53,6 +53,7 @@ import ImgList from "../../../common/imgList";
 import NewSupplier from "./newSupplier";
 import NowProjectStatus from '../../../common/nowProjectStatus';
 import OperationPayNode from "./operationPayNode";
+import DeclarationProgress from "../../../common/declarationProgress";
 const FormItem = Form.Item;
 const { Option } = Select;
 const { TextArea } = Input;
@@ -3887,48 +3888,16 @@ const MyTaskOutsource = 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>
-                          ))
-                        }
-                        {
-                          [
+                      <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: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>
+                            {id:15,name:'立项金额',value:this.state.setUpAmount}
+                          ]}/>
                       {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
                         this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -5286,48 +5255,16 @@ const MyTaskOutsource = 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>
-                    ))
-                  }
-                  {
-                    [
+                <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: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>
+                      {id:15,name:'立项金额',value:this.state.setUpAmount}
+                    ]}/>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}

+ 11 - 42
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -37,6 +37,7 @@ import OrderRiZi from '@/orderRiZi.jsx'
 import moment from "moment";
 import $ from "jquery";
 import PatentSchedule from '../../patentSchedule';
+import DeclarationProgress from "../../../../../common/declarationProgress";
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -922,48 +923,16 @@ class projectOverview extends Component{
                         </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}
+                                ]}/>
                             {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                             {
                                 this.state.bpType === 1 || this.state.bpType === 6 ?

+ 13 - 76
js/component/manageCenter/project/task/taskCount.jsx

@@ -19,6 +19,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
+import DeclarationProgress from "../../../common/declarationProgress";
 
 const {TabPane} = Tabs
 
@@ -1657,48 +1658,16 @@ const IntentionCustomer = Form.create()(
                   </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>
-                        ))
-                      }
-                      {
-                        [
+                    <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: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>
+                          {id:15,name:'立项金额',value:this.state.setUpAmount}
+                        ]}/>
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -2254,48 +2223,16 @@ const IntentionCustomer = Form.create()(
             </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>
-                  ))
-                }
-                {
-                  [
+              <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: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>
+                    {id:15,name:'立项金额',value:this.state.setUpAmount}
+                  ]}/>
               <FormItem
                 className="half-item"
                 {...formItemLayout}

+ 13 - 76
js/component/manageCenter/project/task/taskQuery.jsx

@@ -38,6 +38,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import moment from "moment";
+import DeclarationProgress from "../../../common/declarationProgress";
 
 const Task = React.createClass({
   loadData(pageNo) {
@@ -1567,48 +1568,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>
-                          ))
-                        }
-                        {
-                          [
+                      <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: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>
+                            {id:15,name:'立项金额',value:this.state.setUpAmount}
+                          ]}/>
                       {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
                         this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -2235,48 +2204,16 @@ const Task = React.createClass({
               />
               <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>
-                    ))
-                  }
-                  {
-                    [
+                <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: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>
+                      {id:15,name:'立项金额',value:this.state.setUpAmount}
+                    ]}/>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}