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
@@ -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 },
  kingdeeAssignStatus: { slot: true },
  createTime: { width: 180 },
 };
@@ -175,4 +177,5 @@ export const formalSettlementOption = (settlementType = '') => ({
 });

 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
+export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
 export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);