From f67a4036ed4b40798488bc687e1904fe2faaac5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 14:16:42 +0800
Subject: [PATCH 01/43] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=B8=8E=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8APPROVE=5FTIMEOUT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/contract-manage.js | 4 ++--
 src/api/business/project-change.js  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api/business/contract-manage.js b/src/api/business/contract-manage.js
index b7ce897..875839a 100644
--- a/src/api/business/contract-manage.js
+++ b/src/api/business/contract-manage.js
@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/contract-manage';
@@ -36,8 +37,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
-    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
-    timeout: 120000,
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>
diff --git a/src/api/business/project-change.js b/src/api/business/project-change.js
index f1de353..c369a5f 100644
--- a/src/api/business/project-change.js
+++ b/src/api/business/project-change.js
@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/project-change';
@@ -35,6 +36,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>

From 358add743e116875f6fbd88143c6cabd505854d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 14:36:03 +0800
Subject: [PATCH 02/43] =?UTF-8?q?fix:=20=E5=90=88=E5=90=8C=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8APPROVE=5FTIMEOUT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/contract-change.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/business/contract-change.js b/src/api/business/contract-change.js
index 4f407ec..739be83 100644
--- a/src/api/business/contract-change.js
+++ b/src/api/business/contract-change.js
@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/contract-change';
@@ -35,8 +36,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
-    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
-    timeout: 120000,
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>

