diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js index b425c42..6a0e213 100644 --- a/src/option/settlement/formalSettlement.js +++ b/src/option/settlement/formalSettlement.js @@ -16,6 +16,7 @@ import { approvalStatusOptions, invoiceStatusOptions, kingdeeSyncStatusOptions, + kingdeeWriteOffStatusOptions, paymentStatusOptions, } from './formalSettlementSearch'; import { formalSettlementTableColumns } from './formalSettlementTable'; @@ -87,6 +88,7 @@ const COLUMN_EXTRA = { searchPlaceholder: '请选择', }, kingdeeLockStatus: { slot: true }, + kingdeeWriteOffStatus: { slot: true }, createTime: { width: 180 }, }; @@ -171,4 +173,5 @@ export const formalSettlementOption = () => ({ }); export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value); +export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value); export const paymentStatusName = value => pickLabel(paymentStatusOptions, value); diff --git a/src/option/settlement/formalSettlementSearch.js b/src/option/settlement/formalSettlementSearch.js index cd4d811..cd4805f 100644 --- a/src/option/settlement/formalSettlementSearch.js +++ b/src/option/settlement/formalSettlementSearch.js @@ -34,6 +34,11 @@ export const kingdeeSyncStatusOptions = [ { label: '同步失败', value: 'failed' }, ]; +export const kingdeeWriteOffStatusOptions = [ + { label: '未冲销', value: 'unwrittenoff' }, + { label: '已冲销', value: 'writtenoff' }, +]; + export const formalSettlementSearchFields = [ { label: '结算单号', prop: 'formalSettlementNo', type: 'input' }, { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' }, diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js index 93393b9..117ae86 100644 --- a/src/option/settlement/formalSettlementTable.js +++ b/src/option/settlement/formalSettlementTable.js @@ -25,6 +25,7 @@ export const formalSettlementTableColumns = [ { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 }, { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 }, { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 }, + { label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 }, { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 }, { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 }, { label: '创建人', prop: 'createUserName', minWidth: 110 }, diff --git a/src/utils/kingdee.js b/src/utils/kingdee.js index b3f812c..4a4f6ab 100644 --- a/src/utils/kingdee.js +++ b/src/utils/kingdee.js @@ -13,3 +13,12 @@ export const KINGDEE_STATUS_TAG_TYPES = { /** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */ export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info'; + +/** 金蝶冲销状态 → el-tag 颜色类型(已冲销=绿、未冲销=黄) */ +export const KINGDEE_WRITEOFF_TAG_TYPES = { + writtenoff: 'success', + unwrittenoff: 'warning', +}; + +/** 金蝶冲销状态 → el-tag 颜色类型,未映射状态(null=未校验)返回 info */ +export const kingdeeWriteOffTagType = status => KINGDEE_WRITEOFF_TAG_TYPES[status] || 'info'; diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue index 59bbbb3..4f2d32c 100644 --- a/src/views/settlement/components/formal-settlement-table-panel.vue +++ b/src/views/settlement/components/formal-settlement-table-panel.vue @@ -72,6 +72,15 @@ + +