Merge branch 'master' into feature/20261103-bfi-warehouse-web

# Conflicts: # src/option/settlement/formalSettlement.js
2026-11-04 17:18:51 +08:00
parent 7f694bad55 9efae11811
commit 5d56706eed
35 changed files with 2022 additions and 665 deletions
@@ -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: 'kingdeeAssignStatus', minWidth: 120 },
  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },