ソースを参照

更改项目状态

HW 4 年 前
コミット
71ea1130e7

+ 91 - 69
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -12,7 +12,8 @@ import {
     getProjectStatus,
     getboutique,
     getprovince,
-    ShowModal
+    ShowModal,
+    getProjectName
 } from "@/tools";
 import OrderRiZi from "@/orderRiZi.jsx";
 import $ from "jquery";
@@ -50,6 +51,8 @@ class ProjectDetails extends Component{
     constructor(props) {
         super(props);
         this.state={
+            timeRecordparse:{},
+
             activeKey: '1',
             loading: false,
 
@@ -495,6 +498,7 @@ class ProjectDetails extends Component{
                         certificatesCount:thisdata.certificatesCount, //授权数
                         rejectCount:thisdata.rejectCount,       //驳回数
                         commodityQuantity:thisdata.commodityQuantity, //派单项目数
+                        timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
                     });
                 }
             }.bind(this),
@@ -829,19 +833,9 @@ class ProjectDetails extends Component{
                                             <FormItem
                                                 className="half-item"
                                                 {...formItemLayout}
-                                                label="当前项目情况"
+                                                label="项目状态"
                                             >
-                                                <span>
-                                                  {
-                                                      this.state.status === 0 ? '未开始':
-                                                          this.state.status === 1 ? '进行中':
-                                                              this.state.status === 2 ? '已暂停':
-                                                                  this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                                                      this.state.status === 4 ? '已完成':
-                                                                          this.state.status === 5 ? '项目已完成 已退单':
-                                                                              this.state.status === 6 ? '项目未完成 已退单': ''
-                                                  }
-                                                </span>
+                                                <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                                                 <Button
                                                     type="primary"
                                                     size="small"
@@ -1254,6 +1248,48 @@ 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>
                                                 <FormItem
                                                     className="half-item"
                                                     {...formItemLayout}
@@ -1264,13 +1300,6 @@ class ProjectDetails extends Component{
                                                 <FormItem
                                                     className="half-item"
                                                     {...formItemLayout}
-                                                    label="启动时间"
-                                                >
-                                                    <span>{this.state.startDate}</span>
-                                                </FormItem>
-                                                <FormItem
-                                                    className="half-item"
-                                                    {...formItemLayout}
                                                     label="软著派单数量"
                                                 >
                                                     <span>{this.state.commodityQuantity}</span>
@@ -1289,6 +1318,48 @@ 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>
                                             {
                                                 this.state.bpType === 1 || this.state.bpType === 6 ?
                                                     <div>
@@ -1356,55 +1427,6 @@ class ProjectDetails extends Component{
                                                         <FormItem
                                                             className="half-item"
                                                             {...formItemLayout}
-                                                            label="启动时间"
-                                                        >
-                                                            <span>{this.state.startDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="完成时间"
-                                                        >
-                                                            <span>{this.state.endDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="受理时间"
-                                                        >
-                                                            <span>{this.state.acceptDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="评审时间"
-                                                        >
-                                                            <span>{this.state.reviewDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="公示时间"
-                                                        >
-                                                            <span>{this.state.publicityDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="发证时间"
-                                                        >
-                                                            <span>{this.state.licenceDate}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
-                                                            label="立项金额(万元)"
-                                                        >
-                                                            <span>{this.state.setUpAmount}</span>
-                                                        </FormItem>
-                                                        <FormItem
-                                                            className="half-item"
-                                                            {...formItemLayout}
                                                             label="是否到款"
                                                         >
                                                             <span>

+ 104 - 107
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -24,7 +24,8 @@ import {
   getTaskStatus,
   getApproval,
   getprovince,
-  getProjectStatus
+  getProjectStatus,
+  getProjectName
 } from "@/tools.js";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
@@ -207,6 +208,7 @@ const MyTaskCount = Form.create()(
         page: 1,
         releaseDate: [],
         selectedRowKeys: [],
+        timeRecordparse:{},
         orgCodeUrl: [],
         paginations: false,
         pagination: {
@@ -579,6 +581,7 @@ const MyTaskCount = Form.create()(
               certificatesCount:thisdata.certificatesCount, //授权数
               rejectCount:thisdata.rejectCount,       //驳回数
               commodityQuantity:thisdata.commodityQuantity, //派单项目数
+              timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},
             });
           }
         }.bind(this)
@@ -1243,26 +1246,16 @@ const MyTaskCount = Form.create()(
                 <div className="clearfix">
                   <div className="clearfix">
                     <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="当前项目情况"
+                        className="half-item"
+                        {...formItemLayout}
+                        label="项目状态"
                     >
-                      <span>
-                        {
-                          this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '进行中':
-                                  this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                          this.state.status === 4 ? '已完成':
-                                              this.state.status === 5 ? '项目已完成 已退单':
-                                                  this.state.status === 6 ? '项目未完成 已退单': ''
-                        }
-                      </span>
+                      <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                       <Button
-                        type="primary"
-                        size="small"
-                        style={{ marginTop: "5px", position: "absolute" }}
-                        onClick={this.caozuorizhi}
+                          type="primary"
+                          size="small"
+                          style={{ marginTop: '5px', position: 'absolute' }}
+                          onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -1279,13 +1272,6 @@ const MyTaskCount = Form.create()(
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="项目状态"
-                    >
-                      <span>{getProcessStatus(this.state.projectStatus)}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
                       label="是否特批"
                     >
                       <span>{getApproval(this.state.approval)}</span>
@@ -1590,6 +1576,48 @@ 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>
+                        ))
+                      }
+                      {
+                        [
+                          {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>
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -1629,55 +1657,6 @@ const MyTaskCount = Form.create()(
                             <FormItem
                               className="half-item"
                               {...formItemLayout}
-                              label="启动时间"
-                            >
-                              <span>{this.state.startDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="完成时间"
-                            >
-                              <span>{this.state.endDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="受理时间"
-                            >
-                              <span>{this.state.acceptDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="评审时间"
-                            >
-                              <span>{this.state.reviewDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="公示时间"
-                            >
-                              <span>{this.state.publicityDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="发证时间"
-                            >
-                              <span>{this.state.licenceDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="立项金额(万元)"
-                            >
-                              <span>{this.state.setUpAmount}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
                               label="是否到款"
                             >
                               <span>
@@ -1844,26 +1823,16 @@ const MyTaskCount = Form.create()(
           >
             <div className="clearfix">
               <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="当前项目情况"
+                  className="half-item"
+                  {...formItemLayout}
+                  label="项目状态"
               >
-                <span>
-                  {
-                    this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '进行中':
-                            this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                    this.state.status === 4 ? '已完成':
-                                        this.state.status === 5 ? '项目已完成 已退单':
-                                            this.state.status === 6 ? '项目未完成 已退单': ''
-                  }
-                </span>
+                <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                 <Button
-                  type="primary"
-                  size="small"
-                  style={{ marginTop: "5px", position: "absolute" }}
-                  onClick={this.caozuorizhi}
+                    type="primary"
+                    size="small"
+                    style={{ marginTop: '5px', position: 'absolute' }}
+                    onClick={this.caozuorizhi}
                 >
                   操作日志
                 </Button>
@@ -1880,13 +1849,6 @@ const MyTaskCount = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="项目状态"
-              >
-                <span>{getProcessStatus(this.state.projectStatus)}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
                 label="是否特批"
               >
                 <span>{getApproval(this.state.approval)}</span>
@@ -2167,6 +2129,48 @@ 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>
+                  ))
+                }
+                {
+                  [
+                    {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>
               <FormItem
                 className="half-item"
                 {...formItemLayout}
@@ -2177,13 +2181,6 @@ const MyTaskCount = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="启动时间"
-              >
-                <span>{this.state.startDate}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
                 label="软著派单数量"
               >
                 <span>{this.state.commodityQuantity}</span>

+ 208 - 369
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -42,13 +42,16 @@ import {
   getboutique,
   getprovince,
   moneyVerify,
-  ShowModal
+  ShowModal,
+  getRefundStatus,
+  getProjectName
 } from "@/tools";
-import { projectStatus } from "@/dataDic.js";
+import { projectStatus,projectStatusCascader } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import CheckProject from "../../components/checkProject";
 import ImgList from "../../../common/imgList";
 import NewSupplier from "./newSupplier";
+import NowProjectStatus from '../../../common/nowProjectStatus';
 import OperationPayNode from "./operationPayNode";
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -113,10 +116,10 @@ const MyTaskOutsource = React.createClass({
         contractNo: this.state.contractNoSearch, //合同编号
         taskId: this.state.taskNoSearch, //项目编号
         taskStatus: this.state.taskStatuSearch, //项目状态
-        projectStatus: this.state.projectStatusSearch, //项目状态
         adminName: this.state.adminName, //项目受理人
         outsource: 1,
         approval: this.state.approvalSearch, //特批状态搜索
+        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
       },
       success: function (data) {
         ShowModal(this);
@@ -272,6 +275,7 @@ const MyTaskOutsource = React.createClass({
       flag: false,
       roleName: "",
       modKey: "1",
+      timeRecordparse:{},
       testFlag: true,
       boHuivisible: false,
       companyProvinceArr: [],
@@ -893,7 +897,8 @@ const MyTaskOutsource = React.createClass({
       data: {
         id: this.state.id, //项目编号
         orderNo: this.state.orderNo, //订单编号
-        projectStatus: this.state.projectStatus, //项目状态
+        projectStatus: status || this.state.projectStatus, //项目状态
+        status: this.state.status, //状态
         taskStatus: this.state.taskStatus, //项目状态
         taskComment: this.state.taskComment, //说明
         startDate: this.state.startDate, //启动日期
@@ -908,7 +913,6 @@ const MyTaskOutsource = React.createClass({
         legalPerson: this.state.legalPerson, //法人
         legalPersonTel: this.state.legalPersonTel, //法人电话
         certificateNumber: this.state.certificateNumber, //证书编号
-        status: status ? status : this.state.status, //状态
         formRetrieve: this.state.formRetrieve, //满意度表格
         taskRefund: this.state.taskRefund, //退单
         refundContent: this.state.refundContent, //退单信息
@@ -1046,7 +1050,7 @@ const MyTaskOutsource = React.createClass({
             legalPersonTel: thisdata.legalPersonTel, //法人电话
             certificateNumber: thisdata.certificateNumber, //证书编号
             status: thisdata.status, //状态  0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
-            modifyProjectStatus: thisdata.status,
+            // modifyProjectStatus: thisdata.status,
             formRetrieve: thisdata.formRetrieve, //满意度表格
             taskRefund: thisdata.taskRefund, //退单
             refundContent: thisdata.refundContent, //退单信息
@@ -1071,6 +1075,8 @@ const MyTaskOutsource = React.createClass({
             certificatesCount:thisdata.certificatesCount, //授权数
             rejectCount:thisdata.rejectCount,       //驳回数
             commodityQuantity:thisdata.commodityQuantity, //派单项目数PatentSchedule
+            timeRecord: thisdata.timeRecord || '{}',//项目状态JSON
+            timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
           });
         }
       }.bind(this),
@@ -1678,6 +1684,7 @@ const MyTaskOutsource = React.createClass({
       setUpStatus: '',
       setUpTime: '',
       highTechStatus: '',
+      projectStatusSearch : [], //项目状态
     })
   },
   searchSwitch() {
@@ -1739,6 +1746,29 @@ const MyTaskOutsource = React.createClass({
       }.bind(this)
     );
   },
+  updateProjectStatus(projectStatus,fn){
+    $.ajax({
+      url: globalConfig.context + '/api/admin/orderProject/updateProjectStatus',
+      method: 'post',
+      data: {
+        tid:this.state.tid,
+        projectStatus: projectStatus,
+        timeRecord: '{}'
+      },
+    }).done(
+        function (data) {
+          if (!data.error.length) {
+            this.setState({
+              timeRecordparse: {},
+            })
+            message.success('保存成功!');
+            fn();
+          } else {
+            message.warning(data.error[0].message)
+          }
+        }.bind(this)
+    )
+  },
   changeList(arr) {
     const newArr = [];
     this.state.columns.forEach((item) => {
@@ -3176,21 +3206,17 @@ const MyTaskOutsource = React.createClass({
                   );
                 })}
               </Select>
-              <Select
-                placeholder="项目状态"
-                style={{ width: 150, marginRight: "10px" }}
-                value={this.state.projectStatusSearch}
-                onChange={(e) => {
-                  this.setState({ projectStatusSearch: e });
-                  console.log(this.state.projectStatusSearch);
-                }}
-              >
-                {projectStatus.map(function (item) {
-                  return (
-                    <Select.Option key={item.value}>{item.key}</Select.Option>
-                  );
-                })}
-              </Select>
+              <Cascader
+                  placeholder="项目状态"
+                  style={{ width: 150, marginRight: '10px' }}
+                  options={projectStatusCascader}
+                  value={this.state.projectStatusSearch}
+                  onChange={(e)=>{
+                    this.setState({
+                      projectStatusSearch: e
+                    })
+                  }}
+              />
               <Select
                 placeholder="特批状态"
                 style={{ width: 150, marginRight: "10px" }}
@@ -3301,7 +3327,7 @@ const MyTaskOutsource = React.createClass({
               inset:'-15px',
               zIndex: 1000,
               //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
-              display: this.state.status === 0 ? 'flex' : 'none',
+              display: parseInt(this.state.projectStatus) === 0 ? 'flex' : 'none',
               justifyContent:'center',
               paddingTop: '300px',
               background: 'rgba(0,0,0,0.7)',
@@ -3316,7 +3342,7 @@ const MyTaskOutsource = React.createClass({
                   size='large'
                   onClick={()=>{
                     //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
-                    this.tijiaoOk(1,()=>{
+                    this.updateProjectStatus(1,()=>{
                       this.xiangqing(this.state.id)
                     });
                   }}>
@@ -3355,31 +3381,15 @@ const MyTaskOutsource = React.createClass({
                   <div className="clearfix">
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="当前项目情况"
+                          className="half-item"
+                          {...formItemLayout}
+                          label="项目状态"
                       >
-                        {/*<Radio.Group*/}
-                        {/*  value={this.state.status}*/}
-                        {/*  onChange={(e) => {*/}
-                        {/*    this.setState({ status: e.target.value });*/}
-                        {/*  }}*/}
-                        {/*>*/}
-                        {/*  <Radio value={0}>开启</Radio>*/}
-                        {/*  <Radio value={1}>暂停</Radio>*/}
-                        {/*</Radio.Group>*/}
-                        {/*0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单*/}
                         {
-                          this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '进行中':
-                                  this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                          this.state.status === 4 ? '已完成':
-                                              this.state.status === 5 ? '项目已完成 已退单':
-                                                  this.state.status === 6 ? '项目未完成 已退单': ''
+                          getProjectName(parseInt(this.state.projectStatus))
                         }
                         {
-                          this.state.status !== 0 ? <Button
+                          this.state.projectStatus !== 0 ? <Button
                               type="primary"
                               size="small"
                               style={{ marginTop: "5px" }}
@@ -3393,10 +3403,10 @@ const MyTaskOutsource = React.createClass({
                           </Button> : null
                         }
                         <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: "5px", position: "absolute" }}
-                          onClick={this.caozuorizhi}
+                            type="primary"
+                            size="small"
+                            style={{ marginTop: "5px", position: "absolute" }}
+                            onClick={this.caozuorizhi}
                         >
                           操作日志
                         </Button>
@@ -3413,28 +3423,6 @@ const MyTaskOutsource = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="项目状态"
-                      >
-                        <Select
-                          placeholder="选择项目状态"
-                          style={{ width: "200px" }}
-                          value={this.state.projectStatus}
-                          onChange={(e) => {
-                            this.setState({ projectStatus: e });
-                          }}
-                        >
-                          {projectStatus.map(function (item) {
-                            return (
-                              <Select.Option key={item.value}>
-                                {item.key}
-                              </Select.Option>
-                            );
-                          })}
-                        </Select>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
                         label="是否特批"
                       >
                         <span>{getApproval(this.state.approval)}</span>
@@ -3862,17 +3850,7 @@ const MyTaskOutsource = React.createClass({
                         {...formItemLayout}
                         label="证书编号"
                       >
-                        <Input
-                          placeholder="请输入证书编号"
-                          value={this.state.certificateNumber}
-                          style={{ width: "200px" }}
-                          onChange={(e) => {
-                            this.setState({
-                              certificateNumber: e.target.value,
-                            });
-                          }}
-                          ref="commodityQuantity"
-                        />
+                        {this.state.certificateNumber}
                       </FormItem>
                     </div>
                     <div className="clearfix">
@@ -3909,6 +3887,48 @@ 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>
+                          ))
+                        }
+                        {
+                          [
+                            {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>
                       {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
                         this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -4041,165 +4061,6 @@ const MyTaskOutsource = React.createClass({
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="启动时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.startDate
-                                      ? moment(this.state.startDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ startDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="完成时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.endDate
-                                      ? moment(this.state.endDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ endDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="受理时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.acceptDate
-                                      ? moment(this.state.acceptDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ acceptDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="评审时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.reviewDate
-                                      ? moment(this.state.reviewDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ reviewDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="公示时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.publicityDate
-                                      ? moment(this.state.publicityDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ publicityDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="发证时间"
-                              >
-                                <DatePicker
-                                  style={{
-                                    marginTop: "2px",
-                                    width: "200px",
-                                    height: "32px",
-                                  }}
-                                  showTime
-                                  format="YYYY-MM-DD"
-                                  onOk={() => {}}
-                                  value={
-                                    this.state.licenceDate
-                                      ? moment(this.state.licenceDate)
-                                      : null
-                                  }
-                                  onChange={(data, dataString) => {
-                                    this.setState({ licenceDate: dataString });
-                                  }}
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="立项金额(万元)"
-                              >
-                                <Input
-                                  placeholder="请输入立项金额"
-                                  value={this.state.setUpAmount}
-                                  style={{ width: "200px" }}
-                                  onChange={(e) => {
-                                    this.setState({ setUpAmount: e.target.value });
-                                  }}
-                                  ref="commodityQuantity"
-                                />
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
                                 label="是否到款"
                               >
                                 <Radio.Group
@@ -4943,7 +4804,7 @@ const MyTaskOutsource = React.createClass({
               inset:'-15px',
               zIndex: 1000,
               //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
-              display: this.state.status === 0 ? 'flex' : 'none',
+              display: parseInt(this.state.projectStatus) === 0 ? 'flex' : 'none',
               justifyContent:'center',
               paddingTop: '300px',
               background: 'rgba(0,0,0,0.7)',
@@ -4958,7 +4819,7 @@ const MyTaskOutsource = React.createClass({
                   size='large'
                   onClick={()=>{
                     //0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
-                    this.tijiaoOk(1,()=>{
+                    this.updateProjectStatus(1,()=>{
                       this.xiangqing(this.state.id)
                     });
                   }}>
@@ -4973,30 +4834,15 @@ const MyTaskOutsource = React.createClass({
             <TabPane tab="项目概况" key="1">
               <div className="clearfix">
                 <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="当前项目情况"
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目状态"
                 >
-                  {/*<Radio.Group*/}
-                  {/*  value={this.state.status}*/}
-                  {/*  onChange={(e) => {*/}
-                  {/*    this.setState({ status: e.target.value });*/}
-                  {/*  }}*/}
-                  {/*>*/}
-                  {/*  <Radio value={0}>开启</Radio>*/}
-                  {/*  <Radio value={1}>暂停</Radio>*/}
-                  {/*</Radio.Group>*/}
                   {
-                    this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '进行中':
-                            this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                    this.state.status === 4 ? '已完成':
-                                        this.state.status === 5 ? '项目已完成 已退单':
-                                            this.state.status === 6 ? '项目未完成 已退单': ''
+                    getProjectName(parseInt(this.state.projectStatus))
                   }
                   {
-                    this.state.status !== 0 ? <Button
+                    this.state.projectStatus !== 0 ? <Button
                         type="primary"
                         size="small"
                         style={{ marginTop: "5px" }}
@@ -5010,45 +4856,45 @@ const MyTaskOutsource = React.createClass({
                     </Button> : null
                   }
                   <Button
-                    type="primary"
-                    size="small"
-                    style={{ marginTop: "5px", position: "absolute" }}
-                    onClick={this.caozuorizhi}
+                      type="primary"
+                      size="small"
+                      style={{ marginTop: "5px", position: "absolute" }}
+                      onClick={this.caozuorizhi}
                   >
                     操作日志
                   </Button>
                 </FormItem>
                 <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="合同编号"
+                    className="half-item"
+                    {...formItemLayout}
+                    label="合同编号"
                 >
                   <span>{this.state.contractNo}</span>
                 </FormItem>
               </div>
               <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目状态"
-                >
-                  <Select
-                    placeholder="选择项目状态"
-                    style={{ width: "200px" }}
-                    value={this.state.projectStatus}
-                    onChange={(e) => {
-                      this.setState({ projectStatus: e });
-                    }}
-                  >
-                    {projectStatus.map(function (item) {
-                      return (
-                        <Select.Option key={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      );
-                    })}
-                  </Select>
-                </FormItem>
+                {/*<FormItem*/}
+                {/*  className="half-item"*/}
+                {/*  {...formItemLayout}*/}
+                {/*  label="项目状态"*/}
+                {/*>*/}
+                {/*  <Select*/}
+                {/*    placeholder="选择项目状态"*/}
+                {/*    style={{ width: "200px" }}*/}
+                {/*    value={this.state.projectStatus}*/}
+                {/*    onChange={(e) => {*/}
+                {/*      this.setState({ projectStatus: e });*/}
+                {/*    }}*/}
+                {/*  >*/}
+                {/*    {projectStatus.map(function (item) {*/}
+                {/*      return (*/}
+                {/*        <Select.Option key={item.value}>*/}
+                {/*          {item.key}*/}
+                {/*        </Select.Option>*/}
+                {/*      );*/}
+                {/*    })}*/}
+                {/*  </Select>*/}
+                {/*</FormItem>*/}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -5391,15 +5237,7 @@ const MyTaskOutsource = React.createClass({
                   {...formItemLayout}
                   label="证书编号"
                 >
-                  <Input
-                    placeholder="请输入证书编号"
-                    value={this.state.certificateNumber}
-                    style={{ width: "200px" }}
-                    onChange={(e) => {
-                      this.setState({ certificateNumber: e.target.value });
-                    }}
-                    ref="commodityQuantity"
-                  />
+                  {this.state.certificateNumber}
                 </FormItem>
               </div>
               <div className="clearfix" style={{ marginTop: "10px" }}>
@@ -5448,6 +5286,48 @@ 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>
+                    ))
+                  }
+                  {
+                    [
+                      {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>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -5720,75 +5600,34 @@ const MyTaskOutsource = React.createClass({
               this.payNodeTable(this.state.tid)
             }}
         /> : <div/>}
-        {this.state.projectSituationVisible ? <Modal
-            maskClosable={false}
-            className="customeDetails"
-            footer=""
-            title=""
-            width="500px"
-            visible={this.state.projectSituationVisible}
-            onOk={()=>{
-              this.setState({
-                projectSituationVisible: false
-              })
-            }}
-            onCancel={()=>{
-              this.setState({
-                projectSituationVisible: false
-              })
-            }}
-        >
-          <div>
-            <div style={{
-              paddingBottom: '15px',
-              fontSize:'18px',
-              fontWeight:"bolder",
-            }}>
-              当前项目情况:
-            </div>
-            <div>
-              <Radio.Group
-                  style={{
-                    dispaly:'flex',
-                    flexRow:'column'
-                  }}
-                  value={this.state.modifyProjectStatus}
-                  onChange={(e) => {
-                    this.setState({ modifyProjectStatus: e.target.value });
-                  }}
-              >
-                <Radio value={1}>进行中</Radio>
-                <Radio value={2}>已暂停</Radio>
-                <Radio value={3}>已驳回(专利、软著项目填写)</Radio>
-                <Radio value={4}>已完成</Radio>
-                <Radio value={5}>项目已完成 已退单</Radio>
-                <Radio value={6}>项目未完成 已退单</Radio>
-              </Radio.Group>
-              <div style={{
-                display:'flex',
-                justifyContent:'center',
-                paddingTop:'20px',
-                paddingBottom: '20px',
-              }}>
-                <Button
-                    className="cancel"
-                    type="ghost"
-                    onClick={()=>{
-                      this.tijiaoOk(this.state.modifyProjectStatus,()=>{
-                        this.xiangqing(this.state.id)
-                        this.setState({
-                          projectSituationVisible: false
-                        })
-                      })
-                    }}
-                >
-                  保存
-                </Button>
-              </div>
-              <div style={{textAlign:'center',color:'#f00'}}>注:请根据实际项目情况填写</div>
-            </div>
-          </div>
-        </Modal> : null}
+        {this.state.projectSituationVisible ?
+            <NowProjectStatus
+                tid={this.state.tid}
+                cSort={parseInt(this.state.cSort)}
+                projectTypeJSON={this.state.timeRecord ? JSON.parse(this.state.timeRecord) : {}}
+                projectType={this.state.projectType}
+                projectStatus={this.state.projectStatus}
+                visible={this.state.projectSituationVisible}
+                oldData={{
+                  endDate:this.state.endDate,     //完成时间
+                  acceptDate:this.state.acceptDate,//受理时间
+                  publicityDate:this.state.publicityDate,//公示时间
+                  licenceDate:this.state.licenceDate,//发证时间
+                  setUpAmount:this.state.setUpAmount,//立项金额
+                }}
+                onCancel={()=>{
+                  this.setState({
+                    projectSituationVisible: false
+                  })
+                }}
+                onPreservation={(value)=>{
+                  this.xiangqing(this.state.id)
+                  this.setState({
+                    projectSituationVisible: false
+                  })
+                }}
+            /> : null
+        }
       </div>
     );
   },

+ 1 - 1
js/component/manageCenter/project/task/payApplyReject/detailsModal/index.js

@@ -352,7 +352,7 @@ class DetailsModal extends Component{
                         /> : <div/>}
                     </TabPane>
                     <TabPane tab="项目概况" key="2">
-                        <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid}/>
+                        <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid} taskName={this.props.taskName}/>
                     </TabPane>
                 </Tabs>
             </Modal>

+ 49 - 70
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -27,6 +27,7 @@ import {
     getprovince,
     ShowModal,
     getRefundStatus,
+    getProjectName
 } from '@/tools'
 import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
 import { areaSelect } from '@/NewDicProvinceList'
@@ -72,6 +73,7 @@ class projectOverview extends Component{
     constructor(props) {
         super(props);
         this.state={
+            timeRecordparse:{},
             loading: false,
             projectStatus: props.projectStatus,
             pagination: {
@@ -317,6 +319,7 @@ class projectOverview extends Component{
                         certificatesCount:thisdata.certificatesCount, //授权数
                         rejectCount:thisdata.rejectCount,       //驳回数
                         commodityQuantity:thisdata.commodityQuantity, //派单项目数
+                        timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},
                     })
                     this.loadData(thisdata.orderNo);
                     this.xiangqings(thisdata.orderNo);
@@ -533,19 +536,9 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="当前项目情况"
+                                label="项目状态"
                             >
-                                <span>
-                                    {
-                                        this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '进行中':
-                                                this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                                        this.state.status === 4 ? '已完成':
-                                                            this.state.status === 5 ? '项目已完成 已退单':
-                                                                this.state.status === 6 ? '项目未完成 已退单': ''
-                                    }
-                                </span>
+                                <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                                 <Button
                                     type="primary"
                                     size="small"
@@ -567,14 +560,6 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="项目状态"
-                            >
-                                {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                                <span>{getProjectStatus(this.state.projectStatus)}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
                                 label="是否特批"
                             >
                                 <span>{getApproval(this.state.approval)}</span>
@@ -936,7 +921,50 @@ class projectOverview extends Component{
                             </FormItem>
                         </div>
                         <div className="clearfix">
-                            <h3 className="sub-title">项目申报进度</h3>{/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            <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>
+                            {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                             {
                                 this.state.bpType === 1 || this.state.bpType === 6 ?
                                     <div>
@@ -1003,55 +1031,6 @@ class projectOverview extends Component{
                                         <FormItem
                                             className="half-item"
                                             {...formItemLayout}
-                                            label="启动时间"
-                                        >
-                                            <span>{this.state.startDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="完成时间"
-                                        >
-                                            <span>{this.state.endDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="受理时间"
-                                        >
-                                            <span>{this.state.acceptDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="评审时间"
-                                        >
-                                            <span>{this.state.reviewDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="公示时间"
-                                        >
-                                            <span>{this.state.publicityDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="发证时间"
-                                        >
-                                            <span>{this.state.licenceDate}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
-                                            label="立项金额(万元)"
-                                        >
-                                            <span>{this.state.setUpAmount}</span>
-                                        </FormItem>
-                                        <FormItem
-                                            className="half-item"
-                                            {...formItemLayout}
                                             label="是否到款"
                                         >
                                           <span>

+ 104 - 107
js/component/manageCenter/project/task/taskCount.jsx

@@ -11,7 +11,8 @@ import {
   getApproval,
   getprovince,
   ShowModal,
-  getProjectStatus
+  getProjectStatus,
+  getProjectName
 } from "@/tools.js";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
@@ -167,6 +168,7 @@ const IntentionCustomer = Form.create()(
         page: 1,
         releaseDate: [],
         selectedRowKeys: [],
+        timeRecordparse:{},
         orgCodeUrl: [],
         loadingA: false,
         paginations: false,
@@ -576,6 +578,7 @@ const IntentionCustomer = Form.create()(
               certificatesCount:thisdata.certificatesCount, //授权数
               rejectCount:thisdata.rejectCount,       //驳回数
               commodityQuantity:thisdata.commodityQuantity, //派单项目数
+              timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},//项目状态JSON
             });
           }
         }.bind(this)
@@ -1268,26 +1271,16 @@ const IntentionCustomer = Form.create()(
                 <div className="clearfix">
                   <div className="clearfix">
                     <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="当前项目情况"
+                        className="half-item"
+                        {...formItemLayout}
+                        label="项目状态"
                     >
-                      <span>
-                        {
-                          this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '进行中':
-                                  this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                          this.state.status === 4 ? '已完成':
-                                              this.state.status === 5 ? '项目已完成 已退单':
-                                                  this.state.status === 6 ? '项目未完成 已退单': ''
-                        }
-                      </span>
+                      <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                       <Button
-                        type="primary"
-                        size="small"
-                        style={{ marginTop: "5px", position: "absolute" }}
-                        onClick={this.caozuorizhi}
+                          type="primary"
+                          size="small"
+                          style={{ marginTop: '5px', position: 'absolute' }}
+                          onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -1304,13 +1297,6 @@ const IntentionCustomer = Form.create()(
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="项目状态"
-                    >
-                      <span>{getProjectStatus(this.state.projectStatus)}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
                       label="是否特批"
                     >
                       <span>{getApproval(this.state.approval)}</span>
@@ -1671,6 +1657,48 @@ 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>
+                        ))
+                      }
+                      {
+                        [
+                          {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>
                     {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                     {
                       this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -1738,55 +1766,6 @@ const IntentionCustomer = Form.create()(
                             <FormItem
                               className="half-item"
                               {...formItemLayout}
-                              label="启动时间"
-                            >
-                              <span>{this.state.startDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="完成时间"
-                            >
-                              <span>{this.state.endDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="受理时间"
-                            >
-                              <span>{this.state.acceptDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="评审时间"
-                            >
-                              <span>{this.state.reviewDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="公示时间"
-                            >
-                              <span>{this.state.publicityDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="发证时间"
-                            >
-                              <span>{this.state.licenceDate}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
-                              label="立项金额(万元)"
-                            >
-                              <span>{this.state.setUpAmount}</span>
-                            </FormItem>
-                            <FormItem
-                              className="half-item"
-                              {...formItemLayout}
                               label="是否到款"
                             >
                               <span>
@@ -1953,26 +1932,16 @@ const IntentionCustomer = Form.create()(
           >
             <div className="clearfix">
               <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="当前项目情况"
+                  className="half-item"
+                  {...formItemLayout}
+                  label="项目状态"
               >
-                <span>
-                  {
-                    this.state.status === 0 ? '未开始':
-                        this.state.status === 1 ? '进行中':
-                            this.state.status === 2 ? '已暂停':
-                                this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                    this.state.status === 4 ? '已完成':
-                                        this.state.status === 5 ? '项目已完成 已退单':
-                                            this.state.status === 6 ? '项目未完成 已退单': ''
-                  }
-                </span>
+                <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                 <Button
-                  type="primary"
-                  size="small"
-                  style={{ marginTop: "5px", position: "absolute" }}
-                  onClick={this.caozuorizhi}
+                    type="primary"
+                    size="small"
+                    style={{ marginTop: '5px', position: 'absolute' }}
+                    onClick={this.caozuorizhi}
                 >
                   操作日志
                 </Button>
@@ -1989,13 +1958,6 @@ const IntentionCustomer = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="项目状态"
-              >
-                <span>{getProjectStatus(this.state.projectStatus)}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
                 label="是否特批"
               >
                 <span>{getApproval(this.state.approval)}</span>
@@ -2292,6 +2254,48 @@ 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>
+                  ))
+                }
+                {
+                  [
+                    {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>
               <FormItem
                 className="half-item"
                 {...formItemLayout}
@@ -2302,13 +2306,6 @@ const IntentionCustomer = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
-                label="启动时间"
-              >
-                <span>{this.state.startDate}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
                 label="软著派单数量"
               >
                 <span>{this.state.commodityQuantity}</span>

+ 104 - 109
js/component/manageCenter/project/task/taskQuery.jsx

@@ -29,7 +29,8 @@ import {
   getProjectStatus,
   getboutique,
   getprovince,
-  ShowModal
+  ShowModal,
+  getProjectName
 } from "@/tools";
 const FormItem =Form.Item;
 const {TabPane} = Tabs
@@ -123,6 +124,7 @@ const Task = React.createClass({
       orderNo: "",
       jiedian: [],
       jiedianNew: [],
+      timeRecordparse:{},
       activeKey: "1",
       searchMore: true,
       assignVisible: false,
@@ -488,6 +490,7 @@ const Task = React.createClass({
             certificatesCount:thisdata.certificatesCount, //授权数
             rejectCount:thisdata.rejectCount,       //驳回数
             commodityQuantity:thisdata.commodityQuantity, //派单项目数
+            timeRecordparse: thisdata.timeRecord ? JSON.parse(thisdata.timeRecord) : {},
           });
         }
       }.bind(this),
@@ -1169,26 +1172,16 @@ const Task = React.createClass({
                   <div className="clearfix">
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="当前项目情况"
+                          className="half-item"
+                          {...formItemLayout}
+                          label="项目状态"
                       >
-                        <span>
-                          {
-                            this.state.status === 0 ? '未开始':
-                                this.state.status === 1 ? '进行中':
-                                    this.state.status === 2 ? '已暂停':
-                                        this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                            this.state.status === 4 ? '已完成':
-                                                this.state.status === 5 ? '项目已完成 已退单':
-                                                    this.state.status === 6 ? '项目未完成 已退单': ''
-                          }
-                        </span>
+                        <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                         <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: "5px", position: "absolute" }}
-                          onClick={this.caozuorizhi}
+                            type="primary"
+                            size="small"
+                            style={{ marginTop: '5px', position: 'absolute' }}
+                            onClick={this.caozuorizhi}
                         >
                           操作日志
                         </Button>
@@ -1205,15 +1198,6 @@ const Task = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="项目状态"
-                      >
-                        <span>
-                          {getProjectStatus(this.state.projectStatus)}
-                        </span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
                         label="是否特批"
                       >
                         <span>{getApproval(this.state.approval)}</span>
@@ -1583,6 +1567,48 @@ 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>
                       {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                       {
                         this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -1651,55 +1677,6 @@ const Task = React.createClass({
                               <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="启动时间"
-                              >
-                                <span>{this.state.startDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="完成时间"
-                              >
-                                <span>{this.state.endDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="受理时间"
-                              >
-                                <span>{this.state.acceptDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="评审时间"
-                              >
-                                <span>{this.state.reviewDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="公示时间"
-                              >
-                                <span>{this.state.publicityDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="发证时间"
-                              >
-                                <span>{this.state.licenceDate}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
-                                label="立项金额(万元)"
-                              >
-                                <span>{this.state.setUpAmount}</span>
-                              </FormItem>
-                              <FormItem
-                                className="half-item"
-                                {...formItemLayout}
                                 label="是否到款"
                               >
                                 <span>
@@ -1916,26 +1893,16 @@ const Task = React.createClass({
                   <div>
               <div className="clearfix">
                 <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="当前项目情况"
+                    className="half-item"
+                    {...formItemLayout}
+                    label="项目状态"
                 >
-                  <span>
-                    {
-                      this.state.status === 0 ? '未开始':
-                          this.state.status === 1 ? '进行中':
-                              this.state.status === 2 ? '已暂停':
-                                  this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                      this.state.status === 4 ? '已完成':
-                                          this.state.status === 5 ? '项目已完成 已退单':
-                                              this.state.status === 6 ? '项目未完成 已退单': ''
-                    }
-                  </span>
+                  <span>{getProjectName(parseInt(this.state.projectStatus))}</span>
                   <Button
-                    type="primary"
-                    size="small"
-                    style={{ marginTop: "5px", position: "absolute" }}
-                    onClick={this.caozuorizhi}
+                      type="primary"
+                      size="small"
+                      style={{ marginTop: '5px', position: 'absolute' }}
+                      onClick={this.caozuorizhi}
                   >
                     操作日志
                   </Button>
@@ -1952,13 +1919,6 @@ const Task = React.createClass({
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="项目状态"
-                >
-                  <span>{getProjectStatus(this.state.projectStatus)}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
                   label="是否特批"
                 >
                   <span>{getApproval(this.state.approval)}</span>
@@ -2275,6 +2235,48 @@ 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>
+                    ))
+                  }
+                  {
+                    [
+                      {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>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -2285,13 +2287,6 @@ const Task = React.createClass({
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="启动时间"
-                >
-                  <span>{this.state.startDate}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
                   label="软著派单数量"
                 >
                   <span>{this.state.commodityQuantity}</span>