|
|
@@ -108,9 +108,15 @@ export default {
|
|
|
row.timeLine = ''
|
|
|
}
|
|
|
row.balanceText = this.formatMoney(row.balance)
|
|
|
- row.showSettleLink = Number(row.settleId) > 0
|
|
|
- row.settleLinkText = '结账单 ' + (row.settleNo || '') + ' · ' + this.formatMoney(row.settleAmount) + '元'
|
|
|
- row.showBecomeBalance = Number(row.settleAmount) > 0 && Number(row.becomeBalance) > 0
|
|
|
+ const settleAmt = this.formatMoney(row.settleAmount)
|
|
|
+ const clearAmt = this.formatMoney(row.clearAmount)
|
|
|
+ row.showSettleLink = Number(row.settleId) > 0 || this.hasText(row.settleNo) || Number(row.clearId) > 0 || this.hasText(row.clearSn)
|
|
|
+ if (Number(row.clearId) > 0 || this.hasText(row.clearSn)) {
|
|
|
+ row.settleLinkText = '结账单 ' + (row.clearSn || row.settleNo || '') + ' · 本单销' + clearAmt + '元'
|
|
|
+ } else {
|
|
|
+ row.settleLinkText = '结账单 ' + (row.settleNo || '') + ' · ' + settleAmt + '元'
|
|
|
+ }
|
|
|
+ row.showBecomeBalance = Number(row.becomeBalance) > 0
|
|
|
row.becomeHintText = '剩余可用 ' + this.formatMoney(row.becomeBalance) + '元'
|
|
|
row.showShOrderLink = Number(row.shOrderId) > 0
|
|
|
row.shOrderLinkText = '红冲单 ' + (row.shOrderSn || '')
|
|
|
@@ -143,6 +149,10 @@ export default {
|
|
|
this.$util.pageTo({ url: '/admin/order/detail?id=' + item.shOrderId })
|
|
|
},
|
|
|
goSettle(item) {
|
|
|
+ if (Number(item.clearId) > 0) {
|
|
|
+ this.$util.pageTo({ url: '/admin/clear/info?id=' + item.clearId })
|
|
|
+ return
|
|
|
+ }
|
|
|
this.$util.pageTo({ url: '/admin/settle/detail?id=' + item.settleId })
|
|
|
},
|
|
|
goDetail(item) {
|
|
|
@@ -303,14 +313,14 @@ export default {
|
|
|
}
|
|
|
|
|
|
.bc-date {
|
|
|
- font-size: 22upx;
|
|
|
+ font-size: 26upx;
|
|
|
color: #2c2c2c;
|
|
|
line-height: 1.35;
|
|
|
}
|
|
|
|
|
|
.bc-clock {
|
|
|
margin-top: 4upx;
|
|
|
- font-size: 22upx;
|
|
|
+ font-size: 26upx;
|
|
|
color: #2c2c2c;
|
|
|
line-height: 1.35;
|
|
|
}
|
