From d57d3f86dafe1b43a40b09a8b97acee62525fd8e 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, 5 Nov 2026 16:34:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=87=91=E8=9D=B6=E7=A5=A8=E6=8D=AE?= =?UTF-8?q?=E6=B1=A0=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=B8=8E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=BD=AC=E7=BB=93=E7=AE=97=E4=BF=9D=E6=8C=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kingdee-invoice-pool-dialog/main.vue | 47 ++++++++++++++----- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/components/kingdee-invoice-pool-dialog/main.vue b/src/components/kingdee-invoice-pool-dialog/main.vue index 7b0449c..4c2b1ab 100644 --- a/src/components/kingdee-invoice-pool-dialog/main.vue +++ b/src/components/kingdee-invoice-pool-dialog/main.vue @@ -1,8 +1,8 @@ + @@ -172,8 +177,8 @@ -
- 按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找 +
+ 按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找 -- 2.52.0 From 119d71b4f5c33c239b48275a341e6368a1022fe1 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, 5 Nov 2026 16:49:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=94=B6=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=91=E8=9D=B6=E7=8A=B6=E6=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A2=9C=E8=89=B2=E6=A0=87=E7=AD=BE=E4=B8=8E=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=A1=B5=E9=9D=A2=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/payment/invoiceReceipt.js | 2 +- src/utils/kingdee.js | 11 +++++++++++ src/views/payment/invoice-receipt.vue | 5 +++++ .../components/invoice-receipt-candidates-dialog.vue | 3 ++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/option/payment/invoiceReceipt.js b/src/option/payment/invoiceReceipt.js index add059a..ddc030d 100644 --- a/src/option/payment/invoiceReceipt.js +++ b/src/option/payment/invoiceReceipt.js @@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [ { prop: 'createUserName', label: '创建人', minWidth: 110 }, { prop: 'createTime', label: '创建时间', minWidth: 170 }, { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 }, - { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 }, + { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true }, { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 }, { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 }, ]; diff --git a/src/utils/kingdee.js b/src/utils/kingdee.js index 4a4f6ab..3f82010 100644 --- a/src/utils/kingdee.js +++ b/src/utils/kingdee.js @@ -14,6 +14,17 @@ export const KINGDEE_STATUS_TAG_TYPES = { /** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */ export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info'; +/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */ +export const KINGDEE_PUSH_STATUS_TAG_TYPES = { + unsynced: 'info', + pushed: 'warning', + assigned: 'success', + failed: 'danger', +}; + +/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */ +export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info'; + /** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */ export const KINGDEE_WRITEOFF_TAG_TYPES = { writtenoff: 'success', diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue index 0a15cd8..7f17ab3 100644 --- a/src/views/payment/invoice-receipt.vue +++ b/src/views/payment/invoice-receipt.vue @@ -119,6 +119,9 @@ {{ displayValue(row[column.prop]) }} + + {{ displayValue(row[column.prop]) }} + {{ formatMoney(row[column.prop]) }} {{ displayValue(row[column.prop]) }} @@ -222,6 +225,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue'; import organizationSearch from '@/mixins/organization-search'; import { getMKApprovalUrl } from '@/api/system/business-process'; import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; +import { kingdeePushStatusType } from '@/utils/kingdee'; // 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取 const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh'; @@ -480,6 +484,7 @@ export default { '' ); }, + kingdeePushStatusType, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; }, diff --git a/src/views/settlement/components/invoice-receipt-candidates-dialog.vue b/src/views/settlement/components/invoice-receipt-candidates-dialog.vue index f8d325e..51469f5 100644 --- a/src/views/settlement/components/invoice-receipt-candidates-dialog.vue +++ b/src/views/settlement/components/invoice-receipt-candidates-dialog.vue @@ -74,6 +74,7 @@