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