From fbad28b71736feb21c67ad443526e3689ce80c8b 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, 15 Oct 2026 11:29:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7/?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7/=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=87=91=E8=9D=B6=E8=A7=A3=E9=94=81=E7=BB=88=E6=80=81=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - lockTag 增加解锁终态分支:金蝶删单红tag、金蝶解锁橙tag,tooltip 展示操作人与解锁时间 - 数据来自后端 fillUnlockMarks 回填的 kingdeeUnlockTime/kingdeeUnlockOperator/kingdeeUnlockOperationName --- src/views/payment/invoice-application.vue | 10 ++++++++++ src/views/payment/payment-application.vue | 10 ++++++++++ .../components/formal-settlement-table-panel.vue | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue index c64e07f..6faa32d 100644 --- a/src/views/payment/invoice-application.vue +++ b/src/views/payment/invoice-application.vue @@ -481,6 +481,16 @@ export default { tip: row.kingdeeLockFailReason || '系统将自动补偿重锁', }; } + // 金蝶解锁终态标识:删单解锁的源单已作废,此标签用于区分人工作废与金蝶删单 + if (row.kingdeeUnlockTime) { + const isDelete = row.kingdeeUnlockOperationName === '金蝶删单'; + return { + show: true, + type: isDelete ? 'danger' : 'warning', + label: row.kingdeeUnlockOperationName || '金蝶解锁', + tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`, + }; + } return { show: false }; }, displayValue(value) { diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue index 9980357..0f8b072 100644 --- a/src/views/payment/payment-application.vue +++ b/src/views/payment/payment-application.vue @@ -529,6 +529,16 @@ export default { tip: row.kingdeeLockFailReason || '系统将自动补偿重锁', }; } + // 金蝶解锁终态标识:后端按 unlocked 锁记录回填(付款申请不作废,仅此标识可区分金蝶删单与推送失败) + if (row.kingdeeUnlockTime) { + const isDelete = row.kingdeeUnlockOperationName === '金蝶删单'; + return { + show: true, + type: isDelete ? 'danger' : 'warning', + label: row.kingdeeUnlockOperationName || '金蝶解锁', + tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`, + }; + } return { show: false }; }, displayValue(value) { diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index eaa1868..8813d6e 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -252,6 +252,16 @@ export default { tip: row.kingdeeLockFailReason || '系统将自动补偿重锁', }; } + // 金蝶解锁终态标识:删单解锁的源单已作废,此标签用于区分人工作废与金蝶删单 + if (row.kingdeeUnlockTime) { + const isDelete = row.kingdeeUnlockOperationName === '金蝶删单'; + return { + show: true, + type: isDelete ? 'danger' : 'warning', + label: row.kingdeeUnlockOperationName || '金蝶解锁', + tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`, + }; + } return { show: false }; }, displayValue(value) {