From 4657fc29bd9fa476025607ec78281a748201467c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Wed, 23 Sep 2026 11:05:19 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E6=94=B6=E7=A5=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BB=85=E4=BF=9D=E7=95=99=E6=8E=A8=E9=80=81=E9=87=91?= =?UTF-8?q?=E8=9D=B6=E6=94=B6=E7=A5=A8=E5=8D=95=E5=B9=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=BA=E6=89=B9=E9=87=8F=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/payment/invoiceReceipt.js | 11 +++---- src/option/payment/invoiceReceipt.js | 5 +-- src/views/payment/invoice-receipt-form.vue | 6 ---- src/views/payment/invoice-receipt.vue | 36 ++++++---------------- 4 files changed, 18 insertions(+), 40 deletions(-) diff --git a/src/api/payment/invoiceReceipt.js b/src/api/payment/invoiceReceipt.js index 397a768..c78b5c9 100644 --- a/src/api/payment/invoiceReceipt.js +++ b/src/api/payment/invoiceReceipt.js @@ -25,8 +25,6 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post' export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data }); export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data }); export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data }); -export const syncKingdee = id => - request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } }); export const pushKingdee = ids => request({ url: `${baseUrl}/push-kingdee`, method: 'post', data: ids }); @@ -38,8 +36,9 @@ export const approvalStatusOptions = [ { label: '已作废', value: 'voided' }, ]; -export const kingdeeStatusOptions = [ - { label: '未同步', value: 'unsynced' }, - { label: '已同步', value: 'synced' }, - { label: '同步失败', value: 'failed' }, +export const kingdeePushStatusOptions = [ + { label: '未推送', value: 'unsynced' }, + { label: '已保存收票单', value: 'pushed' }, + { label: '已指定应付', value: 'assigned' }, + { label: '推送失败', value: 'failed' }, ]; diff --git a/src/option/payment/invoiceReceipt.js b/src/option/payment/invoiceReceipt.js index b1ca9e2..8a65835 100644 --- a/src/option/payment/invoiceReceipt.js +++ b/src/option/payment/invoiceReceipt.js @@ -11,6 +11,7 @@ export const invoiceReceiptTableColumns = [ { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 }, { prop: 'createUserName', label: '创建人', minWidth: 110 }, { prop: 'createTime', label: '创建时间', minWidth: 170 }, - { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 }, - { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 }, + { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 }, + { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 }, + { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 }, ]; diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue index fa0ad83..9aacd16 100644 --- a/src/views/payment/invoice-receipt-form.vue +++ b/src/views/payment/invoice-receipt-form.vue @@ -226,8 +226,6 @@ const emptyForm = () => ({ bankName: '', bankAccount: '', issuingBank: '', - kingdeeBillNo: '', - kingdeeStatus: 'unsynced', phone: '', customerEmails: [], departmentEmails: [], @@ -395,8 +393,6 @@ export default { bankName: selected.bankName, bankAccount: selected.bankAccount, issuingBank: selected.issuingBank, - kingdeeBillNo: selected.kingdeeBillNo || '', - kingdeeStatus: selected.kingdeeStatus || 'unsynced', phone: preserveUserInput ? this.form.phone : selected.phone || '', customerEmails: preserveUserInput ? this.form.customerEmails @@ -518,8 +514,6 @@ export default { bankName: this.form.bankName, bankAccount: this.form.bankAccount, issuingBank: this.form.issuingBank, - kingdeeBillNo: this.form.kingdeeBillNo, - kingdeeStatus: this.form.kingdeeStatus, phone: this.form.phone, customerEmails: this.form.customerEmails.join(';'), departmentEmails: this.form.departmentEmails.join(';'), diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue index b6be78a..a0774f6 100644 --- a/src/views/payment/invoice-receipt.vue +++ b/src/views/payment/invoice-receipt.vue @@ -40,10 +40,10 @@ /> - - + +
- 批量同步 推送金蝶收票单批量同步 新增 ({ deptName: '', deptPath: [], approvalStatus: '', - kingdeeStatus: '', + kingdeePushStatus: '', }); export default { @@ -265,7 +258,7 @@ export default { query: emptyQuery(), searchExpanded: false, approvalStatusOptions: api.approvalStatusOptions, - kingdeeStatusOptions: api.kingdeeStatusOptions, + kingdeePushStatusOptions: api.kingdeePushStatusOptions, columns: invoiceReceiptTableColumns, rows: [], selection: [], @@ -370,23 +363,13 @@ export default { this.$message.success('作废成功'); this.loadTable(); }, - async handleBatchSync() { - const rows = this.selection.filter(row => row.approvalStatus === 'approved'); - if (!rows.length) { - this.$message.warning('请选择至少一条审批通过的收票登记'); - return; - } - await Promise.all(rows.map(row => api.syncKingdee(row.id))); - 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} 条收票登记推送金蝶收票单？`, '提示', { + await this.$confirm(`确认将选中的 ${rows.length} 条收票登记同步至金蝶？`, '提示', { type: 'warning', }); const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id))); @@ -408,8 +391,9 @@ export default { 当前处理人: item.currentProcessor, 创建人: item.createUserName, 创建时间: item.createTime, - 金蝶单据号: item.kingdeeBillNo, - 金蝶单据状态: item.kingdeeStatusName, + 金蝶单据号: item.kingdeeReceivedInvoiceNo, + 金蝶状态: item.kingdeePushStatusName, + 失败原因: item.kingdeePushMsg, })); const workbook = XLSX.utils.book_new(); XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '收票登记');