diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue index 99e3837..2d5c6e4 100644 --- a/src/pages/work/accounts/accountDealRecord/addEdit.vue +++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue @@ -248,6 +248,19 @@ onLoad((option) => { getDicts('account_type').then(result => { form.value.typeName = dictStr(form.value.type, result.data) }) + } + // 回填交易类型名称(默认值'2') + if (form.value.dealType) { + getDicts('deal_type').then(result => { + form.value.dealTypeName = dictStr(form.value.dealType, result.data) + }) + } + + // 回填交易类别名称(默认值'1') + if (form.value.dealCategory) { + getDicts('deal_category').then(result => { + form.value.dealCategoryName = dictStr(form.value.dealCategory, result.data) + }) } } else { // 编辑或复制模式 - 先加载数据,再处理账户列表 diff --git a/src/pages/work/accounts/creditTransferRecord/addEdit.vue b/src/pages/work/accounts/creditTransferRecord/addEdit.vue index 3f8c9fc..630269f 100644 --- a/src/pages/work/accounts/creditTransferRecord/addEdit.vue +++ b/src/pages/work/accounts/creditTransferRecord/addEdit.vue @@ -165,6 +165,11 @@ onLoad((option) => { form.value.inAccountId = option.creditCardId } + // 接收账单金额作为默认还款金额 + if (option.billAmount) { + form.value.amount = parseFloat(option.billAmount) + } + if(form.value.id!=null){ title.value="信用卡还款-修改" }else{ diff --git a/src/pages/work/bill/creditCardBill/list.vue b/src/pages/work/bill/creditCardBill/list.vue index e91a8bd..799141a 100644 --- a/src/pages/work/bill/creditCardBill/list.vue +++ b/src/pages/work/bill/creditCardBill/list.vue @@ -90,12 +90,16 @@ - 账单明细 + 明细 交易 + + + 还款 + 修改 @@ -309,6 +313,14 @@ function selectStatus(value) { uni.navigateTo({ url }) isShow.value = true } + + function handleRepay(item) { + // 跳转到信用卡还款页面,传递信用卡ID和账单金额 + let url = `/pages/work/accounts/creditTransferRecord/addEdit?creditCardId=${item.creditCardId}&billAmount=${item.billAmount}` + + uni.navigateTo({ url }) + isShow.value = true + } @@ -691,6 +703,7 @@ page { flex-wrap: wrap; .btn-deal, + .btn-repay, .btn-detail, .btn-edit, .btn-delete { @@ -698,7 +711,7 @@ page { align-items: center; justify-content: center; gap: 6rpx; - padding: 0 20rpx; + padding: 0 10rpx; height: 64rpx; border-radius: 12rpx; font-size: 26rpx; @@ -717,6 +730,13 @@ page { font-weight: 600; } + .btn-repay { + background: rgba(250, 140, 22, 0.1); + color: #fa8c16; + border: 2rpx solid #fa8c16; + font-weight: 600; + } + .btn-detail { background: rgba(82, 196, 26, 0.1); color: #52c41a;