|
@@ -60,6 +60,7 @@
|
|
已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
|
|
已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
|
|
待付合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountPay || productTotal.waitSettleAmountPay==0)) ? toThousands(productTotal.waitSettleAmountPay) : '--' }}</strong> ,
|
|
待付合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountPay || productTotal.waitSettleAmountPay==0)) ? toThousands(productTotal.waitSettleAmountPay) : '--' }}</strong> ,
|
|
折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
|
|
折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
|
|
|
|
+ 余额合计 <strong>{{ (productTotal&&(productTotal.balance || productTotal.balance==0)) ? toThousands(productTotal.balance) : '--' }}</strong> ;
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
@@ -136,14 +137,15 @@ export default {
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
|
|
{ title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
|
|
- { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '已付金额', dataIndex: 'settleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '待付金额', dataIndex: 'waitSettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
- { title: '折让金额', dataIndex: 'discountAmount', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
|
|
+ { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '已付金额', dataIndex: 'settleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '待付金额', dataIndex: 'waitSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '折让金额', dataIndex: 'discountAmount', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
|
+ { title: '余额合计', dataIndex: 'balance', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -157,7 +159,8 @@ export default {
|
|
'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
|
|
'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
|
|
'settleAmountPay': 'SETTLE_AMOUNT_PAY',
|
|
'settleAmountPay': 'SETTLE_AMOUNT_PAY',
|
|
'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
|
|
'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
|
|
- 'discountAmount': 'DISCOUNT_AMOUNT'
|
|
|
|
|
|
+ 'discountAmount': 'DISCOUNT_AMOUNT',
|
|
|
|
+ 'balance': 'BALANCE'
|
|
}
|
|
}
|
|
const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
|
|
const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
|
|
const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
|
|
const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
|
|
@@ -169,7 +172,7 @@ export default {
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
- // 应付金额 值为负,应显示为正
|
|
|
|
|
|
+ // 应付金额 值为负,应显示为正 余额
|
|
data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
|
|
data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|