|
@@ -128,7 +128,8 @@ const approvedOutsourcing = React.createClass({
|
|
|
outsourceName: thisdata.outsourceName,
|
|
|
invoiceAmount: thisdata.invoiceAmount,
|
|
|
finalReceivables: thisdata.finalReceivables,
|
|
|
- finalReceivablesTime: thisdata.finalReceivablesTime
|
|
|
+ finalReceivablesTime: thisdata.finalReceivablesTime,
|
|
|
+ signTotalAmount: thisdata.signTotalAmount
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -191,100 +192,116 @@ const approvedOutsourcing = React.createClass({
|
|
|
changeList: undefined,
|
|
|
columns: [
|
|
|
{
|
|
|
+ title: "合同编号",
|
|
|
+ dataIndex: "contractNo",
|
|
|
+ key: "contractNo",
|
|
|
+ className: "title-table"
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "订单编号",
|
|
|
dataIndex: "orderNo",
|
|
|
- key: "orderNo"
|
|
|
+ key: "orderNo",
|
|
|
+ className: "title-table"
|
|
|
// fixed: "left"
|
|
|
},
|
|
|
{
|
|
|
- title: "合同编号",
|
|
|
- dataIndex: "contractNo",
|
|
|
- key: "contractNo"
|
|
|
+ title: "客户名称",
|
|
|
+ dataIndex: "buyerName",
|
|
|
+ key: "buyerName",
|
|
|
+ className: "title-table"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "订单部门",
|
|
|
+ dataIndex: "departmentName",
|
|
|
+ key: "departmentName",
|
|
|
+ className: "title-table"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "订单负责人",
|
|
|
+ dataIndex: "sellerName",
|
|
|
+ key: "sellerName",
|
|
|
+ className: "title-table"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "外包公司",
|
|
|
+ dataIndex: "outsourceName",
|
|
|
+ key: "outsourceName",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
title: "签单日期",
|
|
|
dataIndex: "signTime",
|
|
|
- key: "signTime"
|
|
|
+ key: "signTime",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
title: "下单日期",
|
|
|
dataIndex: "createTime",
|
|
|
- key: "createTime"
|
|
|
+ key: "createTime",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
- title: "已收款(万元)",
|
|
|
- dataIndex: "actuallyTotalAmount",
|
|
|
- key: "actuallyTotalAmount"
|
|
|
+ title: "签单金额(万元)",
|
|
|
+ dataIndex: "signTotalAmount",
|
|
|
+ key: "signTotalAmount",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
title: "开票金额(万元)",
|
|
|
dataIndex: "invoiceAmount",
|
|
|
- key: "invoiceAmount"
|
|
|
+ key: "invoiceAmount",
|
|
|
+ className: "title-table"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "已收款(万元)",
|
|
|
+ dataIndex: "actuallyTotalAmount",
|
|
|
+ key: "actuallyTotalAmount",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
title: "最近收款(万元)",
|
|
|
dataIndex: "finalReceivables",
|
|
|
- key: "finalReceivables"
|
|
|
+ key: "finalReceivables",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
title: "最近收款时间",
|
|
|
dataIndex: "finalReceivablesTime",
|
|
|
- key: "finalReceivablesTime"
|
|
|
+ key: "finalReceivablesTime",
|
|
|
+ className: "title-table"
|
|
|
},
|
|
|
{
|
|
|
- title: "客户名称",
|
|
|
- dataIndex: "buyerName",
|
|
|
- key: "buyerName"
|
|
|
- },
|
|
|
- {
|
|
|
- title: "外包公司",
|
|
|
- dataIndex: "outsourceName",
|
|
|
- key: "outsourceName"
|
|
|
+ title: "结算状态",
|
|
|
+ dataIndex: "liquidationStatus",
|
|
|
+ key: "liquidationStatus",
|
|
|
+ className: "title-table",
|
|
|
+ render: text => {
|
|
|
+ return getLiquidationStatus(text);
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: "流程状态",
|
|
|
dataIndex: "processStatus",
|
|
|
key: "processStatus",
|
|
|
+ className: "title-table",
|
|
|
render: text => {
|
|
|
return getProcessStatus(text);
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: "订单部门",
|
|
|
- dataIndex: "departmentName",
|
|
|
- key: "departmentName"
|
|
|
- },
|
|
|
- {
|
|
|
title: "特批状态",
|
|
|
dataIndex: "approval",
|
|
|
key: "approval",
|
|
|
+ className: "title-table",
|
|
|
render: text => {
|
|
|
return getApproval(text);
|
|
|
}
|
|
|
},
|
|
|
- // {
|
|
|
- // title: '订单状态',
|
|
|
- // dataIndex: 'orderStatus',
|
|
|
- // key: 'orderStatus',
|
|
|
- // render: text => { return getNewOrderStatus(text)}
|
|
|
- // },
|
|
|
- {
|
|
|
- title: "订单负责人",
|
|
|
- dataIndex: "sellerName",
|
|
|
- key: "sellerName"
|
|
|
- },
|
|
|
- {
|
|
|
- title: "结算状态",
|
|
|
- dataIndex: "liquidationStatus",
|
|
|
- key: "liquidationStatus",
|
|
|
- render: text => {
|
|
|
- return getLiquidationStatus(text);
|
|
|
- }
|
|
|
- },
|
|
|
{
|
|
|
title: "操作",
|
|
|
dataIndex: "caozuo",
|
|
|
key: "caouzo",
|
|
|
+ className: "title-table",
|
|
|
render: (text, recard) => {
|
|
|
return (
|
|
|
<div>
|
|
@@ -526,15 +543,35 @@ const approvedOutsourcing = React.createClass({
|
|
|
searchTime: [,],
|
|
|
printColumns: [
|
|
|
{
|
|
|
+ title: "合同编号",
|
|
|
+ dataIndex: "contractNo",
|
|
|
+ key: "contractNo"
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "订单编号",
|
|
|
dataIndex: "orderNo",
|
|
|
key: "orderNo"
|
|
|
// fixed: "left"
|
|
|
},
|
|
|
{
|
|
|
- title: "合同编号",
|
|
|
- dataIndex: "contractNo",
|
|
|
- key: "contractNo"
|
|
|
+ title: "客户名称",
|
|
|
+ dataIndex: "buyerName",
|
|
|
+ key: "buyerName"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "订单部门",
|
|
|
+ dataIndex: "departmentName",
|
|
|
+ key: "departmentName"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "订单负责人",
|
|
|
+ dataIndex: "sellerName",
|
|
|
+ key: "sellerName"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "外包公司",
|
|
|
+ dataIndex: "outsourceName",
|
|
|
+ key: "outsourceName"
|
|
|
},
|
|
|
{
|
|
|
title: "签单日期",
|
|
@@ -547,14 +584,37 @@ const approvedOutsourcing = React.createClass({
|
|
|
key: "createTime"
|
|
|
},
|
|
|
{
|
|
|
+ title: "签单金额(万元)",
|
|
|
+ dataIndex: "signTotalAmount",
|
|
|
+ key: "signTotalAmount"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "开票金额(万元)",
|
|
|
+ dataIndex: "invoiceAmount",
|
|
|
+ key: "invoiceAmount"
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "已收款(万元)",
|
|
|
dataIndex: "actuallyTotalAmount",
|
|
|
key: "actuallyTotalAmount"
|
|
|
},
|
|
|
{
|
|
|
- title: "客户名称",
|
|
|
- dataIndex: "buyerName",
|
|
|
- key: "buyerName"
|
|
|
+ title: "最近收款(万元)",
|
|
|
+ dataIndex: "finalReceivables",
|
|
|
+ key: "finalReceivables"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "最近收款时间",
|
|
|
+ dataIndex: "finalReceivablesTime",
|
|
|
+ key: "finalReceivablesTime"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "结算状态",
|
|
|
+ dataIndex: "liquidationStatus",
|
|
|
+ key: "liquidationStatus",
|
|
|
+ render: text => {
|
|
|
+ return getLiquidationStatus(text);
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: "流程状态",
|
|
@@ -565,31 +625,12 @@ const approvedOutsourcing = React.createClass({
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: "订单部门",
|
|
|
- dataIndex: "departmentName",
|
|
|
- key: "departmentName"
|
|
|
- },
|
|
|
- {
|
|
|
title: "特批状态",
|
|
|
dataIndex: "approval",
|
|
|
key: "approval",
|
|
|
render: text => {
|
|
|
return getApproval(text);
|
|
|
}
|
|
|
- },
|
|
|
-
|
|
|
- {
|
|
|
- title: "订单负责人",
|
|
|
- dataIndex: "sellerName",
|
|
|
- key: "sellerName"
|
|
|
- },
|
|
|
- {
|
|
|
- title: "结算状态",
|
|
|
- dataIndex: "liquidationStatus",
|
|
|
- key: "liquidationStatus",
|
|
|
- render: text => {
|
|
|
- return getLiquidationStatus(text);
|
|
|
- }
|
|
|
}
|
|
|
],
|
|
|
waterlistDate: [
|
|
@@ -1542,17 +1583,26 @@ const approvedOutsourcing = React.createClass({
|
|
|
pagination={this.state.pagination}
|
|
|
onRowDoubleClick={this.tableRowClick.bind(this)}
|
|
|
rowSelection={rowSelection}
|
|
|
+ size="small"
|
|
|
/>
|
|
|
</Spin>
|
|
|
<p
|
|
|
style={{ display: "inline-block", fontSize: "14px", color: "red" }}
|
|
|
>
|
|
|
- {`收款金额总计(万元):${this.state.hui ? this.state.hui : "0"}` +
|
|
|
- " " +
|
|
|
- " " +
|
|
|
- `合同额总计(万元):${
|
|
|
- this.state.totalHui ? this.state.totalHui : "0"
|
|
|
- }`}
|
|
|
+ {
|
|
|
+ <span style={{ marginRight: 10 }}>
|
|
|
+ {`收款金额总计(万元):${
|
|
|
+ this.state.hui ? this.state.hui : "0"
|
|
|
+ }`}
|
|
|
+ </span>
|
|
|
+ }
|
|
|
+ {
|
|
|
+ <span>
|
|
|
+ {`合同额总计(万元):${
|
|
|
+ this.state.totalHui ? this.state.totalHui : "0"
|
|
|
+ }`}
|
|
|
+ </span>
|
|
|
+ }
|
|
|
</p>
|
|
|
</div>
|
|
|
<div className="patent-desc">
|