|
@@ -121,34 +121,8 @@ const ShouKuang = React.createClass({
|
|
|
} else {
|
|
|
for (let i = 0; i < data.data.pagination.list.length; i++) {
|
|
|
let thisdata = data.data.pagination.list[i];
|
|
|
- theArr.push({
|
|
|
- key: thisdata.orderNo,
|
|
|
- orderNo: thisdata.orderNo,
|
|
|
- orderType: thisdata.orderType,
|
|
|
- orderStatus: thisdata.orderStatus,
|
|
|
- sellerName: thisdata.sellerName,
|
|
|
- processStatus: thisdata.processStatus,
|
|
|
- liquidationStatus: thisdata.liquidationStatus,
|
|
|
- approval: thisdata.approval,
|
|
|
- buyerName: thisdata.buyerName,
|
|
|
- actuallyTotalAmount: thisdata.actuallyTotalAmount,
|
|
|
- signTime: thisdata.signTime,
|
|
|
- companyId: thisdata.companyId,
|
|
|
- companyName: thisdata.companyName,
|
|
|
- buyerId: thisdata.buyerId,
|
|
|
- costAmount: thisdata.costAmount,
|
|
|
- contractNo: thisdata.contractNo,
|
|
|
- createTime: thisdata.createTime,
|
|
|
- departmentName: thisdata.departmentName,
|
|
|
- invoiceAmount: thisdata.invoiceAmount,
|
|
|
- finalReceivables: thisdata.finalReceivables,
|
|
|
- finalReceivablesTime: thisdata.finalReceivablesTime,
|
|
|
- signTotalAmount: thisdata.signTotalAmount,
|
|
|
- financeName: thisdata.financeName,
|
|
|
- backStatus: thisdata.backStatus,
|
|
|
- orderReceivables: thisdata.orderReceivables,
|
|
|
- orderArrears: thisdata.orderArrears,
|
|
|
- });
|
|
|
+ thisdata.key = thisdata.orderNo;
|
|
|
+ theArr.push(thisdata);
|
|
|
}
|
|
|
}
|
|
|
this.state.pagination.current = data.data.pagination.pageNo;
|
|
@@ -713,11 +687,19 @@ const ShouKuang = React.createClass({
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: "已付成本(万元)",
|
|
|
+ title: "总成本(万元)",
|
|
|
dataIndex: "costAmount",
|
|
|
key: "costAmount",
|
|
|
render: (text) => {
|
|
|
return isNaN(parseFloat(text)) ? text : parseFloat(text);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "已付成本(万元)",
|
|
|
+ dataIndex: "paymentAmount",
|
|
|
+ key: "paymentAmount",
|
|
|
+ render: (text) => {
|
|
|
+ return isNaN(parseFloat(text)) ? text : parseFloat(text);
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -869,7 +851,7 @@ const ShouKuang = React.createClass({
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: "已付成本(万元)",
|
|
|
+ title: "总成本(万元)",
|
|
|
dataIndex: "costAmount",
|
|
|
key: "costAmount",
|
|
|
className: "title-table",
|
|
@@ -878,6 +860,15 @@ const ShouKuang = React.createClass({
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
+ title: "已付成本(万元)",
|
|
|
+ dataIndex: "paymentAmount",
|
|
|
+ key: "paymentAmount",
|
|
|
+ className: "title-table",
|
|
|
+ render: (text) => {
|
|
|
+ return isNaN(parseFloat(text)) ? text : parseFloat(text);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "最近收款(万元)",
|
|
|
dataIndex: "finalReceivables",
|
|
|
key: "finalReceivables",
|