|
@@ -23,16 +23,16 @@
|
|
|
</template>
|
|
|
<a-descriptions size="small" :column="4">
|
|
|
<a-descriptions-item label="授信额度">
|
|
|
- <span>{{ total && total.creditLimit? toThousands(total.creditLimit,2):'--' }}</span>
|
|
|
+ <span>{{ total && toThousands(total.creditLimit,2) }}</span>
|
|
|
</a-descriptions-item>
|
|
|
<a-descriptions-item label="待结金额">
|
|
|
- <span>{{ total && total.waitSettleAmount? toThousands(total.waitSettleAmount,2):'--' }}</span>
|
|
|
+ <span>{{ total && toThousands(total.waitSettleAmount,2) }}</span>
|
|
|
</a-descriptions-item>
|
|
|
<a-descriptions-item label="冻结金额">
|
|
|
- <span>{{ total && total.freezeAmount? toThousands(total.freezeAmount,2):'--' }}</span>
|
|
|
+ <span>{{ total && toThousands(total.freezeAmount,2) }}</span>
|
|
|
</a-descriptions-item>
|
|
|
<a-descriptions-item label="可用额度">
|
|
|
- <span>{{ total && total.usableAmount?toThousands(total.usableAmount,2):'--' }}</span>
|
|
|
+ <span>{{ total && toThousands(total.activeAmount,2) }}</span>
|
|
|
</a-descriptions-item>
|
|
|
</a-descriptions>
|
|
|
</a-collapse-panel>
|
|
@@ -67,7 +67,7 @@
|
|
|
<a-alert type="info" style="margin:10px 0">
|
|
|
<div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
|
|
|
共<strong>{{ count }}</strong>条记录;
|
|
|
- 待结算金额合计¥<strong>{{ priceTotal?toThousands(priceTotal,2):'--' }}</strong>
|
|
|
+ 待结算金额合计¥<strong>{{ toThousands(priceTotal,2) }}</strong>
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
<s-table
|
|
@@ -176,10 +176,13 @@ export default {
|
|
|
},
|
|
|
getPageInfo () {
|
|
|
this.spinning = true
|
|
|
+ const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
|
|
|
merchantCashOutDetail({}).then(res => {
|
|
|
- console.log(res, '===========')
|
|
|
+ console.log(res, info, '===========')
|
|
|
if (res.status == 200) {
|
|
|
this.total = res.data
|
|
|
+ this.total.creditLimit = info.creditLimit
|
|
|
+ this.total.waitSettleAmount = info.waitSettleAmount
|
|
|
} else {
|
|
|
this.total = null
|
|
|
}
|