From 7f694bad55c94292e1bad31429d85ef84b53cdc0 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, 4 Nov 2026 11:02:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B6=E6=AC=BE=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=B7=B2=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=BA=94=E4=BB=98=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/settlement/formalSettlement.js     | 33 ++++++++++---------
 .../components/formal-settlement-editor.vue   |  7 +++-
 src/views/settlement/formal-settlement.vue    |  5 ++-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js
index 022dd38..e297129 100644
--- a/src/option/settlement/formalSettlement.js
+++ b/src/option/settlement/formalSettlement.js
@@ -91,21 +91,24 @@ const COLUMN_EXTRA = {
   createTime: { width: 180 },
 };
 
-const buildTableColumns = () =>
-  formalSettlementTableColumns.map(column => {
-    const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
-    if (column.money) {
-      extra.formatter = moneyFormatter;
-      extra.align = 'right';
-    }
-    // link / status 标记的列统一走单元格插槽
-    if (column.link || column.status) extra.slot = true;
-    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
-    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
-    return { ...column, ...extra };
-  });
+// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不展示
+const buildTableColumns = settlementType =>
+  formalSettlementTableColumns
+    .filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
+    .map(column => {
+      const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+      if (column.money) {
+        extra.formatter = moneyFormatter;
+        extra.align = 'right';
+      }
+      // link / status 标记的列统一走单元格插槽
+      if (column.link || column.status) extra.slot = true;
+      // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+      if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
+      return { ...column, ...extra };
+    });
 
-export const formalSettlementOption = () => ({
+export const formalSettlementOption = (settlementType = '') => ({
   height: 'auto',
   calcHeight: 32,
   tip: false,
@@ -167,7 +170,7 @@ export const formalSettlementOption = () => ({
       type: 'daterange',
     }),
     // ---------- 表格列（部分兼搜索项） ----------
-    ...buildTableColumns(),
+    ...buildTableColumns(settlementType),
   ],
 });
 
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index bf65b0c..bf279bb 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -494,7 +494,12 @@
               <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="是否已指定应付" min-width="130" align="center">
+          <el-table-column
+            v-if="form.settlementType !== 'receivable'"
+            label="是否已指定应付"
+            min-width="130"
+            align="center"
+          >
             <template #default="{ row }">
               <el-tooltip
                 :disabled="row.kingdeePushStatus !== 'failed'"
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index 0d12ec2..f4b9dd4 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -255,7 +255,6 @@ export default {
   },
   data() {
     return {
-      option: formalSettlementOption(),
       query: {},
       activeSettlementType: 'payable',
       rows: [],
@@ -289,6 +288,10 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
+    // 列随结算类型切换重建：收款结算单不展示「已指定应付」
+    option() {
+      return formalSettlementOption(this.activeSettlementType);
+    },
     isAdmin() {
       return isAdministrator(this.userInfo);
     },