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

# Conflicts:
#	src/option/settlement/formalSettlement.js

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 },
   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);

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' },

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: 'kingdeeAssignStatus', minWidth: 120 },
   { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },