diff --git a/src/option/payment/invoiceApplication.js b/src/option/payment/invoiceApplication.js index 2e7d138..fa5ed87 100644 --- a/src/option/payment/invoiceApplication.js +++ b/src/option/payment/invoiceApplication.js @@ -13,6 +13,7 @@ export const invoiceApplicationTableColumns = [ { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 }, { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 }, { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 }, + { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 }, { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 }, ]; diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js index 4cb9012..83e9f1f 100644 --- a/src/option/settlement/formalSettlementTable.js +++ b/src/option/settlement/formalSettlementTable.js @@ -21,6 +21,7 @@ export const formalSettlementTableColumns = [ { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 }, { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 }, { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 }, + { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 }, { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 }, { label: '创建人', prop: 'createUserName', minWidth: 110 }, { label: '创建时间', prop: 'createTime', minWidth: 170 }, diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue index 186f7c8..4e7090b 100644 --- a/src/views/payment/invoice-application.vue +++ b/src/views/payment/invoice-application.vue @@ -115,6 +115,12 @@ {{ displayValue(row[column.prop]) }} {{ formatMoney(row[column.prop]) }} + {{ displayValue(row[column.prop]) }} @@ -183,7 +189,9 @@ > = 5) { + return { + show: true, + type: 'danger', + label: '锁定失败·已达上限', + tip: row.kingdeeLockFailReason || '自动补偿次数已用完,请重推「同步金蝶」立即补锁', + }; + } + return { + show: true, + type: 'warning', + label: '锁定失败·补偿中', + tip: row.kingdeeLockFailReason || '系统将自动补偿重锁', + }; + } + return { show: false }; + }, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; }, diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 3eacd02..eaa1868 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -88,6 +88,12 @@ {{ kingdeeSyncName(row.kingdeeSyncStatus) }} + {{ displayValue(row[column.prop]) }} @@ -226,6 +232,28 @@ export default { kingdeeSyncName(value) { return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-'; }, + lockTag(row) { + if (row.kingdeeLockStatus === 'locked') { + return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定,不可编辑/作废' }; + } + if (row.kingdeeLockStatus === 'failed') { + if ((row.kingdeeTryCount || 0) >= 5) { + return { + show: true, + type: 'danger', + label: '锁定失败·已达上限', + tip: row.kingdeeLockFailReason || '自动补偿次数已用完,请重推「同步金蝶」立即补锁', + }; + } + return { + show: true, + type: 'warning', + label: '锁定失败·补偿中', + tip: row.kingdeeLockFailReason || '系统将自动补偿重锁', + }; + } + return { show: false }; + }, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; },