Sfoglia il codice sorgente

添加官费未实缴与已实缴的选项

mentoswzq 4 anni fa
parent
commit
f7e9adb323

+ 8 - 2
js/component/manageCenter/components/checkProject/index.jsx

@@ -1063,8 +1063,14 @@ class CheckProject extends Component {
                                 this.props.patentNameType === 3 ? this.props.patentName : ''
                   }
                 </span>
-                        </div>
-                      </div> : <div/>
+                      </div>
+                    </div> : <div/>
+                }
+                {
+                  this.props.orderTaskOfficialCost === 1 && this.props.startType !== 0?
+                      <div style={{padding:'0px 0px 10px 20px'}}>
+                        官费:<span style={{marginLeft:'15px'}}>{this.props.containOfficialFees === 0 ? '实际已缴费' : '实际未缴费'}</span>
+                      </div> : null
                 }
                 <div className="thirdParty">
                   <div>

+ 55 - 14
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -15,6 +15,7 @@ class DetailsModal extends Component{
             activeKey:'1',
             paySubject: [],
             orderDtails: {},
+            containOfficialFees:0,//官费缴费情况
         }
         this.visitCancel = this.visitCancel.bind(this);
     }
@@ -23,7 +24,8 @@ class DetailsModal extends Component{
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid)
+            this.payNodeTable(this.props.tid);
+            this.xiangqing(this.props.tid);
         }
     }
 
@@ -61,7 +63,7 @@ class DetailsModal extends Component{
                     loading: false,
                 })
                 if (!data.error.length && data.data) {
-                    if(data.data.unitNumber){
+                    if(!isNaN(parseFloat(data.data.unitNumber))){
                         this.setState({
                             oldInfor: {
                                 companyName:data.data.companyName,
@@ -82,20 +84,24 @@ class DetailsModal extends Component{
                         })
                     }else{
                         this.setState({
-                            orderDtails: data.data,
-                            startType: data.data.startType, //类型
-                            outsourceRemarks: data.data.outsourceRemarks,
-                            refundStatus: data.data.refundStatus,
-                            pictureUrl: data.data.pictureUrl
-                                ? splitUrl(
-                                    data.data.pictureUrl,
-                                    ',',
-                                    globalConfig.avatarHost + '/upload',
-                                    url
-                                )
-                                : [], //图片地址
+                            oldInfor: {}
                         })
                     }
+                    this.setState({
+                        containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
+                        orderDtails: data.data,
+                        startType: data.data.startType, //类型
+                        outsourceRemarks: data.data.outsourceRemarks,
+                        refundStatus: data.data.refundStatus,
+                        pictureUrl: data.data.pictureUrl
+                            ? splitUrl(
+                                data.data.pictureUrl,
+                                ',',
+                                globalConfig.avatarHost + '/upload',
+                                url
+                            )
+                            : [], //图片地址
+                    })
                 } else if (data.error && data.error.length) {
                     message.warning(data.error[0].message)
                 } else if (!data.data) {
@@ -228,6 +234,37 @@ class DetailsModal extends Component{
         )
     }
 
+    //订单详情
+    xiangqing(id) {
+        $.ajax({
+            method: 'get',
+            dataType: 'json',
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/orderProject/orderTaskDetail',
+            data: {
+                id: id,
+            },
+            success: function (data) {
+                let thisdata = data.data
+                if (data.error.length || data.data.list == '') {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message)
+                    }
+                } else {
+                    this.setState({
+                        orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                    })
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                })
+            }.bind(this)
+        )
+    }
+
     render() {
         return(
             <Modal
@@ -250,6 +287,7 @@ class DetailsModal extends Component{
                             this.waiDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
+                            this.xiangqing(this.props.tid);
                         }
                     }}
                     tabBarExtraContent={
@@ -271,6 +309,8 @@ class DetailsModal extends Component{
                         {this.state.activeKey === '1' ? <CheckProject
                             {...this.props}
                             tid={this.props.tid}
+                            orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                            containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                             oldInfor={this.state.oldInfor}
                             isAuditPayment={true}
                             status={this.state.refundStatus}
@@ -288,6 +328,7 @@ class DetailsModal extends Component{
                                 this.waiDetail();
                                 this.thirdTable(this.props.tid);
                                 this.payNodeTable(this.props.tid);
+                                this.xiangqing(this.props.tid);
                                 this.props.refreshList && this.props.refreshList();
                             }}
                         /> : <div/>}

+ 55 - 14
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/index.js

@@ -15,6 +15,7 @@ class DetailsModal extends Component{
             activeKey:'1',
             paySubject: [],
             orderDtails: {},
+            containOfficialFees:0,//官费缴费情况
         }
         this.visitCancel = this.visitCancel.bind(this);
     }
@@ -23,7 +24,8 @@ class DetailsModal extends Component{
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid)
+            this.payNodeTable(this.props.tid);
+            this.xiangqing(this.props.tid);
         }
     }
 
