diff --git a/src/api/payment/receiptClaimRecord.js b/src/api/payment/receiptClaimRecord.js index 570888d..90e8633 100644 --- a/src/api/payment/receiptClaimRecord.js +++ b/src/api/payment/receiptClaimRecord.js @@ -8,20 +8,12 @@ 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' }, { label: '已作废', value: 'voided' }, ]; -export const pushStatusOptions = [ - { label: '未推送', value: 'none' }, - { label: '已推送', value: 'pushed' }, - { label: '推送失败', value: 'failed' }, -]; - export const kingdeeBillStatusOptions = [ { label: '未生成', value: 'none' }, { label: '已推送', value: 'pushed' }, diff --git a/src/api/payment/receiptFlow.js b/src/api/payment/receiptFlow.js index 231e0ac..1634b1d 100644 --- a/src/api/payment/receiptFlow.js +++ b/src/api/payment/receiptFlow.js @@ -13,8 +13,6 @@ export const getSettlementCandidates = (keyword, flowId) => }); export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data }); export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' }); -export const pushKingdee = flowId => - request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } }); export const claimStatusOptions = [ { label: '未认领', value: 'unclaimed' }, @@ -22,12 +20,6 @@ export const claimStatusOptions = [ { label: '认领完成', value: 'claimed' }, ]; -export const pushStatusOptions = [ - { label: '未推送', value: 'none' }, - { label: '已推送', value: 'pushed' }, - { label: '推送失败', value: 'failed' }, -]; - export const kingdeeBillStatusOptions = [ { label: '已推送', value: 'pushed' }, { label: '审核通过', value: 'approved' }, diff --git a/src/option/payment/receiptClaimRecord.js b/src/option/payment/receiptClaimRecord.js index d1f1d96..c445762 100644 --- a/src/option/payment/receiptClaimRecord.js +++ b/src/option/payment/receiptClaimRecord.js @@ -1,7 +1,7 @@ export const receiptClaimRecordTableColumns = [ - { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true }, + { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true }, { prop: 'payerName', label: '付款人', minWidth: 130 }, - { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true }, + { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true }, { prop: 'counterpartyName', label: '对方户名', minWidth: 150 }, { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 }, { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 }, diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js index 983f4a1..5a3d6fb 100644 --- a/src/option/payment/receiptFlow.js +++ b/src/option/payment/receiptFlow.js @@ -1,18 +1,14 @@ export const receiptFlowTableColumns = [ - { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true }, + { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true }, { prop: 'payerName', label: '付款人', minWidth: 130 }, - { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true }, + { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true }, { prop: 'counterpartyName', label: '对方户名', minWidth: 150 }, { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 }, { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 }, { 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 }, - { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true }, - { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true }, - { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 }, - { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 }, + { prop: 'unclaimedAmount', label: '未匹配金额', minWidth: 140, money: true }, { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 }, ]; diff --git a/src/views/payment/receipt-claim-record-form.vue b/src/views/payment/receipt-claim-record-form.vue index 0df5b49..9d6f41b 100644 --- a/src/views/payment/receipt-claim-record-form.vue +++ b/src/views/payment/receipt-claim-record-form.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/payment/receipt-claim-record.vue b/src/views/payment/receipt-claim-record.vue index bce6f40..df9d3cc 100644 --- a/src/views/payment/receipt-claim-record.vue +++ b/src/views/payment/receipt-claim-record.vue @@ -3,7 +3,7 @@
- + @@ -56,16 +56,6 @@ - - - - -
- - 查询金蝶认领结果 - - + @@ -360,7 +360,7 @@ export default { 0 ); if (total > remaining + 0.001) { - this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`); + this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过未匹配金额`); return; } } diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue index 8497954..4022c6e 100644 --- a/src/views/payment/receipt-flow-form.vue +++ b/src/views/payment/receipt-flow-form.vue @@ -12,7 +12,7 @@
- + @@ -15,16 +15,6 @@ - - - - - {{ displayValue(row[column.prop]) }} - + @@ -201,7 +178,7 @@ >
- + {{ displayValue(detailDialog.data.receiptNoticeNo) }} @@ -236,23 +213,15 @@ {{ formatMoney(detailDialog.data.remainingAmount) }} - + {{ formatMoney(detailDialog.data.unclaimedAmount) }} - - - {{ displayValue(detailDialog.data.pushStatusName) }} - - {{ displayValue(detailDialog.data.kingdeeBillNo) }} {{ displayValue(detailDialog.data.kingdeeBillStatusName) }} - - {{ displayValue(detailDialog.data.pushFailReason) }} - {{ displayValue(detailDialog.data.summary) }} @@ -267,9 +236,7 @@ - + @@ -297,7 +264,6 @@ const emptyQuery = () => ({ summary: '', detailSerialNo: '', claimStatus: '', - pushStatus: '', kingdeeBillStatus: '', receiptAmountStart: undefined, receiptAmountEnd: undefined, @@ -314,7 +280,6 @@ export default { ArrowUp, query: emptyQuery(), claimStatusOptions: api.claimStatusOptions, - pushStatusOptions: api.pushStatusOptions, kingdeeBillStatusOptions: api.kingdeeBillStatusOptions, columns: receiptFlowTableColumns, visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop), @@ -324,7 +289,6 @@ export default { selectedRows: [], loading: false, syncing: false, - pushingId: null, searchExpanded: false, // 与 avue-crud 一致:搜索项数量超过 searchIndex(默认一行 4 项)时才显示“展开/收起” searchIndex: 4, @@ -389,7 +353,7 @@ export default { this.syncing = true; try { const syncedCount = Number(this.unwrapData(await api.sync()) || 0); - this.$message.success(`流水同步完成,共同步${syncedCount}条认领公告`); + this.$message.success(`流水同步完成,共同步${syncedCount}条收款流水`); await this.loadTable(); } finally { this.syncing = false; @@ -448,38 +412,7 @@ export default { canClaim(row) { return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0; }, - canPush(row) { - return ( - this.hasPermission('receipt_flow_push') && - !!row.billId && - row.claimStatus === 'claimed' && - row.pushStatus !== 'pushed' - ); - }, - async handlePush(row) { - try { - await this.$confirm( - `确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单?`, - '推送金蝶', - { type: 'warning' } - ); - } catch { - return; - } - this.pushingId = row.id; - try { - const data = this.unwrapData(await api.pushKingdee(row.id)); - const billNo = data?.kingdeeBillNo; - this.$message.success(billNo ? `推送成功,金蝶收款单号:${billNo}` : '推送成功'); - await this.loadTable(); - } finally { - this.pushingId = null; - } - }, statusType(row, column) { - if (column?.prop === 'pushStatusName') { - return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info'; - } return ( { claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || '' ); diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index dd85e42..5520a8e 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -559,7 +559,7 @@