|
@@ -19,7 +19,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="商户名称">
|
|
|
- <a-input id="finacialPay-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入商户名称" />
|
|
|
+ <a-input id="finacialPay-settleClientName" v-model.trim="queryParam.settleClientNameCurrent" allowClear placeholder="请输入商户名称" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
bizType: 'ALL',
|
|
|
settleNo: '',
|
|
|
bizNo: '',
|
|
|
- settleClientName: '',
|
|
|
+ settleClientNameCurrent: '',
|
|
|
billState: '',
|
|
|
auditBeginDate: '',
|
|
|
auditEndDate: '',
|
|
@@ -214,7 +214,7 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
|
|
|
- { title: '商户名称', dataIndex: 'settleClientName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '商户名称', dataIndex: 'settleClientNameCurrent', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '应付金额', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '已付金额', dataIndex: 'settledAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '待付金额', dataIndex: 'unsettleAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -336,7 +336,7 @@ export default {
|
|
|
this.openSettleModal = true
|
|
|
const data = {
|
|
|
totalAmount: type ? this.selectTotalAmount : row && row.unsettleAmount || 0,
|
|
|
- settleClientName: type ? '' : row && row.settleClientName || '',
|
|
|
+ settleClientNameCurrent: type ? '' : row && row.settleClientNameCurrent || '',
|
|
|
title: '付款',
|
|
|
type,
|
|
|
row
|
|
@@ -377,7 +377,7 @@ export default {
|
|
|
const _this = this
|
|
|
this.$confirm({
|
|
|
title: '提示',
|
|
|
- content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>付款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
|
|
|
+ content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientNameCurrent}</p><p>付款单号:{row.settleNo},合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
|
|
|
centered: true,
|
|
|
closable: true,
|
|
|
class: 'confirm-center',
|
|
@@ -432,7 +432,7 @@ export default {
|
|
|
bizType: this.curBizType,
|
|
|
settleNo: '',
|
|
|
bizNo: '',
|
|
|
- settleClientName: '',
|
|
|
+ settleClientNameCurrent: '',
|
|
|
billState: '',
|
|
|
beginDate: '',
|
|
|
endDate: '',
|