diff --git a/src/api/payment/invoiceReceipt.js b/src/api/payment/invoiceReceipt.js index d4d0b3e..397a768 100644 --- a/src/api/payment/invoiceReceipt.js +++ b/src/api/payment/invoiceReceipt.js @@ -7,8 +7,6 @@ export const getList = (current, size, params) => export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } }); export const queryInvoicePool = params => request({ url: `${baseUrl}/invoice-pool`, method: 'get', params }); -export const fetchInvoicePoolByNo = invoiceNo => - request({ url: `${baseUrl}/invoice-pool/fetch`, method: 'post', params: { invoiceNo } }); export const getSettlementCandidates = (keyword, receiptId) => request({ url: `${baseUrl}/settlement-candidates`, @@ -29,9 +27,8 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data }); export const syncKingdee = id => request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } }); -// 手动同步为分钟级长任务，单独放宽超时（全局默认 10s 必超时） -export const syncInvoicePool = () => - request({ url: `${baseUrl}/sync-invoice-pool`, method: 'post', timeout: 300000 }); +export const pushKingdee = ids => + request({ url: `${baseUrl}/push-kingdee`, method: 'post', data: ids }); export const approvalStatusOptions = [ { label: '草稿', value: 'draft' }, diff --git a/src/api/settlement/formalSettlement.js b/src/api/settlement/formalSettlement.js index c1fc420..23b280a 100644 --- a/src/api/settlement/formalSettlement.js +++ b/src/api/settlement/formalSettlement.js @@ -50,5 +50,3 @@ export const claimInvoices = data => request({ url: `${baseUrl}/claim-invoices`, method: 'post', data }); export const queryInvoicePool = params => request({ url: `${baseUrl}/invoice-pool`, method: 'get', params }); -export const fetchInvoicePoolByNo = invoiceNo => - request({ url: `${baseUrl}/invoice-pool/fetch`, method: 'post', params: { invoiceNo } }); diff --git a/src/components/kingdee-invoice-pool-dialog/main.vue b/src/components/kingdee-invoice-pool-dialog/main.vue index 8e311eb..cfafaf8 100644 --- a/src/components/kingdee-invoice-pool-dialog/main.vue +++ b/src/components/kingdee-invoice-pool-dialog/main.vue @@ -1,15 +1,5 @@ - - - -
-
- - 补查 -
- +
+ 第 {{ page.current }} 页 + 上一页 + 下一页 + + +
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue index e23c555..fa0ad83 100644 --- a/src/views/payment/invoice-receipt-form.vue +++ b/src/views/payment/invoice-receipt-form.vue @@ -47,7 +47,7 @@ @@ -56,7 +56,7 @@ @@ -154,8 +154,6 @@ title="查询金蝶票据池" :initial-invoice-no="form.invoiceNo" :query-api="apiQueryInvoicePool" - :fetch-api="apiFetchInvoicePool" - :sync-api="apiSyncInvoicePool" @confirm="handleInvoicePicked" /> @@ -217,7 +215,6 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v const emptyForm = () => ({ id: null, - kingdeeInvoicePoolId: null, invoiceNo: '', invoiceDate: '', invoiceType: '', @@ -302,12 +299,6 @@ export default { apiQueryInvoicePool(params) { return api.queryInvoicePool(params); }, - apiFetchInvoicePool(invoiceNo) { - return api.fetchInvoicePoolByNo(invoiceNo); - }, - apiSyncInvoicePool() { - return api.syncInvoicePool(); - }, handleInvoicePicked(rows) { this.confirmInvoice(rows[0]); }, @@ -356,7 +347,7 @@ export default { if (this.settlementIds.length) await this.loadReferenceInformation(); }, validateInvoice(rule, value, callback) { - if (!value || !this.form.kingdeeInvoicePoolId) { + if (!value) { callback(new Error('请选择金蝶票据池发票')); return; } @@ -393,7 +384,6 @@ export default { } const preserveUserInput = options.preserveUserInput === true; Object.assign(this.form, { - kingdeeInvoicePoolId: selected.id, invoiceNo: selected.invoiceNo, invoiceDate: selected.invoiceDate, invoiceType: selected.invoiceType, @@ -517,7 +507,6 @@ export default { payload() { return { id: this.form.id, - kingdeeInvoicePoolId: this.form.kingdeeInvoicePoolId, invoiceNo: this.form.invoiceNo, invoiceDate: this.form.invoiceDate, invoiceType: this.form.invoiceType, @@ -567,8 +556,15 @@ export default { this.$message.warning('请先选择金蝶票据池发票'); return; } - const invoice = this.unwrapData(await api.fetchInvoicePoolByNo(this.form.invoiceNo)); - if (!invoice || !this.confirmInvoice(invoice, { preserveUserInput: true })) return; + const data = this.unwrapData( + await api.queryInvoicePool({ current: 1, size: 1, invoiceNo: this.form.invoiceNo }) + ); + const invoice = (data.records || []).find(item => item.invoiceNo === this.form.invoiceNo); + if (!invoice) { + this.$message.warning('金蝶票池未查询到该发票'); + return; + } + if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return; if (this.settlementIds.length) await this.loadReferenceInformation(); this.$message.success('同步成功'); }, diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue index 55f4acf..b6be78a 100644 --- a/src/views/payment/invoice-receipt.vue +++ b/src/views/payment/invoice-receipt.vue @@ -73,6 +73,13 @@ @click="handleBatchSync" >批量同步 + 推送金蝶收票单 新增 @@ -373,6 +380,19 @@ export default { this.$message.success(`已同步${rows.length}条收票登记`); this.loadTable(); }, + async handlePushKingdee() { + const rows = this.selection.filter(row => row.approvalStatus === 'approved'); + if (!rows.length) { + this.$message.warning('请选择至少一条审批通过的收票登记'); + return; + } + await this.$confirm(`确认将选中的 ${rows.length} 条收票登记推送金蝶收票单？`, '提示', { + type: 'warning', + }); + const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id))); + this.$alert(summary || '推送完成', '推送结果', { confirmButtonText: '知道了' }); + this.loadTable(); + }, async handleExport() { const data = this.unwrapData(await api.getList(1, 100000, this.query)); const exportRows = (data.records || []).map(item => ({ diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index 1077f81..4164bc7 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -419,7 +419,6 @@ multiple :initial-invoice-no="String(invoiceClaimNo || '').trim()" :query-api="invoicePoolQueryApi" - :fetch-api="invoicePoolFetchApi" @confirm="handleInvoiceClaimConfirm" /> @@ -892,7 +891,6 @@ import { getReceiptClaims, claimInvoices as claimInvoicesApi, queryInvoicePool, - fetchInvoicePoolByNo, save, } from '@/api/settlement/formalSettlement'; import { @@ -2173,9 +2171,6 @@ export default { invoicePoolQueryApi(params) { return queryInvoicePool(params); }, - invoicePoolFetchApi(invoiceNo) { - return fetchInvoicePoolByNo(invoiceNo); - }, async handleInvoiceClaimConfirm(rows) { // 统一票池行附件字段为复数 attachmentsJson，认领请求契约是单数 attachmentJson，中转处归一 this.invoiceClaimDialog.selected = rows.map(row => ({