|
@@ -85,39 +85,16 @@ const MyTaskOutsource = React.createClass({
|
|
|
} else {
|
|
|
for (let i = 0; i < data.data.list.length; i++) {
|
|
|
let thisdata = data.data.list[i];
|
|
|
- theArr.push({
|
|
|
- key: i,
|
|
|
- orderNo: thisdata.orderNo, //订单编号
|
|
|
- id: thisdata.id, //项目ID
|
|
|
- taskName: thisdata.taskName, //名称
|
|
|
- cname: thisdata.cname, //项目品类
|
|
|
- receiverName: thisdata.receiverName, //受理人
|
|
|
- projectStatus: thisdata.projectStatus, //项目状态
|
|
|
- taskStatus: thisdata.taskStatus, //项目状态
|
|
|
- taskDate: thisdata.taskDate, //分配时间
|
|
|
- userName:
|
|
|
- thisdata.taskName.substring(0, 5) === "软件著作权"
|
|
|
- ? thisdata.userName +
|
|
|
- "(" +
|
|
|
- thisdata.commodityQuantity.toString() +
|
|
|
- "/" +
|
|
|
- thisdata.alreadyNumber +
|
|
|
- ")"
|
|
|
- : thisdata.userName, //用户名
|
|
|
- depName: thisdata.depName, //部门名称
|
|
|
- commodityQuantity: thisdata.commodityQuantity, //项目数量
|
|
|
- outsourceName: thisdata.outsourceName,
|
|
|
- hours: thisdata.hours,
|
|
|
- contractNo: thisdata.contractNo,
|
|
|
- approval: thisdata.approval, //特批状态
|
|
|
- outsourceStatus: thisdata.outsourceStatus, //外包审核状态
|
|
|
- splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
|
|
|
- splitSuper: thisdata.splitSuper,
|
|
|
- splitId: thisdata.splitId,
|
|
|
- projectType: thisdata.projectType,//项目类型
|
|
|
- patentNameType: thisdata.patentNameType,
|
|
|
- patentName: thisdata.patentName,
|
|
|
- });
|
|
|
+ thisdata.key = i;
|
|
|
+ thisdata.userName = thisdata.taskName.substring(0, 5) === "软件著作权"
|
|
|
+ ? thisdata.userName +
|
|
|
+ "(" +
|
|
|
+ thisdata.commodityQuantity.toString() +
|
|
|
+ "/" +
|
|
|
+ thisdata.alreadyNumber +
|
|
|
+ ")"
|
|
|
+ : thisdata.userName;
|
|
|
+ theArr.push(thisdata);
|
|
|
}
|
|
|
}
|
|
|
this.state.pagination.current = data.data.pageNo;
|
|
@@ -353,6 +330,21 @@ const MyTaskOutsource = React.createClass({
|
|
|
key: "hours",
|
|
|
},
|
|
|
{
|
|
|
+ title: "项目金额(万元)",
|
|
|
+ dataIndex: "commodityPrice",
|
|
|
+ key: "commodityPrice",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "外包成本(万元)",
|
|
|
+ dataIndex: "costAmount",
|
|
|
+ key: "costAmount",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "已付(万元)",
|
|
|
+ dataIndex: "partyAmount",
|
|
|
+ key: "partyAmount",
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "操作",
|
|
|
dataIndex: "caozuo",
|
|
|
key: "caozuo",
|
|
@@ -2956,7 +2948,7 @@ const MyTaskOutsource = React.createClass({
|
|
|
onRefresh={()=>{
|
|
|
this.waiDetail();
|
|
|
this.thirdTable(this.state.tid);
|
|
|
- this.payNodeTable(this.state.tid)
|
|
|
+ this.payNodeTable(this.state.tid);
|
|
|
this.loadData(this.state.page)
|
|
|
}}
|
|
|
/>:<div/>}
|