@@ -61,7 +63,7 @@ class DetailsModal extends Component{
                     loading: false,
                 })
                 if (!data.error.length && data.data) {
-                    if(data.data.unitNumber){
+                    if(!isNaN(parseFloat(data.data.unitNumber))){
                         this.setState({
                             oldInfor: {
                                 companyName:data.data.companyName,
@@ -82,20 +84,24 @@ class DetailsModal extends Component{
                         })
                     }else{
                         this.setState({
-                            orderDtails: data.data,
-                            startType: data.data.startType, //类型
-                            outsourceRemarks: data.data.outsourceRemarks,
-                            refundStatus: data.data.refundStatus,
-                            pictureUrl: data.data.pictureUrl
-                                ? splitUrl(
-                                    data.data.pictureUrl,
-                                    ',',
-                                    globalConfig.avatarHost + '/upload',
-                                    url
-                                )
-                                : [], //图片地址
+                            oldInfor: {}
                         })
                     }
+                    this.setState({
+                        containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
+                        orderDtails: data.data,
+                        startType: data.data.startType, //类型
+                        outsourceRemarks: data.data.outsourceRemarks,
+                        refundStatus: data.data.refundStatus,
+                        pictureUrl: data.data.pictureUrl
+                            ? splitUrl(
+                                data.data.pictureUrl,
+                                ',',
+                                globalConfig.avatarHost + '/upload',
+                                url
+                            )
+                            : [], //图片地址
+                    })
                 } else if (data.error && data.error.length) {
                     message.warning(data.error[0].message)
                 } else if (!data.data) {
@@ -228,6 +234,37 @@ class DetailsModal extends Component{
         )
     }
 
+    //项目详情
+    xiangqing(id) {
+        $.ajax({
+            method: 'get',
+            dataType: 'json',
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/orderProject/orderTaskDetail',
+            data: {
+                id: id,
+            },
+            success: function (data) {
+                let thisdata = data.data
+                if (data.error.length || data.data.list == '') {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message)
+                    }
+                } else {
+                    this.setState({
+                        orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                    })
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                })
+            }.bind(this)
+        )
+    }
+
     render() {
         return(
             <Modal
@@ -250,6 +287,7 @@ class DetailsModal extends Component{
                             this.waiDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
+                            this.xiangqing(this.props.tid);
                         }
                     }}
                     tabBarExtraContent={
@@ -271,6 +309,8 @@ class DetailsModal extends Component{
                         {this.state.activeKey === '1' ? <CheckProject
                             {...this.props}
                             tid={this.props.tid}
+                            orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                            containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                             oldInfor={this.state.oldInfor}
                             isAuditPaymentGLY={true}
                             status={this.state.refundStatus}
@@ -288,6 +328,7 @@ class DetailsModal extends Component{
                                 this.waiDetail();
                                 this.thirdTable(this.props.tid);
                                 this.payNodeTable(this.props.tid);
+                                this.xiangqing(this.props.tid);
                                 this.props.refreshList && this.props.refreshList();
                             }}
                         /> : <div/>}

+ 35 - 0
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -169,6 +169,7 @@ const outsourcingPro = Form.create()(
     },
     getInitialState() {
       return {
+        containOfficialFees:0,//官费缴费情况
         paySubject:[],
         rotateDeg: 0,
         page: 1,
@@ -590,6 +591,36 @@ const outsourcingPro = Form.create()(
         }.bind(this)
       );
     },
+    //项目详情
+    xiangqing1(id) {
+      $.ajax({
+        method: 'get',
+        dataType: 'json',
+        crossDomain: false,
+        url: globalConfig.context + '/api/admin/orderProject/orderTaskDetail',
+        data: {
+          id: id,
+        },
+        success: function (data) {
+          let thisdata = data.data
+          if (data.error.length || data.data.list == '') {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message)
+            }
+          } else {
+            this.setState({
+              orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+            })
+          }
+        }.bind(this),
+      }).always(
+          function () {
+            this.setState({
+              loading: false,
+            })
+          }.bind(this)
+      )
+    },
     //项目列表
     xiangmu(orderNos) {
       let _this = this;
@@ -1002,6 +1033,7 @@ const outsourcingPro = Form.create()(
 
               this.setState({
                 id: data.data.id,
+                containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
                 orderNo: data.data.orderNo,
                 startType: data.data.startType, //类型
                 patentType: data.data.patentType, //专利类型
@@ -1059,6 +1091,7 @@ const outsourcingPro = Form.create()(
       this.xiangmu(record.orderNo);
       this.jiedian(record.orderNo);
       this.jiedianNew(record.orderNo);
+      this.xiangqing1(record.tid);
       // 获取第三方信息表格
       this.thirdTable(record.tid);
     },
@@ -1514,6 +1547,8 @@ const outsourcingPro = Form.create()(
                     <CheckProject
                         {...this.props}
                         tid={this.state.tid}
+                        orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                        containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                         oldInfor={this.state.oldInfor}
                         status={this.state.refundStatus}
                         thirdInfoList={this.state.thirdInfoList}

+ 64 - 19
js/component/manageCenter/project/task/myTask.jsx

@@ -167,6 +167,7 @@ const Task = React.createClass({
   },
   getInitialState() {
     return {
+      containOfficialFees:0,//官费缴费情况
       audit: 1,
       projectType: '', //项目分类
       paySubject: [],
@@ -1591,6 +1592,7 @@ const Task = React.createClass({
             outsourceName: thisdata.outsourceName, //外包公司
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
+            orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
           })
         }
       }.bind(this),
@@ -2247,6 +2249,10 @@ const Task = React.createClass({
             id: _this.state.refundStatus === 2 ? _this.state.mid : undefined,//被拒绝外包申请时,需要传id
           }
 
+          if(_this.state.startType !== 0){
+            data.actualOfficial = _this.state.containOfficialFees;//0实际已缴费 1实际未缴费
+          }
+
           //refundStatus   0-待审核 ,1-审核通过,2-审核拒绝    审核被驳回时和第一次发起外包时,要填写发起原因
           //this.state.startType  0外包 1供应商
           //类型为外包时不需要传 发起原因
@@ -2374,6 +2380,7 @@ const Task = React.createClass({
             })
           }
           this.setState({
+            containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
             startType: data.data.startType, //类型
             patentType: data.data.patentType, //专利类型
             patentNameType: data.data.patentNameType, //专利名称类型
@@ -4475,6 +4482,24 @@ const Task = React.createClass({
                         </Radio.Group>
                       </FormItem>
                     </div>
+                    {/*外包类型无此选项*/}
+                    {this.state.orderTaskOfficialCost === 1 && this.state.startType !== 0 ? <div className="clearfix">
+                      <FormItem
+                          className="half-item"
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 14 }}
+                          label={<span>官费</span>}>
+                          <Radio.Group
+                              value={this.state.containOfficialFees}
+                              onChange={(e) => {
+                                  this.setState({ containOfficialFees: e.target.value })
+                              }}
+                          >
+                              <Radio value={0}>实际已缴费</Radio>
+                              <Radio value={1}>实际未缴费</Radio>
+                          </Radio.Group>
+                      </FormItem>
+                    </div> : <div/>}
                     {/* 第三方信息专利 */}
                     <div
                       style={{
@@ -4737,6 +4762,8 @@ const Task = React.createClass({
                         this.state.visible && this.state.activeKey === '2' ?
                             <CheckProject
                                 {...this.props}
+                                orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                                containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                                 tid={this.state.tid}
                                 oldInfor={this.state.oldInfor}
                                 projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
@@ -5776,6 +5803,23 @@ const Task = React.createClass({
                         </Radio.Group>
                       </FormItem>
                     </div>
+                    {this.state.orderTaskOfficialCost === 1 && this.state.startType !== 0 ? <div className="clearfix">
+                      <FormItem
+                          className="half-item"
+                          labelCol={{ span: 4 }}
+                          wrapperCol={{ span: 14 }}
+                          label={<span>官费</span>}>
+                        <Radio.Group
+                            value={this.state.containOfficialFees}
+                            onChange={(e) => {
+                              this.setState({ containOfficialFees: e.target.value })
+                            }}
+                        >
+                          <Radio value={0}>实际已缴费</Radio>
+                          <Radio value={1}>实际未缴费</Radio>
+                        </Radio.Group>
+                      </FormItem>
+                    </div> : <div/>}
                     {/* 第三方信息专利 */}
                     <div
                         style={{
@@ -5799,26 +5843,25 @@ const Task = React.createClass({
                       >
                       金额总计(万元): {this.state.allTotalAmount}
                     </span>
-                      <Button
-                          type="primary"
-                          onClick={(e) => {
-                            //this.state.startType   类型为外包时,当普通单
-                            if(this.state.projectType === 1 && this.state.patentType === -1){
-                              message.info('请先选择专利类型');
-                            }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
-                              message.info('请先选择专利名称');
-                            } else{
-                              this.addThirdList()
-                            }
-                          }}
-                          style={{
-                            float: 'right',
-                            marginRight: '50px',
-                            marginBottom: '15px',
-                          }}
-                      >
+                    <Button
+                      type="primary"
+                      onClick={(e) => {
+                        //this.state.startType   类型为外包时,当普通单
+                        if(this.state.projectType === 1 && this.state.patentType === -1){
+                          message.info('请先选择专利类型');
+                        }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
+                          message.info('请先选择专利名称');
+                        } else{
+                          this.addThirdList()
+                        }
+                      }}
+                      style={{
+                        float: 'right',
+                        marginRight: '50px',
+                        marginBottom: '15px',
+                      }}>
                         +新增供应商名称
-                      </Button>
+                    </Button>
                     </div>
                     <div
                         className="clearfix"
@@ -6038,6 +6081,8 @@ const Task = React.createClass({
                           <CheckProject
                               {...this.props}
                               tid={this.state.tid}
+                              orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                              containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                               oldInfor={this.state.oldInfor}
                               projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
                               patentNameType={this.state.patentNameType}

+ 39 - 29
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -134,7 +134,7 @@ const MyTaskOutsource = React.createClass({
     }).done(
         function (data) {
           if (!data.error.length && data.data) {
-            if(data.data.unitNumber){
+            if(!isNaN(parseFloat(data.data.unitNumber))){
               this.setState({
                 oldInfor: {
                   companyName:data.data.companyName,
@@ -161,36 +161,40 @@ const MyTaskOutsource = React.createClass({
               })
             }else{
               this.setState({
-                startType: data.data.startType, //类型
-                patentType: data.data.patentType, //专利类型
-                patentNameType: data.data.patentNameType, //专利名称类型
-                patentName: data.data.patentName, //专利名称
-                outsourceRemarks: data.data.outsourceRemarks,
-                remarks: data.data.remarks,
-                companyName: data.data.companyName,
-                amount: data.data.amount,
-                mid: data.data.id,
-                unitPrice: data.data.unitPrice,
-                refundStatus: data.data.refundStatus,
-                unitNumber: data.data.unitNumber,
-                pictureUrl: data.data.pictureUrl
-                    ? splitUrl(
-                        data.data.pictureUrl,
-                        ',',
-                        globalConfig.avatarHost + '/upload',
-                        url
-                    )
-                    : [], //图片地址
-                createTimes: data.data.createTimes,
-                auditTimes: data.data.auditTimes,
-              },()=>{
-                this.setState({
-                  waiDetailLoading: false,
-                })
-                this.thirdTable(this.state.tid);
-                this.payNodeTable(this.state.tid)
+                oldInfor: {}
               })
             }
+            this.setState({
+              startType: data.data.startType, //类型
+              patentType: data.data.patentType, //专利类型
+              patentNameType: data.data.patentNameType, //专利名称类型
+              patentName: data.data.patentName, //专利名称
+              outsourceRemarks: data.data.outsourceRemarks,
+              remarks: data.data.remarks,
+              companyName: data.data.companyName,
+              amount: data.data.amount,
+              mid: data.data.id,
+              unitPrice: data.data.unitPrice,
+              refundStatus: data.data.refundStatus,
+              unitNumber: data.data.unitNumber,
+              pictureUrl: data.data.pictureUrl
+                  ? splitUrl(
+                      data.data.pictureUrl,
+                      ',',
+                      globalConfig.avatarHost + '/upload',
+                      url
+                  )
+                  : [], //图片地址
+              createTimes: data.data.createTimes,
+              auditTimes: data.data.auditTimes,
+              containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
+            },()=>{
+              this.setState({
+                waiDetailLoading: false,
+              })
+              this.thirdTable(this.state.tid);
+              this.payNodeTable(this.state.tid)
+            })
           } else if (data.error && data.error.length) {
             message.warning(data.error[0].message);
             this.setState({
@@ -207,6 +211,7 @@ const MyTaskOutsource = React.createClass({
   },
   getInitialState() {
     return {
+      containOfficialFees:0,//官费缴费情况
       oldInfor:{},
       paySubject: [],
       orderData: [],
@@ -984,6 +989,7 @@ const MyTaskOutsource = React.createClass({
             outsourceName: thisdata.outsourceName, //外包公司名称
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
+            orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
           });
         }
       }.bind(this),
@@ -2957,6 +2963,8 @@ const MyTaskOutsource = React.createClass({
                 {this.state.visible && this.state.modKey === '2'?<CheckProject
                     {...this.props}
                     tid={this.state.tid}
+                    orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                    containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                     status={this.state.refundStatus}
                     projectType={this.state.projectType}
                     oldInfor={this.state.oldInfor}
@@ -3672,6 +3680,8 @@ const MyTaskOutsource = React.createClass({
                 {this.state.speVisible && this.state.modKey === '2'?<CheckProject
                     {...this.props}
                     tid={this.state.tid}
+                    orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                    containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                     status={this.state.refundStatus}
                     projectType={this.state.projectType}
                     oldInfor={this.state.oldInfor}

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

@@ -15,6 +15,7 @@ class DetailsModal extends Component{
             activeKey:'1',
             paySubject: [],
             orderDtails: {},
+            containOfficialFees:0,//官费缴费情况
         }
         this.visitCancel = this.visitCancel.bind(this);
     }
@@ -23,7 +24,8 @@ class DetailsModal extends Component{
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid)
+            this.payNodeTable(this.props.tid);
+            this.xiangqing(this.props.tid);
         }
     }
 
@@ -82,20 +84,24 @@ class DetailsModal extends Component{
                         })
                     }else{
                         this.setState({
-                            orderDtails: data.data,
-                            startType: data.data.startType, //类型
-                            outsourceRemarks: data.data.outsourceRemarks,
-                            refundStatus: data.data.refundStatus,
-                            pictureUrl: data.data.pictureUrl
-                                ? splitUrl(
-                                    data.data.pictureUrl,
-                                    ',',
-                                    globalConfig.avatarHost + '/upload',
-                                    url
-                                )
-                                : [], //图片地址
+                            oldInfor: {}
                         })
                     }
+                    this.setState({
+                        containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
+                        orderDtails: data.data,
+                        startType: data.data.startType, //类型
+                        outsourceRemarks: data.data.outsourceRemarks,
+                        refundStatus: data.data.refundStatus,
+                        pictureUrl: data.data.pictureUrl
+                            ? splitUrl(
+                                data.data.pictureUrl,
+                                ',',
+                                globalConfig.avatarHost + '/upload',
+                                url
+                            )
+                            : [], //图片地址
+                    })
                 } else if (data.error && data.error.length) {
                     message.warning(data.error[0].message)
                 } else if (!data.data) {
@@ -228,6 +234,37 @@ class DetailsModal extends Component{
         )
     }
 
+    //订单详情
+    xiangqing(id) {
+        $.ajax({
+            method: 'get',
+            dataType: 'json',
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/orderProject/orderTaskDetail',
+            data: {
+                id: id,
+            },
+            success: function (data) {
+                let thisdata = data.data
+                if (data.error.length || data.data.list == '') {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message)
+                    }
+                } else {
+                    this.setState({
+                        orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                    })
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                })
+            }.bind(this)
+        )
+    }
+
     render() {
         return(
             <Modal
@@ -250,6 +287,7 @@ class DetailsModal extends Component{
                             this.waiDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
+                            this.xiangqing(this.props.tid);
                         }
                     }}
                     tabBarExtraContent={
@@ -272,6 +310,8 @@ class DetailsModal extends Component{
                             {...this.props}
                             tid={this.props.tid}
                             oldInfor={this.state.oldInfor}
+                            orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                            containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                             status={this.state.refundStatus}
                             patentNameType={this.state.orderDtails.patentNameType}
                             patentName={this.state.orderDtails.patentName}
@@ -287,6 +327,7 @@ class DetailsModal extends Component{
                                 this.waiDetail();
                                 this.thirdTable(this.props.tid);
                                 this.payNodeTable(this.props.tid);
+                                this.xiangqing(this.props.tid);
                                 this.props.refreshList && this.props.refreshList();
                             }}
                         /> : <div/>}

+ 7 - 5
js/component/project.jsx

@@ -37,6 +37,8 @@ const project = React.createClass({
       patentType: -1,
       paySubject: [],
 
+      containOfficialFees:0,//官费缴费情况
+
       visible: false,
       record: this.props.record,
       paginations: false,
@@ -271,6 +273,7 @@ const project = React.createClass({
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch, //外包价格
             projectType: thisdata.bpType,//项目类型
+            orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
           })
         }
       }.bind(this),
@@ -560,6 +563,7 @@ const project = React.createClass({
             })
           }
           this.setState({
+            containOfficialFees: data.data.actualOfficial,//官费类型  0实际已缴费  1实际未缴费
             startType: data.data.startType, //类型
             patentType: data.data.patentType, //专利类型
             patentNameType: data.data.patentNameType, //专利名称类型
@@ -1328,8 +1332,7 @@ const project = React.createClass({
               </Spin>
             </Form> : <div/>}
           </TabPane>
-          {this.props.record && this.props.record.outsource == 1 ? (
-            <TabPane tab="外包审核信息" key="2">
+            <TabPane tab="外包/供应商信息" key="2">
               {this.state.tabsKey === "2" ? <Spin spinning={this.state.loading}>
                 <div>
                   {
@@ -1337,6 +1340,8 @@ const project = React.createClass({
                         <CheckProject
                             {...this.props}
                             tid={this.props.record.id}
+                            orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                            containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
                             oldInfor={this.state.oldInfor}
                             projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
                             patentNameType={this.state.patentNameType}
@@ -1402,9 +1407,6 @@ const project = React.createClass({
                 </div>
               </Spin> : <div/>}
             </TabPane>
-          ) : (
-            ''
-          )}
           {/*{this.props.record && this.props.record.outsource == 1 ? (*/}
           {/*  <TabPane tab="外包公司信息" key="3">*/}
           {/*    <div className="patent-table" style={{ marginTop: '10px' }}>*/}