diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue index aeb56cc..d5723f0 100644 --- a/src/views/settlement/components/formal-settlement-editor.vue +++ b/src/views/settlement/components/formal-settlement-editor.vue @@ -450,7 +450,7 @@ > 认领查询 - + @@ -473,7 +473,9 @@ min-width="180" align="center" > - + - {{ formatMoney(row.matchedAmount) }} + {{ row.issued ? '-' : formatMoney(row.matchedAmount) }} 查看 下载 @@ -543,35 +545,13 @@ @click="repushInvoice(row)" >重新推送 - 删除 + 删除 - -
-
- 开票发票(本结算单开票申请经金蝶开票回写,文件由金蝶发票云直链提供) -
- - - - - - - - - - - - - -
({ + ...row, + issued: true, + invoiceType: + invoiceTypeOptions.find(item => item.value === row.invoiceType)?.label || + row.invoiceType || + '', + })), + ]; + }, // 查看页面「同步」按钮:仅已审批且未同步金蝶(含推送失败)的单据显示,口径与后端推送闸门一致 canSync() { return ( @@ -2702,9 +2698,10 @@ export default { openInvoiceReceiptDialog() { this.invoiceReceiptDialog.visible = true; }, - // 查看页重推入口展示条件:只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付(failed/pushed) + // 查看页重推入口展示条件:只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付(failed/pushed);金蝶回写行不参与 canRepushInvoice(row) { return ( + !row.issued && !this.editable && this.form.settlementType !== 'receivable' && this.form.approvalStatus === 'approved' && @@ -2954,6 +2951,13 @@ export default { this.kingdeeAttachmentBusy = false; } }, + // 发票文件入口分流:金蝶回写开票发票走发票云直链,其余走金蝶票池/登记附件 + viewInvoiceFile(row) { + return row.issued ? this.viewIssuedInvoice(row) : this.viewInvoiceAttachment(row); + }, + downloadInvoiceFile(row) { + return row.issued ? this.downloadIssuedInvoice(row) : this.downloadInvoiceAttachment(row); + }, // 开票发票预览地址:数电PDF优先(OFD浏览器无法预览),退预览图、板式文件 issuedInvoicePreviewUrl(row) { return row.invoicePdfFileUrl || row.invoiceImageUrl || row.invoiceFileUrl || ''; @@ -3591,14 +3595,6 @@ export default { justify-content: flex-end; margin-bottom: 12px; } -.formal-editor__issued-invoices { - margin-top: 16px; -} -.formal-editor__issued-title { - margin-bottom: 8px; - color: var(--el-text-color-secondary); - font-size: 13px; -} .formal-editor__negative-amount { color: var(--el-color-danger); }