Commit 4b4f0cfa authored by yanglilong's avatar yanglilong

Merge branch 'func-ECCS-2391' into 'master'

Func eccs 2391(【商保系统】回款管理-回款详情全部账单过滤掉已回款的账单)

See merge request !73
parents 088ec099 61a12aed
...@@ -434,14 +434,14 @@ export default { ...@@ -434,14 +434,14 @@ export default {
width: 150 width: 150
}, },
{ {
title: '收银', title: '回款金额',
dataIndex: 'receiptTellerName', dataIndex: 'writeOffAmount',
ellipsis: true, ellipsis: true,
width: 120 width: 150
}, },
{ {
title: '回款金', title: '未清余',
dataIndex: 'writeOffAmount', dataIndex: 'residueBackAmount',
ellipsis: true, ellipsis: true,
width: 150 width: 150
}, },
...@@ -464,10 +464,10 @@ export default { ...@@ -464,10 +464,10 @@ export default {
} }
}, },
{ {
title: '未清余额', title: '收银',
dataIndex: 'residueBackAmount', dataIndex: 'receiptTellerName',
ellipsis: true, ellipsis: true,
width: 150 width: 120
} }
]; ];
return base; return base;
...@@ -475,7 +475,7 @@ export default { ...@@ -475,7 +475,7 @@ export default {
selectedColumns() { selectedColumns() {
const base = JSON.parse(JSON.stringify(this.columns)); const base = JSON.parse(JSON.stringify(this.columns));
const changeAmount = this.changeAmount; const changeAmount = this.changeAmount;
base[8] = { base[7] = {
title: '回款金额', title: '回款金额',
dataIndex: 'backAmount', dataIndex: 'backAmount',
ellipsis: true, ellipsis: true,
...@@ -522,7 +522,7 @@ export default { ...@@ -522,7 +522,7 @@ export default {
</div> </div>
); );
}; };
base[11] = { base[8] = {
title: '未清余额', title: '未清余额',
dataIndex: 'residueBackAmount', dataIndex: 'residueBackAmount',
ellipsis: true, ellipsis: true,
...@@ -552,7 +552,7 @@ export default { ...@@ -552,7 +552,7 @@ export default {
); );
} }
}; };
base.splice(8, 0, { base.splice(7, 0, {
title: '余末金额', title: '余末金额',
dataIndex: 'currentReceiptAmount', dataIndex: 'currentReceiptAmount',
ellipsis: true, ellipsis: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment