From 7fd814076108e94b55c57a42e57e56b6c40d444d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Thu, 24 Sep 2026 22:21:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E6=AC=BE=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=E9=A1=B5=E7=9B=B4=E8=BF=9EA301-2=E5=85=AC=E5=91=8A=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=B9=B6=E6=94=AF=E6=8C=81A301-1=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=9B=9E=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/payment/receiptClaimRecord.js | 4 ++ src/api/payment/receiptFlow.js | 2 +- src/option/payment/receiptFlow.js | 1 + src/views/payment/receipt-claim-record.vue | 23 ++++++++ src/views/payment/receipt-flow.vue | 63 +--------------------- 5 files changed, 31 insertions(+), 62 deletions(-) diff --git a/src/api/payment/receiptClaimRecord.js b/src/api/payment/receiptClaimRecord.js index 4bda63f..d120de3 100644 --- a/src/api/payment/receiptClaimRecord.js +++ b/src/api/payment/receiptClaimRecord.js @@ -8,6 +8,8 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get' export const updateAttachments = data => request({ url: `${baseUrl}/attachments`, method: 'post', data }); export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } }); +export const queryKingdeeResult = () => + request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' }); export const claimStatusOptions = [ { label: '已认领', value: 'claimed' }, @@ -16,6 +18,8 @@ export const claimStatusOptions = [ export const kingdeeBillStatusOptions = [ { label: '未生成', value: 'none' }, + { label: '已推送', value: 'pushed' }, { label: '审核通过', value: 'approved' }, + { label: '已收款', value: 'received' }, { label: '处理失败', value: 'failed' }, ]; diff --git a/src/api/payment/receiptFlow.js b/src/api/payment/receiptFlow.js index 32ad53b..64cec7b 100644 --- a/src/api/payment/receiptFlow.js +++ b/src/api/payment/receiptFlow.js @@ -12,7 +12,7 @@ export const getSettlementCandidates = (keyword, flowId) => params: { keyword, flowId }, }); export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data }); -export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data }); +export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' }); export const claimStatusOptions = [ { label: '未认领', value: 'unclaimed' }, diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js index c96acbb..5fc622b 100644 --- a/src/option/payment/receiptFlow.js +++ b/src/option/payment/receiptFlow.js @@ -8,5 +8,6 @@ export const receiptFlowTableColumns = [ { prop: 'summary', label: '摘要', minWidth: 160 }, { prop: 'transactionTime', label: '交易时间', minWidth: 170 }, { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true }, + { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 }, { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true }, ]; diff --git a/src/views/payment/receipt-claim-record.vue b/src/views/payment/receipt-claim-record.vue index 46262ec..c27bb59 100644 --- a/src/views/payment/receipt-claim-record.vue +++ b/src/views/payment/receipt-claim-record.vue @@ -80,6 +80,11 @@
+
+ + 查询金蝶认领结果 + +
- Array.from({ length }, () => Math.floor(Math.random() * 10)).join(''); - -const formatMockDateTime = date => { - const pad = value => String(value).padStart(2, '0'); - return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad( - date.getHours() - )}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`; -}; - -const createReceiptFlowMockRows = () => { - const count = 20 + Math.floor(Math.random() * 31); - return Array.from({ length: count }, (_, index) => { - const template = receiptFlowMockTemplates[index % receiptFlowMockTemplates.length]; - const transactionDate = new Date(); - transactionDate.setDate(transactionDate.getDate() - Math.floor(Math.random() * 7)); - transactionDate.setHours(8 + Math.floor(Math.random() * 10), Math.floor(Math.random() * 60), 0); - const transactionTime = formatMockDateTime(transactionDate); - const dateCode = transactionTime.slice(0, 10).replaceAll('-', ''); - return { - ...template, - receiptNoticeNo: `SKTZ${dateCode}${randomDigits(5)}`, - receiptAmount: Math.floor(10000 + Math.random() * 90000), - counterpartyAccount: `${template.counterpartyAccount.slice(0, -6)}${randomDigits(6)}`, - transactionTime, - detailSerialNo: `MOCK-RF-${dateCode}-${index + 1}${randomDigits(4)}`, - sourceUpdatedTime: transactionTime, - }; - }); -}; - const emptyQuery = () => ({ receiptNoticeNo: '', counterpartyName: '', @@ -329,9 +271,8 @@ export default { async handleSync() { this.syncing = true; try { - const mockRows = createReceiptFlowMockRows(); - const syncedCount = Number(this.unwrapData(await api.sync({ flows: mockRows })) || 0); - this.$message.success(`流水同步完成，共同步${syncedCount}条`); + const syncedCount = Number(this.unwrapData(await api.sync()) || 0); + this.$message.success(`流水同步完成，共同步${syncedCount}条认领公告`); await this.loadTable(); } finally { this.syncing = false;