From 450288106321e9f9a1c872487bd9794bae7ce704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 16:11:29 +0800
Subject: [PATCH 03/43] =?UTF-8?q?feat:=20=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E5=89=8D=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/payment-application.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 45b8fe6..ad7d57b 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -328,15 +328,17 @@ export default {
       this.refreshChange();
     },
     async handleApprove(row) {
-      // 防止重复点击：请求进行中忽略后续点击
+      // 防止重复点击：请求进行中忽略后续点击，避免重复审批和重复提示
       if (this.approveLoading) return;
       this.approveLoading = true;
-      const loading = this.$loading({
-        lock: true,
-        text: '审批处理中，请稍候…',
-        background: 'rgba(255, 255, 255, 0.6)',
-      });
+      let loading = null;
       try {
+        await this.$confirm('确认审批通过该付款申请？', '提示', { type: 'warning' });
+        loading = this.$loading({
+          lock: true,
+          text: '审批处理中，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
         const res = await api.approve({ id: row.id });
         // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
         if (res.data.data === false) {
@@ -346,7 +348,7 @@ export default {
         }
         this.refreshChange();
       } finally {
-        loading.close();
+        loading?.close();
         this.approveLoading = false;
       }
     },

From 775307f5c04e23dee7a5d2de3c6de4536ae02d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 17:00:34 +0800
Subject: [PATCH 04/43] =?UTF-8?q?feat:=20=E4=BB=98=E6=AC=BE=E4=B8=8E?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7=E9=87=91=E8=9D=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E7=9D=80=E8=89=B2=E5=B9=B6=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E5=B1=95=E7=A4=BA=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/payment/paymentApplication.js  |  2 +-
 src/utils/kingdee.js                      | 15 +++++++++++++++
 src/views/payment/invoice-application.vue | 13 +++++++++++++
 src/views/payment/payment-application.vue | 14 ++++++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/kingdee.js

diff --git a/src/option/payment/paymentApplication.js b/src/option/payment/paymentApplication.js
index 65494a3..9a74a22 100644
--- a/src/option/payment/paymentApplication.js
+++ b/src/option/payment/paymentApplication.js
@@ -169,7 +169,7 @@ export const paymentApplicationOption = ({
     { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter },
     { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
     { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
-    { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 },
     { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
     { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
   ],
diff --git a/src/utils/kingdee.js b/src/utils/kingdee.js
new file mode 100644
index 0000000..b3f812c
--- /dev/null
+++ b/src/utils/kingdee.js
@@ -0,0 +1,15 @@
+/**
+ * 金蝶单据状态公共映射
+ */
+
+/** 金蝶单据状态 → el-tag 颜色类型（failed 状态列表页悬浮展示失败原因） */
+export const KINGDEE_STATUS_TAG_TYPES = {
+  synced: 'success',
+  paid: 'success',
+  invoiced: 'success',
+  paying: 'warning',
+  failed: 'danger',
+};
+
+/** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue
index a447f77..e806a80 100644
--- a/src/views/payment/invoice-application.vue
+++ b/src/views/payment/invoice-application.vue
@@ -125,6 +125,17 @@
               {{ displayValue(row[column.prop]) }}
             </el-tag>
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
+            <template v-else-if="column.prop === 'kingdeeStatusName'">
+              <el-tooltip
+                :disabled="row.kingdeeStatus !== 'failed'"
+                :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+                placement="top"
+              >
+                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)" class="status-text">{{
+                  row.kingdeeStatusName || '-'
+                }}</el-tag>
+              </el-tooltip>
+            </template>
             <template v-else-if="column.prop === 'kingdeeLockStatus'">
               <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>
@@ -238,6 +249,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 const emptyQuery = () => ({
   applicationNo: '',
@@ -500,6 +512,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index ad7d57b..321b917 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -68,6 +68,18 @@
         <span v-else>-</span>
       </template>
 
+      <template #kingdeeStatusName="{ row }">
+        <el-tooltip
+          :disabled="row.kingdeeStatus !== 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+          placement="top"
+        >
+          <el-tag :type="kingdeeStatusType(row.kingdeeStatus)" class="status-text">{{
+            row.kingdeeStatusName || '-'
+          }}</el-tag>
+        </el-tooltip>
+      </template>
+
       <template #menu="{ row }">
         <el-link
           v-if="hasPermission('payment_application_view')"
@@ -151,6 +163,7 @@ import { paymentApplicationOption } from '@/option/payment/paymentApplication';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 const paymentApplicationListRoute = '/payment/payment-application';
 const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
@@ -463,6 +476,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };

From f5697e111ae29eda14feecf5a71aaeb50a5329f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 17:00:34 +0800
Subject: [PATCH 05/43] =?UTF-8?q?feat:=20=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8E=E5=AE=A2=E5=95=86=E6=A1=A3=E6=A1=88=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9D=80=E8=89=B2=E5=B9=B6=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/formal-settlement-table-panel.vue   | 14 +++++++++++++-
 src/views/settlement/settlement-adjustment.vue     | 12 ++++++++----
 src/views/vehicle/customer-archive.vue             |  8 +++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 7654dfd..e79dd06 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -60,7 +60,17 @@
       }}</el-tag>
     </template>
 
-    <template #kingdeeSyncStatus="{ row }">{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</template>
+    <template #kingdeeSyncStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeSyncStatus !== 'failed'"
+        :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+        placement="top"
+      >
+        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)" class="status-text">{{
+          kingdeeSyncName(row.kingdeeSyncStatus)
+        }}</el-tag>
+      </el-tooltip>
+    </template>
 
     <template #kingdeeLockStatus="{ row }">
       <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
@@ -84,6 +94,7 @@
 <script>
 import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
 import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 export default {
   name: 'FormalSettlementTablePanel',
@@ -186,6 +197,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     invoiceName(value, settlementType) {
       return invoiceStatusName(value, settlementType);
     },
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index 3d99e0c..9281113 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -93,11 +93,16 @@
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
-            ><el-tag
+            ><el-tooltip
               v-else-if="column.kingdee"
+              :disabled="row.kingdeeSyncStatus !== 'failed'"
+              :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+              placement="top"
+            ><el-tag
               :type="kingdeeStatusType(row.kingdeeSyncStatus)"
               class="status-text"
               >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
+            ></el-tooltip
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
@@ -182,6 +187,7 @@ import { settlementAdjustmentSearchFields } from '@/option/settlement/settlement
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
 import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
+import { kingdeeStatusType } from '@/utils/kingdee';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -365,9 +371,7 @@ export default {
         'info'
       );
     },
-    kingdeeStatusType(status) {
-      return { synced: 'success', failed: 'danger' }[status] || 'info';
-    },
+    kingdeeStatusType,
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 8f02324..2468a66 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -135,7 +135,13 @@
       <template #kingdeeStatus="{ row }">
         <el-tag v-if="row.kingdeeStatus === 'synced'" type="success">已推送</el-tag>
         <el-tag v-else-if="row.kingdeeStatus === 'exist'" type="primary">金蝶已有</el-tag>
-        <el-tag v-else-if="row.kingdeeStatus === 'failed'" type="danger">推送失败</el-tag>
+        <el-tooltip
+          v-else-if="row.kingdeeStatus === 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+          placement="top"
+        >
+          <el-tag type="danger">推送失败</el-tag>
+        </el-tooltip>
         <el-tag v-else type="info">未推送</el-tag>
       </template>
       <template #menu="{ row }">

From 9dab7f749592eb4e7b1cca4bb871ba87845185ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 17:27:10 +0800
Subject: [PATCH 06/43] =?UTF-8?q?fix:=20=E7=BB=93=E7=AE=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8F=92=E6=A7=BD=E5=88=97=E8=A2=AB=E5=85=9C=E5=BA=95?=
 =?UTF-8?q?=20formatter=20=E8=A6=86=E7=9B=96=E5=AF=BC=E8=87=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=A0=E9=A2=9C=E8=89=B2=E4=B8=8E=E6=82=AC=E6=B5=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/settlement/formalSettlement.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js
index e9523be..b425c42 100644
--- a/src/option/settlement/formalSettlement.js
+++ b/src/option/settlement/formalSettlement.js
@@ -99,7 +99,8 @@ const buildTableColumns = () =>
     }
     // link / status 标记的列统一走单元格插槽
     if (column.link || column.status) extra.slot = true;
-    if (!extra.formatter) extra.formatter = textFormatter;
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
     return { ...column, ...extra };
   });
 

From 6119c44394f0a59323db3f040414028a0897b778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 28 Oct 2026 19:04:09 +0800
Subject: [PATCH 07/43] =?UTF-8?q?fix:=20=E9=87=91=E8=9D=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E6=A0=87=E7=AD=BE=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20status-text=20=E7=B1=BB=E6=81=A2=E5=A4=8D=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/invoice-application.vue                       | 2 +-
 src/views/payment/payment-application.vue                       | 2 +-
 .../settlement/components/formal-settlement-table-panel.vue     | 2 +-
 src/views/settlement/settlement-adjustment.vue                  | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue
index e806a80..27075a7 100644
--- a/src/views/payment/invoice-application.vue
+++ b/src/views/payment/invoice-application.vue
@@ -131,7 +131,7 @@
                 :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
                 placement="top"
               >
-                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)" class="status-text">{{
+                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
                   row.kingdeeStatusName || '-'
                 }}</el-tag>
               </el-tooltip>
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 321b917..7135c3a 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -74,7 +74,7 @@
           :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
           placement="top"
         >
-          <el-tag :type="kingdeeStatusType(row.kingdeeStatus)" class="status-text">{{
+          <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
             row.kingdeeStatusName || '-'
           }}</el-tag>
         </el-tooltip>
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index e79dd06..59bbbb3 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -66,7 +66,7 @@
         :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
         placement="top"
       >
-        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)" class="status-text">{{
+        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)">{{
           kingdeeSyncName(row.kingdeeSyncStatus)
         }}</el-tag>
       </el-tooltip>
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index 9281113..50c46a7 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -100,7 +100,6 @@
               placement="top"
             ><el-tag
               :type="kingdeeStatusType(row.kingdeeSyncStatus)"
-              class="status-text"
               >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
             ></el-tooltip
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span

From ea6ec13ea40aa48108389e8522af897b7754ccc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 02:15:57 +0800
Subject: [PATCH 08/43] =?UTF-8?q?fix:=20=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8B=A6=E6=88=AA=E5=B7=B2=E8=B0=83=E6=95=B4=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E5=B9=B6=E8=BF=87=E6=BB=A4=E5=80=99=E9=80=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/payment-application-form.vue | 3 ++-
 src/views/settlement/formal-settlement.vue     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 3e91449..21e0711 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -2702,7 +2702,8 @@ export default {
           this.referenceParams('formal')
         );
         const data = this.unwrapData(response) || {};
-        const records = data.records || [];
+        // 已调整的结算单为调整重推后的归档原单，金额已作废，不可再发起付款
+        const records = (data.records || []).filter(row => row.adjustStatus !== 'adjusted');
         this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
         this.formalPage.total = Number(data.total || 0);
       } finally {
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index 3c7926c..eb7bc38 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -486,6 +486,8 @@ export default {
       const rows = this.selection;
       if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
         return this.$message.warning('仅审批通过的付款结算单允许发起付款申请');
+      if (rows.some(row => row.adjustStatus === 'adjusted'))
+        return this.$message.warning('已调整的结算单不可再发起付款，请使用调整后的新单');
       const contractIds = new Set(rows.map(row => String(row.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has(''))
         return this.$message.warning('付款申请必须选择同一个合同的付款结算单');

From 698f808f0b211e396329d660273a6604e18f347d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 02:19:23 +0800
Subject: [PATCH 09/43] =?UTF-8?q?fix:=20=E7=BB=93=E7=AE=97=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D=E8=81=94=E5=8A=A8=E5=9B=9E?=
 =?UTF-8?q?=E5=A1=AB=E7=94=B3=E8=AF=B7=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=B9=B6=E6=A0=A1=E9=AA=8C=E5=90=88=E8=AE=A1=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

结算信息行改动付款比例或付款金额时，自动把行金额合计回填到上方申请付款金额并重算比例；
保存/提交前校验行金额合计与申请付款金额一致，避免推送金蝶金额与预付建档分摊不一致。
回显加载走默认不同步，避免改写历史单据。
---
 .../payment/payment-application-form.vue      | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 21e0711..cb0eca1 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -3125,18 +3125,21 @@ export default {
       if (!target) return;
       target.paymentRatio = value;
       this.syncRowPayment(target, 'ratio');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
     handleRowAppliedAmountChange(row, value) {
       const target = this.findReferenceRow(row);
       if (!target) return;
       target.appliedAmount = value;
       this.syncRowPayment(target, 'amount');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
-    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
-    syncHeaderSettlementTotalsFromRows() {
-      if (this.referenceRows.length <= 1) return;
+    /**
+     * 结算信息行合计回填付款基本信息。
+     * @param {boolean} syncApplied 行内编辑时同步申请付款金额与比例；回显加载时保持原值，避免改写历史单据
+     */
+    syncHeaderSettlementTotalsFromRows(syncApplied = false) {
+      if (!this.referenceRows.length) return;
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -3145,9 +3148,21 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
       this.amountSyncing = true;
       this.form.settlementAmount = Number(settlementAmount.toFixed(2));
       this.form.payableAmount = Number(payableAmount.toFixed(2));
+      if (syncApplied) {
+        this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+        if (this.paymentAmountBase) {
+          this.form.paymentRatio = Number(
+            ((appliedAmount / this.paymentAmountBase) * 100).toFixed(2)
+          );
+        }
+      }
       this.$nextTick(() => {
         this.amountSyncing = false;
         this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
@@ -3321,6 +3336,18 @@ export default {
           ElMessage.warning(`${exceededRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
           return false;
         }
+        const rowAppliedTotal = this.referenceRows.reduce(
+          (total, item) => total + Number(item.appliedAmount || 0),
+          0
+        );
+        // 金蝶按付款基本信息申请金额推单，行合计不等时预付建档分摊会与金蝶金额不一致
+        if (Math.abs(rowAppliedTotal - appliedAmount) > 0.005) {
+          this.clearMessages();
+          ElMessage.warning(
+            `结算行付款金额合计${rowAppliedTotal.toFixed(2)}与申请付款金额${appliedAmount.toFixed(2)}不一致，请调整`
+          );
+          return false;
+        }
       }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
         this.clearMessages();

From acfe9bdd74e38442ceaa4ded3d9a74fa40944e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 11:20:18 +0800
Subject: [PATCH 10/43] =?UTF-8?q?feat:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8DA301-1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=B9=B6=E4=B8=8B=E7=BA=BF=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E9=87=91=E8=9D=B6=E7=9B=B8=E5=85=B3=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/payment/receiptClaimRecord.js         |  8 --
 src/api/payment/receiptFlow.js                |  8 --
 src/option/payment/receiptClaimRecord.js      |  4 +-
 src/option/payment/receiptFlow.js             | 10 +--
 .../payment/receipt-claim-record-form.vue     |  2 +-
 src/views/payment/receipt-claim-record.vue    | 38 +--------
 src/views/payment/receipt-flow-batch-form.vue |  6 +-
 src/views/payment/receipt-flow-form.vue       |  4 +-
 src/views/payment/receipt-flow.vue            | 83 ++-----------------
 .../components/formal-settlement-editor.vue   |  2 +-
 10 files changed, 24 insertions(+), 141 deletions(-)

diff --git a/src/api/payment/receiptClaimRecord.js b/src/api/payment/receiptClaimRecord.js
index 570888d..90e8633 100644
--- a/src/api/payment/receiptClaimRecord.js
+++ b/src/api/payment/receiptClaimRecord.js
@@ -8,20 +8,12 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
   request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
-export const queryKingdeeResult = () =>
-  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '已认领', value: 'claimed' },
   { label: '已作废', value: 'voided' },
 ];
 
-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
   { label: '已推送', value: 'pushed' },
diff --git a/src/api/payment/receiptFlow.js b/src/api/payment/receiptFlow.js
index 231e0ac..1634b1d 100644
--- a/src/api/payment/receiptFlow.js
+++ b/src/api/payment/receiptFlow.js
@@ -13,8 +13,6 @@ export const getSettlementCandidates = (keyword, flowId) =>
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
 export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
-export const pushKingdee = flowId =>
-  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },
@@ -22,12 +20,6 @@ export const claimStatusOptions = [
   { label: '认领完成', value: 'claimed' },
 ];
 
-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
   { label: '已推送', value: 'pushed' },
   { label: '审核通过', value: 'approved' },
diff --git a/src/option/payment/receiptClaimRecord.js b/src/option/payment/receiptClaimRecord.js
index d1f1d96..c445762 100644
--- a/src/option/payment/receiptClaimRecord.js
+++ b/src/option/payment/receiptClaimRecord.js
@@ -1,7 +1,7 @@
 export const receiptClaimRecordTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
   { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
   { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 983f4a1..5a3d6fb 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -1,18 +1,14 @@
 export const receiptFlowTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
   { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
   { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
-  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
-  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
-  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
-  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
-  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'unclaimedAmount', label: '未匹配金额', minWidth: 140, money: true },
   { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];
diff --git a/src/views/payment/receipt-claim-record-form.vue b/src/views/payment/receipt-claim-record-form.vue
index 0df5b49..9d6f41b 100644
--- a/src/views/payment/receipt-claim-record-form.vue
+++ b/src/views/payment/receipt-claim-record-form.vue
@@ -4,7 +4,7 @@
       <section-card title="收款信息">
         <el-row :gutter="32">
           <el-col :span="6">
-            <el-form-item label="认领通知单">
+            <el-form-item label="收款单号">
               <el-input v-model="form.receiptNoticeNo" disabled />
             </el-form-item>
           </el-col>
diff --git a/src/views/payment/receipt-claim-record.vue b/src/views/payment/receipt-claim-record.vue
index bce6f40..df9d3cc 100644
--- a/src/views/payment/receipt-claim-record.vue
+++ b/src/views/payment/receipt-claim-record.vue
@@ -3,7 +3,7 @@
     <section-card v-if="searchVisible" class="claim-record-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="claim-record-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
             <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="对方户名">
@@ -56,16 +56,6 @@
           <el-form-item v-show="searchExpanded" label="所属组织">
             <el-input v-model="query.claimerDeptName" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item v-show="searchExpanded" label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item v-show="searchExpanded" label="金蝶单据状态">
             <el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
               <el-option
@@ -93,9 +83,6 @@
 
     <section class="claim-record-page__table-panel">
       <div class="claim-record-page__toolbar">
-        <el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
-          查询金蝶认领结果
-        </el-button>
         <table-header-tools
           :columns="columns"
           v-model:visible-column-keys="visibleColumnKeys"
@@ -131,11 +118,7 @@
         <el-table-column label="操作" width="120" fixed="right" align="center">
           <template #default="{ row }">
             <el-link
-              v-if="
-                hasPermission('receipt_claim_record_void') &&
-                  row.claimStatus === 'claimed' &&
-                  row.pushStatus !== 'pushed'
-              "
+              v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
               type="danger"
               @click="handleVoid(row)"
               >作废</el-link
@@ -181,7 +164,6 @@ const emptyQuery = () => ({
   claimDateRange: [],
   claimerDeptName: '',
   kingdeeBillStatus: '',
-  pushStatus: '',
 });
 
 export default {
@@ -195,17 +177,15 @@ export default {
       searchExpanded: false,
       // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
       searchIndex: 4,
-      searchItemCount: 11,
+      searchItemCount: 10,
       searchVisible: true,
       tableSize: 'default',
       claimStatusOptions: api.claimStatusOptions,
       kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
       columns: receiptClaimRecordTableColumns,
       visibleColumnKeys: receiptClaimRecordTableColumns.map(column => column.prop),
       rows: [],
       loading: false,
-      refreshing: false,
       page: { current: 1, size: 10, total: 0 },
     };
   },
@@ -272,7 +252,7 @@ export default {
     },
     async handleVoid(row) {
       await this.$confirm(
-        '作废后将回退本次认领金额，是否继续？',
+        '作废后将回退本次认领金额，并同步作废合同合规系统认领记录，是否继续？',
         '作废认领记录',
         { type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' }
       );
@@ -280,16 +260,6 @@ export default {
       this.$message.success('作废成功');
       await this.loadTable();
     },
-    async handleRefreshKingdeeResult() {
-      this.refreshing = true;
-      try {
-        const updated = Number(this.unwrapData(await api.queryKingdeeResult()) || 0);
-        this.$message.success(`金蝶认领结果回写完成，更新${updated}条`);
-        await this.loadTable();
-      } finally {
-        this.refreshing = false;
-      }
-    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index 547a956..96efcee 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -7,7 +7,7 @@
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
             min-width="160"
             show-overflow-tooltip
           />
@@ -96,7 +96,7 @@
               formatMoney(row.settlement.claimedReceiptAmount)
             }}</template>
           </el-table-column>
-          <el-table-column label="认领通知单" min-width="180">
+          <el-table-column label="收款单号" min-width="180">
             <template #default="{ row }">{{ row.flow.receiptNoticeNo || '-' }}</template>
           </el-table-column>
           <el-table-column label="收款金额" min-width="140" align="right">
@@ -360,7 +360,7 @@ export default {
           0
         );
         if (total > remaining + 0.001) {
-          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过未匹配金额`);
           return;
         }
       }
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 8497954..4022c6e 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -12,7 +12,7 @@
       <section-card title="收款信息">
         <el-row :gutter="32">
           <el-col :span="6"
-            ><el-form-item label="认领通知单"
+            ><el-form-item label="收款单号"
               ><el-input v-model="form.receiptNoticeNo" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
@@ -48,7 +48,7 @@
               ><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
-            ><el-form-item label="金蝶未认领金额"
+            ><el-form-item label="未匹配金额"
               ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
diff --git a/src/views/payment/receipt-flow.vue b/src/views/payment/receipt-flow.vue
index 8fcf069..d1e5ff2 100644
--- a/src/views/payment/receipt-flow.vue
+++ b/src/views/payment/receipt-flow.vue
@@ -3,7 +3,7 @@
     <section v-if="searchVisible" class="receipt-flow-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="receipt-flow-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
             <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="对方户名">
@@ -15,16 +15,6 @@
           <el-form-item label="对方账号">
             <el-input v-model="query.counterpartyAccount" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="认领状态">
             <el-select v-model="query.claimStatus" clearable placeholder="请选择">
               <el-option
@@ -159,23 +149,10 @@
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="170" fixed="right" align="center">
+        <el-table-column label="操作" width="100" fixed="right" align="center">
           <template #default="{ row }">
-            <el-link
-              v-if="canClaim(row)"
-              type="primary"
-              :disabled="pushingId === row.id"
-              @click="openClaim(row)"
-              >认领</el-link
-            >
-            <el-link
-              v-if="canPush(row)"
-              type="warning"
-              :disabled="pushingId === row.id"
-              @click="handlePush(row)"
-              >推送金蝶</el-link
-            >
-            <span v-if="!canClaim(row) && !canPush(row)">-</span>
+            <el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
+            <span v-else>-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -201,7 +178,7 @@
     >
       <div v-loading="detailDialog.loading">
         <el-descriptions :column="3" border>
-          <el-descriptions-item label="认领通知单">
+          <el-descriptions-item label="收款单号">
             {{ displayValue(detailDialog.data.receiptNoticeNo) }}
           </el-descriptions-item>
           <el-descriptions-item label="付款人">
@@ -236,23 +213,15 @@
           <el-descriptions-item label="剩余可认领金额">
             {{ formatMoney(detailDialog.data.remainingAmount) }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶未认领金额">
+          <el-descriptions-item label="未匹配金额">
             {{ formatMoney(detailDialog.data.unclaimedAmount) }}
           </el-descriptions-item>
-          <el-descriptions-item label="推送状态">
-            <el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
-              {{ displayValue(detailDialog.data.pushStatusName) }}
-            </el-tag>
-          </el-descriptions-item>
           <el-descriptions-item label="金蝶收款单号">
             {{ displayValue(detailDialog.data.kingdeeBillNo) }}
           </el-descriptions-item>
           <el-descriptions-item label="金蝶状态">
             {{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
           </el-descriptions-item>
-          <el-descriptions-item label="推送失败原因">
-            {{ displayValue(detailDialog.data.pushFailReason) }}
-          </el-descriptions-item>
           <el-descriptions-item label="摘要">
             {{ displayValue(detailDialog.data.summary) }}
           </el-descriptions-item>
@@ -267,9 +236,7 @@
           </el-table-column>
           <el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
           <el-table-column label="状态变化" min-width="170" align="center">
-            <template #default="{ row }">
-              {{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
-            </template>
+            <template #default="{ row }">{{ claimStatusChange(row) }}</template>
           </el-table-column>
           <el-table-column prop="content" label="认领说明" min-width="220" />
         </el-table>
@@ -297,7 +264,6 @@ const emptyQuery = () => ({
   summary: '',
   detailSerialNo: '',
   claimStatus: '',
-  pushStatus: '',
   kingdeeBillStatus: '',
   receiptAmountStart: undefined,
   receiptAmountEnd: undefined,
@@ -314,7 +280,6 @@ export default {
       ArrowUp,
       query: emptyQuery(),
       claimStatusOptions: api.claimStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
       kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
       columns: receiptFlowTableColumns,
       visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop),
@@ -324,7 +289,6 @@ export default {
       selectedRows: [],
       loading: false,
       syncing: false,
-      pushingId: null,
       searchExpanded: false,
       // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
       searchIndex: 4,
@@ -389,7 +353,7 @@ export default {
       this.syncing = true;
       try {
         const syncedCount = Number(this.unwrapData(await api.sync()) || 0);
-        this.$message.success(`流水同步完成，共同步${syncedCount}条认领公告`);
+        this.$message.success(`流水同步完成，共同步${syncedCount}条收款流水`);
         await this.loadTable();
       } finally {
         this.syncing = false;
@@ -448,38 +412,7 @@ export default {
     canClaim(row) {
       return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
     },
-    canPush(row) {
-      return (
-        this.hasPermission('receipt_flow_push') &&
-        !!row.billId &&
-        row.claimStatus === 'claimed' &&
-        row.pushStatus !== 'pushed'
-      );
-    },
-    async handlePush(row) {
-      try {
-        await this.$confirm(
-          `确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单？`,
-          '推送金蝶',
-          { type: 'warning' }
-        );
-      } catch {
-        return;
-      }
-      this.pushingId = row.id;
-      try {
-        const data = this.unwrapData(await api.pushKingdee(row.id));
-        const billNo = data?.kingdeeBillNo;
-        this.$message.success(billNo ? `推送成功，金蝶收款单号：${billNo}` : '推送成功');
-        await this.loadTable();
-      } finally {
-        this.pushingId = null;
-      }
-    },
     statusType(row, column) {
-      if (column?.prop === 'pushStatusName') {
-        return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info';
-      }
       return (
         { claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || ''
       );
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index dd85e42..5520a8e 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -559,7 +559,7 @@
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
             min-width="160"
             align="center"
           />

From 1957a78c0098b9bd3a93c94917b17dd3c8f954be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 12:55:03 +0800
Subject: [PATCH 11/43] =?UTF-8?q?fix:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=BB=B6=E9=95=BF=E5=88=B030=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/payment/receiptFlow.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/api/payment/receiptFlow.js b/src/api/payment/receiptFlow.js
index 1634b1d..4520988 100644
--- a/src/api/payment/receiptFlow.js
+++ b/src/api/payment/receiptFlow.js
@@ -2,6 +2,9 @@ import request from '@/axios';
 
 const baseUrl = '/blade-transport/receipt-flow';
 
+/** 收款流水同步需远程拉取金蝶收款单并逐条落库，覆盖全局 10s 超时 */
+export const SYNC_TIMEOUT = 30000;
+
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
@@ -12,7 +15,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
     params: { keyword, flowId },
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },

From a725d3078f0f46e3a2ce177a63fb42cb1e9aa953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 14:12:55 +0800
Subject: [PATCH 12/43] =?UTF-8?q?fix:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E8=AF=A6=E6=83=85=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/receipt-flow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/payment/receipt-flow.vue b/src/views/payment/receipt-flow.vue
index d1e5ff2..70af645 100644
--- a/src/views/payment/receipt-flow.vue
+++ b/src/views/payment/receipt-flow.vue
@@ -184,7 +184,7 @@
           <el-descriptions-item label="付款人">
             {{ displayValue(detailDialog.data.payerName) }}
           </el-descriptions-item>
-          <el-descriptions-item label="付款金额">
+          <el-descriptions-item label="收款金额">
             {{ formatMoney(detailDialog.data.receiptAmount) }}
           </el-descriptions-item>
           <el-descriptions-item label="交易时间">

From 94ee14b683490ca8729202dbadf2c647fa79e5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 15:05:28 +0800
Subject: [PATCH 13/43] =?UTF-8?q?feat:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E4=BA=BA=E5=85=AC=E5=8F=B8=E4=B8=8E=E6=A0=B8=E7=AE=97=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/payment/receiptFlow.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 5a3d6fb..736bace 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -5,6 +5,9 @@ export const receiptFlowTableColumns = [
   { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
+  { prop: 'payeeName', label: '收款人（公司）', minWidth: 150 },
+  { prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
+  { prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },

From d89fd9db978d2a5f15a3b30f7af73113a972c442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 16:06:03 +0800
Subject: [PATCH 14/43] =?UTF-8?q?feat:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E4=B8=8E=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/payment/receiptFlow.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 736bace..5757f39 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -13,5 +13,10 @@ export const receiptFlowTableColumns = [
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
   { prop: 'unclaimedAmount', label: '未匹配金额', minWidth: 140, money: true },
+  { prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
+  { prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
+  { prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
+  { prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
+  { prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
   { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];

From d23a9b00de23ce7234b26c9fb44c1156dc878f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 16:13:23 +0800
Subject: [PATCH 15/43] =?UTF-8?q?refactor:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E6=9C=AA=E5=8C=B9=E9=85=8D=E9=87=91=E9=A2=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=BB=9F=E4=B8=80=E4=B8=BAunmatchAmountRec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/payment/receiptFlow.js             | 2 +-
 src/views/payment/receipt-flow-batch-form.vue | 6 +++---
 src/views/payment/receipt-flow-form.vue       | 6 +++---
 src/views/payment/receipt-flow.vue            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 5757f39..4ea9e3d 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -12,7 +12,7 @@ export const receiptFlowTableColumns = [
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
-  { prop: 'unclaimedAmount', label: '未匹配金额', minWidth: 140, money: true },
+  { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
   { prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
   { prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
   { prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index 96efcee..a0cec3c 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -44,7 +44,7 @@
             <template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
           </el-table-column>
           <el-table-column label="金蝶未认领金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
+            <template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
           </el-table-column>
           <el-table-column label="剩余可认领金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
@@ -302,7 +302,7 @@ export default {
       );
     },
     flowRemaining(flow) {
-      const unclaimed = Number(flow.unclaimedAmount || 0);
+      const unclaimed = Number(flow.unmatchAmountRec || 0);
       const receipt = Number(flow.receiptAmount || 0);
       const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
       return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
@@ -356,7 +356,7 @@ export default {
       for (const flow of this.flows) {
         const total = this.flowAllocatedTotal(flow.id);
         const remaining = Math.max(
-          Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
+          Number(flow.unmatchAmountRec || 0) - Number(flow.claimedAmount || 0),
           0
         );
         if (total > remaining + 0.001) {
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 4022c6e..75549b6 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -49,7 +49,7 @@
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="未匹配金额"
-              ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
+              ><el-input :model-value="formatMoney(form.unmatchAmountRec)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="剩余可认领金额"
@@ -205,7 +205,7 @@ const emptyForm = () => ({
   transactionTime: '',
   detailSerialNo: '',
   claimedAmount: 0,
-  unclaimedAmount: 0,
+  unmatchAmountRec: 0,
   claimerName: '',
   claimerDeptName: '',
   claimDate: '',
@@ -252,7 +252,7 @@ export default {
       );
     },
     claimableAmount() {
-      const unclaimed = Number(this.form.unclaimedAmount || 0);
+      const unclaimed = Number(this.form.unmatchAmountRec || 0);
       const receipt = Number(this.form.receiptAmount || 0);
       const ceiling =
         unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
diff --git a/src/views/payment/receipt-flow.vue b/src/views/payment/receipt-flow.vue
index 70af645..29ad100 100644
--- a/src/views/payment/receipt-flow.vue
+++ b/src/views/payment/receipt-flow.vue
@@ -214,7 +214,7 @@
             {{ formatMoney(detailDialog.data.remainingAmount) }}
           </el-descriptions-item>
           <el-descriptions-item label="未匹配金额">
-            {{ formatMoney(detailDialog.data.unclaimedAmount) }}
+            {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
           </el-descriptions-item>
           <el-descriptions-item label="金蝶收款单号">
             {{ displayValue(detailDialog.data.kingdeeBillNo) }}

From 2cf966d6e3b0a6e37d45d8b1b3d16bf960e061a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 18:17:42 +0800
Subject: [PATCH 16/43] =?UTF-8?q?feat:=20=E5=BC=80=E7=A5=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E7=9C=8B=E5=B1=95=E7=A4=BA=E6=AF=8F=E5=BC=A0?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=87=91=E8=9D=B6=E5=BC=80=E7=A5=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E7=BB=93=E6=9E=9C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/invoice-application-form.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 49f2838..9e91a2c 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -293,6 +293,12 @@
                 <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
               </template>
             </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
             <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
               <template #default="{ $index }">
                 <div class="invoice-form-page__links">

From 4b060fc04570703d4911641b5546fe1494326495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 18:17:42 +0800
Subject: [PATCH 17/43] =?UTF-8?q?feat:=20=E5=BC=80=E7=A5=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E7=9C=8B=E5=B1=95=E7=A4=BA=E6=AF=8F=E5=BC=A0?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=87=91=E8=9D=B6=E5=BC=80=E7=A5=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E7=BB=93=E6=9E=9C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/invoice-application-form.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 49f2838..9e91a2c 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -293,6 +293,12 @@
                 <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
               </template>
             </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
             <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
               <template #default="{ $index }">
                 <div class="invoice-form-page__links">

From 78bb38e955b4b7331b3310e01473d540199c93de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 20:07:53 +0800
Subject: [PATCH 18/43] =?UTF-8?q?:bug:=20=E6=94=B6=E6=AC=BE=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E8=AE=A4=E9=A2=86=E9=A2=9D=E5=BA=A6=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D=E5=B9=B6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=8F=AF=E8=AE=A4=E9=A2=86=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

认领只登记本地，额度由本地累计认领控制，金蝶未匹配金额不再作为上限；批量认领校验复用剩余可认领金额口径。
---
 src/option/payment/receiptFlow.js             | 15 ++++++++-------
 src/views/payment/receipt-flow-batch-form.vue | 16 +++++-----------
 src/views/payment/receipt-flow-form.vue       |  7 +++----
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/option/payment/receiptFlow.js b/src/option/payment/receiptFlow.js
index 4ea9e3d..ff2ac33 100644
--- a/src/option/payment/receiptFlow.js
+++ b/src/option/payment/receiptFlow.js
@@ -6,17 +6,18 @@ export const receiptFlowTableColumns = [
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
   { prop: 'payeeName', label: '收款人（公司）', minWidth: 150 },
-  { prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
-  { prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
+  //{ prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
+  //{ prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
+  { prop: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
   { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
-  { prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
-  { prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
-  { prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
-  { prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
-  { prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
+  //{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
+  //{ prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
   { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index a0cec3c..58feffc 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -43,7 +43,7 @@
           <el-table-column label="已认领金额" min-width="130" align="right">
             <template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
           </el-table-column>
-          <el-table-column label="金蝶未认领金额" min-width="140" align="right">
+          <el-table-column label="未匹配金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
           </el-table-column>
           <el-table-column label="剩余可认领金额" min-width="140" align="right">
@@ -302,10 +302,8 @@ export default {
       );
     },
     flowRemaining(flow) {
-      const unclaimed = Number(flow.unmatchAmountRec || 0);
-      const receipt = Number(flow.receiptAmount || 0);
-      const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
+      return Math.max(Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0), 0);
     },
     maxAllocation(row) {
       const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
@@ -355,12 +353,8 @@ export default {
       }
       for (const flow of this.flows) {
         const total = this.flowAllocatedTotal(flow.id);
-        const remaining = Math.max(
-          Number(flow.unmatchAmountRec || 0) - Number(flow.claimedAmount || 0),
-          0
-        );
-        if (total > remaining + 0.001) {
-          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过未匹配金额`);
+        if (total > this.flowRemaining(flow) + 0.001) {
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过剩余可认领金额`);
           return;
         }
       }
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 75549b6..8778966 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -252,11 +252,10 @@ export default {
       );
     },
     claimableAmount() {
-      const unclaimed = Number(this.form.unmatchAmountRec || 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
       const receipt = Number(this.form.receiptAmount || 0);
-      const ceiling =
-        unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(this.form.claimedAmount || 0), 0);
+      const claimed = Number(this.form.claimedAmount || 0);
+      return Math.max(receipt - claimed, 0);
     },
   },
   created() {

From 3397bd6a7b2b9f6ae3932bc5124406da542ca26f 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 11:33:38 +0800
Subject: [PATCH 19/43] =?UTF-8?q?feat:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A3=8E=E9=99=A9=E5=88=97=E6=94=B9=E8=AF=BB=E8=90=BD?=
 =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=94=AF=E6=8C=81=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=AD=9B=E9=80=89=E4=B8=8E=E5=90=8E=E5=8F=B0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=82=AC=E6=B5=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 64 ++++++++++++++------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 2468a66..afea612 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -49,24 +49,24 @@
       </template>
       <template #customerRisk="{ row }">
         <el-tooltip
-          v-if="customerRiskMap[row.customerCode] && customerRiskMap[row.customerCode].risky"
+          v-if="customerRowRisky(row)"
           placement="top"
           effect="dark"
           popper-class="customer-risk-popper"
         >
           <template #content>
-            <div>{{ customerRiskMap[row.customerCode].riskTip || '该客商为高风险/黑名单客商' }}</div>
+            <div>{{ row.hcsRiskDetail || '该客商为高风险/黑名单客商' }}</div>
           </template>
           <el-tag type="danger" class="status-text">
-            {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+            {{ customerRowRiskName(row) }}
           </el-tag>
         </el-tooltip>
         <el-tag
-          v-else-if="customerRiskMap[row.customerCode]"
-          :type="customerRiskMap[row.customerCode].fdRiskLevel === '1' ? 'warning' : 'success'"
+          v-else-if="customerRowRiskName(row)"
+          :type="row.hcsRiskLevel === '1' ? 'warning' : 'success'"
           class="status-text"
         >
-          {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+          {{ customerRowRiskName(row) }}
         </el-tag>
         <span v-else>-</span>
       </template>
@@ -1597,7 +1597,7 @@ import {
   queryKingdeeCustomer,
   syncKingdee,
 } from '@/api/vehicle/customer-archive';
-import { getRiskBatch, getRiskByName } from '@/api/business/hcs';
+import { getRiskByName } from '@/api/business/hcs';
 import {
   getList as getCreditScoreQuantificationList,
   getDetail as getCreditScoreQuantificationDetail,
@@ -1699,7 +1699,6 @@ export default {
       deptSearchInitialized: false,
       loading: true,
       data: [],
-      customerRiskMap: {},
       archiveNameRisky: false,
       archiveNameRiskTip: '',
       page: {
@@ -1963,7 +1962,17 @@ export default {
             label: '客商风险',
             prop: 'customerRisk',
             slot: true,
+            search: true,
+            searchType: 'select',
+            searchOrder: 4,
+            searchPlaceholder: '请选择',
             minWidth: 100,
+            dicData: [
+              { label: '黑名单', value: 'blacklist' },
+              { label: '高风险', value: 'high' },
+              { label: '中风险', value: 'middle' },
+              { label: '低风险', value: 'low' },
+            ],
           },
           {
             label: '客户性质',
@@ -3157,6 +3166,15 @@ export default {
       });
     },
     initBusinessDictionaries() {
+      // 客商风险筛选项走业务字典 customer_risk（dictKey=筛选值 blacklist/high/middle/low，dictValue=名称），字典缺失保留固定兜底项
+      getDictionary({ code: 'customer_risk' }).then(res => {
+        const options = (res.data.data || [])
+          .filter(item => item.dictKey !== '-1')
+          .map(item => ({ label: item.dictValue, value: item.dictKey }));
+        if (options.length) {
+          this.findColumn(this.option.column, 'customerRisk').dicData = options;
+        }
+      });
       this.loadDictOptions('nature_of_client', 'customerNatureOptions', [], options => {
         const customerNatureColumn = this.findColumn(this.option.column, 'customerNature');
         customerNatureColumn.dicData = [{ label: '全部', value: '' }, ...options];
@@ -5534,17 +5552,20 @@ export default {
           const pageData = res.data.data;
           this.page.total = pageData.total;
           this.data = pageData.records;
-          this.loadCustomerRisk(this.data);
           this.selectionClear();
         })
         .finally(() => {
           this.loading = false;
         });
     },
-    // 客商风险标签文案：后端 riskLevelName 转义（黑名单/高风险/中风险/低风险），缺失时兜底
-    customerRiskLabel(risk) {
-      if (!risk) return '';
-      return risk.riskLevelName || (risk.risky ? '风险客商' : '正常');
+    // 客商风险名称（C101-1 每日定时刷新落库字段）：黑名单优先，等级转义，未查询返回空展示"-"
+    customerRowRiskName(row) {
+      if (row.hcsBlackStatus === 'yes') return '黑名单';
+      return { 2: '高风险', 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
+    },
+    // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
+    customerRowRisky(row) {
+      return row.hcsBlackStatus === 'yes' || row.hcsRiskLevel === '2';
     },
     // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
     // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底
@@ -5563,23 +5584,6 @@ export default {
           // 忽略风险查询异常，表单正常填写
         });
     },
-    // 客商列表风险批量查询（C101-1，仅展示不作为安全边界）：失败静默，行内显示"-"，提交链路由后端强校验兜底
-    loadCustomerRisk(rows) {
-      this.customerRiskMap = {};
-      const customerCodes = [...new Set(rows.map(row => row.customerCode).filter(Boolean))];
-      if (!customerCodes.length) return;
-      getRiskBatch(customerCodes)
-        .then(res => {
-          const riskMap = {};
-          ((res.data && res.data.data) || []).forEach(risk => {
-            if (risk && risk.customerCode) riskMap[risk.customerCode] = risk;
-          });
-          this.customerRiskMap = riskMap;
-        })
-        .catch(() => {
-          // 忽略风险查询异常，列表正常展示
-        });
-    },
     handleExport() {
       this.$confirm('是否导出客商档案数据?', '提示', {
         confirmButtonText: '确定',

From c6c7c80d97dce6cddfe00cd8bec004d50f43a594 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 11:35:46 +0800
Subject: [PATCH 20/43] =?UTF-8?q?feat:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A3=8E=E9=99=A9=E5=88=97=E5=86=85=E9=83=A8=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=AE=A2=E5=95=86=E9=BB=98=E8=AE=A4=E6=97=A0=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E5=B9=B6=E7=BB=84=E5=90=88=E5=B1=95=E7=A4=BA=E9=AB=98?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E4=B8=8E=E9=BB=91=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index afea612..5b2718b 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -5558,10 +5558,15 @@ export default {
           this.loading = false;
         });
     },
-    // 客商风险名称（C101-1 每日定时刷新落库字段）：黑名单优先，等级转义，未查询返回空展示"-"
+    // 客商风险名称（每日定时刷新落库字段）：内部组织客商默认无风险；黑名单与高风险组合展示；未查询显示"-"
     customerRowRiskName(row) {
-      if (row.hcsBlackStatus === 'yes') return '黑名单';
-      return { 2: '高风险', 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
+      const isBlack = row.hcsBlackStatus === 'yes';
+      const isHigh = row.hcsRiskLevel === '2';
+      if (isBlack && isHigh) return '高风险、黑名单';
+      if (isHigh) return '高风险';
+      if (isBlack) return '黑名单';
+      if (row.customerKind === 'internal') return '无风险';
+      return { 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
     },
     // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
     customerRowRisky(row) {

From 4d784668241b4d7c13c5e549dbd527c5a9a52885 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 11:44:55 +0800
Subject: [PATCH 21/43] =?UTF-8?q?fix:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A3=8E=E9=99=A9=E5=88=97=E9=BB=91=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=BB=E6=84=8F=E7=AD=89=E7=BA=A7=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=88=E5=A6=82=E4=BD=8E=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E3=80=81=E9=BB=91=E5=90=8D=E5=8D=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 5b2718b..fad6f46 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -5558,15 +5558,14 @@ export default {
           this.loading = false;
         });
     },
-    // 客商风险名称（每日定时刷新落库字段）：内部组织客商默认无风险；黑名单与高风险组合展示；未查询显示"-"
+    // 客商风险名称（每日定时刷新落库字段）：等级与黑名单组合展示（如"低风险、黑名单"）；内部组织默认无风险；未查询显示"-"
     customerRowRiskName(row) {
       const isBlack = row.hcsBlackStatus === 'yes';
-      const isHigh = row.hcsRiskLevel === '2';
-      if (isBlack && isHigh) return '高风险、黑名单';
-      if (isHigh) return '高风险';
-      if (isBlack) return '黑名单';
+      const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
+      if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
+      if (levelName) return levelName;
       if (row.customerKind === 'internal') return '无风险';
-      return { 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
+      return '';
     },
     // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
     customerRowRisky(row) {

From 8b2fa09cb97f674162abffc1ae1c8b1fcfb227df 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 11:46:07 +0800
Subject: [PATCH 22/43] =?UTF-8?q?fix:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A3=8E=E9=99=A9=E5=88=97=E5=8A=A0=E5=AE=BD=E8=87=B3?=
 =?UTF-8?q?150=E9=80=82=E9=85=8D=E7=BB=84=E5=90=88=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index fad6f46..9842145 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1966,7 +1966,7 @@ export default {
             searchType: 'select',
             searchOrder: 4,
             searchPlaceholder: '请选择',
-            minWidth: 100,
+            minWidth: 150,
             dicData: [
               { label: '黑名单', value: 'blacklist' },
               { label: '高风险', value: 'high' },

From 26140aecb9c9becdf65c2c25c2b40a39875e4c56 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 11:47:37 +0800
Subject: [PATCH 23/43] =?UTF-8?q?refactor:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A3=8E=E9=99=A9=E7=AD=9B=E9=80=89=E9=A1=B9=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=BA=AF=E5=AD=97=E5=85=B8=E5=8A=A0=E8=BD=BD=EF=BC=88?=
 =?UTF-8?q?customer=5Frisk=EF=BC=89=E5=8E=BB=E9=99=A4=E7=A1=AC=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 9842145..1f57db2 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1967,12 +1967,8 @@ export default {
             searchOrder: 4,
             searchPlaceholder: '请选择',
             minWidth: 150,
-            dicData: [
-              { label: '黑名单', value: 'blacklist' },
-              { label: '高风险', value: 'high' },
-              { label: '中风险', value: 'middle' },
-              { label: '低风险', value: 'low' },
-            ],
+            // 选项走业务字典 customer_risk（initBusinessDictionaries 加载：dictKey=筛选值，dictValue=名称），未配置时下拉为空
+            dicData: [],
           },
           {
             label: '客户性质',

From 025cba317d60d9ddaf2b7cd82ad856b8c4277afa 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 12:12:57 +0800
Subject: [PATCH 24/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A2?=
 =?UTF-8?q?=E5=95=86=E6=A1=A3=E6=A1=88=E6=B8=85=E7=A9=BA=E5=AE=A2=E5=95=86?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=90=8E=E4=BB=8D=E6=8C=89=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avue 搜索事件只回传非空筛选项，被清空的字段不会出现在参数里，
与上一次查询条件合并会保留旧值，改为点击查询时整体重建查询条件。
---
 src/views/vehicle/customer-archive.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 1f57db2..2b3cbb5 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -5519,7 +5519,9 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      this.query = this.buildQuery(params);
+      // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
+      // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
+      this.query = this.buildQuery(params, true);
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
       done();
@@ -5611,9 +5613,10 @@ export default {
         [this.website.tokenHeader]: getToken(),
       };
     },
-    buildQuery(params = {}) {
-      // 新条件覆盖旧条件；本次显式清空的字段必须从查询里去掉，避免第二次搜索仍带着上一次的客商名称。
-      const merged = { ...this.query, ...params };
+    // replace=true 表示以本次搜索条件为准整体重建（清空字段不会回传，需丢弃旧条件）；
+    // 翻页、刷新等场景传 false，沿用上一次的查询条件
+    buildQuery(params = {}, replace = false) {
+      const merged = replace ? { ...params } : { ...this.query, ...params };
       Object.keys(params).forEach(key => {
         const value = params[key];
         if (

From 70801096dd678cbfee7cbe54961cc2b968905cdd 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 12:21:16 +0800
Subject: [PATCH 25/43] =?UTF-8?q?feat:=20=E4=BB=98=E6=AC=BE/=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E7=BB=93=E7=AE=97=E5=8D=95=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8D=95=E5=BC=A0=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=B9=B6=E6=8F=90=E7=A4=BA=E7=BB=93=E6=9E=9C=E4=B8=8E=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/formal-settlement-editor.vue   | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index dd85e42..c44b005 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -708,7 +708,9 @@
       :rows="changeRecordDetailRows"
     />
     <template v-if="!pageMode" #footer>
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable"
@@ -724,7 +726,9 @@
       >
     </template>
     <div v-if="pageMode && !publicMode" class="formal-editor__page-actions">
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable"
@@ -1051,6 +1055,7 @@ import {
   claimInvoices as claimInvoicesApi,
   queryInvoicePool,
   save,
+  syncKingdee,
 } from '@/api/settlement/formalSettlement';
 import {
   getDetail as getPreSettlementDetail,
@@ -1128,6 +1133,7 @@ export default {
       loading: false,
       draftSaving: false,
       saving: false,
+      syncLoading: false,
       form: createFormalSettlementForm(),
       sources: [],
       details: [],
@@ -1271,6 +1277,16 @@ export default {
     editable() {
       return !this.readonly;
     },
+    // 查看页面「同步」按钮：仅已审批且未同步金蝶（含推送失败）的单据显示，口径与后端推送闸门一致
+    canSync() {
+      return (
+        this.readonly &&
+        !this.publicMode &&
+        this.hasPermission('sync') &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus !== 'synced'
+      );
+    },
     isAdmin() {
       return isAdministrator(this.userInfo);
     },
@@ -2887,8 +2903,30 @@ export default {
         remark: this.form.remark,
       };
     },
-    handleSyncPlaceholder() {
-      this.$message.info('开发中');
+    // 查看页面单张推送金蝶（A102-2/A302-2）：结果与异常原因弹框展示，成败后均刷新详情与列表
+    async handleSync() {
+      if (this.syncLoading) return;
+      this.syncLoading = true;
+      try {
+        const res = await syncKingdee(this.form.id, { meta: { suppressErrorMessage: true } });
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        let message = `同步成功：${this.unwrapData(res) || '-'}`;
+        if (['pending', 'partial'].includes(this.form.attachmentSyncStatus)) {
+          message += '\n该单附件未全部上传，可重推补传';
+        }
+        await this.$alert(message, '同步结果', { type: 'success', confirmButtonText: '知道了' });
+      } catch (error) {
+        const reason = String(error?.message || error || '未知错误').trim() || '未知错误';
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        await this.$alert(`同步失败，${reason}`, '同步结果', {
+          type: 'error',
+          confirmButtonText: '知道了',
+        });
+      } finally {
+        this.syncLoading = false;
+      }
     },
     async handleDraftSave() {
       // 保存草稿：不做表单校验，直接落草稿并返回列表刷新

From e602eecee8a4943c80da85e7eee93998718d49f1 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 13:42:20 +0800
Subject: [PATCH 26/43] =?UTF-8?q?fix:=20=E5=AE=A2=E5=95=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=BB=91=E5=90=8D=E5=8D=95=E6=A0=87=E7=AD=BE=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E6=94=B9=E4=B8=BA=E4=BB=85=E9=87=91=E8=9D=B6=E9=BB=91?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=91=BD=E4=B8=AD=EF=BC=88=E4=B8=8E=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=BE=84=E4=B8=80=E8=87=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 2b3cbb5..0597462 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -5556,9 +5556,13 @@ export default {
           this.loading = false;
         });
     },
+    // 黑名单判定：仅以金蝶黑名单（A801-5）命中为准（失信类别/列入事由任一非空）；C101-1 的 hcsBlackStatus 不作为黑名单依据
+    customerRowIsBlack(row) {
+      return !!(row.kingdeeBlackCategory || row.kingdeeBlackReason);
+    },
     // 客商风险名称（每日定时刷新落库字段）：等级与黑名单组合展示（如"低风险、黑名单"）；内部组织默认无风险；未查询显示"-"
     customerRowRiskName(row) {
-      const isBlack = row.hcsBlackStatus === 'yes';
+      const isBlack = this.customerRowIsBlack(row);
       const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
       if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
       if (levelName) return levelName;
@@ -5567,7 +5571,7 @@ export default {
     },
     // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
     customerRowRisky(row) {
-      return row.hcsBlackStatus === 'yes' || row.hcsRiskLevel === '2';
+      return this.customerRowIsBlack(row) || row.hcsRiskLevel === '2';
     },
     // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
     // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底

From 5351911d50a6bb405d27373d88ebc3538079e1d0 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 14:10:30 +0800
Subject: [PATCH 27/43] =?UTF-8?q?refactor:=20=E5=90=88=E5=90=8C=E4=BE=A7?=
 =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9kingdeeBlackStatus=EF=BC=88=E4=B8=8E=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=88=97=E5=90=8D=E7=BB=9F=E4=B8=80=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/components/hcs-contract-panel.vue | 6 +++---
 src/views/business/contract-manage-change.vue        | 2 +-
 src/views/business/contract-manage.vue               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/business/components/hcs-contract-panel.vue b/src/views/business/components/hcs-contract-panel.vue
index 2a3b1f3..0ffffbb 100644
--- a/src/views/business/components/hcs-contract-panel.vue
+++ b/src/views/business/components/hcs-contract-panel.vue
@@ -38,7 +38,7 @@
         contract.hcsFdId || '-'
       }}</el-descriptions-item>
       <el-descriptions-item label="客商风险">
-        <template v-if="contract.hcsRiskLevel || contract.hcsBlackStatus">
+        <template v-if="contract.hcsRiskLevel || contract.kingdeeBlackStatus">
           <el-tag
             v-if="isBlacklist"
             type="danger"
@@ -130,7 +130,7 @@ export default {
   name: 'HcsContractPanel',
   components: { UploadFilled },
   props: {
-    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/hcsBlackStatus/hcsSpecStatus 等）
+    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/kingdeeBlackStatus/hcsSpecStatus 等）
     contract: { type: Object, required: true },
   },
   emits: ['refresh'],
@@ -152,7 +152,7 @@ export default {
       return this.contract.hcsSyncMsg || '';
     },
     isBlacklist() {
-      return String(this.contract.hcsBlackStatus || '').toLowerCase() === 'yes';
+      return String(this.contract.kingdeeBlackStatus || '').toLowerCase() === 'yes';
     },
     specLabel() {
       return SPEC_STATUS_OPTIONS.find(item => item.value === this.contract.hcsSpecStatus)?.label || '';
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index ba63590..d06a115 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -745,7 +745,7 @@ export default {
     // 高风险/黑名单客商提示：按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定（与合同详情口径一致）
     riskTipText() {
       const riskLevel = String(this.form.hcsRiskLevel || '').trim();
-      const blacklist = String(this.form.hcsBlackStatus || '').toLowerCase() === 'yes';
+      const blacklist = String(this.form.kingdeeBlackStatus || '').toLowerCase() === 'yes';
       if (riskLevel !== '2' && !blacklist) return '';
       const parties = [this.form.partyA, this.form.partyB]
         .map(name => String(name || '').trim())
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 883ab62..61454ec 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1623,7 +1623,7 @@ export default {
     // 详情风险客商提示（基本信息备注后展示）：按推送留痕 hcs_risk_level/hcs_black_status 判定（甲乙取高/任一），文案与后端 riskTip 一致
     detailRiskTipText() {
       const riskLevel = String(this.detailRow.hcsRiskLevel || '').trim();
-      const blacklist = String(this.detailRow.hcsBlackStatus || '').toLowerCase() === 'yes';
+      const blacklist = String(this.detailRow.kingdeeBlackStatus || '').toLowerCase() === 'yes';
       if (riskLevel !== '2' && !blacklist) return '';
       const parties = [this.detailRow.partyA, this.detailRow.partyB]
         .map(name => String(name || '').trim())

From e95151ad51c48723de1a812042fc6d885340c620 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 14:41:49 +0800
Subject: [PATCH 28/43] =?UTF-8?q?feat:=20=E5=90=88=E5=90=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=A2=E5=95=86=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E5=88=97=E5=B9=B6=E6=8A=BD=E5=8F=96=E9=A3=8E=E9=99=A9=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=85=AC=E5=85=B1=E5=B1=95=E7=A4=BA=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=88=E5=AE=A2=E5=95=86=E9=A1=B5=E5=A4=8D=E7=94=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/business/contract-manage.js |  8 ++++++++
 src/utils/risk-display.js              | 28 ++++++++++++++++++++++++++
 src/views/business/contract-manage.vue | 20 ++++++++++++++++++
 src/views/vehicle/customer-archive.vue | 12 ++++-------
 4 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 src/utils/risk-display.js

diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js
index 9efc345..e16d95f 100644
--- a/src/option/business/contract-manage.js
+++ b/src/option/business/contract-manage.js
@@ -621,6 +621,14 @@ export const option = createCrudOption([
     addDisplay: false,
     editDisplay: false,
   },
+  {
+    label: '客商风险',
+    prop: 'customerRisk',
+    slot: true,
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '金蝶合同ID',
     prop: 'kingdeeId',
diff --git a/src/utils/risk-display.js b/src/utils/risk-display.js
new file mode 100644
index 0000000..224e92f
--- /dev/null
+++ b/src/utils/risk-display.js
@@ -0,0 +1,28 @@
+/**
+ * 客商/合同风险标签公共展示逻辑（黑名单=金蝶黑名单 A801-5 命中，与后端 HcsCreditCheckSupport 口径一致）：
+ * 等级与黑名单组合展示、等级在前；内部组织客商默认无风险
+ */
+
+/** 金蝶黑名单命中判定（客商档案行：失信类别/列入事由任一非空） */
+export function isKingdeeBlack(category, reason) {
+  return !!(category || reason);
+}
+
+/** 合同行黑名单判定（推送链路按金蝶命中口径落库 kingdeeBlackStatus=yes） */
+export function isContractBlack(blackStatus) {
+  return String(blackStatus || '').toLowerCase() === 'yes';
+}
+
+/** 风险标签文案：riskLevel=C101-1 等级（0/1/2）；isBlack=金蝶黑名单命中；customerKind=internal 显示"无风险" */
+export function resolveRiskTagName(riskLevel, isBlack, customerKind) {
+  const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[riskLevel] || '';
+  if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
+  if (levelName) return levelName;
+  if (customerKind === 'internal') return '无风险';
+  return '';
+}
+
+/** 是否红色风险标签（黑名单命中或高风险） */
+export function isRiskyTag(riskLevel, isBlack) {
+  return isBlack || riskLevel === '2';
+}
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 61454ec..a4a898e 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -92,6 +92,18 @@
           <span v-else>-</span>
         </template>
 
+        <!-- 客商风险：等级与金蝶黑名单组合展示（推送链路按金蝶命中口径落库），复用公共展示方法 -->
+        <template #customerRisk="{ row }">
+          <el-tag
+            v-if="contractRiskTagName(row)"
+            :type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+            class="status-text"
+          >
+            {{ contractRiskTagName(row) }}
+          </el-tag>
+          <span v-else>-</span>
+        </template>
+
         <template #menu="{ row }">
           <el-link
             v-if="hasPermission(`${config.permission}_view`)"
@@ -1091,6 +1103,7 @@ import { exportBlob } from '@/api/common';
 import * as api from '@/api/business/contract-manage';
 import { createFromContract } from '@/api/business/contract-change';
 import { repush as hcsRepush, repushBatch as hcsRepushBatch, getRisk } from '@/api/business/hcs';
+import { isContractBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import { Position } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getProjectList } from '@/api/business/project-apply';
@@ -1756,6 +1769,13 @@ export default {
     hcsSyncLabel(value) {
       return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
     },
+    // ==================== 客商风险（推送链路按金蝶黑名单命中口径落库，展示复用公共方法） ====================
+    contractRiskTagName(row) {
+      return resolveRiskTagName(row.hcsRiskLevel, isContractBlack(row.kingdeeBlackStatus));
+    },
+    isContractRisky(row) {
+      return isRiskyTag(row.hcsRiskLevel, isContractBlack(row.kingdeeBlackStatus));
+    },
     hcsSyncTagType(value) {
       return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
     },
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 0597462..35e5bec 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1598,6 +1598,7 @@ import {
   syncKingdee,
 } from '@/api/vehicle/customer-archive';
 import { getRiskByName } from '@/api/business/hcs';
+import { isKingdeeBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import {
   getList as getCreditScoreQuantificationList,
   getDetail as getCreditScoreQuantificationDetail,
@@ -5558,20 +5559,15 @@ export default {
     },
     // 黑名单判定：仅以金蝶黑名单（A801-5）命中为准（失信类别/列入事由任一非空）；C101-1 的 hcsBlackStatus 不作为黑名单依据
     customerRowIsBlack(row) {
-      return !!(row.kingdeeBlackCategory || row.kingdeeBlackReason);
+      return isKingdeeBlack(row.kingdeeBlackCategory, row.kingdeeBlackReason);
     },
     // 客商风险名称（每日定时刷新落库字段）：等级与黑名单组合展示（如"低风险、黑名单"）；内部组织默认无风险；未查询显示"-"
     customerRowRiskName(row) {
-      const isBlack = this.customerRowIsBlack(row);
-      const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[row.hcsRiskLevel] || '';
-      if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
-      if (levelName) return levelName;
-      if (row.customerKind === 'internal') return '无风险';
-      return '';
+      return resolveRiskTagName(row.hcsRiskLevel, this.customerRowIsBlack(row), row.customerKind);
     },
     // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
     customerRowRisky(row) {
-      return this.customerRowIsBlack(row) || row.hcsRiskLevel === '2';
+      return isRiskyTag(row.hcsRiskLevel, this.customerRowIsBlack(row));
     },
     // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
     // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底

From d76977c07c4a15220c5699a2308c3fc2812d8450 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 20:09:57 +0800
Subject: [PATCH 29/43] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E5=95=86=E6=A1=A3=E6=A1=88=E9=A3=8E=E9=99=A9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=8C=89=E7=AD=89=E7=BA=A7=E4=B8=8E=E9=BB=91=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E7=BB=86=E5=88=86=E5=B9=B6=E4=BC=98=E5=85=88=E6=8C=89=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/hcs.js                |  4 ++--
 src/views/vehicle/customer-archive.vue | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/api/business/hcs.js b/src/api/business/hcs.js
index 47012a2..80ab649 100644
--- a/src/api/business/hcs.js
+++ b/src/api/business/hcs.js
@@ -32,11 +32,11 @@ export const refreshMasterData = () =>
     timeout: 60000,
   });
 
-export const getRisk = customerCode =>
+export const getRisk = (customerCode, creditCode) =>
   request({
     url: `${baseUrl}/risk`,
     method: 'get',
-    params: { customerCode },
+    params: { customerCode, creditCode },
     timeout: 30000,
   });
 
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 35e5bec..778c426 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -372,7 +372,7 @@
                   <template #content>
                     <div>{{ archiveNameRiskTip || '该客商为高风险/黑名单客商' }}</div>
                   </template>
-                  <div class="archive-name-risk">高风险/黑名单客商</div>
+                  <div class="archive-name-risk">{{ archiveNameRiskLabel }}</div>
                 </el-tooltip>
               </el-form-item>
             </el-col>
@@ -1597,7 +1597,7 @@ import {
   queryKingdeeCustomer,
   syncKingdee,
 } from '@/api/vehicle/customer-archive';
-import { getRiskByName } from '@/api/business/hcs';
+import { getRisk, getRiskByName } from '@/api/business/hcs';
 import { isKingdeeBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import {
   getList as getCreditScoreQuantificationList,
@@ -1702,6 +1702,7 @@ export default {
       data: [],
       archiveNameRisky: false,
       archiveNameRiskTip: '',
+      archiveNameRiskLabel: '',
       page: {
         pageSize: 10,
         pageSizes: [10, 20, 50, 100],
@@ -5574,13 +5575,24 @@ export default {
     checkArchiveNameRisk() {
       this.archiveNameRisky = false;
       this.archiveNameRiskTip = '';
+      this.archiveNameRiskLabel = '';
       const customerName = String(this.archiveForm.fullName || '').trim();
       if (!customerName) return;
-      getRiskByName(customerName)
+      // 新增客商档案本地反查不到编号：金蝶带出后表单已有客商编号，优先按编号查 C101-1，
+      // 并传信用代码供金蝶黑名单（A801-5）兜底；无编号时按名称反查档案
+      const customerCode = String(this.archiveForm.customerCode || '').trim();
+      const request = customerCode
+        ? getRisk(customerCode, String(this.archiveForm.unifiedCreditCode || '').trim())
+        : getRiskByName(customerName);
+      request
         .then(res => {
           const risk = (res.data && res.data.data) || {};
           this.archiveNameRisky = risk.risky === true;
           this.archiveNameRiskTip = risk.riskTip || '';
+          // 红字与列表标签同口径（risk-display）：等级按合同系统返回值翻译，黑名单按金蝶命中标记独立展示，组合不分家
+          this.archiveNameRiskLabel = this.archiveNameRisky
+            ? (resolveRiskTagName(risk.fdRiskLevel, risk.kingdeeBlackHit === true) || '高风险/黑名单') + '客商'
+            : '';
         })
         .catch(() => {
           // 忽略风险查询异常，表单正常填写

From b878bc356e3a3bf0d2a87f6d114d9d9a4fc3c4ef 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 20:20:23 +0800
Subject: [PATCH 30/43] =?UTF-8?q?fix:=20=E4=BB=98=E6=AC=BE=E9=A1=B5?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=AE=A2=E5=95=86=E6=8F=90=E7=A4=BA=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E5=90=8E=E7=AB=AF=E6=98=8E=E7=BB=86=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=AD=89=E7=BA=A7=E9=BB=91=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/payment/payment-application-form.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index cb0eca1..0a01f1c 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -883,8 +883,6 @@ export default {
       // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
       payeeRisky: false,
       payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
       attachmentRuleLoading: false,
       // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
       linkedSettlementAttachmentUrls: [],
@@ -1065,14 +1063,12 @@ export default {
         .toUpperCase();
       return ['D', 'D级', 'E', 'E级', 'F', 'F级'].includes(level) || level.includes('高风险');
     },
-    // 高风险/黑名单收款方提示（C101-1，同合同新增页风险客商提示口径；强制拦截在后端提交校验与金蝶推送门禁）
+    // 高风险/黑名单收款方提示（C101-1，强制拦截在后端提交校验与金蝶推送门禁）：
+    // 等级/黑名单明细以后端 riskTip 为准（黑名单=金蝶命中、等级=C101-1，统一口径），前端不再重复拼接
     payeeRiskText() {
       if (!this.payeeRisky) return '';
-      const levelMap = { 0: '低风险', 1: '中风险', 2: '高风险' };
-      const level = levelMap[this.payeeRiskLevel] || '未知';
-      const blacklist = String(this.payeeBlackStatus || '').trim().toLowerCase() === 'yes' ? '是' : '否';
       const tip = this.payeeRiskTip || `收款方[${this.form.payeeName || ''}]为高风险/黑名单客商`;
-      return `风险等级：${level}｜黑名单：${blacklist}。${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
+      return `${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
     },
     requiredAttachmentMaterials() {
       if (this.form.paymentType === 'project_advance') {
@@ -2341,8 +2337,6 @@ export default {
       this.payeeCustomerLevel = '';
       this.payeeRisky = false;
       this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
       if (!partyBName) {
         if (!preserveCurrentValue) this.clearReceiptAccount();
         return;
@@ -2381,8 +2375,6 @@ export default {
             const risk = this.unwrapData(await getCustomerRisk(detail.customerCode)) || {};
             this.payeeRisky = Boolean(risk.risky);
             this.payeeRiskTip = risk.riskTip || '';
-            this.payeeRiskLevel = risk.fdRiskLevel || '';
-            this.payeeBlackStatus = risk.fdBlackStatus || '';
           } catch (error) {
             // 忽略风险查询异常，提交时后端 C101-1 强校验兜底
           }

From 3df09d7d450f4f842f658788f0571e42097b123e 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 20:34:25 +0800
Subject: [PATCH 31/43] =?UTF-8?q?feat:=20=E5=AE=A2=E5=95=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 778c426..51e15fa 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -291,6 +291,17 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="供应商编码" prop="supplierCode">
+                <el-input
+                  v-model="archiveForm.supplierCode"
+                  maxlength="64"
+                  show-word-limit
+                  disabled
+                  placeholder="金蝶供应商编码，系统自动获取"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="客商类型" prop="customerKind">
                 <el-select
@@ -1922,6 +1933,11 @@ export default {
             searchPlaceholder: '请输入',
             minWidth: 140,
           },
+          {
+            label: '供应商编码',
+            prop: 'supplierCode',
+            minWidth: 140,
+          },
           {
             label: '客商简称',
             prop: 'shortName',
@@ -2707,6 +2723,7 @@ export default {
         currentNode: '当前节点',
         currentProcessor: '当前处理人',
         customerCode: '客商编号',
+        supplierCode: '供应商编码',
         shortName: '客商简称',
         fullName: '客商名称',
         customerType: '客商分类',

From 2083754b16a7275719114dc5335b10e23cc1303c 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 20:41:26 +0800
Subject: [PATCH 32/43] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E5=95=86=E5=A1=AB=E5=86=99=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=90=8E=E5=8D=B3=E6=97=B6=E5=9B=9E=E6=98=BE=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/vehicle/customer-archive.js    | 12 ++++++++++++
 src/views/vehicle/customer-archive.vue | 18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/api/vehicle/customer-archive.js b/src/api/vehicle/customer-archive.js
index 0814c2a..222ca13 100644
--- a/src/api/vehicle/customer-archive.js
+++ b/src/api/vehicle/customer-archive.js
@@ -163,6 +163,18 @@ export const queryKingdeeCustomer = creditCode => {
   });
 };
 
+// 金蝶供应商编码查询（A901-1）：新增客商填写信用代码后即时回显
+export const querySupplierCode = creditCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-supplier-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
 export const syncKingdee = id => {
   return request({
     url: '/blade-transport/customer-archive/sync-kingdee',
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 51e15fa..8f918e7 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1606,6 +1606,7 @@ import {
   getScoreTemplate,
   recognizeBusinessLicenseOcr,
   queryKingdeeCustomer,
+  querySupplierCode,
   syncKingdee,
 } from '@/api/vehicle/customer-archive';
 import { getRisk, getRiskByName } from '@/api/business/hcs';
@@ -2492,6 +2493,7 @@ export default {
       const form = this.archiveForm;
       form.kingdeeStatus = 'none';
       form.customerCode = '';
+      form.supplierCode = '';
       form.fullName = '';
       form.legalPerson = '';
       form.registeredCapital = '';
@@ -2515,7 +2517,21 @@ export default {
         .toUpperCase();
       if (code.length !== 18 || this.unifiedCreditCodeError(code)) return;
       clearTimeout(this.kingdeeQueryTimer);
-      this.kingdeeQueryTimer = setTimeout(() => this.fetchKingdeeCustomer(code), 500);
+      this.kingdeeQueryTimer = setTimeout(() => {
+        this.fetchKingdeeCustomer(code);
+        this.fetchSupplierCode(code);
+      }, 500);
+    },
+    // 新增态下信用代码录入后即时查询金蝶供应商编码（A901-1）回显，查询失败静默留空，保存/同步时后端兜底落库
+    async fetchSupplierCode(code) {
+      try {
+        const res = await querySupplierCode(code);
+        // 防止响应返回时用户已修改代码
+        if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
+        this.archiveForm.supplierCode = res?.data?.data || '';
+      } catch (error) {
+        // 忽略查询异常，编码留空
+      }
     },
     async fetchKingdeeCustomer(code) {
       let customer = null;

From b76ada9d6cb0d9f16bc08a4a88b51613a99f20ff 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 20:53:22 +0800
Subject: [PATCH 33/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BF=A1?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=E6=97=B6=E5=90=8C=E6=AD=A5=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E5=AE=A2=E5=95=86=E5=90=8D=E7=A7=B0=E4=B8=8B=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/vehicle/customer-archive.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 8f918e7..0c701e5 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -2509,6 +2509,7 @@ export default {
     handleKingdeeCreditCodeChange(val) {
       this.kingdeeBlocked = false;
       if (this.readonly || this.archiveForm.id) return;
+      this.clearArchiveNameRisk();
       if (this.archiveForm.kingdeeStatus === 'exist') {
         this.resetKingdeeBackfill();
       }
@@ -5605,17 +5606,21 @@ export default {
     },
     // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
     // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底
-    checkArchiveNameRisk() {
+    // 清空客商名称下风险提示（信用代码变化后原按旧编号+信用代码查询的结果失效）
+    clearArchiveNameRisk() {
       this.archiveNameRisky = false;
       this.archiveNameRiskTip = '';
       this.archiveNameRiskLabel = '';
+    },
+    checkArchiveNameRisk() {
+      this.clearArchiveNameRisk();
       const customerName = String(this.archiveForm.fullName || '').trim();
       if (!customerName) return;
       // 新增客商档案本地反查不到编号：金蝶带出后表单已有客商编号，优先按编号查 C101-1，
       // 并传信用代码供金蝶黑名单（A801-5）兜底；无编号时按名称反查档案
       const customerCode = String(this.archiveForm.customerCode || '').trim();
       const request = customerCode
-        ? getRisk(customerCode, String(this.archiveForm.unifiedCreditCode || '').trim())
+        ? getRisk(customerCode, String(this.archiveForm.unifiedCreditCode || '').trim(), customerName)
         : getRiskByName(customerName);
       request
         .then(res => {

From 24fec3c7d7f6e284acb7373b5ffb84f2a8e07369 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 20:53:41 +0800
Subject: [PATCH 34/43] =?UTF-8?q?fix:=20=E5=AE=A2=E5=95=86=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E6=8C=89=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2=E9=80=8F?=
 =?UTF-8?q?=E4=BC=A0=E5=AE=A2=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/hcs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/business/hcs.js b/src/api/business/hcs.js
index 80ab649..fc93dc4 100644
--- a/src/api/business/hcs.js
+++ b/src/api/business/hcs.js
@@ -32,11 +32,11 @@ export const refreshMasterData = () =>
     timeout: 60000,
   });
 
-export const getRisk = (customerCode, creditCode) =>
+export const getRisk = (customerCode, creditCode, customerName) =>
   request({
     url: `${baseUrl}/risk`,
     method: 'get',
-    params: { customerCode, creditCode },
+    params: { customerCode, creditCode, customerName },
     timeout: 30000,
   });
 

From 8388904916fd6aa6db947bc133b2b3a53243716a 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:02:27 +0800
Subject: [PATCH 35/43] =?UTF-8?q?fix:=20=E5=90=88=E5=90=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AE=A2=E5=95=86=E9=A3=8E=E9=99=A9=E5=88=97=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4=E8=87=B3=E7=AD=BE=E7=BA=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B9=8B=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/business/contract-manage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js
index e16d95f..ac5fac2 100644
--- a/src/option/business/contract-manage.js
+++ b/src/option/business/contract-manage.js
@@ -625,6 +625,7 @@ export const option = createCrudOption([
     label: '客商风险',
     prop: 'customerRisk',
     slot: true,
+    order: 189,
     minWidth: 150,
     addDisplay: false,
     editDisplay: false,

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 36/43] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=87=91?=
 =?UTF-8?q?=E8=9D=B6=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 {

From f7ee9273c6f93e25b2e909c7ad6d6c55ac16f328 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:37:18 +0800
Subject: [PATCH 37/43] =?UTF-8?q?feat:=20=E5=90=88=E5=90=8C=E4=B8=8E?=
 =?UTF-8?q?=E5=AE=A2=E5=95=86=E5=88=97=E8=A1=A8=E5=AE=A2=E5=95=86=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E6=A0=87=E7=AD=BE=E7=BB=9F=E4=B8=80=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=98=8E=E7=BB=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/contract-manage.vue | 27 ++++++++++++++++++++------
 src/views/vehicle/customer-archive.vue | 11 +++++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index a4a898e..0f5b01a 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -92,15 +92,24 @@
           <span v-else>-</span>
         </template>
 
-        <!-- 客商风险：等级与金蝶黑名单组合展示（推送链路按金蝶命中口径落库），复用公共展示方法 -->
+        <!-- 客商风险：等级与金蝶黑名单组合展示（推送链路按金蝶命中口径落库），复用公共展示方法；非无风险标签悬浮见明细 -->
         <template #customerRisk="{ row }">
-          <el-tag
+          <el-tooltip
             v-if="contractRiskTagName(row)"
-            :type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
-            class="status-text"
+            placement="top"
+            effect="dark"
+            popper-class="customer-risk-popper"
           >
-            {{ contractRiskTagName(row) }}
-          </el-tag>
+            <template #content>
+              <div>{{ row.hcsRiskDetail || contractRiskTagName(row) }}</div>
+            </template>
+            <el-tag
+              :type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+              class="status-text"
+            >
+              {{ contractRiskTagName(row) }}
+            </el-tag>
+          </el-tooltip>
           <span v-else>-</span>
         </template>
 
@@ -3820,4 +3829,10 @@ export default {
   white-space: normal;
   line-height: 1.2;
 }
+
+/* 风险客商悬浮提示（同客商列表页）：popper 挂在 body 下，约束宽度 */
+.customer-risk-popper {
+  max-width: 360px;
+  line-height: 1.6;
+}
 </style>
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 0c701e5..4c2ffca 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -49,21 +49,24 @@
       </template>
       <template #customerRisk="{ row }">
         <el-tooltip
-          v-if="customerRowRisky(row)"
+          v-if="customerRowRiskName(row) && customerRowRiskName(row) !== '无风险'"
           placement="top"
           effect="dark"
           popper-class="customer-risk-popper"
         >
           <template #content>
-            <div>{{ row.hcsRiskDetail || '该客商为高风险/黑名单客商' }}</div>
+            <div>{{ row.hcsRiskDetail || customerRowRiskName(row) }}</div>
           </template>
-          <el-tag type="danger" class="status-text">
+          <el-tag
+            :type="customerRowRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+            class="status-text"
+          >
             {{ customerRowRiskName(row) }}
           </el-tag>
         </el-tooltip>
         <el-tag
           v-else-if="customerRowRiskName(row)"
-          :type="row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+          type="success"
           class="status-text"
         >
           {{ customerRowRiskName(row) }}

From 06de9477e5fbfc8c78d8330bfb15f36807f4709f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Sat, 31 Oct 2026 10:16:38 +0800
Subject: [PATCH 38/43] =?UTF-8?q?feat:=20=E5=AE=A2=E5=95=86=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E4=BF=A1=E6=81=AF=E5=BC=80=E6=88=B7=E8=A1=8C=E5=A4=B1?=
 =?UTF-8?q?=E7=84=A6=E5=8C=B9=E9=85=8D=E9=87=91=E8=9D=B6=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=E8=81=94=E8=A1=8C=E5=8F=B7=E5=B9=B6=E4=BF=9D=E5=AD=98=E5=89=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 开户行 label 加问号提示，失焦调 A905-3 按行名精确匹配自动回填联行号，未命中提示检查
- 保存前按联行号校验金蝶档案，查不到拦截保存，接口异常提示稍后重试
- 回填后清除联行号字段残留校验提示
---
 src/api/vehicle/customer-archive.js    | 24 ++++++++
 src/views/vehicle/customer-archive.vue | 81 ++++++++++++++++++++++----
 2 files changed, 93 insertions(+), 12 deletions(-)

diff --git a/src/api/vehicle/customer-archive.js b/src/api/vehicle/customer-archive.js
index 222ca13..0637e27 100644
--- a/src/api/vehicle/customer-archive.js
+++ b/src/api/vehicle/customer-archive.js
@@ -175,6 +175,30 @@ export const querySupplierCode = creditCode => {
   });
 };
 
+// 金蝶开户行查询（A905-3）：收款信息填写开户行失焦后精确匹配带出联行号
+export const queryKingdeeBank = bankName => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      bankName,
+    },
+  });
+};
+
+// 金蝶联行号校验（A905-3）：收款信息保存前按联行号精确匹配，查不到不允许保存
+export const queryKingdeeBankByNumber = cnapsCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank-by-number',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      cnapsCode,
+    },
+  });
+};
+
 export const syncKingdee = id => {
   return request({
     url: '/blade-transport/customer-archive/sync-kingdee',
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 4c2ffca..62a3dac 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1100,8 +1100,18 @@
           <el-form-item label="开户人姓名" prop="accountHolderName">
             <el-input v-model="receiptForm.accountHolderName" maxlength="50" />
           </el-form-item>
-          <el-form-item label="开户行" prop="bankName">
-            <el-input v-model="receiptForm.bankName" maxlength="100" />
+          <el-form-item prop="bankName">
+            <template #label>
+              <span class="receipt-bank-label">
+                开户行
+                <el-tooltip placement="top" effect="dark" content="请填写银行全称，系统将自动匹配金蝶档案带出联行号">
+                  <el-icon class="receipt-bank-help">
+                    <el-icon-question-filled />
+                  </el-icon>
+                </el-tooltip>
+              </span>
+            </template>
+            <el-input v-model="receiptForm.bankName" maxlength="100" @blur="fetchReceiptCnapsCode" />
           </el-form-item>
           <el-form-item label="联行号" prop="cnapsCode">
             <el-input v-model="receiptForm.cnapsCode" maxlength="32" />
@@ -1608,6 +1618,8 @@ import {
   remove,
   getScoreTemplate,
   recognizeBusinessLicenseOcr,
+  queryKingdeeBank,
+  queryKingdeeBankByNumber,
   queryKingdeeCustomer,
   querySupplierCode,
   syncKingdee,
@@ -3657,18 +3669,50 @@ export default {
       this.receiptForm = this.emptyReceiptAccount();
       this.$refs.receiptForm?.clearValidate();
     },
-    saveReceipt() {
-      this.$refs.receiptForm.validate(valid => {
-        if (!valid) return;
-        const receipt = this.normalizeReceipt(this.receiptForm);
-        if (this.receiptIndex > -1) {
-          this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+    // 开户行失焦后按行名精确匹配金蝶行名行号档案（A905-3），命中自动带出联行号，未命中提示检查
+    async fetchReceiptCnapsCode() {
+      const bankName = String(this.receiptForm.bankName || '').trim();
+      if (!bankName) return;
+      try {
+        const res = await queryKingdeeBank(bankName);
+        // 防止响应返回时用户已修改开户行
+        if (String(this.receiptForm.bankName || '').trim() !== bankName) return;
+        const bank = res?.data?.data || null;
+        if (bank && bank.unionNumber) {
+          this.receiptForm.cnapsCode = bank.unionNumber;
+          this.$refs.receiptForm?.clearValidate('cnapsCode');
         } else {
-          this.archiveForm.receiptAccounts.push(receipt);
-          this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
+          this.$message.warning('未查询到金蝶开户行信息，请检查开户行名称');
         }
-        this.receiptBox = false;
-      });
+      } catch (error) {
+        // 忽略查询异常，联行号留空由用户手填
+      }
+    },
+    async saveReceipt() {
+      const valid = await this.$refs.receiptForm.validate().catch(() => false);
+      if (!valid) return;
+      // 保存前按联行号精确校验金蝶行名行号档案（A905-3），查不到不允许保存
+      const cnapsCode = String(this.receiptForm.cnapsCode || '').trim();
+      let bank = null;
+      try {
+        const res = await queryKingdeeBankByNumber(cnapsCode);
+        bank = res?.data?.data || null;
+      } catch (error) {
+        this.$message.warning('金蝶联行号校验失败，请稍后重试');
+        return;
+      }
+      if (!bank || !bank.unionNumber) {
+        this.$message.warning('未查询到金蝶联行号信息，不能保存，请检查联行号');
+        return;
+      }
+      const receipt = this.normalizeReceipt(this.receiptForm);
+      if (this.receiptIndex > -1) {
+        this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+      } else {
+        this.archiveForm.receiptAccounts.push(receipt);
+        this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
+      }
+      this.receiptBox = false;
     },
     deleteReceipt(index) {
       this.$confirm('确定删除该收款信息?', '提示', {
@@ -6127,6 +6171,19 @@ export default {
   :deep(.el-select) {
     width: 60%;
   }
+
+  .receipt-bank-label {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+  }
+
+  .receipt-bank-help {
+    color: #a8abb2;
+    cursor: help;
+    font-size: 14px;
+    flex: none;
+  }
 }
 
 .receipt-dialog__footer-actions {

From f3d69d7df0cb1ada7c4767ef9d757e1d4e65a3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 27 Oct 2026 15:32:15 +0800
Subject: [PATCH 39/43] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/contract-manage.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index d11d3ec..554dbfe 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1122,7 +1122,6 @@ import {
   repush as hcsRepush,
   repushBatch as hcsRepushBatch,
 } from '@/api/business/hcs';
-import { repush as hcsRepush, repushBatch as hcsRepushBatch, getRisk } from '@/api/business/hcs';
 import { isContractBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import { Position } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';

From c0ba9ba39b7f1c2d8fc049d6b7360d7df06840ce Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 2 Nov 2026 21:12:56 +0800
Subject: [PATCH 40/43] =?UTF-8?q?:sparkles:=20=E8=AE=A1=E8=B4=B9/=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6/=E7=BB=93=E7=AE=97=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E6=96=B9=E5=AE=A2=E5=95=86=E4=B8=8E=E6=89=BF=E8=BF=90=E5=95=86?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../components/billing-plan-editor.vue        |  43 ++++++
 .../components/master-order-dispatch.vue      |  42 ++++--
 .../components/waybill-manage-page.vue        | 136 +++++++++++-------
 src/views/business/loading-manage.vue         |  77 ++++++++--
 .../components/settlement-import-page.vue     |  95 ++++++++++--
 .../settlement/receivable-payable-detail.vue  |  34 ++++-
 6 files changed, 337 insertions(+), 90 deletions(-)

diff --git a/src/views/business/components/billing-plan-editor.vue b/src/views/business/components/billing-plan-editor.vue
index 19f4b17..6f68b6a 100644
--- a/src/views/business/components/billing-plan-editor.vue
+++ b/src/views/business/components/billing-plan-editor.vue
@@ -12,6 +12,9 @@
         <el-descriptions-item label="方案名称">{{
             displayValue(draft.planName)
           }}</el-descriptions-item>
+        <el-descriptions-item label="适用客商">{{
+            displayValue(draft.customerName || partyOptionLabel(draft.partyRowId))
+          }}</el-descriptions-item>
         <el-descriptions-item label="运输方式">{{
             transportModeLabel(draft.transportMode)
           }}</el-descriptions-item>
@@ -37,6 +40,20 @@
             :disabled="readonly" /></el-form-item
           ></el-col>
           <el-col :span="8"
+          ><el-form-item label="适用客商" prop="partyRowId"
+          ><el-select
+            v-model="draft.partyRowId"
+            clearable
+            filterable
+            placeholder="请选择适用客商"
+            @change="handlePartyChange"
+          ><el-option
+            v-for="item in partyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" /></el-select></el-form-item
+          ></el-col>
+          <el-col :span="8"
           ><el-form-item label="运输方式" prop="transportMode"
           ><el-select
             v-model="draft.transportMode"
@@ -433,6 +450,7 @@ export default {
     index: { type: Number, default: -1 },
     readonly: Boolean,
     settlementCurrency: { type: String, default: 'RMB' },
+    partyOptions: { type: Array, default: () => [] },
   },
   emits: ['update:modelValue', 'save'],
   data() {
@@ -476,6 +494,7 @@ export default {
       cargoRequest: null,
       formRules: {
         planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
+        partyRowId: [{ required: true, message: '请选择适用客商', trigger: 'change' }],
         transportMode: [{ required: true, message: '请选择运输方式', trigger: 'change' }],
       },
     };
@@ -549,6 +568,10 @@ export default {
     normalizePlan(value = {}) {
       const plan = {
         planName: '',
+        partyRowId: '',
+        partyRole: '',
+        customerId: '',
+        customerName: '',
         transportMode: '',
         transportModeLabel: '',
         defaultPlan: false,
@@ -560,6 +583,21 @@ export default {
       );
       return plan;
     },
+    partyOptionLabel(partyRowId) {
+      const matched = (this.partyOptions || []).find(
+        item => String(item.value) === String(partyRowId)
+      );
+      return matched?.label || '';
+    },
+    handlePartyChange(partyRowId) {
+      const matched = (this.partyOptions || []).find(
+        item => String(item.value) === String(partyRowId)
+      );
+      this.draft.partyRowId = matched?.partyRowId || matched?.value || '';
+      this.draft.partyRole = matched?.partyRole || '';
+      this.draft.customerId = matched?.customerId || '';
+      this.draft.customerName = matched?.customerName || '';
+    },
     normalizeRule(rule = {}) {
       const next = { ...defaultRule(), ...clone(rule) };
       if (next.billingType === '阶梯单价' && next.minimumBillingWeight === '') {
@@ -1032,6 +1070,11 @@ export default {
       this.$refs.formRef.validate(valid => {
         if (!valid || !this.validateRules()) return;
         const plan = clone(this.draft);
+        this.handlePartyChange(plan.partyRowId);
+        plan.partyRowId = this.draft.partyRowId;
+        plan.partyRole = this.draft.partyRole;
+        plan.customerId = this.draft.customerId;
+        plan.customerName = this.draft.customerName;
         const transportMode = this.transportModeOptions.find(
           item => String(item.value) === String(plan.transportMode)
         );
diff --git a/src/views/business/components/master-order-dispatch.vue b/src/views/business/components/master-order-dispatch.vue
index 40dd8a3..b08c4bc 100644
--- a/src/views/business/components/master-order-dispatch.vue
+++ b/src/views/business/components/master-order-dispatch.vue
@@ -195,7 +195,7 @@
           <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
             <el-row :gutter="16">
               <template v-if="isRoad(route)">
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"
                   ><el-form-item label="司机" :required="route.carrierType !== '承运商'"
                     ><el-autocomplete
@@ -255,7 +255,7 @@
                 ></el-col>
               </template>
               <template v-else>
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船班号/船次号/班次号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船长"><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="联系电话"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
@@ -920,6 +920,8 @@ export default {
       route.carrierName = '';
       route.carrierId = '';
       route.carrierContractId = '';
+      route.carrierPartyId = '';
+      route.carrierPartyRole = '';
       this.clearRouteDriverVehicleFields(route);
       if (value === '承运商') {
         route.trailerVehicleNo = '';
@@ -930,15 +932,18 @@ export default {
         if (value === '自运') this.applySelfOperatedCarrierDefaults(route);
       });
     },
-    handleCarrierContractChange(route, contractId) {
+    handleCarrierContractChange(route, selectedValue) {
       const contract = this.carrierOptions.find(
         item =>
+          this.carrierOptionValue(item) === String(selectedValue || '') ||
           [item.contractId, item.carrierName, item.id].some(
-            value => String(value || '') === String(contractId || '')
+            value => String(value || '') === String(selectedValue || '')
           )
       );
       route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
-      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
+      route.carrierPartyId = route.carrierType !== '自运' ? contract?.carrierPartyId || '' : '';
+      route.carrierPartyRole = route.carrierType !== '自运' ? contract?.carrierPartyRole || '' : '';
+      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || contract?.customerId || '' : '';
       route.carrierName = contract?.carrierName || '';
       this.clearRouteDriverVehicleFields(route);
     },
@@ -954,15 +959,23 @@ export default {
       this.driverOptions = [];
     },
     carrierOptionValue(item = {}) {
-      return item.contractId || item.id || item.value || item.carrierName || '';
+      return [item.contractId || item.id || '', item.carrierPartyId || '', item.carrierName || ''].join(
+        '__'
+      );
+    },
+    carrierSelectedValue(route = {}) {
+      return this.carrierOptionValue({
+        contractId: route.carrierContractId,
+        carrierPartyId: route.carrierPartyId,
+        carrierName: route.carrierName,
+      });
     },
     carrierOptionLabel(item) {
-      const duplicateCount = this.carrierOptions.filter(option => option.carrierName === item.carrierName).length;
-      if (duplicateCount <= 1) {
-        return item.carrierName;
-      }
+      const roleLabel = item.carrierPartyRole === 'C' ? '丙方' : item.carrierPartyRole === 'B' ? '乙方' : '';
+      const nameWithRole =
+        roleLabel && item.carrierName ? `${item.carrierName}（${roleLabel}）` : item.carrierName;
       const contractLabel = formatContractOptionLabel(item);
-      return contractLabel ? `${item.carrierName}（${contractLabel}）` : item.carrierName;
+      return contractLabel ? `${nameWithRole} - ${contractLabel}` : nameWithRole;
     },
     driverOptionLabel(item) { return item.driverName || item.name || ''; },
     driverOptionKey(item) { return item.id || item.driverId || this.driverOptionLabel(item) || item.mobile; },
@@ -983,19 +996,22 @@ export default {
             ...item,
             contractId: item.contractId || item.carrierContractId || item.id || '',
             carrierName:
+              item.carrierName ||
               item.partyB ||
               item.partyBName ||
               item.contractPartyB ||
               item.customerContractPartyB ||
-              item.carrierName ||
               '',
             carrierId:
+              item.customerId ||
               item.partyBId ||
               item.partyBUserId ||
               item.contractPartyBId ||
               item.customerContractPartyBId ||
               item.carrierId ||
               '',
+            carrierPartyId: item.carrierPartyId || '',
+            carrierPartyRole: item.carrierPartyRole || '',
           }))
           .filter(item => item.carrierName);
       } finally {
@@ -1137,7 +1153,7 @@ export default {
         id: `${route.segmentNo}-${item.cargoName}-${Date.now()}-${Math.random()}`,
         batchNo,
         segmentNo: route.segmentNo, relationNo: route.segmentNo, documentType: route.documentType, transportType: route.transportType, carrierType: route.carrierType,
-        carrierContractId: route.carrierContractId, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
+        carrierContractId: route.carrierContractId, carrierPartyId: route.carrierPartyId, carrierPartyRole: route.carrierPartyRole, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
         departureName: route.departureName, departureAddress: route.departureAddress, departureContact: route.departureContact, departurePhone: route.departurePhone,
         arrivalName: route.arrivalName, arrivalAddress: route.arrivalAddress, arrivalContact: route.arrivalContact, arrivalPhone: route.arrivalPhone,
         estimatedStartTime: route.estimatedStartTime, estimatedEndTime: route.estimatedEndTime,
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index 268d6cc..302b1d2 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -4650,9 +4650,14 @@ export default {
     },
     taskCarrierValue: {
       get() {
-        return this.form.carrierType === '自运'
-          ? this.form.carrierName || ''
-          : this.form.carrierContractId || this.form.carrierName || '';
+        if (this.form.carrierType === '自运') {
+          return this.form.carrierName || '';
+        }
+        return this.taskCarrierOptionValue({
+          carrierContractId: this.form.carrierContractId,
+          carrierPartyId: this.form.carrierPartyId,
+          carrierName: this.form.carrierName,
+        });
       },
       set(value) {
         this.handleTaskCarrierChange(value);
@@ -7290,6 +7295,8 @@ export default {
         this.form.carrierName = '';
         this.form.carrierId = '';
         this.form.carrierContractId = '';
+        this.form.carrierPartyId = '';
+        this.form.carrierPartyRole = '';
         this.hasProjectProcessConfig = false;
         this.waybillProcessConfigRows = [];
         return;
@@ -7304,6 +7311,8 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
+      this.form.carrierPartyId = '';
+      this.form.carrierPartyRole = '';
       this.loadProjectProcessConfigState();
       this.loadTaskCarrierOptions(project);
       if (this.contractSelectEnabled) {
@@ -7760,6 +7769,8 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
+      this.form.carrierPartyId = '';
+      this.form.carrierPartyRole = '';
       this.form.driverId = '';
       this.form.driverName = '';
       this.form.driverPhone = '';
@@ -7814,7 +7825,9 @@ export default {
     },
     taskCarrierOptionValue(item = {}) {
       if (this.form.carrierType !== '自运') {
-        return item.carrierContractId || item.value || item.id || '';
+        if (item.value) return item.value;
+        return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
+          .join('__');
       }
       return (
         item.carrierName ||
@@ -7852,55 +7865,76 @@ export default {
       names.forEach(append);
       return options;
     },
+    parseContractPartyRows(partyJson, fallbackName = '', partyRole = 'B') {
+      const rows = this.parseJsonArray(partyJson)
+        .map(item => ({
+          id: item.id || '',
+          customerId: item.customerId || '',
+          customerName: String(item.customerName || '').trim(),
+          creditCode: item.creditCode || '',
+          partyRole,
+        }))
+        .filter(item => item.customerName);
+      if (rows.length) return rows;
+      return String(fallbackName || '')
+        .split(/[、,，]/)
+        .map(name => name.trim())
+        .filter(Boolean)
+        .map(name => ({
+          id: '',
+          customerId: '',
+          customerName: name,
+          creditCode: '',
+          partyRole,
+        }));
+    },
     getWaybillCarrierContractOptions(contracts = []) {
-      const carrierNameCounts = contracts.reduce((counts, contract) => {
-        const carrierName = String(
-          contract.partyB ||
-          contract.partyBName ||
-          contract.contractPartyB ||
-          contract.customerContractPartyB ||
-          contract.secondParty ||
-          contract.secondPartyName ||
-          ''
-        ).trim();
-        if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
-        return counts;
-      }, {});
-      return contracts
-        .map(contract => {
-          const carrierName = String(
+      const options = [];
+      contracts.forEach(contract => {
+        if (!contract?.id) return;
+        const parties = [
+          ...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
+          ...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
+        ];
+        if (!parties.length) {
+          const fallbackName = String(
             contract.partyB ||
-            contract.partyBName ||
-            contract.contractPartyB ||
-            contract.customerContractPartyB ||
-            contract.secondParty ||
-            contract.secondPartyName ||
-            ''
+              contract.partyBName ||
+              contract.contractPartyB ||
+              contract.customerContractPartyB ||
+              contract.secondParty ||
+              contract.secondPartyName ||
+              ''
           ).trim();
-          if (!carrierName || !contract.id) return null;
-          const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
-          return {
+          if (fallbackName) {
+            parties.push({
+              id: '',
+              customerId: '',
+              customerName: fallbackName,
+              creditCode: '',
+              partyRole: 'B',
+            });
+          }
+        }
+        const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
+        parties.forEach(party => {
+          const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
+          const optionValue = [contract.id, party.id || '', party.customerName].join('__');
+          options.push({
             id: contract.id,
-            carrierId:
-              contract.partyBId ||
-              contract.partyBUserId ||
-              contract.contractPartyBId ||
-              contract.customerContractPartyBId ||
-              contract.secondPartyId ||
-              contract.secondPartyUserId ||
-              contract.carrierId ||
-              '',
-            value: contract.id,
-            label:
-              carrierNameCounts[carrierName] > 1
-                ? `${carrierName}（${contractIdentifier}）`
-                : carrierName,
-            carrierName,
-            fullName: carrierName,
+            carrierId: party.customerId || '',
+            value: optionValue,
+            label: `${party.customerName}（${roleLabel}） - ${contractIdentifier}`,
+            carrierName: party.customerName,
+            fullName: party.customerName,
             carrierContractId: contract.id,
-          };
-        })
-        .filter(Boolean);
+            carrierPartyId: party.id || '',
+            carrierPartyRole: party.partyRole,
+            creditCode: party.creditCode || '',
+          });
+        });
+      });
+      return options;
     },
     resetWaybillCarrierContractState() {
       this.waybillCarrierContractRequestId += 1;
@@ -7930,6 +7964,8 @@ export default {
             this.form.carrierName = '';
             this.form.carrierId = '';
             this.form.carrierContractId = '';
+            this.form.carrierPartyId = '';
+            this.form.carrierPartyRole = '';
           }
           return options;
         })
@@ -8020,10 +8056,14 @@ export default {
       );
       if (this.form.carrierType !== '自运') {
         this.form.carrierContractId = carrier?.carrierContractId || '';
+        this.form.carrierPartyId = carrier?.carrierPartyId || '';
+        this.form.carrierPartyRole = carrier?.carrierPartyRole || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || '';
       } else {
         this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
+        this.form.carrierPartyId = '';
+        this.form.carrierPartyRole = '';
         this.form.carrierName = value || '';
       }
       // 承运商变更后清空司机/车辆，避免跨组织脏数据
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 5be2599..745a370 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -1448,7 +1448,7 @@
                   <el-select
                     :model-value="
                       dialogForm.carrierType === '承运商'
-                        ? dialogForm.carrierContractId
+                        ? taskCarrierSelectedValue
                         : dialogForm.carrierName
                     "
                     clearable
@@ -1465,7 +1465,7 @@
                   >
                     <el-option
                       v-for="item in taskCarrierOptions"
-                      :key="item.id || item.carrierName"
+                      :key="carrierOptionValue(item)"
                       :label="
                         dialogForm.carrierType === '承运商'
                           ? formatTaskCarrierContractLabel(item)
@@ -1473,7 +1473,7 @@
                       "
                       :value="
                         dialogForm.carrierType === '承运商'
-                          ? item.id
+                          ? carrierOptionValue(item)
                           : item.carrierName || item.partyB
                       "
                     />
@@ -1953,6 +1953,8 @@ const createDialogForm = () => ({
   carrierType: '承运商',
   carrierName: '',
   carrierContractId: '',
+  carrierPartyId: '',
+  carrierPartyRole: '',
   escortName: '',
   escortPhone: '',
   departureAddress: '',
@@ -2256,6 +2258,13 @@ export default {
       if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
       return '请选择';
     },
+    taskCarrierSelectedValue() {
+      return this.carrierOptionValue({
+        id: this.dialogForm.carrierContractId,
+        carrierPartyId: this.dialogForm.carrierPartyId,
+        carrierName: this.dialogForm.carrierName,
+      });
+    },
     detailStatusType() {
       const typeMap = {
         pending: 'success',
@@ -2391,11 +2400,23 @@ export default {
     driverOptionText,
     formatTaskCarrierContractLabel(item = {}) {
       const carrierName = item.carrierName || item.partyB || '';
+      const roleLabel =
+        item.carrierPartyRole === 'C' || item.carrierPartyRole === '丙'
+          ? '丙方'
+          : item.carrierPartyRole === 'B' || item.carrierPartyRole === '乙'
+            ? '乙方'
+            : '';
       const contractLabel = formatContractOptionLabel(item);
-      if (carrierName && contractLabel) {
-        return `${carrierName}（${contractLabel}）`;
+      const nameWithRole = roleLabel && carrierName ? `${carrierName}（${roleLabel}）` : carrierName;
+      if (nameWithRole && contractLabel) {
+        return `${nameWithRole} - ${contractLabel}`;
       }
-      return carrierName || contractLabel;
+      return nameWithRole || contractLabel;
+    },
+    carrierOptionValue(item = {}) {
+      return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
+        '__'
+      );
     },
     syncStandaloneTagTitle() {
       if (!this.isStandalonePage) return;
@@ -4555,6 +4576,8 @@ export default {
     },
     handleCarrierTypeChange() {
       this.dialogForm.carrierContractId = '';
+      this.dialogForm.carrierPartyId = '';
+      this.dialogForm.carrierPartyRole = '';
       this.dialogForm.carrierName = '';
       this.dialogForm.carrierId = '';
       this.clearDialogDriverVehicleFields();
@@ -4565,17 +4588,25 @@ export default {
       }
       if (this.dialogForm.carrierType === '自运') {
         this.dialogForm.carrierContractId = '';
+        this.dialogForm.carrierPartyId = '';
+        this.dialogForm.carrierPartyRole = '';
       }
       this.loadTaskCarrierOptions();
     },
-    handleTaskCarrierChange(contractId) {
-      const contract = this.taskCarrierOptions.find(item =>
-        [item.id, item.carrierName, item.partyB].some(
-          value => String(value || '') === String(contractId || '')
-        )
+    handleTaskCarrierChange(selectedValue) {
+      const contract = this.taskCarrierOptions.find(
+        item =>
+          this.carrierOptionValue(item) === String(selectedValue || '') ||
+          [item.id, item.carrierName, item.partyB].some(
+            value => String(value || '') === String(selectedValue || '')
+          )
       );
       this.dialogForm.carrierContractId =
         this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
+      this.dialogForm.carrierPartyId =
+        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyId || '' : '';
+      this.dialogForm.carrierPartyRole =
+        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyRole || '' : '';
       this.dialogForm.carrierName = contract?.carrierName || '';
       this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
       this.clearDialogDriverVehicleFields();
@@ -4758,30 +4789,45 @@ export default {
             .map(item => ({
               ...item,
               carrierName:
+                item.carrierName ||
                 item.partyB ||
                 item.partyBName ||
                 item.contractPartyB ||
                 item.customerContractPartyB ||
-                item.carrierName ||
                 '',
               carrierId:
+                item.customerId ||
                 item.partyBId ||
                 item.partyBUserId ||
                 item.contractPartyBId ||
                 item.customerContractPartyBId ||
                 item.carrierId ||
                 '',
+              carrierPartyId: item.carrierPartyId || '',
+              carrierPartyRole: item.carrierPartyRole || '',
             }))
             .filter(item => item.carrierName);
           const current =
-            contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
+            this.taskCarrierOptions.find(
+              item =>
+                this.carrierOptionValue(item) === this.taskCarrierSelectedValue ||
+                (String(item.id) === String(this.dialogForm.carrierContractId) &&
+                  (!this.dialogForm.carrierPartyId ||
+                    String(item.carrierPartyId) === String(this.dialogForm.carrierPartyId)) &&
+                  (!this.dialogForm.carrierName ||
+                    item.carrierName === this.dialogForm.carrierName))
+            ) ||
             this.taskCarrierOptions.find(item => item.carrierName === this.dialogForm.carrierName);
           if (current) {
             this.dialogForm.carrierContractId = current.id;
+            this.dialogForm.carrierPartyId = current.carrierPartyId || '';
+            this.dialogForm.carrierPartyRole = current.carrierPartyRole || '';
             this.dialogForm.carrierName = current.carrierName;
             this.dialogForm.carrierId = current.carrierId || '';
           } else {
             this.dialogForm.carrierContractId = '';
+            this.dialogForm.carrierPartyId = '';
+            this.dialogForm.carrierPartyRole = '';
             this.dialogForm.carrierName = '';
             this.dialogForm.carrierId = '';
           }
@@ -4792,19 +4838,22 @@ export default {
             .map(item => ({
               ...item,
               carrierName:
+                item.carrierName ||
                 item.partyB ||
                 item.partyBName ||
                 item.contractPartyB ||
                 item.customerContractPartyB ||
-                item.carrierName ||
                 '',
               carrierId:
+                item.customerId ||
                 item.partyBId ||
                 item.partyBUserId ||
                 item.contractPartyBId ||
                 item.customerContractPartyBId ||
                 item.carrierId ||
                 '',
+              carrierPartyId: item.carrierPartyId || '',
+              carrierPartyRole: item.carrierPartyRole || '',
             }))
             .filter(item => item.carrierName);
           const current = this.taskCarrierOptions.find(
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index 3d6152a..14d0f5e 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -89,26 +89,26 @@
           <el-col :span="8">
             <el-form-item label="承运商合同" prop="carrierContractId">
               <el-select
-                v-model="form.carrierContractId"
+                v-model="form.carrierOptionValue"
                 filterable
                 clearable
                 :disabled="readonly || !form.projectId"
                 style="width: 100%"
-                :placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
+                :placeholder="form.projectId ? '请选择承运商合同客商' : '请先选择项目'"
                 @change="onCarrierContractChange"
               >
                 <el-option
-                  v-for="item in filteredCarrierContracts"
-                  :key="item.id"
-                  :label="formatContractLabel(item)"
-                  :value="item.id"
+                  v-for="item in filteredCarrierContractOptions"
+                  :key="item.optionValue"
+                  :label="item.optionLabel"
+                  :value="item.optionValue"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="承运商">
-              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
+              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同客商后自动填充" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -403,6 +403,9 @@ const createDefaultForm = () => ({
   customerName: '',
   carrierContractId: '',
   carrierContractName: '',
+  carrierOptionValue: '',
+  carrierPartyId: '',
+  carrierPartyRole: '',
   carrierName: '',
   waybillMode: 'new',
   remark: '',
@@ -442,6 +445,62 @@ const filteredCustomerContracts = computed(() => customerContracts.value);
 
 const filteredCarrierContracts = computed(() => carrierContracts.value);
 
+const parsePartyRows = (partyJson, fallbackName = '', partyRole = 'B') => {
+  let rows = [];
+  try {
+    const parsed = partyJson ? JSON.parse(partyJson) : [];
+    if (Array.isArray(parsed)) {
+      rows = parsed
+        .map(item => ({
+          id: item.id || '',
+          customerId: item.customerId || '',
+          customerName: String(item.customerName || '').trim(),
+          partyRole,
+        }))
+        .filter(item => item.customerName);
+    }
+  } catch (error) {
+    rows = [];
+  }
+  if (rows.length) return rows;
+  return String(fallbackName || '')
+    .split(/[、,，]/)
+    .map(name => name.trim())
+    .filter(Boolean)
+    .map(name => ({ id: '', customerId: '', customerName: name, partyRole }));
+};
+
+const filteredCarrierContractOptions = computed(() => {
+  const options = [];
+  filteredCarrierContracts.value.forEach(contract => {
+    const parties = [
+      ...parsePartyRows(contract.partyBJson, contract.partyB, 'B'),
+      ...parsePartyRows(contract.partyCJson, contract.partyC, 'C'),
+    ];
+    if (!parties.length && contract.carrierName) {
+      parties.push({
+        id: '',
+        customerId: '',
+        customerName: contract.carrierName,
+        partyRole: 'B',
+      });
+    }
+    parties.forEach(party => {
+      const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
+      const optionValue = [contract.id, party.id || '', party.customerName].join('__');
+      options.push({
+        ...contract,
+        optionValue,
+        optionLabel: `${party.customerName}（${roleLabel}） - ${formatContractLabel(contract)}`,
+        carrierPartyId: party.id || '',
+        carrierPartyRole: party.partyRole,
+        carrierName: party.customerName,
+      });
+    });
+  });
+  return options;
+});
+
 const extractRecords = response => {
   const data = response?.data || response;
   if (Array.isArray(data)) return data;
@@ -708,6 +767,10 @@ const normalizeContract = item => {
     projectId: normalized.projectId,
     partyA: normalized.partyA || '',
     partyB: normalized.partyB || '',
+    partyC: normalized.partyC || '',
+    partyAJson: normalized.partyAJson || '',
+    partyBJson: normalized.partyBJson || '',
+    partyCJson: normalized.partyCJson || '',
     customerName: normalized.customerName || normalized.partyA || '',
     carrierName: normalized.carrierName || normalized.partyB || '',
   };
@@ -972,10 +1035,9 @@ const autoSelectSingleContracts = () => {
     form.customerContractId = customers[0].id;
     onCustomerContractChange(customers[0].id);
   }
-  const carriers = filteredCarrierContracts.value;
+  const carriers = filteredCarrierContractOptions.value;
   if (carriers.length === 1 && !form.carrierContractId) {
-    form.carrierContractId = carriers[0].id;
-    onCarrierContractChange(carriers[0].id);
+    onCarrierContractChange(carriers[0].optionValue);
   }
 };
 
@@ -987,6 +1049,9 @@ const onProjectChange = async id => {
   form.customerName = '';
   form.carrierContractId = '';
   form.carrierContractName = '';
+  form.carrierOptionValue = '';
+  form.carrierPartyId = '';
+  form.carrierPartyRole = '';
   form.carrierName = '';
   customerContracts.value = [];
   carrierContracts.value = [];
@@ -1005,9 +1070,15 @@ const onCustomerContractChange = id => {
   form.customerName = item?.customerName || item?.partyA || '';
 };
 
-const onCarrierContractChange = id => {
-  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
+const onCarrierContractChange = optionValue => {
+  const item = filteredCarrierContractOptions.value.find(
+    row => String(row.optionValue) === String(optionValue)
+  );
+  form.carrierOptionValue = item?.optionValue || '';
+  form.carrierContractId = item?.id || '';
   form.carrierContractName = item?.contractName || '';
+  form.carrierPartyId = item?.carrierPartyId || '';
+  form.carrierPartyRole = item?.carrierPartyRole || '';
   form.carrierName = item?.carrierName || item?.partyB || '';
 };
 
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 3d15c6c..a837842 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -2904,10 +2904,33 @@ export default {
     buildRequestParams(params = {}) {
       return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
     },
-    syncBillingPlanOptions(contractId) {
+    syncBillingPlanOptions(contractId, counterpartyName = '') {
       const contracts = [...this.updateContractOptions, ...this.contractOptions];
       const contract = contracts.find(item => String(item.id) === String(contractId));
-      const plans = this.parseJson(contract?.billingPlanJson);
+      let plans = this.parseJson(contract?.billingPlanJson);
+      const targetName = String(
+        counterpartyName ||
+          this.updateFeeForm?.counterpartyName ||
+          this.generateQuery?.counterpartyName ||
+          this.currentDetail?.counterpartyName ||
+          this.currentDetail?.carrierName ||
+          this.currentDetail?.customerName ||
+          ''
+      ).trim();
+      if (targetName) {
+        const matched = plans.filter(
+          item =>
+            String(item.customerName || '').trim() === targetName ||
+            String(item.partyRowId || '') ===
+              String(this.updateFeeForm?.carrierPartyId || this.generateQuery?.carrierPartyId || '')
+        );
+        const hasBinding = plans.some(
+          item => item.customerName || item.customerId || item.partyRowId
+        );
+        if (matched.length || hasBinding) {
+          plans = matched;
+        }
+      }
       this.billingPlanOptions = plans.map((item, index) => ({
         id:
           item.id ||
@@ -2916,11 +2939,16 @@ export default {
           item.planName ||
           item.billingPlanName ||
           `plan-${index}`,
-        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+        name: [
+          item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+          item.customerName ? `（${item.customerName}）` : '',
+        ].join(''),
         defaultPlan:
           item.defaultPlan === true ||
           item.defaultPlan === 1 ||
           ['true', '1'].includes(String(item.defaultPlan).toLowerCase()),
+        customerName: item.customerName || '',
+        partyRowId: item.partyRowId || '',
       }));
       return this.billingPlanOptions;
     },

From 68904b02a5ee81efb6e6a74cfa3cbd0a3b214f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 3 Nov 2026 09:54:14 +0800
Subject: [PATCH 41/43] =?UTF-8?q?fix:=20=E5=AE=A1=E6=A0=B8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=BB=9F=E4=B8=80=E8=B6=85=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?60s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/common.js b/src/api/common.js
index 7e03551..884286c 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';
 
 /** 审核按钮统一超时：审批通过后可能同步推送金蝶等耗时操作，覆盖全局 10s */
-export const APPROVE_TIMEOUT = 30000;
+export const APPROVE_TIMEOUT = 60 * 1000;
 
 /**
  * 文件流返回

From 5bde60d8447b953c536528b57b613740c951295b Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 4 Nov 2026 03:14:45 +0800
Subject: [PATCH 42/43] =?UTF-8?q?:sparkles:=20=E7=BC=96=E8=BE=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=9A=E9=80=89=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/views/system/user.vue | 44 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 20fcb3b..53f3997 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -172,6 +172,21 @@
                     />
                   </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                  <el-form-item label="数据管理权限" prop="dataScopeDeptIds">
+                    <el-cascader
+                      v-model="dataScopeCascaderValue"
+                      :options="permissionDeptTree"
+                      :props="deptCascaderProps"
+                      :disabled="isUserViewMode"
+                      clearable
+                      filterable
+                      collapse-tags
+                      collapse-tags-tooltip
+                      placeholder="请选择数据管理组织（可多选）"
+                    />
+                  </el-form-item>
+                </el-col>
                 <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
@@ -592,6 +607,26 @@ export default {
         this.$refs.userFormRef?.validateField('deptId');
       },
     },
+    // 数据管理权限多选级联：form.dataScopeDeptIds 为 id 数组
+    dataScopeCascaderValue: {
+      get() {
+        const ids = Array.isArray(this.form.dataScopeDeptIds)
+          ? this.form.dataScopeDeptIds
+          : this.form.dataScopeDeptIds
+            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
+            : [];
+        return ids
+          .filter(item => item !== undefined && item !== null && item !== '')
+          .map(item => (typeof item === 'number' ? item : String(item)));
+      },
+      set(value) {
+        this.form.dataScopeDeptIds = Array.isArray(value)
+          ? value.filter(item => item !== undefined && item !== null && item !== '')
+          : value
+            ? [value]
+            : [];
+      },
+    },
     isUserViewMode() {
       return this.userDialogMode === 'view';
     },
@@ -1034,6 +1069,7 @@ export default {
           sex: undefined,
           postId: '',
           deptId: [],
+          dataScopeDeptIds: [],
           code: '',
           personCategory: 1,
           remark: '',
@@ -1046,9 +1082,13 @@ export default {
       getUser(row.id).then(res => {
         const user = res.data.data;
         const deptIds = func.split(user.deptId || '');
+        const dataScopeDeptIds = Array.isArray(user.dataScopeDeptIds)
+          ? user.dataScopeDeptIds.map(item => String(item))
+          : [];
         this.form = {
           ...user,
           deptId: Array.isArray(deptIds) ? deptIds : [],
+          dataScopeDeptIds,
           postId: func.split(user.postId || '')[0] || '',
           roleId: func.join(user.roleId || ''),
           personCategory: user.personCategory || 1,
@@ -1064,9 +1104,13 @@ export default {
     submitUserForm() {
       this.$refs.userFormRef.validate(valid => {
         if (!valid) return;
+        const dataScopeDeptIds = Array.isArray(this.form.dataScopeDeptIds)
+          ? this.form.dataScopeDeptIds.filter(item => item !== undefined && item !== null && item !== '')
+          : [];
         const row = {
           ...this.form,
           deptId: func.join(this.form.deptId),
+          dataScopeDeptIds,
           postId: func.join(this.form.postId),
           roleId: func.join(this.form.roleId),
           leaderId: func.join(this.form.leaderId),

From 014ee537a00db8e2344c55023f9e9d73c2b8459b Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Wed, 4 Nov 2026 03:15:44 +0800
Subject: [PATCH 43/43] =?UTF-8?q?:sparkles:=20=E7=BB=84=E7=BB=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81/=E5=B9=B3=E5=8F=B0=E5=85=AC=E5=8F=B8=E3=80=81?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AE=A1=E8=B4=B9=E5=AE=A2=E5=95=86=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E4=B8=8E=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/option/base/measurement-unit.js           |   1 +
 src/option/business/contract-manage.js        |  13 +-
 src/views/base/airport-master.vue             |   9 +-
 src/views/base/currency.vue                   |   9 +-
 src/views/base/customer-type.vue              |   9 +-
 src/views/base/fee-item.vue                   |   9 +-
 src/views/base/measurement-unit.vue           |   7 +
 src/views/base/port-terminal.vue              |   9 +-
 src/views/base/railway-station.vue            |   9 +-
 .../components/billing-plan-editor.vue        |  60 ++++---
 src/views/business/contract-manage-change.vue | 142 ++++++++++++++---
 src/views/business/contract-manage.vue        |  59 +++----
 src/views/business/project-apply.vue          | 132 ++++++++++++++++
 src/views/system/business-dept-config.vue     |   9 +-
 src/views/system/dept.vue                     | 149 ++++++------------
 15 files changed, 428 insertions(+), 198 deletions(-)

diff --git a/src/option/base/measurement-unit.js b/src/option/base/measurement-unit.js
index 84609cc..7a952ff 100644
--- a/src/option/base/measurement-unit.js
+++ b/src/option/base/measurement-unit.js
@@ -38,6 +38,7 @@ export const createOption = () => ({
   delBtn: false,
   selection: true,
   dialogClickModal: false,
+  menuWidth: 320,
   menuFixed: 'right',
   column: [
     {
diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js
index 04a1ab3..c0d0707 100644
--- a/src/option/business/contract-manage.js
+++ b/src/option/business/contract-manage.js
@@ -249,6 +249,15 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 11,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+  },
   {
     label: '合同编号',
     prop: 'contractNo',
@@ -266,7 +275,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 7,
+    searchOrder: 1,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -346,7 +355,7 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '生效类型',
+    label: '合同状态',
     prop: 'effectiveType',
     type: 'select',
     search: true,
diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue
index 9969378..6a99afa 100644
--- a/src/views/base/airport-master.vue
+++ b/src/views/base/airport-master.vue
@@ -60,6 +60,13 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('airport_master_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('airport_master_edit')"
@@ -279,7 +286,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         column: [
           {
             label: '编码',
diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue
index 903fae0..9d41ad5 100644
--- a/src/views/base/currency.vue
+++ b/src/views/base/currency.vue
@@ -68,6 +68,13 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.currency_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="permission.currency_edit"
@@ -171,7 +178,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         menuFixed: 'right',
         column: [
           {
diff --git a/src/views/base/customer-type.vue b/src/views/base/customer-type.vue
index 6653a85..7f18dbd 100644
--- a/src/views/base/customer-type.vue
+++ b/src/views/base/customer-type.vue
@@ -36,6 +36,13 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.customer_type_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="permission.customer_type_edit"
@@ -102,7 +109,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         column: [
           {
             label: '中文名称',
diff --git a/src/views/base/fee-item.vue b/src/views/base/fee-item.vue
index da2f71b..ca1613c 100644
--- a/src/views/base/fee-item.vue
+++ b/src/views/base/fee-item.vue
@@ -76,6 +76,13 @@
         </el-input>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="permission.fee_item_view"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="permission.fee_item_edit"
@@ -141,7 +148,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         column: [
           {
             label: '费用类型',
diff --git a/src/views/base/measurement-unit.vue b/src/views/base/measurement-unit.vue
index 707eb56..4628a46 100644
--- a/src/views/base/measurement-unit.vue
+++ b/src/views/base/measurement-unit.vue
@@ -46,6 +46,13 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          v-if="hasPermission('measurement_unit_view')"
+          type="primary"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           v-if="hasPermission('measurement_unit_edit')"
           type="primary"
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 4f73bd6..6f50522 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -134,6 +134,13 @@
         </div>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('port_terminal_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('port_terminal_edit')"
@@ -370,7 +377,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         column: [
           {
             label: '编码',
diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue
index 8670593..8b1ce51 100644
--- a/src/views/base/railway-station.vue
+++ b/src/views/base/railway-station.vue
@@ -60,6 +60,13 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
+        <el-link
+          type="primary"
+          v-if="hasPermission('railway_station_view')"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('railway_station_edit')"
@@ -250,7 +257,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 180,
+        menuWidth: 220,
         column: [
           {
             label: '编码',
diff --git a/src/views/business/components/billing-plan-editor.vue b/src/views/business/components/billing-plan-editor.vue
index 6f68b6a..28eda87 100644
--- a/src/views/business/components/billing-plan-editor.vue
+++ b/src/views/business/components/billing-plan-editor.vue
@@ -18,9 +18,6 @@
         <el-descriptions-item label="运输方式">{{
             transportModeLabel(draft.transportMode)
           }}</el-descriptions-item>
-        <el-descriptions-item label="默认方案">{{
-            isDefaultPlan(draft) ? '是' : '否'
-          }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ displayValue(draft.remark) }}</el-descriptions-item>
       </el-descriptions>
       <el-form
@@ -68,16 +65,6 @@
             :label="item.label"
             :value="item.value" /></el-select></el-form-item
           ></el-col>
-          <el-col :span="8"
-          ><el-form-item
-          ><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox
-          ><el-tooltip content="同一运输方式仅支持配置一个默认计费方案" placement="top">
-            <el-icon class="billing-plan-editor__default-tip"
-            ><InfoFilled
-            /></el-icon> </el-tooltip
-          ></el-form-item
-          ></el-col
-          >
           <el-col :span="24"
           ><el-form-item label="备注"
           ><el-input
@@ -397,6 +384,7 @@ import { InfoFilled } from '@element-plus/icons-vue';
 import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 import { currencyUnit } from '@/utils/currency';
+// InfoFilled 仅用于保底计费重量列头提示
 
 const clone = value => JSON.parse(JSON.stringify(value));
 /** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
@@ -535,10 +523,24 @@ export default {
       handler(value) {
         if (this.modelValue) {
           this.draft = this.normalizePlan(value);
+          this.applyDefaultPartySelection();
           this.loadRuleItems();
         }
       },
     },
+    modelValue(visible) {
+      if (visible) {
+        this.$nextTick(() => this.applyDefaultPartySelection());
+      }
+    },
+    partyOptions: {
+      deep: true,
+      handler() {
+        if (this.modelValue) {
+          this.applyDefaultPartySelection();
+        }
+      },
+    },
   },
   methods: {
     displayValue(value) {
@@ -558,13 +560,6 @@ export default {
       );
       return this.displayValue(option?.label || this.draft.transportModeLabel || value);
     },
-    isDefaultPlan(plan) {
-      return (
-        plan?.defaultPlan === true ||
-        plan?.defaultPlan === 1 ||
-        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
-      );
-    },
     normalizePlan(value = {}) {
       const plan = {
         planName: '',
@@ -574,10 +569,11 @@ export default {
         customerName: '',
         transportMode: '',
         transportModeLabel: '',
-        defaultPlan: false,
         remark: '',
         ...clone(value || {}),
       };
+      // 一个客商对应一个方案，不再维护默认方案字段
+      delete plan.defaultPlan;
       plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
         this.normalizeRule(rule)
       );
@@ -589,6 +585,28 @@ export default {
       );
       return matched?.label || '';
     },
+    /**
+     * 仅一个可选客商时默认选中（客户合同仅一个甲方的常见场景）
+     */
+    applyDefaultPartySelection() {
+      if (this.readonly) {
+        return;
+      }
+      const options = this.partyOptions || [];
+      if (options.length !== 1) {
+        return;
+      }
+      const current = String(this.draft.partyRowId || '');
+      const only = options[0];
+      const onlyValue = String(only?.value || only?.partyRowId || '');
+      if (!onlyValue) {
+        return;
+      }
+      if (current && current === onlyValue) {
+        return;
+      }
+      this.handlePartyChange(only.value || only.partyRowId);
+    },
     handlePartyChange(partyRowId) {
       const matched = (this.partyOptions || []).find(
         item => String(item.value) === String(partyRowId)
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index ba63590..3258494 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -299,25 +299,27 @@
           ><el-radio label="system">系统生成</el-radio
           ><el-radio label="manual">账单导入生成</el-radio></el-radio-group
         >
-        <el-table :data="plans" border class="change-table"
-          ><el-table-column type="index" label="序号" width="70" /><el-table-column
-            prop="planName"
-            label="方案名称"
-            min-width="220"
-          /><el-table-column label="默认方案" min-width="120"
-            ><template #default="{ row }">{{
-              row.defaultPlan ? '是' : '否'
-            }}</template></el-table-column
-          ><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
-            v-if="!pageReadonly"
-            label="操作"
-            width="180"
-            ><template #default="{ row, $index }"
-              ><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
-              ><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
-            ></el-table-column
-          ></el-table
-        >
+        <el-table :data="plans" border class="change-table">
+          <el-table-column type="index" label="序号" width="70" />
+          <el-table-column prop="planName" label="方案名称" min-width="180" />
+          <el-table-column label="适用客商" min-width="180">
+            <template #default="{ row }">
+              {{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" min-width="200" />
+          <el-table-column v-if="!pageReadonly" label="操作" width="180">
+            <template #default="{ row, $index }">
+              <el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
+              <el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
+            </template>
+          </el-table-column>
+          <el-table-column v-else label="操作" width="100">
+            <template #default="{ row, $index }">
+              <el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
+            </template>
+          </el-table-column>
+        </el-table>
       </section>
 
       <section class="change-section">
@@ -491,7 +493,9 @@
         v-model="planDialogVisible"
         :value="planEditor"
         :index="planEditorIndex"
+        :readonly="pageReadonly"
         :settlement-currency="form.settlementCurrency"
+        :party-options="billingPartyOptions"
         @save="savePlan"
       />
 
@@ -630,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
     endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
   }));
 
+const createPartyRow = (row = {}) => ({
+  id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
+  customerId: row.customerId || '',
+  customerName: row.customerName || '',
+  creditCode: row.creditCode || row.unifiedCreditCode || '',
+  contactId: row.contactId || '',
+  contactName: row.contactName || '',
+  contactPhone: row.contactPhone || '',
+});
+
+const partyRoleLabel = role => {
+  if (role === 'A') return '甲方';
+  if (role === 'B') return '乙方';
+  if (role === 'C') return '丙方';
+  return role || '';
+};
+
+const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
+  const rows = (() => {
+    if (Array.isArray(partyJson)) return partyJson;
+    if (!partyJson) return [];
+    try {
+      const data = JSON.parse(partyJson);
+      return Array.isArray(data) ? data : [];
+    } catch (error) {
+      return [];
+    }
+  })().map(item => createPartyRow(item));
+  if (rows.length) return rows;
+  if (fallbackName) {
+    return String(fallbackName)
+      .split(/[、,]/)
+      .map(name => name.trim())
+      .filter(Boolean)
+      .map(name => createPartyRow({ customerName: name }));
+  }
+  return requireOne ? [createPartyRow()] : [];
+};
+
 export default {
   components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
   data() {
@@ -637,6 +680,9 @@ export default {
       form: {},
       period: [],
       plans: [],
+      partyARows: [],
+      partyBRows: [],
+      partyCRows: [],
       attachments: [],
       contractFiles: [],
       contractFileRows: [],
@@ -675,7 +721,7 @@ export default {
       settlementModeDictOptions: [],
       contractFormatDictOptions: [],
       planDialogVisible: false,
-      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditor: { planName: '', remark: '', rules: [] },
       planEditorIndex: -1,
       billingElements: [
         '按重量',
@@ -756,6 +802,29 @@ export default {
     isSettlementRuleChange() {
       return this.form.changeType === '结算规则变更';
     },
+    /**
+     * 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
+     */
+    billingPartyOptions() {
+      const category = String(this.form.contractCategory || '').trim();
+      const allowedRoles =
+        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
+      return [
+        ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
+        ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
+        ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
+      ]
+        .filter(row => allowedRoles.includes(row.partyRole))
+        .filter(row => row.customerName || row.customerId)
+        .map(row => ({
+          value: row.id,
+          label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
+          partyRole: row.partyRole,
+          partyRowId: row.id,
+          customerId: row.customerId,
+          customerName: row.customerName,
+        }));
+    },
     changeAttachmentLocationOptions() {
       if (this.isSettlementRuleChange) {
         return ['变更材料'];
@@ -890,6 +959,9 @@ export default {
       };
       this.changeMaterials = this.parse(data.changeAttachmentsJson);
       this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
+      this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
+      this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
+      this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
       this.plans = this.parse(data.billingPlanJson);
       this.attachments = this.mergeChangeAttachments(
         this.parse(data.attachmentsJson),
@@ -1048,10 +1120,32 @@ export default {
         .replace(/\D/g, '')
         .replace(/^0+/, '');
     },
-    addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
-    editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
-    toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
-    savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
+    addPlan() {
+      this.planEditorIndex = -1;
+      this.planEditor = {
+        planName: `计费方案${this.plans.length + 1}`,
+        remark: '',
+        rules: [{}],
+      };
+      this.planDialogVisible = true;
+    },
+    editPlan(row, index) {
+      this.planEditorIndex = index;
+      this.planEditor = JSON.parse(JSON.stringify(row));
+      this.planDialogVisible = true;
+    },
+    billingPlanCustomerLabel(row) {
+      const matched = this.billingPartyOptions.find(
+        item => String(item.partyRowId) === String(row.partyRowId)
+      );
+      return matched?.label || row.customerName || '';
+    },
+    savePlan(value, index) {
+      const nextPlan = { ...value };
+      delete nextPlan.defaultPlan;
+      if (index < 0) this.plans.push(nextPlan);
+      else this.plans.splice(index, 1, nextPlan);
+    },
     handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
     handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
     attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index b98b545..3972ef3 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1685,12 +1685,21 @@ export default {
         { role: 'C', label: '丙方', rows: this.partyCRows },
       ];
     },
+    /**
+     * 计费方案适用客商：
+     * - 客户合同：仅甲方（仅 1 个甲方时编辑器自动选中）
+     * - 承运商合同：仅乙方、丙方（应付明细按这些方案生成）
+     */
     billingPartyOptions() {
+      const category = String(this.form.contractCategory || '').trim();
+      const allowedRoles =
+        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
       return [
         ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
         ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
         ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
       ]
+        .filter(row => allowedRoles.includes(row.partyRole))
         .filter(row => row.customerName || row.customerId)
         .map(row => ({
           value: row.id,
@@ -2315,7 +2324,6 @@ export default {
       if (!this.validatePartyRows(true)) return false;
       return (
         this.validateBillingPlanBindings() &&
-        this.validateBillingPlanDefault() &&
         this.validateSettlementRules() &&
         this.validatePaymentRatios()
       );
@@ -2911,10 +2919,17 @@ export default {
     validateBillingPlanBindings() {
       if (!this.billingPlanRows.length) return true;
       const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
+      const category = String(this.form.contractCategory || '').trim();
+      const roleHint =
+        category === '承运商合同'
+          ? '请选择乙方或丙方客商'
+          : category === '客户合同'
+            ? '请选择甲方客商'
+            : '请选择适用客商';
       for (let index = 0; index < this.billingPlanRows.length; index += 1) {
         const plan = this.billingPlanRows[index];
         if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
-          this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
+          this.$message.warning(`计费方案第${index + 1}个${roleHint}`);
           return false;
         }
       }
@@ -3169,21 +3184,13 @@ export default {
     openBillingPlan(row = {}, index = -1) {
       this.billingPlanIndex = index;
       this.billingPlanForm =
-        index < 0
-          ? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
-          : clone(row);
+        index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
       this.billingPlanBox = true;
       this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
     },
     saveBillingPlan(plan, index) {
       const nextPlan = clone(plan);
-      if (this.isDefaultBillingPlan(nextPlan)) {
-        this.billingPlanRows.forEach((item, itemIndex) => {
-          if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
-            item.defaultPlan = false;
-          }
-        });
-      }
+      delete nextPlan.defaultPlan;
       if (index < 0) this.billingPlanRows.push(nextPlan);
       else this.billingPlanRows.splice(index, 1, nextPlan);
       this.billingPlanBox = false;
@@ -3193,31 +3200,6 @@ export default {
         this.billingPlanRows.splice(index, 1);
       });
     },
-    isDefaultBillingPlan(plan) {
-      return (
-        plan?.defaultPlan === true ||
-        plan?.defaultPlan === 1 ||
-        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
-      );
-    },
-    validateBillingPlanDefault() {
-      if (!this.billingPlanRows.length) return true;
-      const defaultCountByTransportMode = this.billingPlanRows.reduce((result, plan) => {
-        const transportMode = plan.transportMode || '';
-        result[transportMode] =
-          (result[transportMode] || 0) + Number(this.isDefaultBillingPlan(plan));
-        return result;
-      }, {});
-      const invalidTransportMode = Object.entries(defaultCountByTransportMode).find(
-        ([, count]) => count > 1
-      );
-      if (invalidTransportMode) {
-        const [transportMode, count] = invalidTransportMode;
-        this.$message.warning(`运输方式“${transportMode}”仅支持配置一个默认计费方案`);
-        return false;
-      }
-      return true;
-    },
     isFixedCycleSettlementType(value) {
       return value === '按固定天数周期' || value === '固定天数周期结算';
     },
@@ -3551,8 +3533,7 @@ export default {
       return list
         .map(item => {
           if (!item || typeof item !== 'object') return String(item ?? '');
-          const name = item.planName || item.name || '未命名方案';
-          return item.defaultPlan ? `${name}（默认）` : name;
+          return item.planName || item.name || '未命名方案';
         })
         .filter(Boolean)
         .join('、');
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 35ed640..2dfa40b 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -761,6 +761,96 @@
           />
         </div>
 
+        <template v-if="showProjectContractSection">
+          <div class="dialog-section-title project-apply-form__table-title">项目合同</div>
+          <el-table
+            v-loading="projectContractLoading"
+            :data="projectContractRows"
+            border
+            class="project-apply-form__table"
+          >
+            <el-table-column type="index" label="序号" width="80" align="center" />
+            <el-table-column
+              prop="contractCategory"
+              label="合同类型"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractNo"
+              label="合同编号"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                <el-link
+                  v-if="row.id && row.contractNo"
+                  type="primary"
+                  @click.stop="openProjectContractDetail(row)"
+                >
+                  {{ row.contractNo }}
+                </el-link>
+                <span v-else>{{ row.contractNo || '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="contractName"
+              label="合同名称"
+              min-width="160"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyA"
+              label="甲方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyB"
+              label="乙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyC"
+              label="丙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="startDate"
+              label="开始日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="endDate"
+              label="结束日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractAmount"
+              label="合同金额"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                {{ formatAmount(row.contractAmount) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+
         <div
           v-if="!isChangeDialog && !isNewProjectDialog"
           class="dialog-section-title project-apply-form__table-title"
@@ -990,6 +1080,7 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
+import { getList as getContractManageList } from '@/api/business/contract-manage';
 import {
   loadHcsImmediateEnabled,
   repush as hcsRepush,
@@ -1387,6 +1478,8 @@ export default {
         'zip',
       ],
       changeRows: [],
+      projectContractRows: [],
+      projectContractLoading: false,
       changeRecordDetailVisible: false,
       changeRecordDetail: null,
       changeRecordDetailRows: [],
@@ -1463,6 +1556,9 @@ export default {
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
+    showProjectContractSection() {
+      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
+    },
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
@@ -2111,6 +2207,8 @@ export default {
       this.attachmentRows = [];
       this.selectedAttachmentRows = [];
       this.changeRows = [];
+      this.projectContractRows = [];
+      this.projectContractLoading = false;
       this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
@@ -2159,6 +2257,40 @@ export default {
       this.syncSelectedCustomerOptions();
       this.ensureCurrentPlatformOption();
       this.ensureCurrentBusinessDeptOption();
+      this.loadProjectContracts(row?.id);
+    },
+    loadProjectContracts(projectId) {
+      if (!this.showProjectContractSection || !projectId) {
+        this.projectContractRows = [];
+        this.projectContractLoading = false;
+        return;
+      }
+      this.projectContractLoading = true;
+      getContractManageList(1, 1000, { projectId })
+        .then(res => {
+          const data = res.data?.data;
+          const records = Array.isArray(data) ? data : data?.records || [];
+          this.projectContractRows = records.filter(
+            item => String(item.projectId) === String(projectId)
+          );
+        })
+        .catch(() => {
+          this.projectContractRows = [];
+          this.$message.error('项目合同加载失败');
+        })
+        .finally(() => {
+          this.projectContractLoading = false;
+        });
+    },
+    openProjectContractDetail(row) {
+      if (!row?.id) {
+        this.$message.warning('合同信息不完整，无法跳转');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: row.id, name: '合同详情' },
+      });
     },
     fillDefaultUsers() {
       const userId = this.userInfo?.userId || this.userInfo?.id || '';
diff --git a/src/views/system/business-dept-config.vue b/src/views/system/business-dept-config.vue
index fe1cda4..1e87a6b 100644
--- a/src/views/system/business-dept-config.vue
+++ b/src/views/system/business-dept-config.vue
@@ -20,6 +20,13 @@
       @on-load="onLoad"
     >
       <template #menu="{ row, index }">
+        <el-link
+          v-if="permission.business_dept_config_view"
+          type="primary"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
         <el-link
           v-if="permission.business_dept_config_edit"
           type="primary"
@@ -117,7 +124,7 @@ export default {
         editBtn: false,
         delBtn: false,
         viewBtn: false,
-        menuWidth: 140,
+        menuWidth: 220,
         dialogWidth: 900,
         dialogClickModal: false,
         labelPosition: 'right',
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index b7780fc..b1e90c4 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -203,7 +203,6 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';
 
-const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
  * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -323,7 +322,7 @@ export default {
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过
+                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
                   if (!deptCode) {
                     callback();
                     return;
@@ -332,34 +331,6 @@ export default {
                     callback(new Error('组织编码不能超过30个字符'));
                     return;
                   }
-                  const parentId = this.normalizeParentId(this.form?.parentId);
-                  // 顶级组织不选择上级时，编码不依赖上级编码
-                  if (!parentId) {
-                    callback();
-                    return;
-                  }
-                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
-                    this.loadParentDeptCode(parentId);
-                    callback(new Error('正在加载上级组织编码，请稍后重试'));
-                    return;
-                  }
-                  if (!this.parentDeptCode) {
-                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
-                    return;
-                  }
-                  // 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
-                  let expectedPrefix = this.parentDeptCode;
-                  const category = Number(this.form?.deptCategory);
-                  if (category === 2) {
-                    expectedPrefix = 'GWWL';
-                  } else if (category === 3 && this.form?.belongCompanyCode) {
-                    expectedPrefix = String(this.form.belongCompanyCode).trim();
-                  }
-                  const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
-                  if (!pattern.test(deptCode)) {
-                    callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
-                    return;
-                  }
                   callback();
                 },
                 trigger: 'blur',
@@ -431,50 +402,22 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
             order: 36,
             search: true,
             searchOrder: 2,
             searchPlaceholder: '请选择是否平台公司',
             formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
-            change: ({ value }) => this.handlePlatformCompanyChange(value),
-            rules: [
-              {
-                required: true,
-                message: '请选择是否平台公司',
-                trigger: 'change',
-              },
-            ],
-          },
-          {
-            label: '金蝶部门代码',
-            prop: 'kingdeeDeptCode',
-            minWidth: 140,
-            order: 35,
-            maxlength: 64,
-            showWordLimit: true,
-            // 仅平台公司维护/展示金蝶组织代码；非平台公司列表留空
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            formatter: row =>
-              Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
             rules: [
               {
                 validator: (rule, value, callback) => {
-                  const code = String(value || '').trim();
-                  if (!code) {
-                    callback();
-                    return;
-                  }
-                  if (code.length > 64) {
-                    callback(new Error('金蝶部门代码不能超过64个字符'));
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否平台公司'));
                     return;
                   }
                   callback();
                 },
-                trigger: 'blur',
+                trigger: 'change',
               },
             ],
           },
@@ -487,7 +430,6 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
             order: 34,
             search: true,
@@ -496,8 +438,14 @@ export default {
             formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
             rules: [
               {
-                required: true,
-                message: '请选择是否业务部门',
+                validator: (rule, value, callback) => {
+                  // 不能用 required:true：值为 0（否）时会被当成空
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否业务部门'));
+                    return;
+                  }
+                  callback();
+                },
                 trigger: 'change',
               },
             ],
@@ -988,6 +936,7 @@ export default {
     /**
      * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
      * 排序为空时由后端默认填充 1。
+     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
      */
     prepareDeptSubmitRow(row) {
       const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -995,6 +944,8 @@ export default {
         return false;
       }
       row.deptCategory = category;
+      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
+      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
       if (row.status === '' || row.status === null || row.status === undefined) {
         delete row.status;
       } else {
@@ -1007,6 +958,9 @@ export default {
       }
       return true;
     },
+    normalizeYesNoFlag(value) {
+      return Number(value) === 1 ? 1 : 0;
+    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1163,21 +1117,6 @@ export default {
         row.parentId = 0;
       }
     },
-    handlePlatformCompanyChange(value) {
-      const isPlatform = Number(value) === 1;
-      this.syncKingdeeDeptCodeDisplay(isPlatform);
-      if (!isPlatform && this.form) {
-        this.form.kingdeeDeptCode = '';
-      }
-    },
-    syncKingdeeDeptCodeDisplay(isPlatformCompany) {
-      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
-      if (!column) return;
-      const visible = Number(isPlatformCompany) === 1;
-      column.addDisplay = visible;
-      column.editDisplay = visible;
-      column.viewDisplay = visible;
-    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -1322,9 +1261,6 @@ export default {
     rowSave(row, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
-      row.kingdeeDeptCode =
-        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1370,9 +1306,6 @@ export default {
     rowUpdate(row, index, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
-      row.kingdeeDeptCode =
-        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1479,34 +1412,40 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
-          this.form.isPlatformCompany = 0;
-        }
-        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
-          this.form.isBusinessDept = 0;
-        }
-        this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
+        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
+        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
+        done();
+        return;
       }
       if (type === 'edit') {
         this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
       }
       if (['edit', 'view'].includes(type)) {
-        getDept(this.form.id).then(res => {
-          this.form = Object.assign(res.data.data, {
-            hasChildren: this.form.hasChildren,
+        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
+        getDept(this.form.id)
+          .then(res => {
+            const detail = res.data.data || {};
+            Object.assign(this.form, detail, {
+              hasChildren: this.form.hasChildren,
+              isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
+              isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
+            });
+            if (this.form.parentId === '0') {
+              this.form.parentId = '';
+            }
+            this.loadParentDeptCode(this.form.parentId);
+            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
+              const splitResult = func.split(this.form.leaderId);
+              this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
+            }
+            done();
+          })
+          .catch(() => {
+            done();
           });
-          if (this.form.parentId === '0') {
-            this.form.parentId = '';
-          }
-          this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
-          this.loadParentDeptCode(this.form.parentId);
-          if (this.form.hasOwnProperty('leaderId')) {
-            const splitResult = func.split(this.form.leaderId);
-            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-          }
-        });
+        return;
       }
       done();
     },