From e0a420ad08978f814d15eec83f579d1d371c615c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Fri, 30 Oct 2026 21:23:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E5=86=B2=E9=94=80=E7=8A=B6=E6=80=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 列表新增「金蝶冲销状态」单元格插槽：已同步显示 已冲销/未冲销/未校验 标签，未同步显示 -
- 新增 kingdeeWriteOffStatusOptions 选项与 kingdeeWriteOffTagType 颜色映射
---
 src/option/settlement/formalSettlement.js       |  3 +++
 src/option/settlement/formalSettlementSearch.js |  5 +++++
 src/option/settlement/formalSettlementTable.js  |  1 +
 src/utils/kingdee.js                            |  9 +++++++++
 .../formal-settlement-table-panel.vue           | 17 +++++++++++++++--
 5 files changed, 33 insertions(+), 2 deletions(-)

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 @@
       </el-tooltip>
     </template>
 
+    <template #kingdeeWriteOffStatus="{ row }">
+      <el-tag
+        v-if="row.kingdeeSyncStatus === 'synced'"
+        :type="kingdeeWriteOffTagType(row.kingdeeWriteOffStatus)"
+        >{{ kingdeeWriteOffName(row.kingdeeWriteOffStatus) || '未校验' }}</el-tag
+      >
+      <span v-else>-</span>
+    </template>
+
     <template #kingdeeLockStatus="{ row }">
       <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
         <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -93,8 +102,8 @@
 
 <script>
 import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
-import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
-import { kingdeeStatusType } from '@/utils/kingdee';
+import { kingdeeSyncName, kingdeeWriteOffName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeStatusType, kingdeeWriteOffTagType } from '@/utils/kingdee';
 
 export default {
   name: 'FormalSettlementTablePanel',
@@ -207,6 +216,10 @@ export default {
     kingdeeSyncName(value) {
       return kingdeeSyncName(value);
     },
+    kingdeeWriteOffName(value) {
+      return kingdeeWriteOffName(value);
+    },
+    kingdeeWriteOffTagType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return {