From 4d3b6cdaed9175caf48e3a2e375bd618bb042c93 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, 16 Oct 2026 19:47:01 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E7=BB=93=E7=AE=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8D=95=E6=8E=A5=E5=85=A5=E9=87=91=E8=9D=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=B8=8E=E5=86=B2=E9=94=80=E9=A2=84?=
 =?UTF-8?q?=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/settlement/settlementAdjustment.js    |  4 ++
 .../settlement/settlementAdjustmentTable.js   |  2 +
 .../settlement-adjustment-editor.vue          | 15 +++++++
 .../settlement/settlement-adjustment.vue      | 42 +++++++++++++++----
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/api/settlement/settlementAdjustment.js b/src/api/settlement/settlementAdjustment.js
index d809bf6..4c7b460 100644
--- a/src/api/settlement/settlementAdjustment.js
+++ b/src/api/settlement/settlementAdjustment.js
@@ -17,6 +17,10 @@ export const approve = id => request({ url: `${baseUrl}/approve`, method: 'post'
 export const returnBill = (id, reason) =>
   request({ url: `${baseUrl}/return`, method: 'post', data: { id, reason } });
 export const repush = id => request({ url: `${baseUrl}/repush`, method: 'post', params: { id } });
+export const syncKingdee = id =>
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+export const kingdeeWriteOffPrecheck = formalSettlementId =>
+  request({ url: `${baseUrl}/kingdee-writeoff-precheck`, method: 'get', params: { formalSettlementId } });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
diff --git a/src/option/settlement/settlementAdjustmentTable.js b/src/option/settlement/settlementAdjustmentTable.js
index aaaa9fc..ad8b2fb 100644
--- a/src/option/settlement/settlementAdjustmentTable.js
+++ b/src/option/settlement/settlementAdjustmentTable.js
@@ -9,6 +9,8 @@ export const settlementAdjustmentTableColumns = [
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
+  { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 130, kingdee: true },
+  { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '当前节点', prop: 'currentNode', minWidth: 120 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
diff --git a/src/views/settlement/components/settlement-adjustment-editor.vue b/src/views/settlement/components/settlement-adjustment-editor.vue
index 0c646d3..0ee9530 100644
--- a/src/views/settlement/components/settlement-adjustment-editor.vue
+++ b/src/views/settlement/components/settlement-adjustment-editor.vue
@@ -414,6 +414,8 @@ export default {
       });
       this.details = [];
       this.recalculate();
+      // 金蝶冲销预检：软提示，不阻断建单（金蝶不可用时静默降级）
+      this.precheckWriteOff(formalSettlementId);
       this.loading = true;
       try {
         const { data } = await api.getFormalDetails(formalSettlementId);
@@ -431,6 +433,19 @@ export default {
         this.loading = false;
       }
     },
+    async precheckWriteOff(formalSettlementId) {
+      try {
+        const { data } = await api.kingdeeWriteOffPrecheck(formalSettlementId);
+        if (String(this.form.formalSettlementId) !== String(formalSettlementId)) return;
+        const result = data?.data || data || {};
+        if (!result.message) return;
+        if (result.syncStatus === 'synced' && result.writtenOff === false)
+          this.$message.warning(result.message);
+        else this.$message.info(result.message);
+      } catch (error) {
+        // 预检软提示：金蝶查询失败静默降级，不阻断建单
+      }
+    },
     addFeeRow() {
       this.details.push({
         formalSettlementDetailId: null,
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index c4bacd4..9a43c11 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
+              v-else-if="column.kingdee"
+              :type="kingdeeStatusType(row.kingdeeSyncStatus)"
+              class="status-text"
+              >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
         >
-        <el-table-column label="操作" width="120" fixed="right" align="center"
+        <el-table-column label="操作" width="320" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="settlement-adjustment-page__links">
               <el-link
@@ -138,6 +143,15 @@
                 type="danger"
                 @click="handleReturn(row)"
                 >驳回</el-link
+              ><el-link
+                v-if="
+                  hasPermission('settlement_adjustment_sync') &&
+                  row.approvalStatus === 'approved' &&
+                  row.kingdeeSyncStatus !== 'synced'
+                "
+                type="primary"
+                @click="handleSyncKingdee(row)"
+                >推送金蝶</el-link
               ><el-link
                 v-if="
                   hasPermission('settlement_adjustment_repush') &&
@@ -180,6 +194,7 @@ import * as api from '@/api/settlement/settlementAdjustment';
 import { settlementAdjustmentSearchFields } from '@/option/settlement/settlementAdjustmentSearch';
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
+import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -300,12 +315,10 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      await api.approve(row.id);
-      if (row.kingdeeSyncStatus === 'synced')
-        this.$message.warning(
-          '调整已生效，本地已更新；原结算单已推送金蝶，请财务先手工冲销旧应付单后再重新推送。'
-        );
-      else this.$message.success('审批通过');
+      const res = await api.approve(row.id);
+      // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
+      if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
+      else this.$message.success(res.data.msg || '审批通过');
       this.loadTable();
     },
     async handleReturn(row) {
@@ -317,14 +330,19 @@ export default {
       this.$message.success('已驳回');
       this.loadTable();
     },
+    async handleSyncKingdee(row) {
+      const res = await api.syncKingdee(row.id);
+      this.$message.success(`已推送金蝶：${res.data.data || '-'}`);
+      this.loadTable();
+    },
     async handleRepush(row) {
       await this.$confirm(
-        '请确认金蝶旧应付单已由财务手工冲销，继续将生成全新财务应付单。',
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
         '高危操作确认',
         { type: 'warning', confirmButtonText: '确认重新推送' }
       );
       const { data } = await api.repush(row.id);
-      this.$message.success(`已生成新金蝶应付单：${data?.data || data || '-'}`);
+      this.$message.success(`已生成新金蝶单据：${data?.data || data || '-'}`);
       this.loadTable();
     },
     statusType(status) {
@@ -333,6 +351,12 @@ export default {
         'info'
       );
     },
+    kingdeeStatusType(status) {
+      return { synced: 'success', failed: 'danger' }[status] || 'info';
+    },
+    kingdeeSyncName(value) {
+      return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
+    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },
-- 
2.52.0


From baec42f876293fd38447b038958e730a936e6efb 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, 16 Oct 2026 19:47:08 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E4=B8=8E=E9=87=8D=E6=8E=A8=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlement/formalSettlementTable.js       |  2 ++
 .../components/formal-settlement-editor.vue   | 28 +++++++++++++++++++
 .../formal-settlement-table-panel.vue         |  7 +++++
 3 files changed, 37 insertions(+)

diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js
index 390c4e1..dececd2 100644
--- a/src/option/settlement/formalSettlementTable.js
+++ b/src/option/settlement/formalSettlementTable.js
@@ -19,6 +19,8 @@ export const formalSettlementTableColumns = [
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
   { label: '当前节点', prop: 'currentNode', minWidth: 130 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
+  { label: '调整标识', prop: 'adjustFlag', minWidth: 110 },
+  { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 930e2a1..3807f0c 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -639,6 +639,22 @@
           <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
             <template #default="{ row }">{{ displayValue(row.createTime) }}</template>
           </el-table-column>
+          <el-table-column
+            v-if="hasPermission('settlement_adjustment_repush')"
+            label="操作"
+            width="120"
+            align="center"
+          >
+            <template #default="{ row }">
+              <el-link
+                v-if="row.approvalStatus === 'approved' && row.kingdeeSyncStatus === 'synced'"
+                type="danger"
+                @click="handleAdjustmentRepush(row)"
+                >重新推送</el-link
+              >
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
 
@@ -1048,6 +1064,7 @@ import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/m
 import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
+import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment';
 
 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
 const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
@@ -1316,6 +1333,17 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
+    async handleAdjustmentRepush(row) {
+      await this.$confirm(
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
+        '高危操作确认',
+        { type: 'warning', confirmButtonText: '确认重新推送' }
+      );
+      const res = await settlementAdjustmentApi.repush(row.id);
+      this.$message.success(`已生成新金蝶单据：${res.data?.data || res.data || '-'}`);
+      await this.loadFormalDetail(this.recordId);
+      this.$emit('success');
+    },
     async loadFormalDetail(id) {
       const response = this.publicMode
         ? await getMkPublicDetail('formal-settlement', id)
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 9108e5c..80ed458 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -92,6 +92,7 @@
           <span v-else-if="column.prop === 'kingdeeSyncStatus'">{{
             kingdeeSyncName(row.kingdeeSyncStatus)
           }}</span>
+          <span v-else-if="column.prop === 'adjustFlag'">{{ adjustFlag(row) }}</span>
           <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>
@@ -275,6 +276,12 @@ export default {
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },
+    adjustFlag(row) {
+      // 原单已调整 / 重推生成的新单（显示来源原单号）
+      if (row.adjustStatusName) return row.adjustStatusName;
+      if (row.originFormalSettlementNo) return '调整后单';
+      return '-';
+    },
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
-- 
2.52.0


From c1bc55e1335b494240c2377cc937bde05accde5d 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, 16 Oct 2026 19:58:52 +0800
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E7=BB=93=E7=AE=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8D=95=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6=E4=B8=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8E=A8=E9=80=81=E5=90=88=E5=B9=B6=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlement/settlement-adjustment.vue      | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index 9a43c11..60d321e 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -144,23 +144,10 @@
                 @click="handleReturn(row)"
                 >驳回</el-link
               ><el-link
-                v-if="
-                  hasPermission('settlement_adjustment_sync') &&
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeSyncStatus !== 'synced'
-                "
-                type="primary"
-                @click="handleSyncKingdee(row)"
-                >推送金蝶</el-link
-              ><el-link
-                v-if="
-                  hasPermission('settlement_adjustment_repush') &&
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeSyncStatus === 'synced'
-                "
-                type="danger"
-                @click="handleRepush(row)"
-                >重新推送（高危）</el-link
+                v-if="hasPermission('settlement_adjustment_repush') && row.approvalStatus === 'approved'"
+                :type="row.kingdeeSyncStatus === 'synced' ? 'danger' : 'primary'"
+                @click="handleKingdee(row)"
+                >{{ row.kingdeeSyncStatus === 'synced' ? '重新推送（高危）' : '推送金蝶' }}</el-link
               >
             </div></template
           ></el-table-column
@@ -330,6 +317,11 @@ export default {
       this.$message.success('已驳回');
       this.loadTable();
     },
+    // 单一入口按状态分流：未同步/失败→推送原结算单；已同步→冲销后重推新单（高危）
+    async handleKingdee(row) {
+      if (row.kingdeeSyncStatus === 'synced') return this.handleRepush(row);
+      return this.handleSyncKingdee(row);
+    },
     async handleSyncKingdee(row) {
       const res = await api.syncKingdee(row.id);
       this.$message.success(`已推送金蝶：${res.data.data || '-'}`);
-- 
2.52.0


From f440343830d3c345ac1c15d310e766cd05f4d288 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, 17 Oct 2026 00:56:04 +0800
Subject: [PATCH 4/8] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E7=BB=84=E4=BB=B6=20sass=20@import=20=E5=BC=83?=
 =?UTF-8?q?=E7=94=A8=E8=AD=A6=E5=91=8A=EF=BC=8C=E6=94=B9=E7=94=A8=20@use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/components/rank-panel.vue        | 2 +-
 src/views/wel/components/section-business.vue  | 2 +-
 src/views/wel/components/section-finance.vue   | 2 +-
 src/views/wel/components/section-fleet.vue     | 2 +-
 src/views/wel/components/section-kpi.vue       | 2 +-
 src/views/wel/components/section-project.vue   | 2 +-
 src/views/wel/components/section-structure.vue | 2 +-
 src/views/wel/components/section-summary.vue   | 2 +-
 src/views/wel/components/section-vehicle.vue   | 2 +-
 src/views/wel/components/wel-filters.vue       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/wel/components/rank-panel.vue b/src/views/wel/components/rank-panel.vue
index 1ffaa6e..982968a 100644
--- a/src/views/wel/components/rank-panel.vue
+++ b/src/views/wel/components/rank-panel.vue
@@ -42,5 +42,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 </style>
diff --git a/src/views/wel/components/section-business.vue b/src/views/wel/components/section-business.vue
index 9322f72..a0e3d8c 100644
--- a/src/views/wel/components/section-business.vue
+++ b/src/views/wel/components/section-business.vue
@@ -156,7 +156,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .business-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-finance.vue b/src/views/wel/components/section-finance.vue
index 59a6dfd..7846a01 100644
--- a/src/views/wel/components/section-finance.vue
+++ b/src/views/wel/components/section-finance.vue
@@ -60,7 +60,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .finance-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-fleet.vue b/src/views/wel/components/section-fleet.vue
index 19cc1c3..b209256 100644
--- a/src/views/wel/components/section-fleet.vue
+++ b/src/views/wel/components/section-fleet.vue
@@ -67,7 +67,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .fleet-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-kpi.vue b/src/views/wel/components/section-kpi.vue
index 074fcd6..187bd4d 100644
--- a/src/views/wel/components/section-kpi.vue
+++ b/src/views/wel/components/section-kpi.vue
@@ -92,7 +92,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .kpi-card {
   background: #ffffff;
diff --git a/src/views/wel/components/section-project.vue b/src/views/wel/components/section-project.vue
index a1ad6e2..ee30c53 100644
--- a/src/views/wel/components/section-project.vue
+++ b/src/views/wel/components/section-project.vue
@@ -62,7 +62,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .project-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-structure.vue b/src/views/wel/components/section-structure.vue
index d8e3504..f46208a 100644
--- a/src/views/wel/components/section-structure.vue
+++ b/src/views/wel/components/section-structure.vue
@@ -102,7 +102,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .structure-cards__item {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-summary.vue b/src/views/wel/components/section-summary.vue
index 7891a0a..3204bcf 100644
--- a/src/views/wel/components/section-summary.vue
+++ b/src/views/wel/components/section-summary.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .summary-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-vehicle.vue b/src/views/wel/components/section-vehicle.vue
index 528f6b3..61b44aa 100644
--- a/src/views/wel/components/section-vehicle.vue
+++ b/src/views/wel/components/section-vehicle.vue
@@ -68,7 +68,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .vehicle-cards__item {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/wel-filters.vue b/src/views/wel/components/wel-filters.vue
index 3af1636..214357c 100644
--- a/src/views/wel/components/wel-filters.vue
+++ b/src/views/wel/components/wel-filters.vue
@@ -41,7 +41,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .wel-filter__range {
   width: 110px;
-- 
2.52.0


From 4b165471e328d06caf6a9ad0c50ed471aead7d65 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, 17 Oct 2026 16:08:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E7=BB=93=E7=AE=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8D=95=E7=BB=93=E7=AE=97=E5=8D=95=E5=8F=B7=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlement/settlementAdjustmentTable.js     |  2 +-
 src/views/settlement/settlement-adjustment.vue  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/option/settlement/settlementAdjustmentTable.js b/src/option/settlement/settlementAdjustmentTable.js
index ad8b2fb..4919a1a 100644
--- a/src/option/settlement/settlementAdjustmentTable.js
+++ b/src/option/settlement/settlementAdjustmentTable.js
@@ -1,6 +1,6 @@
 export const settlementAdjustmentTableColumns = [
   { label: '单据号', prop: 'adjustmentNo', minWidth: 160, link: true, fixed: 'left' },
-  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160 },
+  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160, link: true },
   { label: '结算单类型', prop: 'settlementTypeName', minWidth: 110 },
   { label: '项目名称', prop: 'projectName', minWidth: 140 },
   { label: '所属组织', prop: 'deptName', minWidth: 140 },
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index 60d321e..629f8c1 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -88,7 +88,7 @@
             ><el-link
               v-if="column.link && row[column.prop]"
               type="primary"
-              @click="openView(row)"
+              @click="handleTableLink(row, column)"
               >{{ row[column.prop] }}</el-link
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
@@ -285,6 +285,21 @@ export default {
     openView(row) {
       this.editor = { visible: true, id: row.id, readonly: true };
     },
+    // 单据号→本单查看弹窗；结算单号→跳正式结算列表页并自动打开该单详情（页面支持 ?detailNo=）
+    handleTableLink(row, column) {
+      if (column.prop === 'formalSettlementNo') {
+        this.openSettlementDetail(row.formalSettlementNo);
+        return;
+      }
+      this.openView(row);
+    },
+    openSettlementDetail(detailNo) {
+      if (!detailNo) {
+        this.$message.info('当前记录未关联结算单详情');
+        return;
+      }
+      this.$router.push({ path: '/settlement/formal-settlement', query: { detailNo } });
+    },
     isEditable(row) {
       return ['draft', 'returned'].includes(row.approvalStatus);
     },
-- 
2.52.0


From 73c12cc1c74b8a121f078fc8c87909ab42eb8c2a 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, 17 Oct 2026 16:34:08 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B8=A6detailNo?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=AD=A3=E5=BC=8F=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E7=BC=93=E5=AD=98=E5=AE=9E=E4=BE=8B=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=9F=A5=E7=9C=8B=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settlement/formal-settlement.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index c4b9da0..bbd00d3 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -253,6 +253,10 @@ export default {
       if (detailNo) this.openRouteDetail(detailNo);
     },
   },
+  created() {
+    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
+    this.ownFullPath = this.$route.fullPath;
+  },
   mounted() {
     this.loadOrganizationOptions();
     this.loadTable();
@@ -342,7 +346,7 @@ export default {
     },
     async openRouteDetail(detailNo = this.$route.query.detailNo) {
       const formalSettlementNo = String(detailNo || '').trim();
-      if (!formalSettlementNo) return;
+      if (!formalSettlementNo || this.ownFullPath !== this.$route.fullPath) return;
       const response = await api.getList(1, 10, { formalSettlementNo });
       const data = this.unwrapData(response);
       const row = (data.records || []).find(item => item.formalSettlementNo === formalSettlementNo);
-- 
2.52.0


From 65967226019d64b9998f5d49d2be90bd674cff16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Sun, 18 Oct 2026 14:32:15 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E5=8D=95=E6=96=B0=E5=A2=9E=E9=A2=84=E4=BB=98=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E6=A0=8F=E4=B8=8E=E4=BB=98=E6=AC=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

结算合计下新增汇总栏（结算合计原金额-已付金额含预付核销-剩余未付）；只读付款信息合并展示进度预付-项目预付核销-结算尾款三类记录；预结算转正式自动预填来源预结算核销行；单据状态名提取公共 settlementStatus 工具与预结算编辑器共用
---
 src/utils/settlementStatus.js                 |  23 ++++
 .../components/formal-settlement-editor.vue   | 116 ++++++++++++++++--
 .../components/pre-settlement-editor.vue      |  11 +-
 3 files changed, 128 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/settlementStatus.js

diff --git a/src/utils/settlementStatus.js b/src/utils/settlementStatus.js
new file mode 100644
index 0000000..4fdf2ec
--- /dev/null
+++ b/src/utils/settlementStatus.js
@@ -0,0 +1,23 @@
+/**
+ * 结算单预付记录单据状态名（预结算编辑器与正式结算编辑器共用，避免两页状态名不一致）
+ */
+export function settlementStatusName(status, displayValue) {
+  const labels = {
+    reviewing: '审批中',
+    approved: '审批通过',
+    paid: '已付款',
+    returned: '已驳回',
+    voided: '已作废',
+    draft: '草稿',
+  };
+  const name = labels[status];
+  if (name) return name;
+  return typeof displayValue === 'function' ? displayValue(status) : status || '-';
+}
+
+/**
+ * 统一预付付款记录类型名
+ */
+export function settlementRecordTypeName(recordType) {
+  return { progress_advance: '进度预付', project_advance: '项目预付核销' }[recordType] || '';
+}
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 3807f0c..acb8277 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -177,6 +177,22 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-descriptions
+          v-if="form.settlementType === 'payable'"
+          :column="3"
+          border
+          class="formal-editor__settle-summary"
+        >
+          <el-descriptions-item label="结算合计（原金额）">
+            {{ formatMoney(form.settlementAmount) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="已付金额（含预付、核销）">
+            {{ formatMoney(settlePaidTotal) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="剩余未付金额">
+            {{ formatMoney(settleRemainTotal) }}
+          </el-descriptions-item>
+        </el-descriptions>
       </section-card>
 
       <section-card title="结算明细">
@@ -577,28 +593,27 @@
             <template #default="{ row }">{{ displayValue(row.claimStatusName) }}</template>
           </el-table-column>
         </el-table>
-        <el-table v-else :data="paymentApplications" border>
+        <el-table v-else :data="paymentRecords" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column prop="paymentTypeName" label="付款类型" min-width="120" align="center">
-            <template #default="{ row }">{{ displayValue(row.paymentTypeName) }}</template>
+          <el-table-column label="付款类型" min-width="120" align="center">
+            <template #default="{ row }">{{ displayValue(row.typeName) }}</template>
           </el-table-column>
           <el-table-column label="付款方式" min-width="140" align="center">
-            <template #default="{ row }">{{ paymentMethodName(row.paymentMethod) }}</template>
+            <template #default="{ row }">{{ row.recordType ? '-' : paymentMethodName(row.paymentMethod) }}</template>
           </el-table-column>
           <el-table-column prop="paymentNo" label="单据号" min-width="160" align="center" />
-          <el-table-column prop="appliedAmount" label="申请付款金额" min-width="145" align="center">
+          <el-table-column prop="appliedAmount" label="申请/核销金额" min-width="145" align="center">
             <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
           </el-table-column>
           <el-table-column prop="paidAmount" label="已付款金额" min-width="130" align="center">
             <template #default="{ row }">{{ formatMoney(row.paidAmount) }}</template>
           </el-table-column>
-          <el-table-column
-            prop="approvalStatusName"
-            label="单据状态"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">{{ displayValue(row.approvalStatusName) }}</template>
+          <el-table-column label="单据状态" min-width="120" align="center">
+            <template #default="{ row }">
+              {{ row.recordType
+                ? settlementStatusName(row.billStatus)
+                : displayValue(row.approvalStatusName) }}
+            </template>
           </el-table-column>
           <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" align="center">
             <template #default="{ row }">{{ displayValue(row.kingdeeBillNo) }}</template>
@@ -1054,6 +1069,10 @@ import { InfoFilled } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { normalizeCurrencyCode } from '@/utils/currency';
+import {
+  settlementRecordTypeName,
+  settlementStatusName,
+} from '@/utils/settlementStatus';
 import { downloadFileByUrl } from '@/utils/util';
 import {
   downloadKingdeeInvoiceFile,
@@ -1097,6 +1116,7 @@ export default {
       details: [],
       summaryFees: [],
       paymentApplications: [],
+      advancePayments: [],
       receiptClaims: [],
       adjustments: [],
       changeRecords: [],
@@ -1270,6 +1290,34 @@ export default {
     summaryTotal() {
       return this.summaryFees.reduce((total, row) => total + Number(row.settlementAmount || 0), 0);
     },
+    // 已付金额（含预付、核销）：编辑态取来源预结算预付快照 + 当前核销行实时合计（草稿态无尾款申请）；只读态用落库值
+    settlePaidTotal() {
+      if (!this.editable) return Number(this.form.paidAmount || 0);
+      const advancePaid = this.sources.reduce(
+        (sum, item) => sum + Number(item.advancePaidAmount || 0),
+        0
+      );
+      const writeOff = this.projectAdvanceWriteOffs.reduce(
+        (sum, row) => sum + Number(row.writeOffAmount || 0),
+        0
+      );
+      return advancePaid + writeOff;
+    },
+    settleRemainTotal() {
+      return Math.max(Number(this.form.settlementAmount || 0) - Number(this.settlePaidTotal || 0), 0);
+    },
+    // 付款记录合并表：预付付款记录（进度预付/项目预付核销）+ 尾款付款申请
+    paymentRecords() {
+      const advances = (this.advancePayments || []).map(row => ({
+        ...row,
+        typeName: settlementRecordTypeName(row.recordType),
+      }));
+      const tails = (this.paymentApplications || []).map(row => ({
+        ...row,
+        typeName: row.paymentTypeName,
+      }));
+      return [...advances, ...tails];
+    },
     filteredDetails() {
       return this.details.filter(row =>
         Object.entries(this.appliedDetailQuery).every(([field, keyword]) => {
@@ -1365,6 +1413,7 @@ export default {
       this.detailFeeSnapshots = {};
       this.pendingAdjustments = {};
       this.paymentApplications = data.paymentApplications || [];
+      this.advancePayments = data.advancePayments || [];
       if (this.readonly && this.form.settlementType === 'receivable' && !this.publicMode) {
         this.receiptClaims = this.unwrapData(await getReceiptClaims(id)) || [];
       }
@@ -1408,6 +1457,7 @@ export default {
       this.adjustments = [];
       this.changeRecords = [];
       this.projectAdvanceWriteOffs = [];
+      this.advancePayments = [];
       this.attachments = [];
       this.selectedAttachmentRows = [];
       this.invoices = [];
@@ -1556,6 +1606,19 @@ export default {
         this.sources.map(item => getPreSettlementDetail(item.preSettlementId))
       );
       const settlements = responses.map(response => this.unwrapData(response) || {});
+      // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行）
+      const writeOffRows = settlements.flatMap(settlement => settlement.projectAdvanceWriteOffs || []);
+      const existingWriteOffIds = new Set(
+        this.projectAdvanceWriteOffs.map(row => String(row.paymentApplicationId))
+      );
+      writeOffRows.forEach(row => {
+        if (existingWriteOffIds.has(String(row.paymentApplicationId))) return;
+        existingWriteOffIds.add(String(row.paymentApplicationId));
+        this.projectAdvanceWriteOffs.push({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+        });
+      });
       this.details = settlements.flatMap(settlement =>
         (settlement.details || []).map(detail => ({
           ...detail,
@@ -1726,7 +1789,7 @@ export default {
       this.candidate.page.current = 1;
       this.loadCandidates();
     },
-    confirmCandidates() {
+    async confirmCandidates() {
       const merged = [...this.sources, ...this.candidate.selected];
       const map = new Map(
         merged.map(item => [
@@ -1734,6 +1797,7 @@ export default {
           { ...item, preSettlementId: item.preSettlementId || item.id },
         ])
       );
+      const previousIds = new Set(this.sources.map(item => String(item.preSettlementId || item.id)));
       this.sources = [...map.values()];
       this.form.sourcePreSettlementIds = this.sources.map(item => item.preSettlementId);
       if (this.sources.length) {
@@ -1750,6 +1814,26 @@ export default {
       this.form.localSettlementAmount =
         this.form.settlementAmount * Number(this.form.exchangeRate || 1);
       this.candidate.visible = false;
+      // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行，额度单份占用）
+      const newIds = this.sources
+        .map(item => item.preSettlementId)
+        .filter(id => !previousIds.has(String(id)));
+      if (!newIds.length) return;
+      const responses = await Promise.all(newIds.map(id => getPreSettlementDetail(id)));
+      const rows = responses.flatMap(response =>
+        this.unwrapData(response)?.projectAdvanceWriteOffs || []
+      );
+      const existing = new Set(
+        this.projectAdvanceWriteOffs.map(row => String(row.paymentApplicationId))
+      );
+      rows.forEach(row => {
+        if (existing.has(String(row.paymentApplicationId))) return;
+        existing.add(String(row.paymentApplicationId));
+        this.projectAdvanceWriteOffs.push({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+        });
+      });
     },
     removeSource(index) {
       this.sources.splice(index, 1);
@@ -2736,6 +2820,9 @@ export default {
       };
       return this.displayValue(labels[value] || value);
     },
+    settlementStatusName(status) {
+      return settlementStatusName(status, this.displayValue);
+    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -3132,6 +3219,9 @@ export default {
 .formal-editor__negative-amount {
   color: var(--el-color-danger);
 }
+.formal-editor__settle-summary {
+  margin-top: 8px;
+}
 .formal-editor :deep(.formal-editor__negative-amount .el-input__inner) {
   color: var(--el-color-danger);
 }
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 5d5ad8e..22f4832 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -990,6 +990,7 @@ import {
 } from '@/option/settlement/preSettlementTable';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { normalizeCurrencyCode } from '@/utils/currency';
+import { settlementStatusName } from '@/utils/settlementStatus';
 import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
@@ -2877,15 +2878,7 @@ export default {
       return value === undefined || value === null || value === '' ? '-' : value;
     },
     advanceStatusName(status) {
-      return (
-        {
-          reviewing: '审批中',
-          approved: '审批通过',
-          paid: '已付款',
-          returned: '已驳回',
-          voided: '已作废',
-        }[status] || this.displayValue(status)
-      );
+      return settlementStatusName(status, this.displayValue);
     },
     advanceCreateUserName(row) {
       return this.displayValue(
-- 
2.52.0


From bbe71e340a8694e26b36dc89ad1690a432f2824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Mon, 19 Oct 2026 01:36:52 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E6=8C=89=E9=92=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=98=B2=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index f8c0915..baf454c 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -163,6 +163,7 @@ export default {
       rows: [],
       selection: [],
       loading: false,
+      approveLoading: false,
       syncLoading: false,
       resultSyncing: false,
       query: {},
@@ -327,14 +328,21 @@ export default {
       this.refreshChange();
     },
     async handleApprove(row) {
-      const res = await api.approve({ id: row.id });
-      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
-      if (res.data.data === false) {
-        this.$message.warning(res.data.msg);
-      } else {
-        this.$message.success(res.data.msg || '审批通过');
+      // 防止重复点击：请求进行中忽略后续点击
+      if (this.approveLoading) return;
+      this.approveLoading = true;
+      try {
+        const res = await api.approve({ id: row.id });
+        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+        if (res.data.data === false) {
+          this.$message.warning(res.data.msg);
+        } else {
+          this.$message.success(res.data.msg || '审批通过');
+        }
+        this.refreshChange();
+      } finally {
+        this.approveLoading = false;
       }
-      this.refreshChange();
     },
     handleMkAudit(row) {
       if (!row?.id) {
-- 
2.52.0