diff --git a/src/option/payment/paymentApplication.js b/src/option/payment/paymentApplication.js
index fdb7227..bf7969b 100644
--- a/src/option/payment/paymentApplication.js
+++ b/src/option/payment/paymentApplication.js
@@ -17,5 +17,6 @@ export const paymentApplicationTableColumns = [
{ prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
{ prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
{ prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
+ { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
{ prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
];
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 94b65ad..49ccb72 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -138,6 +138,12 @@
>{{ row[column.prop] || '-' }}
{{ formatMoney(row[column.prop]) }}
+
+
+ {{ lockTag(row).label }}
+
+ -
+
{{ displayValue(row[column.prop]) }}
@@ -200,7 +206,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;
},