From 35ea8e25b4649edc32408120dcb84cf47cad4eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E8=84=8F=E7=8B=BC?= <786316265@qq.com> Date: Mon, 11 Aug 2025 16:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AE=8C=E5=90=8E=E7=9A=84transfers?= =?UTF-8?q?=EF=BC=88=E6=B2=A1=E6=9C=89=E8=A7=A3=E5=86=B3=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Transfers.vue | 287 ++++++++++++++++++++++++++++++++++------ 1 file changed, 250 insertions(+), 37 deletions(-) diff --git a/src/views/Transfers.vue b/src/views/Transfers.vue index 3a65a3e..5e7f1dd 100644 --- a/src/views/Transfers.vue +++ b/src/views/Transfers.vue @@ -206,13 +206,13 @@
确认收款 @@ -237,8 +237,115 @@
- - + + +
+
+

转账信息

+
+ 转账金额： + ¥{{ currentTransfer.amount }} +
+
+ 转账说明： + {{ currentTransfer.description }} +
+
+ 转账时间： + {{ formatTime(currentTransfer.created_at) }} +
+
+ 转账类型： + {{ getTransferTypeText(currentTransfer.transfer_type) }} +
+
+ +
+

转账凭证

+
+ + + +
+
+ +
+ +

暂无转账凭证

+
+
+ + + + + + + + + + + + + + + + + + + + @@ -264,6 +371,20 @@ const showReturnDialog = ref(false) const statusFilter = ref('') const currentTransfer = ref({}) const currentAllocation = ref({}) +const confirmFormRef = ref(null) + +const confirmForm = reactive({ + confirmedAmount: '', + remarks: '' +}) + +const confirmRules = { + confirmedAmount: [ + { required: true, message: '请输入实际收到的金额', trigger: 'blur' }, + { type: 'number', min: 0, message: '金额必须大于0', trigger: 'blur' } + ] +} + const returnForm = reactive({ returnAmount: '', description: '' @@ -529,46 +650,45 @@ const confirmReturn = async () => { } } -const confirmReceived = async (transferId) => { - try { - const transfer = allTransferHistory.value.find(t => t.id === transferId); - if (!transfer) { - ElMessage.error('转账记录不存在'); - return; - } +const showVoucherConfirmDialog = (transfer) => { + currentTransfer.value = transfer + showVoucherDialog.value = true +} +const doConfirmReceived = async () => { + try { await ElMessageBox.confirm( - '请确认已收到款项并核对凭证，确定要确认收款吗？', + `确定已收到¥${currentTransfer.value.amount}款项吗？`, '确认收款', { - confirmButtonText: '确认收款', + confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' } - ); + ) - confirmLoading.value = true; + confirmLoading.value = true - // 使用 transferAPI.confirmReceived 方法 - const response = await transferAPI.confirmReceived(transferId); + const response = await transferAPI.confirmReceived(currentTransfer.value.id) if (response.data.success) { - ElMessage.success('收款确认成功'); - await loadTransferHistory(); - await loadPendingTransfers(); + ElMessage.success('收款确认成功') + showVoucherDialog.value = false + await loadTransferHistory() + await loadPendingTransfers() } } catch (error) { if (error !== 'cancel') { - console.error('确认收款失败:', error); + console.error('确认收款失败:', error) const errorMsg = error.response?.data?.message || error.response?.data?.error?.message || - '确认收款失败'; - ElMessage.error(errorMsg); + '确认收款失败' + ElMessage.error(errorMsg) } } finally { - confirmLoading.value = false; + confirmLoading.value = false } -}; +} const confirmNotReceived = async (transferId) => { try { @@ -580,30 +700,29 @@ const confirmNotReceived = async (transferId) => { cancelButtonText: '取消', type: 'warning' } - ); + ) - confirmLoading.value = true; + confirmLoading.value = true - // 使用 transferAPI.confirmNotReceived 方法 - const response = await transferAPI.confirmNotReceived(transferId); + const response = await transferAPI.confirmNotReceived(transferId) if (response.data.success) { - ElMessage.success(response.data.message || '操作成功'); - await loadTransferHistory(); - await loadPendingTransfers(); + ElMessage.success(response.data.message || '操作成功') + await loadTransferHistory() + await loadPendingTransfers() } } catch (error) { if (error !== 'cancel') { - console.error('确认未收款失败:', error); + console.error('确认未收款失败:', error) const errorMsg = error.response?.data?.message || error.response?.data?.error?.message || - '操作失败'; - ElMessage.error(errorMsg); + '操作失败' + ElMessage.error(errorMsg) } } finally { - confirmLoading.value = false; + confirmLoading.value = false } -}; +}