diff --git a/bms-front/src/views/ar/bill/index.vue b/bms-front/src/views/ar/bill/index.vue index e9462e3b..39399dc0 100644 --- a/bms-front/src/views/ar/bill/index.vue +++ b/bms-front/src/views/ar/bill/index.vue @@ -47,7 +47,7 @@ 确认 作废 导出明细 - 去核销 + 核销 反核销 diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue index 613586d6..936ee621 100644 --- a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue @@ -949,17 +949,14 @@ - - + + {{ woDialog.bill.billNo }} {{ woDialog.bill.billName || '-' }} CNY {{ formatMoney(woDialog.bill.unwrittenAmount) }} - - CNY {{ formatMoney(currentAccount.balance) }} - @@ -1904,10 +1901,9 @@ function loadBillWriteoffData() { /* ---- 核销弹窗 ---- */ const woSubmitLoading = ref(false) -const woDialog = reactive({ visible: false, bill: null, form: {}, accountLoading: false }) -let writeoffAccountRequestSerial = 0 +const woDialog = reactive({ visible: false, bill: null, form: {} }) -async function openWriteoffDialog(row) { +function openWriteoffDialog(row) { const customerId = Number(route.query.customerId) if (!customerId) { proxy.$modal.msgError('缺少客户ID,无法发起核销') @@ -1925,27 +1921,9 @@ async function openWriteoffDialog(row) { remark: '' } woDialog.visible = true - - // 仍刷新账户余额供展示,但不再限制核销金额 - const requestSerial = ++writeoffAccountRequestSerial - woDialog.accountLoading = true - try { - const res = await listAccount(customerId) - if (requestSerial !== writeoffAccountRequestSerial) return - accountList.value = res.data || [] - } catch (e) { - if (requestSerial !== writeoffAccountRequestSerial) return - proxy.$modal.msgError('账户余额刷新失败,请稍后重试') - } finally { - if (requestSerial === writeoffAccountRequestSerial) woDialog.accountLoading = false - } } function submitWriteoff() { - if (woDialog.accountLoading) { - proxy.$modal.msgWarning('正在刷新账户余额,请稍候') - return - } const bill = woDialog.bill const rawAmount = typeof woDialog.form.writeoffAmount === 'string' ? woDialog.form.writeoffAmount.trim()