ソースを参照

专利项目修改
增加认证费用
增加申报批次

HW 4 年 前
コミット
0c135537b0

+ 143 - 3
js/component/manageCenter/order/orderNew/addService.jsx

@@ -100,6 +100,8 @@ const NewService = Form.create()(
                 type: thisdata.type,
                 officialCost: thisdata.officialCost,
                 costReduction: thisdata.costReduction,
+                declarationBatch: thisdata.declarationBatch,//申报批次
+                ifCertificationFee: String(thisdata.ifCertificationFee),//是否包含申报批次
               });
             }
           }
@@ -2379,6 +2381,10 @@ const NewService = Form.create()(
         displayFees: "none",
         officialCost: "", //是否有官费
         costReduction: "", //是否有费减
+        addProjectType: "",
+        ifCertificationFee: "",//是否包含认证费用
+        isIso: false,//是否为贯标项目
+        declarationBatch: '',
       });
     },
 
@@ -2761,7 +2767,6 @@ const NewService = Form.create()(
       fwList.map(function (item) {
         if (value == item.bname) {
           kid = item;
-          console.log(item);
         }
       });
       if (kid.type == "1") {
@@ -2773,9 +2778,12 @@ const NewService = Form.create()(
           displayFees: "none",
         });
       }
+      //0通用 1专利 2软著 3审计 4双软 5高新 6商标
       this.setState({
         commodityName: value,
         gid: kid.id,
+        addProjectType:  kid.type,
+        isIso: value.indexOf("贯标") !== -1,// 是否为贯标项目
         //commodityPrice:kid.price==0?kid.price.toString():kid.price,
         commodityFirstPayment:
           kid.firstPayment == 0
@@ -2904,6 +2912,14 @@ const NewService = Form.create()(
         this.refs.commodityQuantity.focus();
         return false;
       }
+      if(this.state.addProjectType === 5 && !this.state.declarationBatch){
+        message.warning("请选择企业要求申报批次!");
+        return false;
+      }
+      if((this.state.isIso || this.state.addProjectType === 5) && !this.state.ifCertificationFee){
+        message.warning("请选择是否包含认证费用!");
+        return false;
+      }
       this.setState({
         loading: true,
       });
@@ -2922,6 +2938,8 @@ const NewService = Form.create()(
           commodityQuantity: this.state.commodityQuantity, //商品数量
           commodityPrice: this.state.commodityPrice, //签单总价
           taskComment: this.state.taskComment, //服务说明
+          declarationBatch:this.state.declarationBatch || undefined,//申报批次
+          ifCertificationFee:this.state.ifCertificationFee || undefined,//是否包含认证费用
           main: this.state.main, //是否为主要项目
           officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
           costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
@@ -2944,7 +2962,6 @@ const NewService = Form.create()(
     },
     //点击打卡项目详情
     tableRowClick(record) {
-      console.log(record);
       if (record.type=='1'){
         this.setState({
           displayFees: "block",
@@ -2959,13 +2976,17 @@ const NewService = Form.create()(
       this.setState({
         jid: record.id, //项目ID
         kid: record.commodityId, //商品ID
-        commodityName: record.commodityName, //金额
+        commodityName: record.commodityName, //项目名称
         commodityPrice: record.commodityPrice, //金额
         commodityQuantity: record.commodityQuantity, //数量
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addState: 0,
         addnextVisible: true,
+        addProjectType: record.type,
+        declarationBatch: record.declarationBatch || '',//申报批次(只有高新有)
+        ifCertificationFee: record.ifCertificationFee || '',//是否包含认证费
+        isIso: record.commodityName.indexOf("贯标") !== -1,
       });
     },
     //修改项目详情
@@ -3003,6 +3024,8 @@ const NewService = Form.create()(
           taskComment: this.state.taskComment, //备注
           officialCost: this.state.officialCost, //是否有官费
           costReduction: this.state.costReduction, //是否有费减
+          declarationBatch: this.state.declarationBatch || undefined,//申报批次
+          ifCertificationFee: this.state.ifCertificationFee ||undefined,//是否包含官费
         },
       }).done(
         function (data) {
@@ -6350,6 +6373,65 @@ const NewService = Form.create()(
                         />
                       </FormItem>
                     </div>
+                    {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                    {this.state.addProjectType === 5 ?
+                    <div className="clearfix">
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="企业要求申报批次"
+                        >
+                          <Select
+                              placeholder="请选择企业要求申报批次"
+                              style={{ width: "200px" }}
+                              value={this.state.declarationBatch}
+                              onChange={(e) => {
+                                this.setState({ declarationBatch: e });
+                              }}
+                          >
+                            <Select.Option value={1}>
+                              第一批
+                            </Select.Option>
+                            <Select.Option value={2}>
+                              第二批
+                            </Select.Option>
+                            <Select.Option value={3}>
+                              第三批
+                            </Select.Option>
+                            <Select.Option value={4}>
+                              第四批
+                            </Select.Option>
+                          </Select>
+                          <span className="mandatory">*</span>
+                        </FormItem>
+                    </div>: null
+                    }
+                    {
+                      this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
+                        <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否包含认证费用"
+                        >
+                          <Select
+                              placeholder="请选择是否包含认证费用"
+                              style={{ width: "200px" }}
+                              value={this.state.ifCertificationFee}
+                              onChange={(e) => {
+                                this.setState({ ifCertificationFee: e });
+                              }}
+                          >
+                            <Select.Option value={'0'}>
+                              否
+                            </Select.Option>
+                            <Select.Option value={'1'}>
+                              是
+                            </Select.Option>
+                          </Select>
+                          <span className="mandatory">*</span>
+                        </FormItem>
+                      </div>: null
+                    }
                     <FormItem
                       wrapperCol={{ span: 12, offset: 4 }}
                       className="half-middle"
@@ -6498,6 +6580,64 @@ const NewService = Form.create()(
                             />
                           </FormItem>
                         </div>
+                        {this.state.addProjectType === 5 ?
+                            <div className="clearfix">
+                              <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="企业要求申报批次"
+                              >
+                                <Select
+                                    placeholder="请选择企业要求申报批次"
+                                    style={{ width: "200px" }}
+                                    value={this.state.declarationBatch}
+                                    onChange={(e) => {
+                                      this.setState({ declarationBatch: e });
+                                    }}
+                                >
+                                  <Select.Option value={1}>
+                                    第一批
+                                  </Select.Option>
+                                  <Select.Option value={2}>
+                                    第二批
+                                  </Select.Option>
+                                  <Select.Option value={3}>
+                                    第三批
+                                  </Select.Option>
+                                  <Select.Option value={4}>
+                                    第四批
+                                  </Select.Option>
+                                </Select>
+                                <span className="mandatory">*</span>
+                              </FormItem>
+                            </div>: null
+                        }
+                        {
+                          this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费用"
+                            >
+                              <Select
+                                  placeholder="请选择是否包含认证费用"
+                                  style={{ width: "200px" }}
+                                  value={this.state.ifCertificationFee}
+                                  onChange={(e) => {
+                                    this.setState({ ifCertificationFee: e });
+                                  }}
+                              >
+                                <Select.Option value={'0'}>
+                                  不包含
+                                </Select.Option>
+                                <Select.Option value={'1'}>
+                                  包含
+                                </Select.Option>
+                              </Select>
+                              <span className="mandatory">*</span>
+                            </FormItem>
+                          </div>: null
+                        }
                         <FormItem
                           wrapperCol={{ span: 12, offset: 4 }}
                           className="half-middle"

+ 50 - 1
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {Button, Form, message, Modal, Spin, Table, Tabs, Tag} from "antd";
+import {Button, Form, Input, message, Modal, Spin, Table, Tabs, Tag} from "antd";
 import PatentSchedule from "../task/patentSchedule";
 import ImgList from "../../../common/imgList";
 import OrderDetail from "../../order/orderNew/changeComponent/orderDetail";
@@ -438,6 +438,9 @@ class ProjectDetails extends Component{
                 } else {
                     let thisdata = data.data;
                     this.setState({
+                        certificationCorporate: thisdata.certificationCorporate,//认证费公司
+                        certificationFee: thisdata.certificationFee,//认证费
+                        ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
                         id: thisdata.id, //ID
                         orderNo: thisdata.orderNo, //订单编号
                         userName: thisdata.userName, //客户名称
@@ -787,6 +790,9 @@ class ProjectDetails extends Component{
                 isSoftware: true,
             })
         }
+        this.setState({
+            isIso: this.props.taskName.indexOf("贯标") !== -1,
+        })
         this.departmentList();
         this.xiangqing(this.props.id);
         this.xiangqings(this.props.orderNo);
@@ -990,6 +996,49 @@ class ProjectDetails extends Component{
                                         </div>
                                         <div className="clearfix">
                                             <h3 className="sub-title">任务信息</h3>
+                                            {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                                            {/*高新与贯标需要显示*/}
+                                            {
+                                                this.state.bpType === 5 || this.state.isIso ?
+                                                    <div>
+                                                        <FormItem
+                                                            className="half-item"
+                                                            {...formItemLayout}
+                                                            label="认证费"
+                                                        >
+                                                            <span>
+                                                              {
+                                                                  this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                                              }
+                                                            </span>
+                                                        </FormItem>
+                                                        {this.state.ifCertificationFee === 1 ?<FormItem
+                                                            className="half-item"
+                                                            {...formItemLayout}
+                                                            label="认证费(万元)"
+                                                        >
+                                                            <span>
+                                                                {
+                                                                    this.state.certificationFee
+                                                                }
+                                                            </span>
+                                                        </FormItem> : null}
+                                                        {this.state.ifCertificationFee === 1 ? <FormItem
+                                                            className="half-item"
+                                                            {...formItemLayout}
+                                                            label=""
+                                                        /> : null}
+                                                        {this.state.ifCertificationFee === 1 ? <FormItem
+                                                            className="half-item"
+                                                            {...formItemLayout}
+                                                            label="付款公司名称"
+                                                        >
+                                                            <span>
+                                                                {this.state.certificationCorporate}
+                                                            </span>
+                                                        </FormItem>:null}
+                                                    </div> : null
+                                            }
                                             <FormItem
                                                 className="half-item"
                                                 {...formItemLayout}

+ 79 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -1407,6 +1407,7 @@ const Task = React.createClass({
     }
     this.setState({
       projectType: record.projectType,
+      isIso: record.taskName.indexOf("贯标") !== -1,
       orderNo: record.orderNo,
       id:record.id,
       tid:record.id,
@@ -1487,6 +1488,12 @@ const Task = React.createClass({
         spotCheckStatus: typeof this.state.spotCheckStatus === 'number' ? this.state.spotCheckStatus : undefined,//是否抽查 0否 1未通过 2通过
         urgentDay: typeof this.state.urgentDay === 'number' ? this.state.urgentDay : undefined,//加急天数
         ifMaterial: typeof this.state.ifMaterial === 'number' ? this.state.ifMaterial :  undefined,//有无材料
+        acceptCount: this.state.acceptCount || undefined,
+        certificatesCount: this.state.certificatesCount || undefined,
+        rejectCount: this.state.rejectCount || undefined,
+        certificationCorporate: this.state.certificationCorporate || undefined,//认证费公司
+        certificationFee: this.state.certificationFee,//认证费
+        ifCertificationFee: this.state.ifCertificationFee,//是否包含认证费
       },
     }).done(
       function (data) {
@@ -1558,6 +1565,9 @@ const Task = React.createClass({
         } else {
           localStorage.setItem('cSort', thisdata.sort)
           this.setState({
+            certificationCorporate: thisdata.certificationCorporate,//认证费公司
+            certificationFee: thisdata.certificationFee,//认证费
+            ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
             sort: thisdata.sort,
             cSort: thisdata.sort,
             id: thisdata.id, //ID
@@ -4039,6 +4049,58 @@ const Task = React.createClass({
                     {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                     <div className="clearfix">
                       <h3 className="sub-title">项目信息</h3>
+                      {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                      {/*高新与贯标需要显示*/}
+                      {
+                        this.state.projectType === 5 || this.state.isIso ?
+                            <div>
+                              <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费"
+                              >
+                                <span>
+                                  {
+                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                              </FormItem>
+                              {this.state.ifCertificationFee === 1 ?<FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费(万元)"
+                              >
+                                <Input
+                                    placeholder="请输入认证金额"
+                                    value={this.state.certificationFee}
+                                    style={{ width: '200px'}}
+                                    onChange={(e) => {
+                                      this.setState({ certificationFee: e.target.value })
+                                    }}
+                                />
+                              </FormItem> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label=""
+                              /> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="付款公司名称"
+                              >
+                                <Input
+                                    placeholder="请输入代付款公司名称"
+                                    value={this.state.certificationCorporate}
+                                    style={{ width: '200px'}}
+                                    onChange={(e) => {
+                                      this.setState({ certificationCorporate: e.target.value })
+                                    }}
+                                    ref="commodityQuantity"
+                                />
+                              </FormItem>:null}
+                            </div> : null
+                      }
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
@@ -4166,6 +4228,23 @@ const Task = React.createClass({
                                         rejectCount={this.state.rejectCount}
                                         commodityQuantity={this.state.commodityQuantity}
                                         refresh={()=>{this.xiangqing(this.state.id)}}
+                                        onChange={(key,value)=>{
+                                          if(key === 'acceptCount'){
+                                            this.setState({
+                                              acceptCount: value
+                                            })
+                                          }
+                                          if(key === 'certificatesCount'){
+                                            this.setState({
+                                              certificatesCount: value
+                                            })
+                                          }
+                                          if(key === 'rejectCount'){
+                                            this.setState({
+                                              rejectCount: value
+                                            })
+                                          }
+                                        }}
                                     />
                                 </div> :
                       <div>

+ 49 - 0
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -496,6 +496,9 @@ const MyTaskCount = Form.create()(
           splitId: record.splitId
         });
       }
+      this.setState({
+        isIso: record.taskName.indexOf("贯标") !== -1,
+      })
       this.xiangqing(record.id, record.taskName);
       this.xiangqings(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -519,6 +522,9 @@ const MyTaskCount = Form.create()(
           } else {
             let thisdata = data.data;
             this.setState({
+              certificationCorporate: thisdata.certificationCorporate,//认证费公司
+              certificationFee: thisdata.certificationFee,//认证费
+              ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
               id: thisdata.id, //ID
               orderNo: thisdata.orderNo, //订单编号
               userName: thisdata.userName, //客户名称
@@ -1363,6 +1369,49 @@ const MyTaskCount = Form.create()(
                   </div>
                   <div className="clearfix">
                     <h3 className="sub-title">任务信息</h3>
+                    {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                    {/*高新与贯标需要显示*/}
+                    {
+                      this.state.bpType === 5 || this.state.isIso ?
+                          <div>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费"
+                            >
+                                <span>
+                                  {
+                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                            </FormItem>
+                            {this.state.ifCertificationFee === 1 ?<FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费(万元)"
+                            >
+                                <span>
+                                    {
+                                      this.state.certificationFee
+                                    }
+                                </span>
+                            </FormItem> : null}
+                            {this.state.ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label=""
+                            /> : null}
+                            {this.state.ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="付款公司名称"
+                            >
+                                <span>
+                                    {this.state.certificationCorporate}
+                                </span>
+                            </FormItem>:null}
+                          </div> : null
+                    }
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 79 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -853,6 +853,7 @@ const MyTaskOutsource = React.createClass({
     this.setState({
       orderNo: record.orderNo,
       id:record.id,
+      isIso: record.taskName.indexOf("贯标") !== -1,
     })
 
     this.xiangqings(record.orderNo);
@@ -930,6 +931,12 @@ const MyTaskOutsource = React.createClass({
         spotCheckStatus: typeof this.state.spotCheckStatus === 'number' ? this.state.spotCheckStatus : undefined,//是否抽查 0否 1未通过 2通过
         urgentDay: typeof this.state.urgentDay === 'number' ? this.state.urgentDay : undefined,//加急天数
         ifMaterial: typeof this.state.ifMaterial === 'number' ? this.state.ifMaterial :  undefined,//有无材料
+        acceptCount: this.state.acceptCount || undefined,
+        certificatesCount: this.state.certificatesCount || undefined,
+        rejectCount: this.state.rejectCount || undefined,
+        certificationCorporate: this.state.certificationCorporate || undefined,//认证费公司
+        certificationFee: this.state.certificationFee,//认证费
+        ifCertificationFee: this.state.ifCertificationFee,//是否包含认证费
       },
     }).done(
       function (data) {
@@ -1001,6 +1008,9 @@ const MyTaskOutsource = React.createClass({
         } else {
           localStorage.setItem('cSort', thisdata.sort);
           this.setState({
+            certificationCorporate: thisdata.certificationCorporate,//认证费公司
+            certificationFee: thisdata.certificationFee,//认证费
+            ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
             id: thisdata.id, //ID
             sort: thisdata.sort,
             orderNo: thisdata.orderNo, //订单编号
@@ -3748,6 +3758,58 @@ const MyTaskOutsource = React.createClass({
                     {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                     <div className="clearfix">
                       <h3 className="sub-title">项目信息</h3>
+                      {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                      {/*高新与贯标需要显示*/}
+                      {
+                        this.state.projectType === 5 || this.state.isIso ?
+                            <div>
+                              <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费"
+                              >
+                                <span>
+                                  {
+                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                              </FormItem>
+                              {this.state.ifCertificationFee === 1 ?<FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费(万元)"
+                              >
+                                <Input
+                                    placeholder="请输入认证金额"
+                                    value={this.state.certificationFee}
+                                    style={{ width: '200px'}}
+                                    onChange={(e) => {
+                                      this.setState({ certificationFee: e.target.value })
+                                    }}
+                                />
+                              </FormItem> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label=""
+                              /> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="付款公司名称"
+                              >
+                                <Input
+                                    placeholder="请输入代付款公司名称"
+                                    value={this.state.certificationCorporate}
+                                    style={{ width: '200px'}}
+                                    onChange={(e) => {
+                                      this.setState({ certificationCorporate: e.target.value })
+                                    }}
+                                    ref="commodityQuantity"
+                                />
+                              </FormItem>:null}
+                            </div> : null
+                      }
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
@@ -3875,6 +3937,23 @@ const MyTaskOutsource = React.createClass({
                                   rejectCount={this.state.rejectCount}
                                   commodityQuantity={this.state.commodityQuantity}
                                   refresh={()=>{this.xiangqing(this.state.id)}}
+                                  onChange={(key,value)=>{
+                                    if(key === 'acceptCount'){
+                                      this.setState({
+                                        acceptCount: value
+                                      })
+                                    }
+                                    if(key === 'certificatesCount'){
+                                      this.setState({
+                                        certificatesCount: value
+                                      })
+                                    }
+                                    if(key === 'rejectCount'){
+                                      this.setState({
+                                        rejectCount: value
+                                      })
+                                    }
+                                  }}
                               />
                             </div> :
                             <div>

+ 39 - 3
js/component/manageCenter/project/task/patentSchedule.jsx

@@ -189,6 +189,9 @@ class PatentSchedule extends Component{
             ],
             dataSourceA: [],
             progressLogLoading: false,
+            acceptCount: props.acceptCount || 0,
+            certificatesCount: props.certificatesCount || 0,
+            rejectCount: props.rejectCount || 0,
         };
         this.changeEvidence = this.changeEvidence.bind(this);
         this.createTaskProgress = this.createTaskProgress.bind(this);
@@ -455,9 +458,42 @@ class PatentSchedule extends Component{
                     fontWeight: 400,
                 }}>
                     <div style={{paddingRight:'10px'}}>派单项目数:{this.props.commodityQuantity}</div>
-                    <div style={{paddingRight:'10px'}}>受理数:{this.props.acceptCount}</div>
-                    <div style={{paddingRight:'10px'}}>下证数(即授权数):{this.props.certificatesCount}</div>
-                    <div>驳回数:{this.props. rejectCount}</div>
+                    <div style={{paddingRight:'10px'}}>
+                        受理数:
+                        {this.props.readOnly ?
+                            this.props.acceptCount:
+                            <Input type='number' defaultValue={this.props.acceptCount || 0} value={this.state.acceptCount} style={{width:'70px'}} onChange={(e)=>{
+                                this.setState({
+                                    acceptCount:e.target.value
+                                })
+                                this.props.onChange('acceptCount',e.target.value);
+                            }}/>
+                        }
+                    </div>
+                    <div style={{paddingRight:'10px'}}>
+                        下证数(即授权数):
+                        {this.props.readOnly ?
+                            this.props.certificatesCount:
+                            <Input type='number' defaultValue={this.props.certificatesCount || 0} value={this.state.certificatesCount || (this.props.certificatesCount || 0)} style={{width:'70px'}} onChange={(e)=>{
+                                this.setState({
+                                    certificatesCount:e.target.value
+                                })
+                                this.props.onChange('certificatesCount',e.target.value);
+                            }}/>
+                        }
+                    </div>
+                    <div>
+                        驳回数:
+                        {this.props.readOnly ?
+                            this.props.rejectCount:
+                            <Input type='number' defaultValue={this.props.rejectCount || 0} value={this.state.rejectCount || (this.props.rejectCount || 0)} style={{width:'70px'}} onChange={(e)=>{
+                                this.setState({
+                                    rejectCount:e.target.value
+                                })
+                                this.props.onChange('rejectCount',e.target.value);
+                            }}/>
+                        }
+                    </div>
                     <div style={{display:'flex',alignItems:'center',marginLeft:'auto'}}>
                         {!this.props.readOnly ? <Button
                             type="primary"

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

@@ -191,6 +191,9 @@ class projectOverview extends Component{
     }
 
     componentDidMount() {
+        this.setState({
+            isIso: this.props.taskName.indexOf("贯标") !== -1,
+        })
         this.xiangqing(this.props.tid);
         this.loadData();
     }
@@ -258,6 +261,9 @@ class projectOverview extends Component{
                     }
                 } else {
                     this.setState({
+                        certificationCorporate: thisdata.certificationCorporate,//认证费公司
+                        certificationFee: thisdata.certificationFee,//认证费
+                        ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
                         id: thisdata.id, //ID
                         orderNo: thisdata.orderNo, //订单编号
                         userName: thisdata.userName, //客户名称
@@ -682,6 +688,49 @@ class projectOverview extends Component{
                         </div>
                         <div className="clearfix">
                             <h3 className="sub-title">任务信息</h3>
+                            {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {/*高新与贯标需要显示*/}
+                            {
+                                this.state.bpType === 5 || this.state.isIso ?
+                                    <div>
+                                        <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="认证费"
+                                        >
+                                <span>
+                                  {
+                                      this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                                        </FormItem>
+                                        {this.state.ifCertificationFee === 1 ?<FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="认证费(万元)"
+                                        >
+                                <span>
+                                    {
+                                        this.state.certificationFee
+                                    }
+                                </span>
+                                        </FormItem> : null}
+                                        {this.state.ifCertificationFee === 1 ? <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label=""
+                                        /> : null}
+                                        {this.state.ifCertificationFee === 1 ? <FormItem
+                                            className="half-item"
+                                            {...formItemLayout}
+                                            label="付款公司名称"
+                                        >
+                                  <span>
+                                      {this.state.certificationCorporate}
+                                  </span>
+                                        </FormItem>:null}
+                                    </div> : null
+                            }
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}

+ 49 - 0
js/component/manageCenter/project/task/taskCount.jsx

@@ -490,6 +490,9 @@ const IntentionCustomer = Form.create()(
           visible: true
         });
       }
+      this.setState({
+        isIso: record.taskName.indexOf("贯标") !== -1,
+      })
       this.xiangqing(record.id, record.taskName);
       this.xiangqings(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -513,6 +516,9 @@ const IntentionCustomer = Form.create()(
           } else {
             let thisdata = data.data;
             this.setState({
+              certificationCorporate: thisdata.certificationCorporate,//认证费公司
+              certificationFee: thisdata.certificationFee,//认证费
+              ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
               id: thisdata.id, //ID
               orderNo: thisdata.orderNo, //订单编号
               userName: thisdata.userName, //客户名称
@@ -1390,6 +1396,49 @@ const IntentionCustomer = Form.create()(
                   </div>
                   <div className="clearfix">
                     <h3 className="sub-title">任务信息</h3>
+                    {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                    {/*高新与贯标需要显示*/}
+                    {
+                      this.state.bpType === 5 || this.state.isIso ?
+                          <div>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费"
+                            >
+                                <span>
+                                  {
+                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                            </FormItem>
+                            {this.state.ifCertificationFee === 1 ?<FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费(万元)"
+                            >
+                                <span>
+                                    {
+                                      this.state.certificationFee
+                                    }
+                                </span>
+                            </FormItem> : null}
+                            {this.state.ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label=""
+                            /> : null}
+                            {this.state.ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="付款公司名称"
+                            >
+                                                            <span>
+                                                                {this.state.certificationCorporate}
+                                                            </span>
+                            </FormItem>:null}
+                          </div> : null
+                    }
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 49 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -392,6 +392,9 @@ const Task = React.createClass({
         splitId: record.splitId,
       });
     }
+    this.setState({
+      isIso: record.taskName.indexOf("贯标") !== -1,
+    })
     this.xiangqing(record.id, record.taskName);
     this.xiangqings(record.orderNo);
     this.xiangmu(record.orderNo);
@@ -428,6 +431,9 @@ const Task = React.createClass({
         } else {
           let thisdata = data.data;
           this.setState({
+            certificationCorporate: thisdata.certificationCorporate,//认证费公司
+            certificationFee: thisdata.certificationFee,//认证费
+            ifCertificationFee: thisdata.ifCertificationFee,//是否包含认证费
             id: thisdata.id, //ID
             orderNo: thisdata.orderNo, //订单编号
             userName: thisdata.userName, //客户名称
@@ -1304,6 +1310,49 @@ const Task = React.createClass({
                     </div>
                     <div className="clearfix">
                       <h3 className="sub-title">任务信息</h3>
+                      {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                      {/*高新与贯标需要显示*/}
+                      {
+                        this.state.bpType === 5 || this.state.isIso ?
+                            <div>
+                              <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费"
+                              >
+                                <span>
+                                  {
+                                    this.state.ifCertificationFee === 1 ? '包含' : '不包含'
+                                  }
+                                </span>
+                              </FormItem>
+                              {this.state.ifCertificationFee === 1 ?<FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="认证费(万元)"
+                              >
+                                <span>
+                                    {
+                                      this.state.certificationFee
+                                    }
+                                </span>
+                              </FormItem> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label=""
+                              /> : null}
+                              {this.state.ifCertificationFee === 1 ? <FormItem
+                                  className="half-item"
+                                  {...formItemLayout}
+                                  label="付款公司名称"
+                              >
+                                  <span>
+                                      {this.state.certificationCorporate}
+                                  </span>
+                              </FormItem>:null}
+                            </div> : null
+                      }
                       <FormItem
                         className="half-item"
                         {...formItemLayout}