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 01/18] =?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;
     },

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 02/18] =?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: '该单据已被金蝶锁定，不可编辑/作废' };

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 03/18] =?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 || '-'}`);

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 04/18] =?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;

From acfbb4c54e74fd15a2426c7561e4ba9ba6997337 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 17 Oct 2026 08:31:27 +0800
Subject: [PATCH 05/18] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E5=AF=B9=E8=B4=A6=E5=8C=B9=E9=85=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8E=E5=AE=8C=E6=88=90=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E7=96=91=E4=BC=BC=E9=87=8D=E5=A4=8D=E8=AF=AF=E5=88=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../transport-reconciliation-editor.vue          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/settlement/components/transport-reconciliation-editor.vue b/src/views/settlement/components/transport-reconciliation-editor.vue
index bcee540..4351b68 100644
--- a/src/views/settlement/components/transport-reconciliation-editor.vue
+++ b/src/views/settlement/components/transport-reconciliation-editor.vue
@@ -1278,10 +1278,13 @@ export default {
         delete snapshot._externalKey;
         delete snapshot.feeItems;
         snapshot.feeItemsJson = row.feeItemsJson || JSON.stringify(row.feeItems || {});
+        snapshot.actualDepartureTime = this.normalizeExternalDateTime(row.actualDepartureTime);
+        snapshot.actualCompletionTime = this.normalizeExternalDateTime(row.actualCompletionTime);
         return snapshot;
       });
     },
     serializeExternalRows() {
+      const duplicateIds = new Set(this.duplicateRows.map(row => String(row.id)));
       return this.externalDetails.map(row => {
         const snapshot = { ...row };
         delete snapshot._sourceRows;
@@ -1290,6 +1293,7 @@ export default {
         snapshot.feeItemsJson = row.feeItemsJson || JSON.stringify(row.feeItems || {});
         snapshot.actualDepartureTime = this.normalizeExternalDateTime(row.actualDepartureTime);
         snapshot.actualCompletionTime = this.normalizeExternalDateTime(row.actualCompletionTime);
+        snapshot.suspectedDuplicate = duplicateIds.has(String(row.id));
         return snapshot;
       });
     },
@@ -1336,6 +1340,11 @@ export default {
       }
     },
     async handleComplete() {
+      const unmatchedInternal = this.internalDetails.filter(item => item.matchResult !== 'matched').length;
+      const unmatchedExternal = this.externalDetails.filter(item => item.matchStatus !== 'matched').length;
+      if (this.duplicateRows.length || unmatchedInternal || unmatchedExternal) {
+        return this.$message.warning('所有内外部账单明细必须一一匹配且不存在疑似重复');
+      }
       if (
         Number(this.form.differenceCount || 0) !== 0 ||
         Number(this.form.differenceQuantity || 0) !== 0 ||
@@ -1694,8 +1703,11 @@ export default {
     },
     normalizeExternalDateTime(value) {
       if (!value) return null;
-      const text = String(value);
-      return text.length === 10 ? `${text}T00:00:00` : text;
+      const text = String(value).trim();
+      if (!text) return null;
+      const date = this.$dayjs(text);
+      if (date.isValid()) return date.format('YYYY-MM-DD HH:mm:ss');
+      return text.length === 10 ? `${text} 00:00:00` : text.replace('T', ' ');
     },
     refreshLocalStats() {
       const internalQuantity = this.internalDetails.reduce(

From d1e779bbccf21f75c6a1ce21a7093de9d522621d Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 17 Oct 2026 15:35:20 +0800
Subject: [PATCH 06/18] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=85=A8=E9=87=8F=E5=90=8C=E6=AD=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E6=8C=89=E5=85=AC=E5=8F=B8=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E5=B9=B6=E5=8E=BB=E6=8E=89=E7=A1=AE=E8=AE=A4=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/api/system/dept.js    |   4 +-
 src/views/system/dept.vue | 121 +++++++++++++++++++++++++++-----------
 2 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 5a489e0..c7f22de 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -77,7 +77,8 @@ export const syncOaDepartment = (
   size = 20,
   signal,
   incremental = false,
-  modifiedSince
+  modifiedSince,
+  companyOaId
 ) => {
   return request({
     url: '/blade-system/dept/sync-oa-department',
@@ -87,6 +88,7 @@ export const syncOaDepartment = (
       size,
       incremental: !!incremental,
       modifiedSince: modifiedSince || undefined,
+      companyOaId: companyOaId || undefined,
     },
     timeout: 60000,
     signal,
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 9058af3..c37610a 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -153,7 +153,12 @@
         />
         <div class="oa-sync-meta" v-if="oaSyncStage === 'clear'">当前阶段：{{ oaSyncStageLabel }}</div>
         <div class="oa-sync-meta" v-else>
-          当前阶段：{{ oaSyncStageLabel }}，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
+          当前阶段：{{ oaSyncStageLabel }}
+          <template v-if="oaSyncStage === 'department' && oaSyncProgress.companyTotal">
+            ，公司 {{ oaSyncProgress.companyIndex || 0 }} / {{ oaSyncProgress.companyTotal }}
+            <template v-if="oaSyncProgress.companyOaId">（oaId={{ oaSyncProgress.companyOaId }}）</template>
+          </template>
+          ，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
         </div>
         <div class="oa-sync-stats">
           <div class="oa-sync-stat">
@@ -257,6 +262,9 @@ export default {
         synced: 0,
         skipped: 0,
         dumpFilePath: '',
+        companyOaId: '',
+        companyIndex: 0,
+        companyTotal: 0,
       },
       parentId: 0,
       page: {
@@ -642,12 +650,18 @@ export default {
       }
       const totalPage = this.oaSyncTotalPage;
       const current = Number(this.oaSyncProgress.current) || 0;
-      const stageBase = this.oaSyncStage === 'department' ? 50 : 0;
-      if (totalPage <= 0) {
-        return stageBase;
+      if (this.oaSyncStage === 'department') {
+        const companyTotal = Math.max(1, Number(this.oaSyncProgress.companyTotal) || 1);
+        const companyIndex = Math.max(1, Number(this.oaSyncProgress.companyIndex) || 1);
+        const companyBase = ((companyIndex - 1) / companyTotal) * 50;
+        const pageRatio = totalPage > 0 ? Math.min(1, current / totalPage) : 0;
+        const companyPagePercent = (pageRatio * 50) / companyTotal;
+        return Math.min(99, Math.round(50 + companyBase + companyPagePercent));
       }
-      const stagePercent = Math.min(50, Math.round((current / totalPage) * 50));
-      return Math.min(99, stageBase + stagePercent);
+      if (totalPage <= 0) {
+        return 0;
+      }
+      return Math.min(49, Math.round((current / totalPage) * 50));
     },
     oaSyncProgressStatus() {
       if (this.oaSyncStatus === 'done') {
@@ -661,25 +675,7 @@ export default {
   },
   methods: {
     handleOaOrgFullSync() {
-      this.$confirm(
-        '全量同步将拉取 OA 公司/部门（仅保留二级公司 oaId=2、135 及其子公司与部门）；已存在且 OA 更新时间一致的记录会跳过。是否清除后同步？选择“是”将保留顶级「外部组织」与集团锚点(id=1/GWWL)，删除其余组织后再同步；选择“否”则直接全量同步。',
-        '全量同步',
-        {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false,
-          type: 'warning',
-        }
-      )
-        .then(() => {
-          this.startOaOrgSync({ clearNonTop: true, incremental: false });
-        })
-        .catch(action => {
-          if (action === 'cancel') {
-            this.startOaOrgSync({ clearNonTop: false, incremental: false });
-          }
-        });
+      this.startOaOrgSync({ clearNonTop: false, incremental: false });
     },
     handleOaOrgIncrementalSync() {
       this.$confirm(
@@ -714,6 +710,9 @@ export default {
         synced: 0,
         skipped: 0,
         dumpFilePath: '',
+        companyOaId: '',
+        companyIndex: 0,
+        companyTotal: 0,
       };
       this.runOaOrgSyncPages();
     },
@@ -725,6 +724,25 @@ export default {
         error?.name === 'AbortError'
       );
     },
+    applyOaOrgSyncPage(page, current, size) {
+      this.oaSyncProgress.current = page.current || current;
+      this.oaSyncProgress.size = page.size || size;
+      this.oaSyncProgress.total = page.total || 0;
+      this.oaSyncProgress.synced += page.syncedCount || 0;
+      this.oaSyncProgress.skipped += page.skippedCount || 0;
+      if (page.dumpFilePath) {
+        this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
+      }
+      if (page.companyOaId != null) {
+        this.oaSyncProgress.companyOaId = page.companyOaId || '';
+      }
+      if (page.companyIndex != null) {
+        this.oaSyncProgress.companyIndex = page.companyIndex || 0;
+      }
+      if (page.companyTotal != null) {
+        this.oaSyncProgress.companyTotal = page.companyTotal || 0;
+      }
+    },
     async runOaOrgSyncStage(syncApi) {
       const size = 20;
       const incremental = this.oaSyncMode === 'incremental';
@@ -742,20 +760,52 @@ export default {
         if (!modifiedSince && page.modifiedSince) {
           modifiedSince = page.modifiedSince;
         }
-        this.oaSyncProgress.current = page.current || current;
-        this.oaSyncProgress.size = page.size || size;
-        this.oaSyncProgress.total = page.total || 0;
-        this.oaSyncProgress.synced += page.syncedCount || 0;
-        this.oaSyncProgress.skipped += page.skippedCount || 0;
-        if (page.dumpFilePath) {
-          this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
-        }
+        this.applyOaOrgSyncPage(page, current, size);
         if (page.finished) {
           break;
         }
         current += 1;
       }
     },
+    /**
+     * 部门阶段：公司同步完成后，按公司 oaId 轮询；当前公司部门拉完后切换下一公司并重置页码
+     */
+    async runOaOrgDepartmentSyncStage() {
+      const size = 20;
+      const incremental = this.oaSyncMode === 'incremental';
+      let current = 1;
+      let modifiedSince = '';
+      let companyOaId = '';
+      while (!this.oaSyncCancelled) {
+        const res = await syncOaDepartment(
+          current,
+          size,
+          this.oaSyncController?.signal,
+          incremental,
+          modifiedSince,
+          companyOaId
+        );
+        const page = res?.data?.data || {};
+        if (!modifiedSince && page.modifiedSince) {
+          modifiedSince = page.modifiedSince;
+        }
+        if (page.companyOaId) {
+          companyOaId = page.companyOaId;
+        }
+        this.applyOaOrgSyncPage(page, current, size);
+        if (page.finished) {
+          break;
+        }
+        if (page.companyFinished && page.nextCompanyOaId) {
+          companyOaId = page.nextCompanyOaId;
+          current = 1;
+          this.oaSyncProgress.current = 0;
+          this.oaSyncProgress.total = 0;
+          continue;
+        }
+        current += 1;
+      }
+    },
     async runOaOrgSyncPages() {
       try {
         if (this.oaSyncClearNonTop) {
@@ -775,7 +825,10 @@ export default {
         this.oaSyncStage = 'department';
         this.oaSyncProgress.current = 0;
         this.oaSyncProgress.total = 0;
-        await this.runOaOrgSyncStage(syncOaDepartment);
+        this.oaSyncProgress.companyOaId = '';
+        this.oaSyncProgress.companyIndex = 0;
+        this.oaSyncProgress.companyTotal = 0;
+        await this.runOaOrgDepartmentSyncStage();
         if (this.oaSyncCancelled) {
           this.oaSyncStatus = 'cancelled';
           return;

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 07/18] =?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);
     },

From f4542cd0b8794dec3db471f82f7ee25e45c5b092 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 17 Oct 2026 16:22:39 +0800
Subject: [PATCH 08/18] =?UTF-8?q?:zap:=20=E7=BB=84=E7=BB=87=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=8C=89=E5=85=AC=E5=8F=B8=E5=88=B7=E6=96=B0=E6=A0=91?=
 =?UTF-8?q?=E5=B9=B6=E5=8A=A0=E5=AE=BD=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=88=97?=
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/dept.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index c37610a..5136762 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -298,7 +298,7 @@ export default {
           {
             label: '组织名称',
             prop: 'deptName',
-            minWidth: 160,
+            minWidth: 320,
             order: 80,
             search: true,
             searchOrder: 2,
@@ -801,6 +801,11 @@ export default {
           current = 1;
           this.oaSyncProgress.current = 0;
           this.oaSyncProgress.total = 0;
+          // 单公司部门拉完并重建层级后刷新树，便于中途核对挂载结果
+          this.parentId = 0;
+          this.data = [];
+          this.$refs.crud?.refreshTable?.();
+          this.onLoad(this.page, this.query);
           continue;
         }
         current += 1;

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 09/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B8=A6detailN?=
 =?UTF-8?q?o=E8=B7=B3=E8=BD=AC=E6=AD=A3=E5=BC=8F=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E7=BC=93=E5=AD=98=E5=AE=9E=E4=BE=8B=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=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);

From 38ca25024282cc68d216e838aa28e4473aede9a6 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 17 Oct 2026 17:01:27 +0800
Subject: [PATCH 10/18] =?UTF-8?q?:sparkles:=20=E9=A1=B9=E7=9B=AE=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=8F=AF=E7=BC=96=E8=BE=91=E4=B8=9A=E5=8A=A1=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8/=E5=B9=B3=E5=8F=B0=E5=85=AC=E5=8F=B8=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0=E5=88=97=E5=B7=A6=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/views/business/project-apply.vue | 7 ++++---
 src/views/system/dept.vue            | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index e05c03d..e4b41bb 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -224,7 +224,7 @@
               placeholder="请选择"
               filterable
               clearable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
             />
           </el-form-item>
           <el-form-item label="平台公司" prop="undertakeDeptId">
@@ -236,7 +236,7 @@
               collapse-tags-tooltip
               clearable
               filterable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
               @change="handleUndertakeDeptChange"
             >
               <el-option
@@ -2493,7 +2493,8 @@ export default {
     loadDeptOptions() {
       getDeptTree().then(res => {
         const deptTree = res.data.data || [];
-        const businessDeptTree = ['add', 'edit', 'majorSupplement'].includes(this.dialogType)
+        // 新增/编辑/重大补录/项目变更均可选择业务部门，排除外部组织
+        const businessDeptTree = ['add', 'edit', 'majorSupplement', 'change'].includes(this.dialogType)
           ? this.excludeExternalOrganization(deptTree)
           : deptTree;
         this.deptOptions = this.flattenDept(businessDeptTree);
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 5136762..bfac437 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -299,6 +299,8 @@ export default {
             label: '组织名称',
             prop: 'deptName',
             minWidth: 320,
+            align: 'left',
+            headerAlign: 'left',
             order: 80,
             search: true,
             searchOrder: 2,
@@ -1518,6 +1520,12 @@ export default {
 </script>
 
 <style scoped>
+/* 覆盖全站表格居中：树形组织名称需左对齐，展开后缩进才可读 */
+:deep(.el-table th.el-table__cell.is-left .cell),
+:deep(.el-table td.el-table__cell.is-left .cell) {
+  text-align: left;
+}
+
 .carrier-search-form {
   padding: 12px 12px 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);

From 8db52ef168982bcc5ad53528c61d7bb522ab5e69 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sat, 17 Oct 2026 17:03:26 +0800
Subject: [PATCH 11/18] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E5=90=8E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=86=8D=E6=AC=A1=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/option/business/project-apply.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/option/business/project-apply.js b/src/option/business/project-apply.js
index 9a96ad6..502032e 100644
--- a/src/option/business/project-apply.js
+++ b/src/option/business/project-apply.js
@@ -97,7 +97,8 @@ export const config = {
       action: 'startChange',
       label: '变更',
       statusProp: 'approvalStatus',
-      status: ['approved'],
+      // 立项通过、变更通过后均可再次发起变更
+      status: ['approved', 'change_approved'],
       permission: 'project_apply_change',
     },
   ],

From 6f2383a7e50e2d81022b06edb2e78a966e9014f5 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 18 Oct 2026 05:12:26 +0800
Subject: [PATCH 12/18] =?UTF-8?q?:sparkles:=20=E7=BB=93=E7=AE=97=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96=E4=B8=8E=E5=90=88?=
 =?UTF-8?q?=E5=90=8C/=E8=BF=90=E5=8D=95=E5=AF=BC=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

付款申请汇票筛选与提示去重、结算菜单拆分与金蝶同步弹框、应收应付详情高度、合同计费与半月结调整，以及导入运单批量删除校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/api/settlement/formalSettlement.js        |  11 +-
 src/axios.js                                  |  23 +-
 src/option/payment/paymentApplication.js      |  35 +-
 .../settlement/formalSettlementSearch.js      |   2 +-
 .../settlement/formalSettlementTable.js       |   8 +-
 src/option/settlement/preSettlementForm.js    |   2 +-
 src/option/settlement/preSettlementSearch.js  |   2 +-
 src/option/settlement/preSettlementTable.js   |   2 +-
 .../settlement/receivable-payable-detail.js   |   4 +-
 .../transportReconciliationSearch.js          |   2 +-
 src/router/page/index.js                      |   4 +-
 src/router/views/index.js                     |   7 +-
 src/utils/mk-approval.js                      |   2 +-
 src/utils/settlement-menu.js                  |  39 ++
 .../components/business-crud-page.vue         |   2 +-
 .../components/waybill-import-dialog.vue      |  24 +-
 src/views/business/contract-manage-change.vue |   9 +-
 src/views/business/contract-manage.vue        |   7 +-
 .../payment/invoice-application-form.vue      |   4 +-
 src/views/payment/invoice-application.vue     |   2 +-
 src/views/payment/invoice-receipt-form.vue    |   2 +-
 .../payment/payment-application-form.vue      | 579 ++++++++++++++----
 src/views/payment/payment-application.vue     |   1 +
 .../components/formal-settlement-editor.vue   | 292 +++++----
 .../formal-settlement-table-panel.vue         |  32 +-
 .../components/pre-settlement-editor.vue      | 186 +++---
 .../components/settlement-import-page.vue     |   2 +-
 .../transport-reconciliation-editor.vue       |   2 +-
 .../settlement/formal-settlement-form.vue     |  22 +-
 src/views/settlement/formal-settlement.vue    | 244 +++++---
 src/views/settlement/payment-settlement.vue   |  12 +
 src/views/settlement/pre-settlement-form.vue  |   4 +-
 .../settlement/pre-settlement-public-view.vue |   2 +-
 src/views/settlement/pre-settlement.vue       |  46 +-
 src/views/settlement/receipt-settlement.vue   |  12 +
 .../settlement/receivable-payable-detail.vue  | 253 +++++++-
 36 files changed, 1387 insertions(+), 495 deletions(-)
 create mode 100644 src/utils/settlement-menu.js
 create mode 100644 src/views/settlement/payment-settlement.vue
 create mode 100644 src/views/settlement/receipt-settlement.vue

diff --git a/src/api/settlement/formalSettlement.js b/src/api/settlement/formalSettlement.js
index 92830f8..ea4cb14 100644
--- a/src/api/settlement/formalSettlement.js
+++ b/src/api/settlement/formalSettlement.js
@@ -31,8 +31,15 @@ export const approve = data => request({ url: `${baseUrl}/approve`, method: 'pos
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 // 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+// config.meta.suppressErrorMessage=true 时由页面弹框汇总结果，避免拦截器重复 toast
+export const syncKingdee = (id, config = {}) =>
+  request({
+    url: `${baseUrl}/sync-kingdee`,
+    method: 'post',
+    timeout: 30000,
+    params: { id },
+    ...config,
+  });
 export const getDetailFees = detailId =>
   request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
 export const getReceiptClaims = formalSettlementId =>
diff --git a/src/axios.js b/src/axios.js
index 1d23232..a3de4a3 100644
--- a/src/axios.js
+++ b/src/axios.js
@@ -74,12 +74,15 @@ const redirectToLogin = () => {
  * 统一弹出错误提示并返回带标记的 Error。
  * `_notified` 标记用于让业务层（批量导入等）识别「拦截器已经提示过」，
  * 避免同一条错误被弹两次。
+ * meta.suppressErrorMessage=true 时由业务层自行弹框汇总，拦截器不再 toast。
  */
-const notifiedError = message => {
-  ElMessage({
-    message: message,
-    type: 'error',
-  });
+const notifiedError = (message, config) => {
+  if (config?.meta?.suppressErrorMessage !== true) {
+    ElMessage({
+      message: message,
+      type: 'error',
+    });
+  }
   const error = new Error(message);
   error._notified = true;
   return error;
@@ -260,12 +263,12 @@ axios.interceptors.response.use(
 
     // OAuth2 业务错误码提示
     if (status > 2000 && !validatenull(res.data.error_description)) {
-      return Promise.reject(notifiedError(message));
+      return Promise.reject(notifiedError(message, config));
     }
 
     // 其余非 200 响应统一提示
     if (status !== 200) {
-      return Promise.reject(notifiedError(message));
+      return Promise.reject(notifiedError(message, config));
     }
     return res;
   },
@@ -273,7 +276,11 @@ axios.interceptors.response.use(
     NProgress.done();
     // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
     // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
-    if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
+    if (
+      !axios.isCancel(error) &&
+      !isRefreshTokenRequest(error?.config) &&
+      error?.config?.meta?.suppressErrorMessage !== true
+    ) {
       ElMessage({
         message: error?.response?.data?.msg || '请求失败，请稍后重试',
         type: 'error',
diff --git a/src/option/payment/paymentApplication.js b/src/option/payment/paymentApplication.js
index 9f3b688..65494a3 100644
--- a/src/option/payment/paymentApplication.js
+++ b/src/option/payment/paymentApplication.js
@@ -52,7 +52,8 @@ export const paymentApplicationOption = ({
   searchShow: true,
   searchIcon: true,
   searchLabelWidth: 88,
-  searchMenuSpan: 24,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
   searchIndex: 4,
   searchMenuPosition: 'right',
   border: true,
@@ -78,6 +79,7 @@ export const paymentApplicationOption = ({
       prop: 'paymentNo',
       slot: true,
       search: true,
+      searchSpan: 5,
       searchOrder: 9,
       searchPlaceholder: '请输入',
       minWidth: 150,
@@ -88,6 +90,7 @@ export const paymentApplicationOption = ({
       type: 'daterange',
       searchType: 'daterange',
       search: true,
+      searchSpan: 5,
       searchOrder: 8,
       hide: true,
       showColumn: false,
@@ -95,18 +98,24 @@ export const paymentApplicationOption = ({
       editDisplay: false,
       viewDisplay: false,
     },
-    searchOnlyColumn({
-      label: '客户名称',
-      prop: 'payeeNameSearch',
-      searchOrder: 7,
-      searchProp: 'payeeName',
-    }),
-    searchOnlyColumn({
-      label: '项目名称',
-      prop: 'projectNameSearch',
-      searchOrder: 6,
-      searchProp: 'projectName',
-    }),
+    {
+      ...searchOnlyColumn({
+        label: '客户名称',
+        prop: 'payeeNameSearch',
+        searchOrder: 7,
+        searchProp: 'payeeName',
+      }),
+      searchSpan: 5,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '项目名称',
+        prop: 'projectNameSearch',
+        searchOrder: 6,
+        searchProp: 'projectName',
+      }),
+      searchSpan: 5,
+    },
     searchOnlyColumn({
       label: '关联结算单',
       prop: 'settlementNo',
diff --git a/src/option/settlement/formalSettlementSearch.js b/src/option/settlement/formalSettlementSearch.js
index abe3520..cd4d811 100644
--- a/src/option/settlement/formalSettlementSearch.js
+++ b/src/option/settlement/formalSettlementSearch.js
@@ -36,7 +36,7 @@ export const kingdeeSyncStatusOptions = [
 
 export const formalSettlementSearchFields = [
   { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '项目', prop: 'projectName', type: 'input' },
   { label: '所属组织', prop: 'deptName', type: 'cascader' },
   { label: '合同编号', prop: 'contractNo', type: 'input' },
diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js
index 390c4e1..bf3f0c4 100644
--- a/src/option/settlement/formalSettlementTable.js
+++ b/src/option/settlement/formalSettlementTable.js
@@ -28,7 +28,7 @@ export const formalSettlementTableColumns = [
 ];
 
 export const sourceColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
   { label: '结算金额', prop: 'settlementAmount', minWidth: 130, money: true },
   { label: '申请预付金额', prop: 'advanceAppliedAmount', minWidth: 140, money: true },
   { label: '已付款金额', prop: 'advancePaidAmount', minWidth: 130, money: true },
@@ -48,6 +48,7 @@ export const detailColumns = [
   { label: '运输总量', prop: 'transportQuantity', minWidth: 120 },
   { label: '里程（KM）', prop: 'mileage', minWidth: 120 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '运输单价', prop: 'unitPrice', minWidth: 120, money: true },
   { label: '运费', prop: 'freightAmount', minWidth: 120, money: true },
   { label: '调整金额', prop: 'adjustAmount', minWidth: 120, money: true },
@@ -66,7 +67,7 @@ export const summaryColumns = [
 ];
 
 export const candidateColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 170 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 170 },
   { label: '项目名称', prop: 'projectName', minWidth: 140 },
   { label: '所属组织', prop: 'deptName', minWidth: 140 },
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
@@ -86,7 +87,7 @@ export const candidateDetailColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '来源', prop: 'sourceType', minWidth: 110 },
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
   { label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 160 },
   { label: '运单号', prop: 'waybillNo', minWidth: 150 },
   { label: '车号', prop: 'vehicleNo', minWidth: 130 },
@@ -94,6 +95,7 @@ export const candidateDetailColumns = [
   { label: '货物名称', prop: 'cargoName', minWidth: 140 },
   { label: '货物类型', prop: 'cargoType', minWidth: 130 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '应收应付合计', prop: 'totalAmount', minWidth: 140, money: true },
   { label: '状态', prop: 'settlementStatusName', minWidth: 110 },
 ];
diff --git a/src/option/settlement/preSettlementForm.js b/src/option/settlement/preSettlementForm.js
index cace25d..ef70be7 100644
--- a/src/option/settlement/preSettlementForm.js
+++ b/src/option/settlement/preSettlementForm.js
@@ -4,7 +4,7 @@ export const settlementTypeOptions = [
 ];
 
 export const preSettlementFormFields = [
-  { label: '预结算单号', prop: 'preSettlementNo', readonly: true },
+  { label: '预付结算单号', prop: 'preSettlementNo', readonly: true },
   { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
   { label: '合同编号', prop: 'contractNo', readonly: true },
   { label: '项目名称', prop: 'projectName', readonly: true },
diff --git a/src/option/settlement/preSettlementSearch.js b/src/option/settlement/preSettlementSearch.js
index 1165ae9..c270345 100644
--- a/src/option/settlement/preSettlementSearch.js
+++ b/src/option/settlement/preSettlementSearch.js
@@ -7,7 +7,7 @@ export const approvalStatusOptions = [
 ];
 
 export const preSettlementSearchFields = [
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '预付单号', prop: 'advanceNo', type: 'input' },
   { label: '项目名称', prop: 'projectName', type: 'input' },
   { label: '所属组织', prop: 'deptName', type: 'cascader' },
diff --git a/src/option/settlement/preSettlementTable.js b/src/option/settlement/preSettlementTable.js
index 01ab798..26c06ed 100644
--- a/src/option/settlement/preSettlementTable.js
+++ b/src/option/settlement/preSettlementTable.js
@@ -1,5 +1,5 @@
 export const preSettlementTableColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
   { label: '来源', prop: 'sourceType', minWidth: 100 },
   { label: '付款方', prop: 'payerName', minWidth: 160 },
   { label: '收款方', prop: 'payeeName', minWidth: 160 },
diff --git a/src/option/settlement/receivable-payable-detail.js b/src/option/settlement/receivable-payable-detail.js
index 29123d0..bdf976d 100644
--- a/src/option/settlement/receivable-payable-detail.js
+++ b/src/option/settlement/receivable-payable-detail.js
@@ -20,7 +20,7 @@ export const searchFields = [
   { label: '货物名称', prop: 'cargoName', type: 'input' },
   { label: '合同编号', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '车号', prop: 'vehicleNo', type: 'input' },
@@ -35,7 +35,7 @@ export const tableColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 140 },
   { label: '合同名称', prop: 'contractName', minWidth: 140 },
   { label: '来源', prop: 'sourceType', minWidth: 110 },
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
   { label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 140, link: true },
   { label: '运单号', prop: 'waybillNo', minWidth: 140, link: true },
   { label: '车号', prop: 'vehicleNo', minWidth: 120 },
diff --git a/src/option/settlement/transportReconciliationSearch.js b/src/option/settlement/transportReconciliationSearch.js
index 0f1ca83..9852557 100644
--- a/src/option/settlement/transportReconciliationSearch.js
+++ b/src/option/settlement/transportReconciliationSearch.js
@@ -13,7 +13,7 @@ export const reconciliationStatusOptions = [
 
 export const transportReconciliationSearchFields = [
   { prop: 'reconciliationNo', label: '对账单号', type: 'input' },
-  { prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
+  { prop: 'preSettlementNos', label: '预付结算单号', type: 'input' },
   { prop: 'projectName', label: '项目', type: 'input' },
   { prop: 'deptName', label: '所属组织', type: 'cascader' },
   { prop: 'contractNo', label: '合同编号', type: 'input' },
diff --git a/src/router/page/index.js b/src/router/page/index.js
index e2a8ab1..11c3a57 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -108,7 +108,7 @@ export default [
   },
   {
     path: '/settlement/pre-settlement/public-view',
-    name: '查看预结算信息',
+    name: '查看预付结算单信息',
     component: () => import('@/views/settlement/pre-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
@@ -119,7 +119,7 @@ export default [
   },
   {
     path: '/settlement/formal-settlement/public-view',
-    name: '查看正式结算信息',
+    name: '查看结算单信息',
     component: () => import('@/views/settlement/formal-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 546ffb2..6d11ebd 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -95,7 +95,7 @@ export default [
     children: [
       {
         path: '',
-        name: '新增编辑预结算',
+        name: '新增编辑预付结算单',
         meta: {
           keepAlive: false,
           activeMenu: '/settlement/pre-settlement',
@@ -110,10 +110,11 @@ export default [
     children: [
       {
         path: '',
-        name: '新增编辑正式结算',
+        name: '新增编辑结算单',
         meta: {
           keepAlive: false,
-          activeMenu: '/settlement/formal-settlement',
+          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          activeMenu: '/settlement/payment-settlement',
         },
         component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
       },
diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js
index 83806da..9e224b2 100644
--- a/src/utils/mk-approval.js
+++ b/src/utils/mk-approval.js
@@ -23,7 +23,7 @@ export const MK_BIZ = {
   },
   'pre-settlement': {
     dictName: '提交预结算审核流',
-    subjectPrefix: '预结算审批',
+    subjectPrefix: '预付结算审批',
     rejected: ['returned'],
     approved: ['approved'],
   },
diff --git a/src/utils/settlement-menu.js b/src/utils/settlement-menu.js
new file mode 100644
index 0000000..86413c0
--- /dev/null
+++ b/src/utils/settlement-menu.js
@@ -0,0 +1,39 @@
+/** 结算菜单拆分后的展示名与权限前缀 */
+
+export const SETTLEMENT_TYPE_PAYABLE = 'payable';
+export const SETTLEMENT_TYPE_RECEIVABLE = 'receivable';
+
+export function settlementBillLabel(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE ? '收款结算单' : '付款结算单';
+}
+
+export function settlementPermissionPrefix(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE
+    ? 'receipt_settlement'
+    : 'payment_settlement';
+}
+
+export function settlementListPath(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE
+    ? '/settlement/receipt-settlement'
+    : '/settlement/payment-settlement';
+}
+
+/**
+ * 权限判断：优先新菜单码，兼容旧 formal_settlement_*。
+ * @param {Object} ctx 组件实例（需含 permission、isAdmin、validData）
+ * @param {string} settlementType payable|receivable
+ * @param {string} action add|edit|view...
+ */
+export function hasSettlementPermission(ctx, settlementType, action) {
+  if (ctx?.isAdmin) return true;
+  const prefix = settlementPermissionPrefix(settlementType);
+  const codes = [`${prefix}_${action}`, `formal_settlement_${action}`];
+  return codes.some(code => {
+    const value = ctx?.permission?.[code];
+    if (typeof ctx?.validData === 'function') {
+      return ctx.validData(value, false);
+    }
+    return value === true;
+  });
+}
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index 115eb11..484ead8 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -5897,7 +5897,7 @@ export default {
         '固定金额（整单一口价）': ['固定一口价'],
         按数量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
       },
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['月结', '日结', '周结', '固定天数周期结算'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       reconciliationModeOptions: ['明细逐行核对', '按账单汇总核对', '跳过自动核对'],
       packageOptions,
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 3645750..309467e 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -1266,9 +1266,27 @@ const fillEditForm = async row => {
   if (carrierValue) carrierChange(carrierValue);
   await loadBatchRows(snapshot.id);
 };
-const removeBatches = () =>
-  api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
-const removeBatch = row => api.removeImportBatches(row.id).then(loadBatches);
+/** 与行操作一致：仅草稿可删除 */
+const canRemoveBatch = row => String(row?.importStatus || '') === 'draft';
+const removeBatches = () => {
+  if (!selected.value.length) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  // 选中含不可删条目时整批拦截（含已完成/进行中），不静默跳过
+  if (selected.value.some(row => !canRemoveBatch(row))) {
+    ElMessage.warning('已完成运单不可删除');
+    return;
+  }
+  return api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
+};
+const removeBatch = row => {
+  if (!canRemoveBatch(row)) {
+    ElMessage.warning('已完成运单不可删除');
+    return;
+  }
+  return api.removeImportBatches(row.id).then(loadBatches);
+};
 const projectChange = async id => {
   const requestId = ++projectRequestId;
   const item = projects.value.find(row => String(row.id) === String(id));
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index 344a997..c745705 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -217,7 +217,12 @@
       />
 
       <section class="change-section">
-        <div class="section-head"><div class="dialog-section-title">计费信息</div><el-button type="primary" plain @click="addPlan">添加</el-button></div>
+        <div class="section-head">
+          <div class="dialog-section-title">计费信息</div>
+          <el-button v-if="feeGenerationMode !== 'manual'" type="primary" plain @click="addPlan"
+            >添加</el-button
+          >
+        </div>
         <el-radio-group v-model="feeGenerationMode"><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 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>
       </section>
@@ -440,7 +445,7 @@ export default {
       },
       preSettlementConfig: {},
       formalSettlementConfig: {},
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['月结', '日结', '周结', '固定天数周期结算'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({
         label: `${index + 1}日`,
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 3623a5e..8076697 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -647,7 +647,12 @@
                 <el-radio label="manual">账单导入生成</el-radio>
               </el-radio-group>
             </div>
-            <el-button type="primary" @click="openBillingPlan()">添加</el-button>
+            <el-button
+              v-if="form.feeGenerationMode !== 'manual'"
+              type="primary"
+              @click="openBillingPlan()"
+              >添加</el-button
+            >
           </div>
           <el-table :data="billingPlanRows" border>
             <el-table-column type="index" label="序号" width="80" align="center" />
diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 0c6f4cd..d4ed32a 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -774,7 +774,7 @@ export default {
     },
     validateSettlements(rule, value, callback) {
       if (!this.form.settlements.length) {
-        callback(new Error('请选择正式结算单'));
+        callback(new Error('请选择付款结算单'));
         return;
       }
       callback();
@@ -1215,7 +1215,7 @@ export default {
     },
     async syncReferenceData() {
       if (!this.settlementIds.length) {
-        this.$message.warning('请先选择正式结算单');
+        this.$message.warning('请先选择付款结算单');
         return;
       }
       await Promise.all([this.loadReceiverInformation(), this.loadSettlementDetails(false)]);
diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue
index 0deb659..969c41a 100644
--- a/src/views/payment/invoice-application.vue
+++ b/src/views/payment/invoice-application.vue
@@ -359,7 +359,7 @@ export default {
           item => String(item.formalSettlementNo || '').trim() === normalizedNo
         );
         if (!row?.id) {
-          this.$message.warning('未找到对应的正式结算单');
+          this.$message.warning('未找到对应的付款结算单');
           return;
         }
         this.$router.push({
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index 1d06b34..200e758 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -76,7 +76,7 @@
             <el-form-item label="关联结算单" prop="settlementIds">
               <el-input :model-value="settlementLabel" readonly placeholder="请选择应付正式结算单">
                 <template v-if="!readonly" #append>
-                  <el-tooltip content="选择正式结算单" placement="top">
+                  <el-tooltip content="选择付款结算单" placement="top">
                     <el-button :icon="Search" @click="openSettlementDialog" />
                   </el-tooltip>
                 </template>
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index a3e337d..9c69366 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -140,7 +140,8 @@
                 :step="0.01"
                 :controls="false"
                 style="width: 100%"
-                value-on-clear="0"
+                :value-on-clear="null"
+                placeholder="请输入申请付款金额"
               /></el-form-item
           ></el-col>
           <el-col :span="6"
@@ -241,11 +242,22 @@
             <template #default="{ row }">{{ formatMoney(row.payableAmount) }}</template>
           </el-table-column>
           <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="110">
-            <template #default="{ row }">{{ formatMoney(row.paymentRatio) }}</template>
+            <template #default="{ row }">
+              <span :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
+                {{ formatMoney(row.paymentRatio) }}
+              </span>
+            </template>
           </el-table-column>
           <el-table-column prop="appliedAmount" label="付款金额" min-width="130">
             <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
           </el-table-column>
+          <el-table-column prop="ratioRemark" label="备注" min-width="220" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
+                {{ row.ratioRemark || '-' }}
+              </span>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
       <section-card v-if="showInvoiceSection" title="发票信息">
@@ -409,7 +421,7 @@
         <el-button v-if="!readonly" type="primary" plain @click="syncPaymentRecords"
           >同步</el-button
         >
-        <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft()"
+        <el-button v-if="!readonly && canSave" type="primary" plain @click="handleSave"
           >保存</el-button
         >
         <el-button
@@ -483,7 +495,7 @@
           </el-form>
         </el-card>
         <el-tabs v-model="referenceTab" @tab-change="handleReferenceTabChange">
-          <el-tab-pane v-if="canSelectFormalSettlement" label="正式结算单" name="formal">
+          <el-tab-pane v-if="canSelectFormalSettlement" label="付款结算单" name="formal">
             <el-table
               v-loading="formalPage.loading"
               :data="formalRows"
@@ -491,12 +503,19 @@
               @selection-change="formalSelection = $event"
             >
               <el-table-column type="selection" width="50" />
-              <el-table-column prop="formalSettlementNo" label="结算单号" />
-              <el-table-column prop="projectName" label="所属项目" />
-              <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额">
+              <el-table-column prop="formalSettlementNo" label="结算单号" min-width="150" />
+              <el-table-column prop="projectName" label="所属项目" min-width="140" />
+              <el-table-column prop="contractName" label="合同名称" min-width="160" />
+              <el-table-column prop="settlementAmount" label="结算金额" min-width="130">
                 <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
               </el-table-column>
+              <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
+                <template #default="{ row }">{{
+                  row.payableAmount === undefined || row.payableAmount === null
+                    ? '-'
+                    : formatMoney(row.payableAmount)
+                }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectFormal(row)">选择</el-link>
@@ -515,7 +534,7 @@
               />
             </div>
           </el-tab-pane>
-          <el-tab-pane v-if="canSelectPreSettlement" label="预结算单" name="pre">
+          <el-tab-pane v-if="canSelectPreSettlement" label="预付结算单" name="pre">
             <el-table
               v-loading="prePage.loading"
               :data="preRows"
@@ -523,12 +542,19 @@
               @selection-change="preSelection = $event"
             >
               <el-table-column type="selection" width="50" />
-              <el-table-column prop="preSettlementNo" label="结算单号" />
-              <el-table-column prop="projectName" label="所属项目" />
-              <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额">
+              <el-table-column prop="preSettlementNo" label="结算单号" min-width="150" />
+              <el-table-column prop="projectName" label="所属项目" min-width="140" />
+              <el-table-column prop="contractName" label="合同名称" min-width="160" />
+              <el-table-column prop="settlementAmount" label="结算金额" min-width="130">
                 <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
               </el-table-column>
+              <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
+                <template #default="{ row }">{{
+                  row.payableAmount === undefined || row.payableAmount === null
+                    ? '-'
+                    : formatMoney(row.payableAmount)
+                }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectPre(row)">选择</el-link>
@@ -562,22 +588,27 @@
       </template>
     </el-dialog>
     <el-dialog v-model="billDialogVisible" title="选择汇票" width="80%" append-to-body>
-      <div class="payment-form-page__reference-search">
-        <el-form :model="billQuery" label-position="right" label-width="160px" @submit.prevent>
-          <div class="payment-form-page__reference-search-fields">
-            <el-form-item label="汇票筛选">
-              <el-input
-                v-model="billQuery.keyword"
-                clearable
-                placeholder="请输入汇票号、出票单位或收票单位"
-                @keyup.enter="handleBillSearch"
-              />
-            </el-form-item>
-          </div>
-          <div class="payment-form-page__reference-search-actions">
-            <el-button type="primary" @click="handleBillSearch">搜索</el-button>
-            <el-button @click="resetBillSearch">清空</el-button>
-          </div>
+      <div class="payment-form-page__reference-search payment-form-page__bill-search">
+        <el-form
+          :model="billQuery"
+          inline
+          label-position="right"
+          label-width="88px"
+          @submit.prevent
+        >
+          <el-form-item label="汇票筛选">
+            <el-input
+              v-model="billQuery.keyword"
+              clearable
+              style="width: 320px"
+              placeholder="请输入汇票号、出票单位或收票单位"
+              @keyup.enter="handleBillSearch"
+            />
+          </el-form-item>
+          <el-form-item class="payment-form-page__bill-search-actions">
+            <el-button type="primary" @click="handleBillSearch">查询</el-button>
+            <el-button @click="resetBillSearch">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <el-table v-loading="billPage.loading" :data="billRows" border>
@@ -652,7 +683,7 @@
 </template>
 
 <script>
-import { ElImageViewer } from 'element-plus';
+import { ElImageViewer, ElMessage } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-file-viewer/core';
 import '@open-file-viewer/core/style.css';
@@ -814,8 +845,12 @@ export default {
       contractSignatureFileAvailable: false,
       contractPaymentRatioLimit: null,
       contractPaymentRatioExceeded: false,
+      /** 合同付款比例设置（按第1笔、第2笔…顺序） */
+      contractPaymentRatioRows: [],
       payeeCustomerLevel: '',
       attachmentRuleLoading: false,
+      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
+      linkedSettlementAttachmentUrls: [],
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
       attachmentImagePreviewIndex: 0,
@@ -860,7 +895,7 @@ export default {
         billLedgerId: [{ validator: this.validateBillLedger, trigger: 'change' }],
         settlementAmount: [{ validator: this.validateSettlementAmount, trigger: 'change' }],
         appliedAmount: [
-          { required: true, validator: this.validateAppliedAmount, trigger: 'change' },
+          { required: true, validator: this.validateAppliedAmount, trigger: ['change', 'blur'] },
         ],
       },
     };
@@ -905,8 +940,8 @@ export default {
     referenceDialogTitle() {
       if (this.form.paymentType === 'project_advance') return '选择项目合同';
       if (this.canSelectPreSettlement && this.canSelectFormalSettlement) return '选择结算单';
-      if (this.canSelectPreSettlement) return '选择预结算单';
-      if (this.canSelectFormalSettlement) return '选择正式结算单';
+      if (this.canSelectPreSettlement) return '选择预付结算单';
+      if (this.canSelectFormalSettlement) return '选择付款结算单';
       return '选择结算单';
     },
     billPayment() {
@@ -960,10 +995,8 @@ export default {
     },
     settlementRows() {
       if (this.referenceRows.length) {
-        return this.referenceRows.map(item => ({
-          ...item,
-          paymentRatio: this.form.paymentRatio,
-          appliedAmount:
+        return this.referenceRows.map(item => {
+          const appliedAmount =
             item.fixedAppliedAmount === true
               ? Number(item.appliedAmount || 0)
               : Number(
@@ -971,8 +1004,14 @@ export default {
                     (Number(item.settlementAmount || 0) * Number(this.form.paymentRatio || 0)) /
                     100
                   ).toFixed(2)
-                ),
-        }));
+                );
+          return {
+            ...item,
+            paymentRatio: this.form.paymentRatio,
+            appliedAmount,
+            ...this.buildSettlementRatioHint(item),
+          };
+        });
       }
       if (!this.referenceLabel) return [];
       return [
@@ -982,6 +1021,8 @@ export default {
           payableAmount: this.form.payableAmount,
           paymentRatio: this.form.paymentRatio,
           appliedAmount: this.form.appliedAmount,
+          paymentSequence: 1,
+          ...this.buildSettlementRatioHint({ paymentSequence: 1 }),
         },
       ];
     },
@@ -1071,7 +1112,7 @@ export default {
         !this.form.preSettlementId &&
         !this.form.preSettlementIds?.length
       ) {
-        callback(new Error('请选择预结算单'));
+        callback(new Error('请选择预付结算单'));
         return;
       }
       if (
@@ -1102,14 +1143,18 @@ export default {
       callback();
     },
     validateAppliedAmount(rule, value, callback) {
+      if (value === null || value === undefined || value === '') {
+        callback(new Error('请填写申请付款金额'));
+        return;
+      }
       const amount = Number(value);
       const payableAmount = Number(this.form.payableAmount || 0);
-      if (value === null || value === undefined || value === '' || !Number.isFinite(amount)) {
+      if (!Number.isFinite(amount)) {
         callback(new Error('请填写申请付款金额'));
         return;
       }
       if (amount <= 0) {
-        callback(new Error('申请付款金额必须大于0'));
+        callback(new Error('申请付款金额必须大于0，不能为0元'));
         return;
       }
       if (
@@ -1132,10 +1177,23 @@ export default {
         return;
       }
       const selected = this.billOptions.find(item => String(item.id) === String(value));
-      if (
-        selected &&
-        Number(this.form.appliedAmount || 0) > Number(selected.availableBalance || 0)
-      ) {
+      if (!selected) {
+        callback();
+        return;
+      }
+      if (selected.billType && selected.billType !== 'received') {
+        callback(new Error('汇票付款仅可选择收票类型的汇票'));
+        return;
+      }
+      if (selected.maturityDate) {
+        const maturity = this.$dayjs(selected.maturityDate).startOf('day');
+        const today = this.$dayjs().startOf('day');
+        if (maturity.isValid() && maturity.isBefore(today)) {
+          callback(new Error('所选汇票已到期，不可选择'));
+          return;
+        }
+      }
+      if (Number(this.form.appliedAmount || 0) > Number(selected.availableBalance || 0)) {
         callback(new Error('申请付款金额不能超过汇票可用余额'));
         return;
       }
@@ -1263,6 +1321,7 @@ export default {
           await this.loadContractOptions(this.form.projectId);
         }
         await this.fillBillTypeFromContract(this.form.contractId);
+        await this.refreshSettlementPaymentSequences();
         await this.loadAttachmentRuleData(await this.loadCurrentSettlementDetails());
         if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
       } else {
@@ -1290,6 +1349,7 @@ export default {
         this.form.billType = '';
         this.contractPartyBName = '';
         this.receiptAccountOptions = [];
+        this.resetContractPaymentRatioLimit();
         return;
       }
       try {
@@ -1301,11 +1361,13 @@ export default {
           this.form.payerName = partyA;
         }
         this.contractPartyBName = String(data?.partyB || data?.payeeName || '').trim();
+        this.applyContractPaymentRatioLimit(data || {});
         await this.loadReceiptAccountOptions(autoSelectDefault);
       } catch (error) {
         this.form.billType = '';
         this.contractPartyBName = '';
         this.receiptAccountOptions = [];
+        this.resetContractPaymentRatioLimit();
       }
     },
     async loadPaymentMethodOptions() {
@@ -1400,16 +1462,33 @@ export default {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has('')) {
-        this.$message.warning('所选正式结算单合同信息不一致，请返回后重新选择');
+        this.$message.warning('所选付款结算单合同信息不一致，请返回后重新选择');
         return;
       }
       const first = rows[0];
-      const referenceRows = rows.map(item => ({
-        ...this.createReferenceRow(item),
-        settlementNo: item.formalSettlementNo || item.settlementNo || '',
-        appliedAmount: Number(item.appliedAmount || 0),
-        fixedAppliedAmount: true,
-      }));
+      const amountResponses = await Promise.all(
+        rows.map(item => {
+          const referenceId = item.settlementId || item.id;
+          if (!this.isValidReferenceId(referenceId)) return Promise.resolve(null);
+          return api
+            .getReferenceAmount('settlement_payment', referenceId, this.form.id)
+            .catch(() => null);
+        })
+      );
+      const referenceRows = rows.map((item, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        return {
+          ...this.createReferenceRow({
+            ...item,
+            settlementAmount: amount.settlementAmount ?? item.settlementAmount,
+            payableAmount: amount.payableAmount ?? item.payableAmount,
+            paymentSequence: amount.paymentSequence,
+          }),
+          settlementNo: item.formalSettlementNo || item.settlementNo || '',
+          appliedAmount: Number(item.appliedAmount || 0),
+          fixedAppliedAmount: true,
+        };
+      });
       const settlementAmount = referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1503,21 +1582,76 @@ export default {
     },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
-      const appliedAmount = Number(row.advanceAppliedAmount || row.appliedPaymentAmount || 0);
       const isPre = Boolean(row.preSettlementNo || row.preSettlementId || row.referenceType === 'pre');
+      const paymentSequence = Number(row.paymentSequence);
+      // 可付款金额必须来自 referenceAmount 接口（已扣减占用中的付款申请）；缺失时置 0，避免误用未扣减结算金额
+      const payableAmount =
+        row.payableAmount === undefined || row.payableAmount === null
+          ? 0
+          : Number(row.payableAmount || 0);
       return {
         id: row.preSettlementId || row.settlementId || row.id,
         settlementNo: row.preSettlementNo || row.formalSettlementNo || row.settlementNo || '',
         referenceType: isPre ? 'pre' : 'formal',
         settlementAmount: Number(Number(settlementAmount || 0).toFixed(2)),
-        payableAmount: Number(
-          (row.payableAmount === undefined || row.payableAmount === null
-            ? Math.max(0, settlementAmount - appliedAmount)
-            : Number(row.payableAmount || 0)
-          ).toFixed(2)
-        ),
+        payableAmount: Number(Math.max(0, payableAmount).toFixed(2)),
+        paymentSequence: Number.isFinite(paymentSequence) && paymentSequence > 0 ? paymentSequence : 1,
       };
     },
+    /**
+     * 按合同付款比例配置，判断当前付款次序是否超上限。
+     * @param {Object} row 结算信息行（含 paymentSequence）
+     */
+    buildSettlementRatioHint(row = {}) {
+      const sequence = Number(row.paymentSequence || 1);
+      const paymentRatio = Number(this.form.paymentRatio);
+      const ratioConfig = this.contractPaymentRatioRows[sequence - 1];
+      const ratioLimitValue = ratioConfig?.ratioLimit;
+      const ratioLimit = Number(ratioLimitValue);
+      const hasLimit =
+        ratioLimitValue !== null &&
+        ratioLimitValue !== undefined &&
+        String(ratioLimitValue).trim() !== '' &&
+        Number.isFinite(ratioLimit);
+      const hasPaymentRatio =
+        this.form.paymentRatio !== null &&
+        this.form.paymentRatio !== undefined &&
+        String(this.form.paymentRatio).trim() !== '' &&
+        Number.isFinite(paymentRatio);
+      const ratioExceeded = hasLimit && hasPaymentRatio && paymentRatio > ratioLimit;
+      return {
+        paymentSequence: Number.isFinite(sequence) && sequence > 0 ? sequence : 1,
+        contractRatioLimit: hasLimit ? ratioLimit : null,
+        ratioExceeded,
+        ratioRemark: ratioExceeded
+          ? `合同约定第${sequence}笔付款比例上限为${Number(ratioLimit).toFixed(2)}%`
+          : '',
+      };
+    },
+    /** 为结算信息行回填付款次序（第几次付款） */
+    async refreshSettlementPaymentSequences() {
+      if (!this.isSettlementRelatedType || !this.referenceRows.length) {
+        return;
+      }
+      const paymentType =
+        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+      const amountResponses = await Promise.all(
+        this.referenceRows.map(item => {
+          if (!this.isValidReferenceId(item.id)) {
+            return Promise.resolve(null);
+          }
+          return api.getReferenceAmount(paymentType, item.id, this.form.id).catch(() => null);
+        })
+      );
+      this.referenceRows = this.referenceRows.map((item, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        const paymentSequence = Number(amount.paymentSequence || item.paymentSequence || 1);
+        return {
+          ...item,
+          paymentSequence: Number.isFinite(paymentSequence) && paymentSequence > 0 ? paymentSequence : 1,
+        };
+      });
+    },
     createInvoiceRows(invoices = [], settlementNo = '') {
       return (invoices || []).map(invoice => ({
         settlementNo,
@@ -1568,29 +1702,41 @@ export default {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size > 1 || contractIds.has('')) {
-        this.$message.warning('所选预结算单合同信息不一致，请返回后重新选择');
+        this.$message.warning('所选预付结算单合同信息不一致，请返回后重新选择');
         return;
       }
       const first = rows[0];
       this.form.invoices = [];
       const paymentType =
         this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
-      const amountResponses = await Promise.all(
-        rows.map(item => {
-          const referenceId = item.preSettlementId || item.id;
-          if (!this.isValidReferenceId(referenceId)) return Promise.resolve(null);
-          return api.getReferenceAmount(paymentType, referenceId, this.form.id).catch(() => null);
-        })
-      );
-      this.referenceRows = rows.map((item, index) => {
-        const amount = this.unwrapData(amountResponses[index]) || {};
-        return this.createReferenceRow({
-          ...item,
-          referenceType: 'pre',
-          settlementAmount: amount.settlementAmount ?? item.settlementAmount,
-          payableAmount: amount.payableAmount,
+      try {
+        const amountResponses = await Promise.all(
+          rows.map(item => {
+            const referenceId = item.preSettlementId || item.id;
+            if (!this.isValidReferenceId(referenceId)) {
+              return Promise.reject(new Error('结算单无效'));
+            }
+            return api.getReferenceAmount(paymentType, referenceId, this.form.id);
+          })
+        );
+        this.referenceRows = rows.map((item, index) => {
+          const amount = this.unwrapData(amountResponses[index]) || {};
+          const settlementAmount = Number(amount.settlementAmount ?? item.settlementAmount ?? 0);
+          if (amount.payableAmount === undefined || amount.payableAmount === null) {
+            throw new Error('可付款金额获取失败，请重试');
+          }
+          return this.createReferenceRow({
+            ...item,
+            referenceType: 'pre',
+            settlementAmount,
+            payableAmount: Number(amount.payableAmount || 0),
+            paymentSequence: amount.paymentSequence,
+          });
         });
-      });
+      } catch (error) {
+        this.$message.error(error?.message || '可付款金额获取失败，请重试');
+        return;
+      }
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1600,7 +1746,7 @@ export default {
         0
       );
       const paymentRatio = Number(this.form.paymentRatio || 0);
-      // 尾款付款场景下选择预结算单时保留尾款付款类型，不强制改为进度预付
+      // 尾款付款场景下选择预付结算单时保留尾款付款类型，不强制改为进度预付
       this.amountSyncing = true;
       Object.assign(this.form, {
         paymentType,
@@ -1625,7 +1771,8 @@ export default {
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
         billType: '',
-        appliedAmount: Number(((settlementAmount * paymentRatio) / 100).toFixed(2)),
+        // 申请金额按可付款金额×比例，避免未扣减已申请额度
+        appliedAmount: Number(((payableAmount * paymentRatio) / 100).toFixed(2)),
       });
       this.paymentRecords = [];
       this.clearReceiptAccount();
@@ -1827,7 +1974,7 @@ export default {
       );
       return typeMatched || this.matchAttachmentMaterialByFileName(file, materials);
     },
-    mergeAutomaticAttachments(files, materials, sourceName, defaultMaterial = null) {
+    mergeAutomaticAttachments(files, materials, sourceName, defaultMaterial = null, sourceKey = '') {
       const existingUrls = new Set(
         (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
       );
@@ -1848,26 +1995,95 @@ export default {
             attachmentType: MATERIAL_TYPE_MAP[material.key],
             description: file.description || `自动取自${sourceName}`,
             sourceImported: true,
+            sourceKey: sourceKey || undefined,
           };
         });
       if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
+      return imported;
+    },
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
+    removeAutomaticAttachments(sourceKey, sourceName = '') {
+      const previousUrls = new Set(
+        sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
+      );
+      this.form.attachments = (this.form.attachments || []).filter(file => {
+        const url = this.attachmentFileUrl(file);
+        if (sourceKey && file.sourceKey === sourceKey) return false;
+        if (
+          sourceName &&
+          file.sourceImported &&
+          String(file.description || '').includes(`自动取自${sourceName}`)
+        ) {
+          return false;
+        }
+        if (previousUrls.size && url && previousUrls.has(url)) return false;
+        return true;
+      });
+      if (sourceKey === 'settlement') {
+        this.linkedSettlementAttachmentUrls = [];
+      }
+    },
+    /** 按当前结算单附件整批同步：先清旧关联，再写入新结算单上传的附件 */
+    syncSettlementAttachments(settlementRows = []) {
+      const settlementMaterials = [
+        ATTACHMENT_MATERIALS.weighingSlip,
+        ATTACHMENT_MATERIALS.entrustOrder,
+        ATTACHMENT_MATERIALS.settlement,
+      ];
+      const settlementFiles = (settlementRows || []).flatMap(row => this.parse(row.attachmentsJson));
+      const nextUrlSet = new Set(
+        settlementFiles.map(file => this.attachmentFileUrl(file)).filter(Boolean)
+      );
+      // 编辑回显时草稿里已有结算单附件但无 sourceKey：用 URL 交集补齐待替换清单
+      if (!(this.linkedSettlementAttachmentUrls || []).length && nextUrlSet.size) {
+        this.linkedSettlementAttachmentUrls = (this.form.attachments || [])
+          .map(file => this.attachmentFileUrl(file))
+          .filter(url => url && nextUrlSet.has(url));
+      }
+      this.removeAutomaticAttachments('settlement', '结算单');
+      const imported = this.mergeAutomaticAttachments(
+        settlementFiles,
+        settlementMaterials,
+        '结算单',
+        null,
+        'settlement'
+      );
+      this.linkedSettlementAttachmentUrls = imported
+        .map(file => this.attachmentFileUrl(file))
+        .filter(Boolean);
     },
     async loadCurrentSettlementDetails() {
+      const preIds = [
+        ...(this.form.preSettlementIds || []),
+        this.form.preSettlementId,
+        ...(this.referenceRows || [])
+          .filter(item => item.referenceType === 'pre')
+          .map(item => item.id),
+      ]
+        .map(id => String(id ?? '').trim())
+        .filter(id => this.isValidReferenceId(id));
+      const formalIds = [
+        ...(this.form.settlementIds || []),
+        this.form.settlementId,
+        ...(this.referenceRows || [])
+          .filter(item => item.referenceType !== 'pre')
+          .map(item => item.id),
+      ]
+        .map(id => String(id ?? '').trim())
+        .filter(id => this.isValidReferenceId(id));
+      const uniquePreIds = [...new Set(preIds)];
+      const uniqueFormalIds = [...new Set(formalIds)];
       if (
-        this.form.paymentType === 'progress_advance' &&
-        this.isValidReferenceId(this.form.preSettlementId)
+        (this.form.paymentType === 'progress_advance' ||
+          this.form.paymentType === 'settlement_payment') &&
+        uniquePreIds.length
       ) {
-        const response = await preApi.getDetail(this.form.preSettlementId);
-        const detail = this.unwrapData(response);
-        return detail?.id ? [detail] : [];
+        const responses = await Promise.all(uniquePreIds.map(id => preApi.getDetail(id)));
+        return responses.map(response => this.unwrapData(response)).filter(item => item?.id);
       }
-      if (
-        this.form.paymentType === 'settlement_payment' &&
-        this.isValidReferenceId(this.form.settlementId)
-      ) {
-        const response = await formalApi.getDetail(this.form.settlementId);
-        const detail = this.unwrapData(response);
-        return detail?.id ? [detail] : [];
+      if (this.form.paymentType === 'settlement_payment' && uniqueFormalIds.length) {
+        const responses = await Promise.all(uniqueFormalIds.map(id => formalApi.getDetail(id)));
+        return responses.map(response => this.unwrapData(response)).filter(item => item?.id);
       }
       return [];
     },
@@ -1877,32 +2093,29 @@ export default {
       this.contractSignatureFileAvailable = false;
       this.resetContractPaymentRatioLimit();
       try {
-        const settlementMaterials = [
-          ATTACHMENT_MATERIALS.weighingSlip,
-          ATTACHMENT_MATERIALS.entrustOrder,
-          ATTACHMENT_MATERIALS.settlement,
-        ];
-        const settlementFiles = (settlementRows || []).flatMap(row =>
-          this.parse(row.attachmentsJson)
-        );
-        this.mergeAutomaticAttachments(settlementFiles, settlementMaterials, '结算单');
+        // 切换结算单时，附件区同步替换为当前结算单已上传附件
+        this.syncSettlementAttachments(settlementRows);
         if (!this.form.contractId) {
           this.firstContractPayment = false;
+          this.removeAutomaticAttachments('contract', '合同');
           return;
         }
         const contractResponse = await getContractDetail(this.form.contractId);
         const contract = this.unwrapData(contractResponse) || {};
+        // 结算信息需用合同全部付款比例配置判断第几笔是否超限
+        this.applyContractPaymentRatioLimit(contract);
         if (this.form.paymentType === 'project_advance') {
-          this.applyContractPaymentRatioLimit(contract);
           const contractFiles = this.parse(contract.contractFileJson);
           this.contractSignatureFileAvailable = contractFiles.some(file =>
             Boolean(this.attachmentFileUrl(file))
           );
+          this.removeAutomaticAttachments('contract', '合同');
           this.mergeAutomaticAttachments(
             contractFiles,
             [ATTACHMENT_MATERIALS.contract],
             '合同',
-            ATTACHMENT_MATERIALS.contract
+            ATTACHMENT_MATERIALS.contract,
+            'contract'
           );
           return;
         }
@@ -1916,12 +2129,14 @@ export default {
             String(item.id || '') !== String(this.form.id || '') &&
             item.approvalStatus !== 'voided'
         );
+        this.removeAutomaticAttachments('contract', '合同');
         if (this.firstContractPayment) {
           this.mergeAutomaticAttachments(
             this.parse(contract.contractFileJson),
             [ATTACHMENT_MATERIALS.contract],
             '合同',
-            ATTACHMENT_MATERIALS.contract
+            ATTACHMENT_MATERIALS.contract,
+            'contract'
           );
         }
       } catch (error) {
@@ -1933,9 +2148,12 @@ export default {
     resetContractPaymentRatioLimit() {
       this.contractPaymentRatioLimit = null;
       this.contractPaymentRatioExceeded = false;
+      this.contractPaymentRatioRows = [];
     },
     applyContractPaymentRatioLimit(contract = {}) {
-      const [firstRatio] = this.parse(contract.paymentRatioJson);
+      const ratioRows = this.parse(contract.paymentRatioJson).filter(item => item && typeof item === 'object');
+      this.contractPaymentRatioRows = ratioRows;
+      const [firstRatio] = ratioRows;
       const ratioLimitValue = firstRatio?.ratioLimit;
       const ratioLimit = Number(ratioLimitValue);
       this.contractPaymentRatioLimit =
@@ -2279,6 +2497,18 @@ export default {
       this.loadBillPage();
     },
     selectBill(row) {
+      if (row?.billType && row.billType !== 'received') {
+        ElMessage.warning('汇票付款仅可选择收票类型的汇票');
+        return;
+      }
+      if (row?.maturityDate) {
+        const maturity = this.$dayjs(row.maturityDate).startOf('day');
+        const today = this.$dayjs().startOf('day');
+        if (maturity.isValid() && maturity.isBefore(today)) {
+          ElMessage.warning('所选汇票已到期，不可选择');
+          return;
+        }
+      }
       this.form.billLedgerId = row.id;
       this.form.billNo = row.billNo || '';
       this.billOptions = [row];
@@ -2296,6 +2526,33 @@ export default {
         contractName: String(contractName || '').trim() || undefined,
       };
     },
+    async fillReferencePayableAmounts(rows, paymentType) {
+      if (!rows?.length) return rows || [];
+      const amountResponses = await Promise.all(
+        rows.map(row => {
+          const referenceId = row.id;
+          if (!this.isValidReferenceId(referenceId)) {
+            return Promise.resolve(null);
+          }
+          return api
+            .getReferenceAmount(paymentType, referenceId, this.form.id)
+            .catch(() => null);
+        })
+      );
+      return rows.map((row, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
+        const payableAmount =
+          amount.payableAmount === undefined || amount.payableAmount === null
+            ? null
+            : Number(amount.payableAmount || 0);
+        return {
+          ...row,
+          settlementAmount,
+          payableAmount,
+        };
+      });
+    },
     async loadFormalReferences() {
       this.formalPage.loading = true;
       try {
@@ -2305,7 +2562,8 @@ export default {
           this.referenceParams('formal')
         );
         const data = this.unwrapData(response) || {};
-        this.formalRows = data.records || [];
+        const records = data.records || [];
+        this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
         this.formalPage.total = Number(data.total || 0);
       } finally {
         this.formalPage.loading = false;
@@ -2320,7 +2578,10 @@ export default {
           this.referenceParams('pre')
         );
         const data = this.unwrapData(response) || {};
-        this.preRows = data.records || [];
+        const records = data.records || [];
+        const paymentType =
+          this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+        this.preRows = await this.fillReferencePayableAmounts(records, paymentType);
         this.prePage.total = Number(data.total || 0);
       } finally {
         this.prePage.loading = false;
@@ -2413,7 +2674,7 @@ export default {
         }
       }
       if (!id) {
-        this.$message.warning(isPre ? '未找到对应的预结算单' : '未找到对应的正式结算单');
+        this.$message.warning(isPre ? '未找到对应的预付结算单' : '未找到对应的付款结算单');
         return;
       }
       this.$router.push({
@@ -2421,7 +2682,7 @@ export default {
         query: {
           mode: 'view',
           id,
-          name: isPre ? '查看预结算' : '查看正式结算',
+          name: isPre ? '查看预付结算单' : '查看付款结算单',
         },
       });
     },
@@ -2463,7 +2724,14 @@ export default {
       const amount = this.unwrapData(amountResponse) || {};
       const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
       const payableAmount = Number(amount.payableAmount ?? 0);
-      this.referenceRows = [this.createReferenceRow({ ...row, settlementAmount, payableAmount })];
+      this.referenceRows = [
+        this.createReferenceRow({
+          ...row,
+          settlementAmount,
+          payableAmount,
+          paymentSequence: amount.paymentSequence,
+        }),
+      ];
       this.clearReceiptAccount();
       Object.assign(this.form, {
         paymentType: 'settlement_payment',
@@ -2508,14 +2776,17 @@ export default {
       const rows = this.formalSelection || [];
       if (!rows.length) return;
       if (new Set(rows.map(item => String(item.contractId || ''))).size !== 1) {
-        this.$message.warning('所选正式结算单必须属于同一合同');
+        this.$message.warning('所选付款结算单必须属于同一合同');
         return;
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => formalApi.getDetail(row.id)));
-      await this.applyTransferredFormalSettlements(
-        details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
-      );
+      const detailRows = details.map((response, index) => ({
+        ...validRows[index],
+        ...this.unwrapData(response),
+      }));
+      await this.applyTransferredFormalSettlements(detailRows);
+      await this.loadAttachmentRuleData(detailRows);
       this.referenceVisible = false;
     },
     async selectPre(row) {
@@ -2533,7 +2804,13 @@ export default {
       const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
       const payableAmount = Number(amount.payableAmount ?? 0);
       this.referenceRows = [
-        this.createReferenceRow({ ...row, settlementAmount, payableAmount, referenceType: 'pre' }),
+        this.createReferenceRow({
+          ...row,
+          settlementAmount,
+          payableAmount,
+          referenceType: 'pre',
+          paymentSequence: amount.paymentSequence,
+        }),
       ];
       this.form.invoices = [];
       this.paymentRecords = [];
@@ -2572,14 +2849,17 @@ export default {
       const rows = this.preSelection || [];
       if (!rows.length) return;
       if (new Set(rows.map(item => String(item.contractId || ''))).size !== 1) {
-        this.$message.warning('所选预结算单必须属于同一合同');
+        this.$message.warning('所选预付结算单必须属于同一合同');
         return;
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => preApi.getDetail(row.id)));
-      await this.applyTransferredPreSettlements(
-        details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
-      );
+      const detailRows = details.map((response, index) => ({
+        ...validRows[index],
+        ...this.unwrapData(response),
+      }));
+      await this.applyTransferredPreSettlements(detailRows);
+      await this.loadAttachmentRuleData(detailRows);
       this.referenceVisible = false;
     },
     normalizeAttachments(files) {
@@ -2722,30 +3002,60 @@ export default {
               })),
       };
     },
+    /** 顶部「保存」：保存成功后关闭表单页并回到列表 */
+    async handleSave() {
+      await this.saveDraft({ showSuccess: true, closePage: true });
+    },
+    clearMessages() {
+      ElMessage.closeAll();
+      this.$message?.closeAll?.();
+    },
     async saveDraft(options = {}) {
-      const showSuccess = options.showSuccess !== false;
+      // 仅显式 showSuccess:true 时提示；提交前静默保存默认不弹「保存成功」
+      const showSuccess = options.showSuccess === true;
+      const closePage = options.closePage === true;
       await this.$refs.formRef.validate();
+      const appliedAmount = Number(this.form.appliedAmount);
+      if (
+        this.form.appliedAmount === null ||
+        this.form.appliedAmount === undefined ||
+        this.form.appliedAmount === '' ||
+        !Number.isFinite(appliedAmount) ||
+        appliedAmount <= 0
+      ) {
+        this.clearMessages();
+        ElMessage.warning('申请付款金额必填且必须大于0');
+        return false;
+      }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
-        this.$message.warning('请选择所属项目');
+        this.clearMessages();
+        ElMessage.warning('请选择所属项目');
         return false;
       }
       try {
         this.validateInvoices();
         this.validatePaymentRecords();
       } catch (error) {
-        this.$message.warning(error.message);
+        this.clearMessages();
+        ElMessage.warning(error.message);
         return false;
       }
       const data = this.unwrapData(await api.save(this.payload()));
       this.form.id = data;
       if (showSuccess) {
-        this.$message.success('保存成功');
+        this.clearMessages();
+        ElMessage.success('保存成功');
+      }
+      if (closePage) {
+        sessionStorage.setItem(paymentApplicationListRefreshKey, '1');
+        this.goBack();
       }
       return true;
     },
     async submitForm() {
-      // 提交前静默保存，避免同时弹出「保存成功」与材料缺失 toast
-      const saved = await this.saveDraft({ showSuccess: false });
+      // 提交前静默保存；不校验/提示附件未上传；全程只保留一条「提交成功」
+      this.clearMessages();
+      const saved = await this.saveDraft({ showSuccess: false, closePage: false });
       if (!saved) return;
       const previousApprovalStatus = this.form.approvalStatus || '';
       await api.submit({ id: this.form.id });
@@ -2756,8 +3066,9 @@ export default {
         approvalStatus: previousApprovalStatus,
         mkEnabled: await loadMkEnabled().catch(() => false),
       });
-      this.$message.success('提交成功');
-      // 通知列表页（keep-alive）重新拉取数据
+      this.clearMessages();
+      ElMessage.success('提交成功');
+      // 通知列表页（keep-alive）重新拉取列表
       sessionStorage.setItem(paymentApplicationListRefreshKey, '1');
       this.goBack();
     },
@@ -2820,6 +3131,19 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.payment-form-page__bill-search :deep(.el-form--inline) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0 8px;
+}
+.payment-form-page__bill-search :deep(.el-form-item) {
+  margin-right: 0;
+  margin-bottom: 8px;
+}
+.payment-form-page__bill-search-actions {
+  margin-left: 0;
+}
 .payment-form-page__reference-pagination {
   margin-top: 12px;
 }
@@ -2854,6 +3178,9 @@ export default {
   font-size: 13px;
   font-weight: 400;
 }
+.payment-form-page__ratio-exceeded {
+  color: var(--el-color-danger);
+}
 .payment-form-page__attachment-checklist {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 44cde10..f8c0915 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -322,6 +322,7 @@ export default {
         approvalStatus: previousApprovalStatus,
         mkEnabled: this.mkEnabled,
       });
+      this.$message.closeAll?.();
       this.$message.success('提交成功');
       this.refreshChange();
     },
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 930e2a1..04a82d3 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -702,7 +702,7 @@
       </el-button>
     </div>
 
-    <el-dialog v-model="candidate.visible" title="选择预结算单" width="88%" append-to-body>
+    <el-dialog v-model="candidate.visible" title="选择预付结算单" width="88%" append-to-body>
       <el-card>
         <el-form
           :model="candidate.query"
@@ -711,7 +711,7 @@
           label-width="88px"
           class="formal-editor__candidate-search"
         >
-          <el-form-item label="预结算单号"
+          <el-form-item label="预付结算单号"
           ><el-input v-model="candidate.query.preSettlementNo" clearable
           /></el-form-item>
           <el-form-item label="合同编号"
@@ -836,20 +836,6 @@
         <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
         <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
         <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-        <el-table-column label="计费规则" min-width="190" align="center">
-          <template #default="{ row }">
-            <div class="formal-editor__billing-rule-cell">
-              <span>{{ displayValue(billingRuleName(row)) }}</span>
-              <el-icon
-                class="formal-editor__billing-rule-icon"
-                title="查看计费规则详情"
-                @click="openBillingRuleInfo(row)"
-              >
-                <InfoFilled />
-              </el-icon>
-            </div>
-          </template>
-        </el-table-column>
         <el-table-column label="运输总量" min-width="150" align="center">
           <template #default="{ row }">
             <el-input-number
@@ -887,11 +873,29 @@
           v-for="feeItem in adjustFeeItemNames"
           :key="feeItem"
           :label="feeItem"
-          min-width="140"
+          min-width="160"
           align="center"
         >
           <template #default="{ row }">
+            <div v-if="isFreightFeeItem(feeItem)" class="formal-editor__billing-rule-cell">
+              <el-input-number
+                v-model="row.feeItems[feeItem]"
+                :min="0"
+                :precision="2"
+                :controls="false"
+                @change="recalculateAdjustRow(row, feeItem)"
+              />
+              <el-icon
+                v-if="hasBillingRule(row)"
+                class="formal-editor__billing-rule-icon"
+                title="查看计费规则详情"
+                @click="openBillingRuleInfo(row)"
+              >
+                <InfoFilled />
+              </el-icon>
+            </div>
             <el-input-number
+              v-else
               v-model="row.feeItems[feeItem]"
               :min="0"
               :precision="2"
@@ -905,11 +909,6 @@
             <el-input-number v-model="row.settlementAmountTax" :precision="2" :controls="false" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="200" align="center">
-          <template #default="{ row }">
-            <el-input v-model="row.remark" maxlength="200" />
-          </template>
-        </el-table-column>
       </el-table>
       <el-form
         :model="adjust"
@@ -917,8 +916,15 @@
         label-width="auto"
         class="formal-editor__adjust-reason"
       >
-        <el-form-item label="调整原因" required>
-          <el-input v-model="adjust.reason" maxlength="200" show-word-limit />
+        <el-form-item label="备注">
+          <el-input
+            v-model="adjust.reason"
+            type="textarea"
+            :rows="2"
+            maxlength="200"
+            show-word-limit
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -939,51 +945,45 @@
       <template v-if="billingRuleDialog.rule">
         <div class="dialog-section-title">计费规则</div>
         <el-descriptions :column="2" border class="formal-editor__billing-rule-detail">
-          <el-descriptions-item label="规则名称">{{
-            displayValue(billingRuleDialog.rule.name)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="费用类型">{{
-            displayValue(billingRuleDialog.rule.feeType)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="费用项">{{
-            displayValue(billingRuleDialog.rule.feeItem)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费要素">{{
-            displayValue(billingRuleDialog.rule.billingElement)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费类型">{{
-            displayValue(billingRuleDialog.rule.billingType)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费单位">{{
-            displayValue(billingRuleDialog.rule.billingUnit)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="单价">{{
-            displayValue(billingRuleDialog.rule.unitPrice)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="最低计费量">{{
-            displayValue(billingRuleDialog.rule.minimumBillingWeight)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费区间">{{
-            billingRuleRanges(billingRuleDialog.rule)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">{{
-            displayValue(billingRuleDialog.rule.remark)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="费用项">
+            {{ displayValue(billingRuleDialog.rule.feeItem) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费要素">
+            {{ displayValue(billingRuleDialog.rule.billingElement) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费类型">
+            {{ displayValue(billingRuleDialog.rule.billingType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费单位">
+            {{ displayValue(billingRuleDialog.rule.billingUnit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="单价">
+            {{ displayValue(billingRuleDialog.rule.unitPrice) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="最低计费量">
+            {{ displayValue(billingRuleDialog.rule.minimumBillingWeight) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费区间">
+            {{ billingRuleRanges(billingRuleDialog.rule) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ displayValue(billingRuleDialog.rule.remark) }}
+          </el-descriptions-item>
         </el-descriptions>
         <div class="dialog-section-title formal-editor__billing-rule-match-title">匹配条件</div>
         <el-descriptions :column="2" border class="formal-editor__billing-rule-detail">
-          <el-descriptions-item label="起运地">{{
-            displayValue(billingRuleDialog.rule.matchCondition.origin)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="目的地">{{
-            displayValue(billingRuleDialog.rule.matchCondition.destination)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="运输方式">{{
-            displayValue(billingRuleDialog.rule.matchCondition.transportMode)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="货物类型">{{
-            displayValue(billingRuleDialog.rule.matchCondition.cargoType)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="起运地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.origin) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="目的地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物名称">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物类型">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
+          </el-descriptions-item>
         </el-descriptions>
       </template>
       <el-empty v-else description="暂无计费规则详情" />
@@ -995,6 +995,7 @@
 </template>
 
 <script>
+import { InfoFilled } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
@@ -1034,7 +1035,6 @@ import {
 } from '@/option/settlement/formalSettlementTable';
 import { getDictionary } from '@/api/system/dictbiz';
 import { h } from 'vue';
-import { InfoFilled } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { normalizeCurrencyCode } from '@/utils/currency';
@@ -1220,7 +1220,13 @@ export default {
       return isAdministrator(this.userInfo);
     },
     title() {
-      return this.readonly ? '查看正式结算单' : this.recordId ? '编辑正式结算单' : '新增正式结算单';
+      const billLabel =
+        this.form.settlementType === 'receivable' ? '收款结算单' : '付款结算单';
+      return this.readonly
+        ? `查看${billLabel}`
+        : this.recordId
+        ? `编辑${billLabel}`
+        : `新增${billLabel}`;
     },
     detailFeeItemNames() {
       const names = new Set();
@@ -1314,7 +1320,17 @@ export default {
   methods: {
     formatContractOptionLabel,
     hasPermission(code) {
-      return this.isAdmin || this.validData(this.permission?.[code], false);
+      if (this.isAdmin) return true;
+      const action = String(code || '').replace(
+        /^(payment_settlement_|receipt_settlement_|formal_settlement_)/,
+        ''
+      );
+      const prefix =
+        this.form.settlementType === 'receivable' ? 'receipt_settlement' : 'payment_settlement';
+      return (
+        this.validData(this.permission?.[`${prefix}_${action}`], false) ||
+        this.validData(this.permission?.[`formal_settlement_${action}`], false)
+      );
     },
     async loadFormalDetail(id) {
       const response = this.publicMode
@@ -2152,8 +2168,19 @@ export default {
         )}.xlsx`
       );
     },
-    billingRuleName(row) {
-      return this.normalizeBillingRule(row).name;
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
     },
     openBillingRuleInfo(row) {
       this.billingRuleDialog.rule = this.normalizeBillingRule(row);
@@ -2179,26 +2206,8 @@ export default {
       const matchCondition = this.parseObject(
         source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
       );
-      const ruleNames = matchedRules
-        .map(item => item.ruleName || item.name || item.billingRuleName || item.feeItem)
-        .filter(Boolean);
       return {
         ...rule,
-        name:
-          source.billingRuleName ||
-          source.feeRuleName ||
-          source.ruleName ||
-          source.billingPlanRuleName ||
-          source.billingPlanName ||
-          rule.name ||
-          rule.ruleName ||
-          rule.billingRuleName ||
-          rule.planName ||
-          rule.billingPlanName ||
-          ruleNames.join('、') ||
-          rule.feeItem ||
-          '',
-        feeType: source.billingFeeType || source.feeType || rule.feeType,
         feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
         billingElement:
           source.billingElement ||
@@ -2216,7 +2225,11 @@ export default {
           ...matchCondition,
           origin: matchCondition.origin || matchCondition.originName,
           destination: matchCondition.destination || matchCondition.destinationName,
-          transportMode: matchCondition.transportMode || matchCondition.transportType,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
           cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
         },
       };
@@ -2294,7 +2307,11 @@ export default {
         detailId: row.formalSettlementId ? row.id : null,
         sourceDetailId: row.sourceDetailId || null,
         feeKey,
-        reason: pending?.reason || '',
+        // 底部备注回显结算明细备注；暂存过的调整优先取暂存备注
+        reason:
+          pending?.reason !== undefined && pending?.reason !== null
+            ? pending.reason
+            : row.remark || '',
         rows: [],
         targetRow: row.formalSettlementId ? null : row,
       };
@@ -2317,7 +2334,6 @@ export default {
       }
     },
     async saveAdjustment() {
-      if (!this.adjust.reason.trim()) return this.$message.warning('请输入调整原因');
       if (this.adjust.rows.some(row => row.calculating)) {
         return this.$message.warning('费用正在重新计算，请稍候');
       }
@@ -2346,6 +2362,14 @@ export default {
             .reduce((total, item) => total + Number(item.settlementAmountTax || 0), 0)
             .toFixed(2)
         );
+        const settlementAmountNoTax = Number(
+          this.adjust.rows
+            .reduce((total, item) => total + Number(item.settlementAmountNoTax || 0), 0)
+            .toFixed(2)
+        );
+        const hasSettlementAmountNoTax = this.adjust.rows.some(
+          item => item.settlementAmountNoTax !== undefined && item.settlementAmountNoTax !== null
+        );
         const feeItems = this.adjust.rows.reduce((result, item) => {
           Object.entries(item.feeItems || {}).forEach(([name, amount]) => {
             result[name] = Number((Number(result[name] || 0) + Number(amount || 0)).toFixed(2));
@@ -2359,24 +2383,37 @@ export default {
           originalAmount,
           adjustAmount: Number((settlementAmount - originalAmount).toFixed(2)),
           settlementAmountTax: settlementAmount,
+          settlementAmountNoTax: hasSettlementAmountNoTax
+            ? settlementAmountNoTax
+            : target.settlementAmountNoTax,
           feeItemsJson: JSON.stringify(feeItems),
-          freightAmount: this.adjust.rows.reduce(
-            (total, item) => total + Number(item.freightAmount || 0),
-            0
+          freightAmount: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.freightAmount || 0), 0)
+              .toFixed(2)
           ),
-          transportQuantity: this.adjust.rows.reduce(
-            (total, item) => total + Number(item.transportQuantity || 0),
-            0
+          transportQuantity: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.transportQuantity || 0), 0)
+              .toFixed(2)
+          ),
+          mileage: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.mileage || 0), 0)
+              .toFixed(2)
           ),
-          mileage: this.adjust.rows.reduce((total, item) => total + Number(item.mileage || 0), 0),
           unitPrice: edited.unitPrice,
-          remark: edited.remark,
+          // 底部备注写入结算明细备注
+          remark: this.adjust.reason || '',
           pendingDetailAdjustment: true,
         });
         if (this.adjust.feeKey) {
+          const clonedRows = this.cloneAdjustRows(this.adjust.rows);
+          // 暂存后同步费用快照，避免再次打开调整弹窗或汇总时仍用调整前数据。
+          this.detailFeeSnapshots[this.adjust.feeKey] = clonedRows;
           this.pendingAdjustments[this.adjust.feeKey] = {
             reason: this.adjust.reason,
-            rows: this.cloneAdjustRows(this.adjust.rows),
+            rows: clonedRows,
           };
         }
         await this.refreshSummaryFees();
@@ -2398,7 +2435,6 @@ export default {
             feeItems: row.feeItems,
             settlementAmountTax: row.settlementAmountTax,
             settlementAmountNoTax: row.settlementAmountNoTax,
-            remark: row.remark,
           })),
         });
         this.$message.success('调整保存成功');
@@ -2422,6 +2458,17 @@ export default {
       }));
       await this.confirmInvoiceClaims();
     },
+    // 发票认领默认金额以当前结算金额为准：优先表单结算金额，其次结算合计，再次明细含税合计。
+    resolveInvoiceClaimSettlementAmount() {
+      const formAmount = Number(this.form.settlementAmount || 0);
+      if (formAmount > 0) return formAmount;
+      const summaryAmount = Number(this.summaryTotal || 0);
+      if (summaryAmount > 0) return summaryAmount;
+      return this.details.reduce(
+        (total, row) => total + Number(row.settlementAmountTax || row.settlementAmount || 0),
+        0
+      );
+    },
     async confirmInvoiceClaims() {
       if (!this.invoiceClaimDialog.selected.length) {
         this.$message.warning('请至少选择一条发票');
@@ -2430,26 +2477,33 @@ export default {
       this.invoiceClaimDialog.confirming = true;
       try {
         const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
+        const settlementAmount = this.resolveInvoiceClaimSettlementAmount();
+        if (settlementAmount > 0 && Number(this.form.settlementAmount || 0) <= 0) {
+          this.form.settlementAmount = Number(settlementAmount).toFixed(2);
+        }
         let remaining = Math.max(
-          Number(this.form.settlementAmount || 0) -
+          settlementAmount -
             this.invoices.reduce((total, item) => total + Number(item.matchedAmount || 0), 0),
           0
         );
         const invoices = this.invoiceClaimDialog.selected
           .filter(row => !existingNumbers.has(String(row.invoiceNo)))
           .map(row => {
-            const sourceAmount = Number(row.matchedAmount || 0);
+            // 票池 matchedAmount 默认等于整张发票金额；可匹配口径优先取 availableInvoiceAmount
+            const sourceAmount = Number(
+              row.availableInvoiceAmount || row.matchedAmount || row.invoiceAmount || 0
+            );
+            // 可匹配金额大于剩余结算金额时，默认匹配金额取剩余结算金额（单张发票常见场景）
             const matchedAmount =
-              Number(this.form.settlementAmount || 0) > 0
-                ? Math.min(sourceAmount, remaining)
-                : sourceAmount;
-            if (Number(this.form.settlementAmount || 0) > 0) {
+              settlementAmount > 0 ? Math.min(sourceAmount, remaining) : sourceAmount;
+            if (settlementAmount > 0) {
               remaining = Math.max(0, remaining - matchedAmount);
             }
             return {
               ...row,
               invoiceType: row.invoiceTypeName || row.invoiceType || '',
-              matchedAmount,
+              availableInvoiceAmount: sourceAmount,
+              matchedAmount: Number(matchedAmount.toFixed(2)),
             };
           })
           .filter(row => row.matchedAmount > 0);
@@ -2507,7 +2561,7 @@ export default {
         }
         matchedTotal += matchedAmount;
       }
-      if (matchedTotal > Number(this.form.settlementAmount || 0)) {
+      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
         this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
         return false;
       }
@@ -2615,7 +2669,7 @@ export default {
         summaryFees: this.summaryFees
           .filter(
             row =>
-              row.manualFlag === 1 ||
+              Number(row.manualFlag) === 1 ||
               row.id ||
               Number(row.adjustAmount || 0) !== 0 ||
               String(row.remark || '').trim()
@@ -2626,7 +2680,7 @@ export default {
             feeItem: row.feeItem,
             adjustAmount: Number(row.adjustAmount || 0),
             remark: row.remark,
-            manualFlag: row.manualFlag || 0,
+            manualFlag: Number(row.manualFlag) === 1 ? 1 : 0,
           })),
         attachmentsJson: this.stringifyAttachments(this.attachments),
         invoices: this.invoices.map(row => ({
@@ -3053,20 +3107,6 @@ export default {
 .formal-editor__billing-rule-match-title {
   margin-top: 20px;
 }
-.dialog-section-title {
-  display: flex;
-  align-items: center;
-  min-height: 22px;
-  font-size: 16px;
-  font-weight: 600;
-}
-.dialog-section-title::before {
-  width: 4px;
-  height: 18px;
-  margin-right: 8px;
-  background: #409eff;
-  content: '';
-}
 .formal-editor__attachment-missing {
   margin-left: 12px;
   color: var(--el-color-danger);
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 9108e5c..b15b642 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -3,13 +3,13 @@
     <div class="fs-table-panel__toolbar">
       <div>
         <el-button
-          v-if="hasPermission('formal_settlement_add')"
+          v-if="hasPermission('add')"
           type="primary"
           @click="$emit('create')"
           >新增</el-button
         >
         <el-button
-          v-if="hasPermission('formal_settlement_payment')"
+          v-if="showPaymentAction && hasPermission('payment')"
           type="primary"
           plain
           :disabled="!selection.length"
@@ -17,23 +17,23 @@
           >付款申请</el-button
         >
         <el-button
-          v-if="hasPermission('formal_settlement_sync')"
+          v-if="hasPermission('sync')"
           type="primary"
           plain
-          :disabled="selection.length !== 1"
+          :disabled="!selection.length"
           :loading="syncLoading"
           @click="$emit('sync')"
           >同步金蝶</el-button
         >
         <el-button
-          v-if="hasPermission('formal_settlement_print')"
+          v-if="hasPermission('print')"
           type="primary"
           plain
           @click="emitSingle('print')"
           >打印结算单</el-button
         >
         <el-button
-          v-if="hasPermission('formal_settlement_export')"
+          v-if="hasPermission('export')"
           type="primary"
           plain
           @click="$emit('export')"
@@ -149,6 +149,9 @@ export default {
     hasPermission: { type: Function, required: true },
     mkEnabled: { type: Boolean, default: false },
     searchVisible: { type: Boolean, default: true },
+    /** 是否展示付款申请按钮（仅付款结算单） */
+    showPaymentAction: { type: Boolean, default: true },
+    billLabel: { type: String, default: '结算单' },
   },
   emits: [
     'create',
@@ -223,7 +226,7 @@ export default {
     },
     emitSingle(type) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${type === 'print' ? '打印' : '操作'}需选择一条正式结算单`);
+        this.$message.warning(`${type === 'print' ? '打印' : '操作'}需选择一条${this.billLabel}`);
         return;
       }
       this.$emit('action', { type, row: this.selection[0] });
@@ -233,27 +236,26 @@ export default {
     },
     rowActions(row) {
       const actions = [];
-      if (this.hasPermission('formal_settlement_view'))
-        actions.push({ type: 'view', label: '查看' });
-      if (this.hasPermission('formal_settlement_edit') && this.isEditable(row))
+      if (this.hasPermission('view')) actions.push({ type: 'view', label: '查看' });
+      if (this.hasPermission('edit') && this.isEditable(row))
         actions.push({ type: 'edit', label: '编辑' });
-      if (this.hasPermission('formal_settlement_delete') && row.approvalStatus === 'draft')
+      if (this.hasPermission('delete') && row.approvalStatus === 'draft')
         actions.push({ type: 'delete', label: '删除', danger: true });
-      if (this.hasPermission('formal_settlement_submit') && this.isEditable(row))
+      if (this.hasPermission('submit') && this.isEditable(row))
         actions.push({ type: 'submit', label: '提交' });
       if (
         this.mkEnabled &&
-        this.hasPermission('formal_settlement_approve') &&
+        this.hasPermission('approve') &&
         ['reviewing', 'approved'].includes(row.approvalStatus)
       ) {
         actions.push({ type: 'mkAudit', label: '流程' });
       }
-      if (!this.mkEnabled && this.hasPermission('formal_settlement_approve') && row.approvalStatus === 'reviewing') {
+      if (!this.mkEnabled && this.hasPermission('approve') && row.approvalStatus === 'reviewing') {
         actions.push({ type: 'approve', label: '通过' });
         actions.push({ type: 'return', label: '驳回', danger: true });
       }
       if (
-        this.hasPermission('formal_settlement_void') &&
+        this.hasPermission('void') &&
         row.approvalStatus === 'approved' &&
         row.kingdeeSyncStatus !== 'synced'
       )
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 5d5ad8e..ca9b5a6 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -459,7 +459,7 @@
       </section-card>
 
       <section-card v-if="form.id && readonly" title="变更记录">
-        <el-table :data="adjustChangeRecords" border>
+        <el-table :data="changeRecords" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             v-for="column in changeTableColumns"
@@ -753,20 +753,6 @@
       <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
       <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
       <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-      <el-table-column label="计费规则" min-width="190" align="center">
-        <template #default="{ row }">
-          <div class="pre-settlement-editor__billing-rule-cell">
-            <span>{{ displayValue(billingRuleName(row)) }}</span>
-            <el-icon
-              class="pre-settlement-editor__billing-rule-icon"
-              title="查看计费规则详情"
-              @click="openBillingRuleInfo(row)"
-            >
-              <InfoFilled />
-            </el-icon>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="运输总量" min-width="150" align="center">
         <template #default="{ row }">
           <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
@@ -809,11 +795,33 @@
         v-for="feeItem in adjustFeeItemNames"
         :key="feeItem"
         :label="feeItem"
-        min-width="140"
+        min-width="160"
         align="center"
       >
         <template #default="{ row }">
+          <div
+            v-if="isFreightFeeItem(feeItem)"
+            class="pre-settlement-editor__billing-rule-cell"
+          >
+            <el-input-number
+              v-model="row.feeItems[feeItem]"
+              :min="0"
+              :precision="2"
+              :controls="false"
+              :disabled="adjustDialog.readonly"
+              @change="recalculateAdjustRow(row, feeItem)"
+            />
+            <el-icon
+              v-if="hasBillingRule(row)"
+              class="pre-settlement-editor__billing-rule-icon"
+              title="查看计费规则详情"
+              @click="openBillingRuleInfo(row)"
+            >
+              <InfoFilled />
+            </el-icon>
+          </div>
           <el-input-number
+            v-else
             v-model="row.feeItems[feeItem]"
             :min="0"
             :precision="2"
@@ -833,11 +841,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="200" align="center">
-        <template #default="{ row }">
-          <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
-        </template>
-      </el-table-column>
     </el-table>
     <el-form
       v-if="!adjustDialog.readonly"
@@ -846,7 +849,7 @@
       label-width="auto"
       class="pre-settlement-editor__adjust-reason"
     >
-      <el-form-item label="调整原因">
+      <el-form-item label="备注">
         <el-input
           v-model="adjustDialog.reason"
           type="textarea"
@@ -885,12 +888,6 @@
     <template v-if="billingRuleDialog.rule">
       <div class="dialog-section-title">计费规则</div>
       <el-descriptions :column="2" border class="pre-settlement-editor__billing-rule-detail">
-        <el-descriptions-item label="规则名称">
-          {{ displayValue(billingRuleDialog.rule.name) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="费用类型">
-          {{ displayValue(billingRuleDialog.rule.feeType) }}
-        </el-descriptions-item>
         <el-descriptions-item label="费用项">
           {{ displayValue(billingRuleDialog.rule.feeItem) }}
         </el-descriptions-item>
@@ -926,8 +923,8 @@
         <el-descriptions-item label="目的地">
           {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
         </el-descriptions-item>
-        <el-descriptions-item label="运输方式">
-          {{ displayValue(billingRuleDialog.rule.matchCondition.transportMode) }}
+        <el-descriptions-item label="货物名称">
+          {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
         </el-descriptions-item>
         <el-descriptions-item label="货物类型">
           {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
@@ -1202,8 +1199,8 @@ export default {
       return this.editable && this.hasPermission('pre_settlement_adjust');
     },
     dialogTitle() {
-      if (this.readonly) return '查看预结算单';
-      return this.form.id ? '编辑预结算单' : '新增预结算单';
+      if (this.readonly) return '查看预付结算单';
+      return this.form.id ? '编辑预付结算单' : '新增预付结算单';
     },
     settlementTypeName() {
       return this.form.settlementType === 'receivable' ? '应收' : '应付';
@@ -1285,13 +1282,6 @@ export default {
       });
       return Array.from(names);
     },
-    adjustChangeRecords() {
-      return this.changeRecords.filter(
-        row =>
-          row.changeType === '结算明细项' &&
-          String(row.lineNo ?? '') === String(this.adjustDialog.detailLineNo ?? '')
-      );
-    },
   },
   watch: {
     modelValue: {
@@ -1865,7 +1855,25 @@ export default {
       });
 
       const manualFees = this.summaryFees.filter(row => Number(row.manualFlag) === 1);
-      this.summaryFees = [...summaryMap.values(), ...manualFees];
+      const nextFeeMap = new Map();
+      summaryMap.forEach((row, key) => nextFeeMap.set(`0\u0000${key}`, row));
+      manualFees.forEach(row => {
+        const key = `1\u0000${row.feeType}\u0000${row.feeItem}`;
+        nextFeeMap.set(key, row);
+      });
+      // 按编辑前顺序回填，新增费用项追加到末尾，避免手工费用被统一挤到最后。
+      const orderedFees = [];
+      const previousKeys = this.summaryFees.map(
+        row => `${Number(row.manualFlag) === 1 ? 1 : 0}\u0000${row.feeType}\u0000${row.feeItem}`
+      );
+      previousKeys.forEach(key => {
+        const row = nextFeeMap.get(key);
+        if (!row) return;
+        orderedFees.push(row);
+        nextFeeMap.delete(key);
+      });
+      nextFeeMap.forEach(row => orderedFees.push(row));
+      this.summaryFees = orderedFees;
       this.recalculateLocalAmount();
     },
     // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少来源费用快照时退化为明细自身的汇总行。
@@ -2053,7 +2061,7 @@ export default {
       }
     },
     async removeDetailRow(row) {
-      await this.$confirm('确认将该明细踢出预结算单？', '提示', { type: 'warning' });
+      await this.$confirm('确认将该明细踢出预付结算单？', '提示', { type: 'warning' });
       if (!this.form.id || !row.id || row.id === row.sourceDetailId) {
         this.details = this.details.filter(item => item !== row);
         this.buildSummaryFeesFromDetails();
@@ -2228,7 +2236,11 @@ export default {
           : '';
       const sourceDetailId = String(this.adjustDialog.sourceDetailId || '');
       const pending = sourceDetailId ? this.pendingAdjustments[sourceDetailId] : null;
-      this.adjustDialog.reason = pending?.reason || '';
+      // 底部备注回显结算明细备注；暂存过的调整优先取暂存备注
+      this.adjustDialog.reason =
+        pending?.reason !== undefined && pending?.reason !== null
+          ? pending.reason
+          : detailRow.remark || '';
       try {
         // 已暂存的调整结果优先回显，避免重新打开时又回到调整前的数据。
         if (pending?.rows?.length) {
@@ -2295,8 +2307,19 @@ export default {
       this.adjustChangeRecordDetailRows = this.buildAdjustChangeRecordRows(row);
       this.adjustChangeRecordVisible = true;
     },
-    billingRuleName(row) {
-      return this.normalizeBillingRule(row).name;
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
     },
     openBillingRuleInfo(row) {
       this.billingRuleDialog.rule = this.normalizeBillingRule(row);
@@ -2323,27 +2346,8 @@ export default {
       const matchCondition = this.parseObject(
         source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
       );
-      const ruleNames = matchedRules
-        .map(item => item.ruleName || item.name || item.billingRuleName || item.feeItem)
-        .filter(Boolean);
-      const name =
-        source.billingRuleName ||
-        source.feeRuleName ||
-        source.ruleName ||
-        source.billingPlanRuleName ||
-        source.billingPlanName ||
-        rule.name ||
-        rule.ruleName ||
-        rule.billingRuleName ||
-        rule.planName ||
-        rule.billingPlanName ||
-        ruleNames.join('、') ||
-        rule.feeItem ||
-        '';
       return {
         ...rule,
-        name,
-        feeType: source.billingFeeType || source.feeType || rule.feeType,
         feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
         billingElement:
           source.billingElement ||
@@ -2361,7 +2365,11 @@ export default {
           ...matchCondition,
           origin: matchCondition.origin || matchCondition.originName,
           destination: matchCondition.destination || matchCondition.destinationName,
-          transportMode: matchCondition.transportMode || matchCondition.transportType,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
           cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
         },
       };
@@ -2451,9 +2459,13 @@ export default {
             reason: this.adjustDialog.reason,
             rows: this.adjustRows.map(row => ({ ...row, feeItems: { ...row.feeItems } })),
           };
-          this.applyLocalAdjustment(this.adjustDialog.sourceDetailId, this.adjustRows);
+          this.applyLocalAdjustment(
+            this.adjustDialog.sourceDetailId,
+            this.adjustRows,
+            this.adjustDialog.reason
+          );
           this.adjustDialog.visible = false;
-          this.$message.success('结算明细调整已暂存，保存预结算单后生效');
+          this.$message.success('结算明细调整已暂存，保存预付结算单后生效');
           return;
         }
         await adjustDetail({
@@ -2468,7 +2480,6 @@ export default {
             feeItems: row.feeItems,
             settlementAmountTax: row.settlementAmountTax,
             settlementAmountNoTax: row.settlementAmountNoTax,
-            remark: row.remark,
           })),
         });
         this.adjustDialog.visible = false;
@@ -2479,12 +2490,12 @@ export default {
         this.adjustDialog.saving = false;
       }
     },
-    applyLocalAdjustment(sourceDetailId, rows) {
+    applyLocalAdjustment(sourceDetailId, rows, detailRemark) {
       const detail = this.details.find(
         item => String(item.sourceDetailId || item.id) === String(sourceDetailId)
       );
       if (!detail) return;
-      // 原金额以进入预结算单时的费用快照为基准，调整金额 = 结算金额 - 原金额。
+      // 原金额以进入预付结算单时的费用快照为基准，调整金额 = 结算金额 - 原金额。
       const baseRows = this.sourceFeeSnapshots[String(sourceDetailId)] || [];
       const originalAmount = baseRows.length
         ? baseRows.reduce((sum, row) => sum + Number(row.settlementAmountTax || 0), 0)
@@ -2493,20 +2504,48 @@ export default {
         (sum, row) => sum + Number(row.settlementAmountTax || 0),
         0
       );
+      const settlementAmountNoTax = rows.reduce(
+        (sum, row) => sum + Number(row.settlementAmountNoTax || 0),
+        0
+      );
+      const hasSettlementAmountNoTax = rows.some(
+        row => row.settlementAmountNoTax !== undefined && row.settlementAmountNoTax !== null
+      );
       const freightAmount = rows.reduce((sum, row) => sum + Number(row.freightAmount || 0), 0);
+      const transportQuantity = rows.reduce(
+        (sum, row) => sum + Number(row.transportQuantity || 0),
+        0
+      );
+      const mileage = rows.reduce((sum, row) => sum + Number(row.mileage || 0), 0);
       const feeItems = {};
       rows.forEach(row =>
         Object.entries(row.feeItems || {}).forEach(([name, amount]) => {
           feeItems[name] = Number((Number(feeItems[name] || 0) + Number(amount || 0)).toFixed(2));
         })
       );
+      const firstRow = rows[0] || {};
       Object.assign(detail, {
+        transportQuantity: Number(transportQuantity.toFixed(2)),
+        mileage: Number(mileage.toFixed(2)),
+        unitPrice: Number(firstRow.unitPrice || 0),
         originalAmount: Number(originalAmount.toFixed(2)),
         adjustAmount: Number((settlementAmountTax - originalAmount).toFixed(2)),
         settlementAmountTax: Number(settlementAmountTax.toFixed(2)),
+        settlementAmountNoTax: hasSettlementAmountNoTax
+          ? Number(settlementAmountNoTax.toFixed(2))
+          : detail.settlementAmountNoTax,
         freightAmount: Number(freightAmount.toFixed(2)),
         feeItemsJson: JSON.stringify(feeItems),
+        // 底部备注写入结算明细备注
+        remark: detailRemark ?? '',
       });
+      // 暂存调整后同步费用缓存，保证货物名称/类型拼接与列表展示一致。
+      if (detail.id) {
+        this.detailFeeCache[detail.id] = rows.map(row => ({
+          ...row,
+          feeItems: { ...row.feeItems },
+        }));
+      }
       this.buildSummaryFeesFromDetails();
     },
     async persistPendingAdjustments() {
@@ -2534,11 +2573,14 @@ export default {
             feeItems: pendingRow.feeItems,
             settlementAmountTax: pendingRow.settlementAmountTax,
             settlementAmountNoTax: pendingRow.settlementAmountNoTax,
-            remark: pendingRow.remark,
           };
         });
         if (rows.length) {
-          await adjustDetail({ detailId: detail.id, changeReason: pending.reason, rows });
+          await adjustDetail({
+            detailId: detail.id,
+            changeReason: pending.reason,
+            rows,
+          });
         }
       }
       this.pendingAdjustments = {};
@@ -2610,7 +2652,7 @@ export default {
       XLSX.utils.book_append_sheet(workbook, sheet, '结算明细');
       XLSX.writeFile(
         workbook,
-        `${this.form.preSettlementNo || '预结算单'}结算明细${this.$dayjs().format(
+        `${this.form.preSettlementNo || '预付结算单'}结算明细${this.$dayjs().format(
           'YYYY-MM-DD HH-mm-ss'
         )}.xlsx`
       );
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index e9a2475..e87995c 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -55,7 +55,7 @@
                 <el-option label="正式结算单" value="formal" />
                 <el-option
                   v-if="form.settlementType === 'payable'"
-                  label="预结算单"
+                  label="预付结算单"
                   value="pre"
                 />
               </el-select>
diff --git a/src/views/settlement/components/transport-reconciliation-editor.vue b/src/views/settlement/components/transport-reconciliation-editor.vue
index 4351b68..b31bb0a 100644
--- a/src/views/settlement/components/transport-reconciliation-editor.vue
+++ b/src/views/settlement/components/transport-reconciliation-editor.vue
@@ -508,7 +508,7 @@
               <span class="completion-dialog__value">{{ displayValue(form.reconciliationNo) }}</span>
             </div>
             <div class="completion-dialog__field">
-              <span class="completion-dialog__label">预结算单号</span>
+              <span class="completion-dialog__label">预付结算单号</span>
               <span class="completion-dialog__value">{{
                 displayValue(form.preSettlementNo || form.formalSettlementNo)
               }}</span>
diff --git a/src/views/settlement/formal-settlement-form.vue b/src/views/settlement/formal-settlement-form.vue
index 7986b38..0a8f33f 100644
--- a/src/views/settlement/formal-settlement-form.vue
+++ b/src/views/settlement/formal-settlement-form.vue
@@ -16,6 +16,7 @@
 <script>
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
+import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
 
 const LIST_REFRESH_KEY = 'formal-settlement-list-refresh';
 
@@ -35,12 +36,25 @@ export default {
     readonly() {
       return this.$route.query.mode === 'view';
     },
+    settlementType() {
+      return this.$route.query.settlementType || this.transferPayload?.settlementType || 'payable';
+    },
+    billLabel() {
+      return settlementBillLabel(this.settlementType);
+    },
     pageTitle() {
-      return this.readonly ? '查看正式结算' : this.recordId ? '编辑正式结算' : '新增正式结算';
+      return this.readonly
+        ? `查看${this.billLabel}`
+        : this.recordId
+        ? `编辑${this.billLabel}`
+        : `新增${this.billLabel}`;
+    },
+    listPath() {
+      return this.$route.query.listPath || settlementListPath(this.settlementType);
     },
     editorInitialData() {
-      const settlementType = this.$route.query.settlementType;
-      if (!this.transferPayload && !settlementType) return null;
+      const settlementType = this.settlementType;
+      if (!this.transferPayload && !this.$route.query.settlementType) return null;
       return {
         ...(this.transferPayload || {}),
         ...(settlementType ? { settlementType } : {}),
@@ -63,7 +77,7 @@ export default {
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
       this.$router.$avueRouter.closeTag();
-      this.$router.push('/settlement/formal-settlement');
+      this.$router.push(this.listPath);
     },
     syncTagTitle() {
       this.$nextTick(() => {
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index c4b9da0..734e3a4 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -52,53 +52,32 @@
 
     <section class="formal-page__table-panel">
       <el-tabs
+        v-if="!lockedSettlementType"
         type="border-card"
         v-model="activeSettlementType"
         @tab-change="handleSettlementTypeChange"
       >
         <el-tab-pane label="应付" name="payable">
           <formal-settlement-table-panel
-            :key="activeSettlementType"
-            :rows="rows"
-            :columns="columns"
-            :loading="loading"
-            :page="page"
-            :has-permission="hasPermissionFn"
-            :sync-loading="syncLoading"
-            :mk-enabled="mkEnabled"
-            v-model:search-visible="searchVisible"
-            @create="openCreate"
-            @payment="openPaymentDialog"
-            @sync="handleSync"
-            @export="handleExport"
-            @refresh="loadTable"
-            @page-change="onPageChange"
-            @action="onAction"
-            @update:selection="selection = $event"
+            :key="'payable'"
+            v-bind="tablePanelProps"
+            v-on="tablePanelListeners"
           />
         </el-tab-pane>
         <el-tab-pane label="应收" name="receivable">
           <formal-settlement-table-panel
-            :key="activeSettlementType"
-            :rows="rows"
-            :columns="columns"
-            :loading="loading"
-            :page="page"
-            :has-permission="hasPermissionFn"
-            :sync-loading="syncLoading"
-            :mk-enabled="mkEnabled"
-            v-model:search-visible="searchVisible"
-            @create="openCreate"
-            @payment="openPaymentDialog"
-            @sync="handleSync"
-            @export="handleExport"
-            @refresh="loadTable"
-            @page-change="onPageChange"
-            @action="onAction"
-            @update:selection="selection = $event"
+            :key="'receivable'"
+            v-bind="tablePanelProps"
+            v-on="tablePanelListeners"
           />
         </el-tab-pane>
       </el-tabs>
+      <formal-settlement-table-panel
+        v-else
+        :key="activeSettlementType"
+        v-bind="tablePanelProps"
+        v-on="tablePanelListeners"
+      />
     </section>
     <formal-settlement-editor
       v-model="editor.visible"
@@ -116,7 +95,7 @@
       <section-card title="付款信息">
         <template v-if="paymentDialog.rows.length > 1">
           <div class="formal-payment-dialog__batch-tip">
-            已选择 {{ paymentDialog.rows.length }} 条同合同应付正式结算单，请确认各单申请金额。
+            已选择 {{ paymentDialog.rows.length }} 条同合同付款结算单，请确认各单申请金额。
           </div>
           <el-table :data="paymentDialog.rows" border>
             <el-table-column prop="formalSettlementNo" label="结算单号" min-width="160" />
@@ -176,6 +155,12 @@
 import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import {
+  hasSettlementPermission,
+  settlementBillLabel,
+  settlementListPath,
+} from '@/utils/settlement-menu';
+import { isAdministrator } from '@/utils/auth';
 import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
@@ -210,6 +195,14 @@ export default {
   name: 'FormalSettlement',
   components: { FormalSettlementEditor, FormalSettlementTablePanel },
   mixins: [organizationSearch],
+  props: {
+    /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
+    lockedSettlementType: {
+      type: String,
+      default: '',
+      validator: value => ['', 'payable', 'receivable'].includes(value),
+    },
+  },
   data() {
     return {
       ArrowDown,
@@ -237,9 +230,52 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['permission']),
+    ...mapGetters(['permission', 'userInfo']),
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    billLabel() {
+      return settlementBillLabel(this.activeSettlementType);
+    },
     hasPermissionFn() {
-      return code => this.permission?.[code] !== false;
+      return actionOrCode => {
+        const action = String(actionOrCode || '').replace(
+          /^(payment_settlement_|receipt_settlement_|formal_settlement_)/,
+          ''
+        );
+        return hasSettlementPermission(this, this.activeSettlementType, action);
+      };
+    },
+    tablePanelProps() {
+      return {
+        rows: this.rows,
+        columns: this.columns,
+        loading: this.loading,
+        page: this.page,
+        hasPermission: this.hasPermissionFn,
+        syncLoading: this.syncLoading,
+        mkEnabled: this.mkEnabled,
+        searchVisible: this.searchVisible,
+        showPaymentAction: this.activeSettlementType === 'payable',
+        billLabel: this.billLabel,
+      };
+    },
+    tablePanelListeners() {
+      return {
+        create: this.openCreate,
+        payment: this.openPaymentDialog,
+        sync: this.handleSync,
+        export: this.handleExport,
+        refresh: this.loadTable,
+        'page-change': this.onPageChange,
+        action: this.onAction,
+        'update:selection': selection => {
+          this.selection = selection;
+        },
+        'update:searchVisible': visible => {
+          this.searchVisible = visible;
+        },
+      };
     },
     visibleSearchFields() {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
@@ -249,11 +285,22 @@ export default {
     },
   },
   watch: {
+    lockedSettlementType: {
+      immediate: true,
+      handler(value) {
+        if (value === 'payable' || value === 'receivable') {
+          this.activeSettlementType = value;
+        }
+      },
+    },
     '$route.query.detailNo'(detailNo) {
       if (detailNo) this.openRouteDetail(detailNo);
     },
   },
   mounted() {
+    if (this.lockedSettlementType === 'payable' || this.lockedSettlementType === 'receivable') {
+      this.activeSettlementType = this.lockedSettlementType;
+    }
     this.loadOrganizationOptions();
     this.loadTable();
     this.openRouteDetail();
@@ -272,8 +319,8 @@ export default {
     }
   },
   methods: {
-    hasPermission(code) {
-      return this.permission?.[code] !== false;
+    hasPermission(actionOrCode) {
+      return this.hasPermissionFn(actionOrCode);
     },
     async loadTable() {
       this.loading = true;
@@ -326,15 +373,23 @@ export default {
         path: '/settlement/formal-settlement/form',
         query: {
           mode: 'add',
-          name: '新增正式结算',
+          name: `新增${this.billLabel}`,
           settlementType: this.activeSettlementType,
+          listPath: settlementListPath(this.activeSettlementType),
         },
       });
     },
     openEdit(row) {
+      const settlementType = row.settlementType || this.activeSettlementType;
       this.$router.push({
         path: '/settlement/formal-settlement/form',
-        query: { mode: 'edit', id: row.id, name: '编辑正式结算' },
+        query: {
+          mode: 'edit',
+          id: row.id,
+          name: `编辑${settlementBillLabel(settlementType)}`,
+          settlementType,
+          listPath: settlementListPath(settlementType),
+        },
       });
     },
     openView(row) {
@@ -347,20 +402,22 @@ export default {
       const data = this.unwrapData(response);
       const row = (data.records || []).find(item => item.formalSettlementNo === formalSettlementNo);
       if (!row) {
-        this.$message.warning('未找到对应的正式结算单');
+        this.$message.warning(`未找到对应的${this.billLabel}`);
         return;
       }
-      this.activeSettlementType = row.settlementType || this.activeSettlementType;
+      if (!this.lockedSettlementType) {
+        this.activeSettlementType = row.settlementType || this.activeSettlementType;
+      }
       this.openView(row);
     },
     async handleDelete(row) {
-      await this.$confirm('确认删除该正式结算草稿？', '提示', { type: 'warning' });
+      await this.$confirm(`确认删除该${this.billLabel}草稿？`, '提示', { type: 'warning' });
       await api.remove(row.id);
       this.$message.success('删除成功');
       this.loadTable();
     },
     async handleSubmit(row) {
-      await this.$confirm('提交后来源预结算将保持锁定，确认提交？', '提示', { type: 'warning' });
+      await this.$confirm('提交后来源预付结算单将保持锁定，确认提交？', '提示', { type: 'warning' });
       const previousApprovalStatus = row.approvalStatus || '';
       await api.submit({ id: row.id });
       await submitMkApprovalFlow({
@@ -375,7 +432,7 @@ export default {
     },
     handleMkAudit(row) {
       if (!row?.id) {
-        this.$message.warning('正式结算单ID为空，无法打开审核页');
+        this.$message.warning(`${this.billLabel}ID为空，无法打开审核页`);
         return;
       }
       getMKApprovalUrl({ bizId: String(row.id) })
@@ -393,7 +450,7 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm(
-        '审核通过后正式结算生效，金额只能通过结算调整单处理，确认通过？',
+        `审核通过后${this.billLabel}生效，金额只能通过结算调整单处理，确认通过？`,
         '提示',
         { type: 'warning' }
       );
@@ -415,7 +472,7 @@ export default {
       this.loadTable();
     },
     async handleVoid(row) {
-      const { value } = await this.$prompt('请输入作废原因', '作废正式结算单', {
+      const { value } = await this.$prompt('请输入作废原因', `作废${this.billLabel}`, {
         inputValidator: value => Boolean(value?.trim()) || '请输入作废原因',
       });
       await api.voidBill({ id: row.id, reason: value });
@@ -424,46 +481,80 @@ export default {
     },
     selectedOne(action) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${action}需选择一条正式结算单`);
+        this.$message.warning(`${action}需选择一条${this.billLabel}`);
         return null;
       }
       return this.selection[0];
     },
     async handleSync() {
       if (this.syncLoading) return;
-      const row = this.selectedOne('同步金蝶');
-      if (!row) return;
-
+      const rows = (this.selection || []).filter(row => row.approvalStatus === 'approved');
+      if (!rows.length) {
+        this.$message.warning(`请选择至少一条审批通过的${this.billLabel}`);
+        return;
+      }
       this.syncLoading = true;
       try {
-        const response = await api.syncKingdee(row.id);
-        const data = this.unwrapData(response);
-        this.$message.success(`同步成功，金蝶单据号：${data}`);
-        await this.loadTable();
-        // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
-        const freshRow = (this.rows || []).find(item => String(item.id) === String(row.id));
-        if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
-          this.$message({
-            type: 'warning',
-            message: '该单附件未全部上传，可重推补传',
-            duration: 8000,
-          });
+        let successCount = 0;
+        let failCount = 0;
+        let lastFailReason = '';
+        for (const row of rows) {
+          try {
+            await api.syncKingdee(row.id, { meta: { suppressErrorMessage: true } });
+            successCount += 1;
+          } catch (error) {
+            failCount += 1;
+            lastFailReason = String(error?.message || error || '未知错误').trim() || '未知错误';
+          }
         }
+        await this.loadTable();
+        if (rows.length === 1) {
+          if (failCount) {
+            await this.$alert(`同步失败，${lastFailReason}`, '同步结果', {
+              type: 'error',
+              confirmButtonText: '知道了',
+            });
+          } else {
+            let message = '同步成功';
+            const freshRow = (this.rows || []).find(item => String(item.id) === String(rows[0].id));
+            if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
+              message += '\n该单附件未全部上传，可重推补传';
+            }
+            await this.$alert(message, '同步结果', {
+              type: 'success',
+              confirmButtonText: '知道了',
+            });
+          }
+          return;
+        }
+        let batchMessage = `完成同步${successCount}条，失败${failCount}条`;
+        const idSet = new Set(rows.map(row => String(row.id)));
+        const pendingCount = (this.rows || []).filter(
+          row =>
+            idSet.has(String(row.id)) && ['pending', 'partial'].includes(row.attachmentSyncStatus)
+        ).length;
+        if (pendingCount) {
+          batchMessage += `\n其中${pendingCount}单附件未全部上传，可重推补传`;
+        }
+        await this.$alert(batchMessage, '同步结果', {
+          type: failCount ? 'warning' : 'success',
+          confirmButtonText: '知道了',
+        });
       } finally {
         this.syncLoading = false;
       }
     },
     async openPaymentDialog() {
-      if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');
+      if (!this.selection.length) return this.$message.warning(`请至少选择一条${this.billLabel}`);
       const rows = this.selection;
       if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
-        return this.$message.warning('仅审批通过的应付正式结算单允许发起付款申请');
+        return this.$message.warning('仅审批通过的付款结算单允许发起付款申请');
       const contractIds = new Set(rows.map(row => String(row.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has(''))
-        return this.$message.warning('付款申请必须选择同一个合同的正式结算单');
+        return this.$message.warning('付款申请必须选择同一个合同的付款结算单');
       const paymentRows = rows.map(row => ({ ...row, appliedAmount: this.paymentRemaining(row) }));
       if (paymentRows.some(row => row.appliedAmount <= 0))
-        return this.$message.warning('所选正式结算单均须存在剩余可申请金额');
+        return this.$message.warning('所选付款结算单均须存在剩余可申请金额');
       try {
         const sourceFormalSettlements = await Promise.all(
           paymentRows.map(async row => {
@@ -499,7 +590,7 @@ export default {
           })
         );
         if (sourceFormalSettlements.some(row => row.appliedAmount <= 0)) {
-          this.$message.warning('所选正式结算单均须存在剩余可申请金额');
+          this.$message.warning('所选付款结算单均须存在剩余可申请金额');
           return;
         }
         const transferToken = createSettlementTransfer({
@@ -519,7 +610,7 @@ export default {
       const paymentRows = this.paymentDialog.rows;
       if (paymentRows.length > 1) {
         if (paymentRows.some(row => Number(row.appliedAmount || 0) <= 0))
-          return this.$message.warning('请输入各正式结算单的申请付款金额');
+          return this.$message.warning('请输入各付款结算单的申请付款金额');
         if (paymentRows.some(row => Number(row.appliedAmount) > this.paymentRemaining(row)))
           return this.$message.warning('申请付款金额不能超过剩余可申请金额');
       } else if (Number(this.paymentDialog.form.appliedAmount || 0) <= 0) {
@@ -555,9 +646,11 @@ export default {
       win.document.write(
         `<!doctype html><html><head><title>${
           row.formalSettlementNo
-        }</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;padding:32px;color:#222}h1{text-align:center}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:16px 28px;margin-top:30px}.item{border-bottom:1px solid #ddd;padding:8px 0}.actions{text-align:center;margin-top:36px}@media print{.actions{display:none}}</style></head><body><h1>正式结算单</h1><div class="grid"><div class="item">结算单号：${this.escapeHtml(
+        }</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;padding:32px;color:#222}h1{text-align:center}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:16px 28px;margin-top:30px}.item{border-bottom:1px solid #ddd;padding:8px 0}.actions{text-align:center;margin-top:36px}@media print{.actions{display:none}}</style></head><body><h1>${this.escapeHtml(
+          settlementBillLabel(row.settlementType || this.activeSettlementType)
+        )}</h1><div class="grid"><div class="item">结算单号：${this.escapeHtml(
           row.formalSettlementNo
-        )}</div><div class="item">预结算单号：${this.escapeHtml(
+        )}</div><div class="item">预付结算单号：${this.escapeHtml(
           row.preSettlementNos
         )}</div><div class="item">项目：${this.escapeHtml(
           row.projectName
@@ -582,12 +675,15 @@ export default {
       const params = this.buildQueryParams();
       if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
       const { data } = await api.exportList(params);
-      downloadFile(data, `正式结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      downloadFile(
+        data,
+        `${this.billLabel}${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`
+      );
     },
     buildQueryParams() {
       // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
       const params = this.normalizeOrganizationSearch({ ...this.query }, 'deptName');
-      params.settlementType = this.activeSettlementType;
+      params.settlementType = this.lockedSettlementType || this.activeSettlementType;
       const range = params.createDateRange || [];
       delete params.createDateRange;
       if (range.length === 2) {
diff --git a/src/views/settlement/payment-settlement.vue b/src/views/settlement/payment-settlement.vue
new file mode 100644
index 0000000..66ac565
--- /dev/null
+++ b/src/views/settlement/payment-settlement.vue
@@ -0,0 +1,12 @@
+<template>
+  <formal-settlement locked-settlement-type="payable" />
+</template>
+
+<script>
+import FormalSettlement from './formal-settlement.vue';
+
+export default {
+  name: 'PaymentSettlement',
+  components: { FormalSettlement },
+};
+</script>
diff --git a/src/views/settlement/pre-settlement-form.vue b/src/views/settlement/pre-settlement-form.vue
index 9bd3549..18586de 100644
--- a/src/views/settlement/pre-settlement-form.vue
+++ b/src/views/settlement/pre-settlement-form.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container class="pre-settlement-form-page">
     <div class="pre-settlement-form-page__title">{{ pageTitle }}</div>
-    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存预结算单时再落库。 -->
+    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存预付结算单时再落库。 -->
     <pre-settlement-editor
       v-model="editorVisible"
       page-mode
@@ -31,7 +31,7 @@ export default {
       return this.$route.query.id || '';
     },
     pageTitle() {
-      return this.recordId || this.savedRecordId ? '编辑预结算' : '新增预结算';
+      return this.recordId || this.savedRecordId ? '编辑预付结算单' : '新增预付结算单';
     },
   },
   watch: {
diff --git a/src/views/settlement/pre-settlement-public-view.vue b/src/views/settlement/pre-settlement-public-view.vue
index 1ddec11..1d76372 100644
--- a/src/views/settlement/pre-settlement-public-view.vue
+++ b/src/views/settlement/pre-settlement-public-view.vue
@@ -1,7 +1,7 @@
 <template>
   <mk-public-shell biz-type="pre-settlement" :get-form="getForm">
     <basic-container>
-      <div class="mk-public-form-title">查看预结算</div>
+      <div class="mk-public-form-title">查看预付结算单</div>
       <pre-settlement-editor
         ref="page"
         :model-value="true"
diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue
index 75caf7a..dda0871 100644
--- a/src/views/settlement/pre-settlement.vue
+++ b/src/views/settlement/pre-settlement.vue
@@ -446,13 +446,13 @@ export default {
     openCreate() {
       this.$router.push({
         path: '/settlement/pre-settlement/form',
-        query: { mode: 'add', name: '新增预结算' },
+        query: { mode: 'add', name: '新增预付结算单' },
       });
     },
     openEdit(row) {
       this.$router.push({
         path: '/settlement/pre-settlement/form',
-        query: { mode: 'edit', id: row.id, name: '编辑预结算' },
+        query: { mode: 'edit', id: row.id, name: '编辑预付结算单' },
       });
     },
     openView(row) {
@@ -465,7 +465,7 @@ export default {
       const records = data?.data?.records || [];
       const row = records.find(item => item.preSettlementNo === preSettlementNo);
       if (!row) {
-        this.$message.warning('未找到对应的预结算单');
+        this.$message.warning('未找到对应的预付结算单');
         return;
       }
       this.openView(row);
@@ -474,30 +474,30 @@ export default {
       return ['draft', 'returned'].includes(row.approvalStatus);
     },
     async handleDelete(row) {
-      await this.$confirm('确认删除该预结算草稿？', '提示', { type: 'warning' });
+      await this.$confirm('确认删除该预付结算单草稿？', '提示', { type: 'warning' });
       await remove(row.id);
       this.$message.success('删除成功');
       this.loadTable();
     },
     selectedOne(operationName) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${operationName}需选择一条预结算单`);
+        this.$message.warning(`${operationName}需选择一条预付结算单`);
         return null;
       }
       return this.selection[0];
     },
     handleAdvanceApplication() {
       if (!this.selection.length) {
-        this.$message.warning('请选择需要发起预付申请的预结算单');
+        this.$message.warning('请选择需要发起预付申请的预付结算单');
         return;
       }
       if (this.selection.some(row => !row.contractId)) {
-        this.$message.warning('所选预结算单缺少合同ID，无法发起预付申请');
+        this.$message.warning('所选预付结算单缺少合同ID，无法发起预付申请');
         return;
       }
       const contractIds = new Set(this.selection.map(row => String(row.contractId)));
       if (contractIds.size > 1) {
-        this.$message.warning('预付申请只能选择同一合同下的预结算单');
+        this.$message.warning('预付申请只能选择同一合同下的预付结算单');
         return;
       }
       if (
@@ -508,7 +508,7 @@ export default {
             row.formalSettlementNo
         )
       ) {
-        this.$message.warning('仅审批通过、未转正式结算的应付预结算单可发起预付');
+        this.$message.warning('仅审批通过、未转付款结算的应付预付结算单可发起预付');
         return;
       }
       const sourcePreSettlements = this.selection.map(row => ({
@@ -533,11 +533,11 @@ export default {
     },
     handleFormalSettlement() {
       if (!this.selection.length) {
-        this.$message.warning('请选择需要转正式结算的预结算单');
+        this.$message.warning('请选择需要转付款结算的预付结算单');
         return;
       }
       if (this.selection.some(row => row.approvalStatus !== 'approved')) {
-        this.$message.warning('仅审核通过的预结算单可转正式结算');
+        this.$message.warning('仅审核通过的预付结算单可转付款结算');
         return;
       }
       const hasCompleteProjectIds = this.selection.every(
@@ -549,7 +549,7 @@ export default {
         )
       );
       if (projectKeys.size > 1) {
-        this.$message.warning('尾款结算只能选择同一项目下的预结算单');
+        this.$message.warning('尾款结算只能选择同一项目下的预付结算单');
         return;
       }
       const transferToken = createSettlementTransfer({
@@ -560,14 +560,20 @@ export default {
       });
       this.$router.push({
         path: '/settlement/formal-settlement/form',
-        query: { mode: 'add', name: '新增正式结算', transferToken },
+        query: {
+          mode: 'add',
+          name: '新增付款结算单',
+          settlementType: 'payable',
+          listPath: '/settlement/payment-settlement',
+          transferToken,
+        },
       });
     },
     async openPrintDialog() {
       const row = this.selectedOne('打印结算单');
       if (!row) return;
       if (row.approvalStatus === 'voided') {
-        this.$message.warning('已作废的预结算单不能打印');
+        this.$message.warning('已作废的预付结算单不能打印');
         return;
       }
       this.printDialog.row = row;
@@ -622,8 +628,8 @@ export default {
         )
         .join('');
       return `<!doctype html><html><head><meta charset="utf-8"><title>${this.escapeHtml(
-        detail.preSettlementNo || '预结算单'
-      )}</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;color:#222;padding:28px}h1{text-align:center;font-size:24px}.meta{display:grid;grid-template-columns:repeat(3,1fr);gap:14px 24px;margin:24px 0}.meta div{border-bottom:1px solid #ddd;padding:7px 0}table{width:100%;border-collapse:collapse;margin-top:16px}th,td{border:1px solid #bbb;padding:9px;text-align:center;font-size:13px}th{background:#f5f5f5}.actions{text-align:center;margin-top:24px}@media print{.actions{display:none}}</style></head><body><h1>预结算单</h1><div class="meta"><div>预结算单号：${this.escapeHtml(
+        detail.preSettlementNo || '预付结算单'
+      )}</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;color:#222;padding:28px}h1{text-align:center;font-size:24px}.meta{display:grid;grid-template-columns:repeat(3,1fr);gap:14px 24px;margin:24px 0}.meta div{border-bottom:1px solid #ddd;padding:7px 0}table{width:100%;border-collapse:collapse;margin-top:16px}th,td{border:1px solid #bbb;padding:9px;text-align:center;font-size:13px}th{background:#f5f5f5}.actions{text-align:center;margin-top:24px}@media print{.actions{display:none}}</style></head><body><h1>预付结算单</h1><div class="meta"><div>预付结算单号：${this.escapeHtml(
         detail.preSettlementNo
       )}</div><div>项目名称：${this.escapeHtml(
         detail.projectName
@@ -651,7 +657,7 @@ export default {
       const params = this.buildQuery();
       if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
       const { data } = await exportList(params);
-      downloadFile(data, `预结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      downloadFile(data, `预付结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     async handleSubmit(row) {
       const previousApprovalStatus = row.approvalStatus || '';
@@ -668,7 +674,7 @@ export default {
     },
     handleMkAudit(row) {
       if (!row?.id) {
-        this.$message.warning('预结算单ID为空，无法打开审核页');
+        this.$message.warning('预付结算单ID为空，无法打开审核页');
         return;
       }
       getMKApprovalUrl({ bizId: String(row.id) })
@@ -685,7 +691,7 @@ export default {
         });
     },
     async handleApprove(row) {
-      await this.$confirm('确认审批通过该预结算单？', '提示', { type: 'warning' });
+      await this.$confirm('确认审批通过该预付结算单？', '提示', { type: 'warning' });
       await approve({ id: row.id });
       this.$message.success('审批通过');
       this.loadTable();
@@ -700,7 +706,7 @@ export default {
       this.loadTable();
     },
     async handleVoid(row) {
-      const { value } = await this.$prompt('请输入作废原因', '作废预结算单', {
+      const { value } = await this.$prompt('请输入作废原因', '作废预付结算单', {
         inputType: 'textarea',
         inputValidator: value => Boolean(value?.trim()) || '请输入作废原因',
       });
diff --git a/src/views/settlement/receipt-settlement.vue b/src/views/settlement/receipt-settlement.vue
new file mode 100644
index 0000000..809f1ef
--- /dev/null
+++ b/src/views/settlement/receipt-settlement.vue
@@ -0,0 +1,12 @@
+<template>
+  <formal-settlement locked-settlement-type="receivable" />
+</template>
+
+<script>
+import FormalSettlement from './formal-settlement.vue';
+
+export default {
+  name: 'ReceiptSettlement',
+  components: { FormalSettlement },
+};
+</script>
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index b0a39ef..8ad92aa 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -54,9 +54,11 @@
       </div>
 
       <el-table
+        ref="mainTableRef"
         v-loading="loading"
         :data="rows"
         :size="tableSize"
+        :height="listTableHeight"
         border
         class="settlement-detail-page__table"
         @selection-change="selectionChange"
@@ -146,7 +148,21 @@
                   show-overflow-tooltip
                 >
                   <template #default="{ row }">
-                    {{ formatFeeDetailCell(row, column.prop) }}
+                    <div
+                      v-if="isFreightFeeColumn(column)"
+                      class="settlement-detail-page__billing-rule-cell"
+                    >
+                      <span>{{ formatFeeDetailCell(row, column.prop) }}</span>
+                      <el-icon
+                        v-if="hasBillingRule(row)"
+                        class="settlement-detail-page__billing-rule-icon"
+                        title="查看计费规则详情"
+                        @click.stop="openBillingRuleInfo(row)"
+                      >
+                        <InfoFilled />
+                      </el-icon>
+                    </div>
+                    <span v-else>{{ formatFeeDetailCell(row, column.prop) }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -934,11 +950,70 @@
         </el-button>
       </template>
     </el-dialog>
+
+    <el-dialog
+      v-model="billingRuleDialog.visible"
+      title="计费规则详情"
+      width="720px"
+      append-to-body
+      destroy-on-close
+    >
+      <template v-if="billingRuleDialog.rule">
+        <div class="dialog-section-title">计费规则</div>
+        <el-descriptions :column="2" border class="settlement-detail-page__billing-rule-detail">
+          <el-descriptions-item label="费用项">
+            {{ displayValue(billingRuleDialog.rule.feeItem) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费要素">
+            {{ displayValue(billingRuleDialog.rule.billingElement) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费类型">
+            {{ displayValue(billingRuleDialog.rule.billingType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费单位">
+            {{ displayValue(billingRuleDialog.rule.billingUnit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="单价">
+            {{ displayValue(billingRuleDialog.rule.unitPrice) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="最低计费量">
+            {{ displayValue(billingRuleDialog.rule.minimumBillingWeight) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费区间">
+            {{ billingRuleRanges(billingRuleDialog.rule) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ displayValue(billingRuleDialog.rule.remark) }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div class="dialog-section-title settlement-detail-page__billing-rule-match-title">
+          匹配条件
+        </div>
+        <el-descriptions :column="2" border class="settlement-detail-page__billing-rule-detail">
+          <el-descriptions-item label="起运地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.origin) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="目的地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物名称">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物类型">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </template>
+      <el-empty v-else description="暂无计费规则详情" />
+      <template #footer>
+        <el-button type="primary" @click="billingRuleDialog.visible = false">关闭</el-button>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-import { ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
+import { ArrowDown, ArrowUp, Close, InfoFilled } from '@element-plus/icons-vue';
 import {
   changeRecordColumns,
   feeDetailBaseColumns,
@@ -990,7 +1065,7 @@ const ADJUST_BILLING_TYPE_MAP = {
 };
 
 export default {
-  components: { SettlementTableTools },
+  components: { SettlementTableTools, InfoFilled },
   props: {
     settlementType: {
       type: String,
@@ -1002,6 +1077,7 @@ export default {
       ArrowDown,
       ArrowUp,
       Close,
+      InfoFilled,
       searchFields,
       tableColumns,
       tableFeeItemNames: [],
@@ -1018,6 +1094,8 @@ export default {
       rows: [],
       selection: [],
       page: { current: 1, size: 10, total: 0 },
+      // 底部详情/调整面板打开时压缩主表高度，露出表格滚动条
+      listTableHeight: undefined,
       detailDialog: {
         visible: false,
         title: '费用明细',
@@ -1027,6 +1105,10 @@ export default {
       },
       feeRows: [],
       dynamicFeeColumns: [],
+      billingRuleDialog: {
+        visible: false,
+        rule: null,
+      },
       adjustDialog: { visible: false, loading: false, submitting: false, row: null },
       adjustRows: [],
       adjustDynamicFeeColumns: [],
@@ -1210,11 +1292,28 @@ export default {
     transportCargoTypeOptions() {
       return this.cargoTypeOptions.filter(item => item.children?.length);
     },
+    /** 底部单据详情或调整面板是否展开（与 teleport 面板显示条件一致） */
+    isBottomPanelOpen() {
+      return Boolean(this.detailDialog.visible || this.adjustDialog.visible);
+    },
   },
   watch: {
     '$route.fullPath'() {
       this.openRouteDetail();
     },
+    isBottomPanelOpen() {
+      this.$nextTick(() => this.updateListTableHeight());
+    },
+    searchVisible() {
+      if (this.isBottomPanelOpen) {
+        this.$nextTick(() => this.updateListTableHeight());
+      }
+    },
+    searchExpanded() {
+      if (this.isBottomPanelOpen) {
+        this.$nextTick(() => this.updateListTableHeight());
+      }
+    },
     displayTableColumns: {
       immediate: true,
       handler(columns) {
@@ -1238,6 +1337,7 @@ export default {
     },
   },
   async mounted() {
+    window.addEventListener('resize', this.updateListTableHeight);
     this.loadTransportTypeOptions();
     this.loadCargoTypeOptions();
     this.loadPriceUnitOptions();
@@ -1249,6 +1349,7 @@ export default {
     this.closeInnerDialogs();
   },
   beforeUnmount() {
+    window.removeEventListener('resize', this.updateListTableHeight);
     this.closeInnerDialogs();
   },
   methods: {
@@ -1262,6 +1363,26 @@ export default {
       this.previewDialog.visible = false;
       this.generateContractDialog.visible = false;
     },
+    /** 底部面板打开时按剩余视口压缩主表高度，关闭后恢复自适应 */
+    updateListTableHeight() {
+      if (!this.isBottomPanelOpen) {
+        this.listTableHeight = undefined;
+        this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
+        return;
+      }
+      const tablePanel = this.$el?.querySelector?.('.settlement-detail-page__table-panel');
+      const toolbar = tablePanel?.querySelector('.settlement-detail-page__toolbar');
+      const pagination = tablePanel?.querySelector('.settlement-detail-page__pagination');
+      const panelTop = tablePanel?.getBoundingClientRect?.()?.top ?? 200;
+      const toolbarHeight = toolbar?.offsetHeight ?? 56;
+      const paginationHeight = pagination?.offsetHeight ?? 64;
+      // 与 .settlement-detail-page__detail-panel 的 max-height: min(60vh, 560px) 对齐
+      const bottomPanelHeight = Math.min(window.innerHeight * 0.6, 560);
+      const available =
+        window.innerHeight - panelTop - toolbarHeight - paginationHeight - bottomPanelHeight - 8;
+      this.listTableHeight = Math.max(180, Math.floor(available));
+      this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
+    },
     contractCategoryName(value) {
       return (
         this.contractCategoryOptions.find(item => String(item.value) === String(value))?.label ||
@@ -1690,6 +1811,8 @@ export default {
       this.detailDialog.visible = false;
       this.detailDialog.row = null;
       this.changeRecordsDialog.visible = false;
+      this.billingRuleDialog.visible = false;
+      this.billingRuleDialog.rule = null;
     },
     closeAdjustPanel() {
       this.clearAdjustCalculations();
@@ -1934,6 +2057,108 @@ export default {
     isFreightFeeItem(name) {
       return String(name || '').includes('运费') || String(name || '').includes('运输费');
     },
+    isFreightFeeColumn(column = {}) {
+      return (
+        column.prop === 'freightAmount' ||
+        this.isFreightFeeItem(column.label) ||
+        this.isFreightFeeItem(column.feeItemName)
+      );
+    },
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
+    },
+    openBillingRuleInfo(row) {
+      this.billingRuleDialog.rule = this.normalizeBillingRule(row);
+      this.billingRuleDialog.visible = true;
+    },
+    normalizeBillingRule(row) {
+      const source = row || {};
+      const nested = [
+        source.billingRule,
+        source.billingRuleInfo,
+        source.billingRuleJson,
+        source.billingRulesJson,
+        source.billingRules,
+        source.billingPlanRule,
+        source.feeRule,
+        source.rule,
+      ].find(value => value !== undefined && value !== null && value !== '');
+      const parsedNested = this.parseJsonValue(nested);
+      const matchedRules = Array.isArray(parsedNested)
+        ? parsedNested.filter(item => item && typeof item === 'object')
+        : [];
+      let rule = this.parseObject(matchedRules[0] || parsedNested || nested);
+      if (!Object.keys(rule).length && typeof nested === 'string') rule = { name: nested };
+      const matchCondition = this.parseObject(
+        source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
+      );
+      return {
+        ...rule,
+        feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
+        billingElement:
+          source.billingElement ||
+          source.billingFactor ||
+          rule.billingElement ||
+          rule.billingFactor,
+        billingType: source.billingType || rule.billingType,
+        billingUnit: source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
+        unitPrice: source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice,
+        minimumBillingWeight:
+          source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit,
+        remark: source.billingRuleRemark || source.ruleRemark || rule.remark,
+        rules: matchedRules,
+        matchCondition: {
+          ...matchCondition,
+          origin: matchCondition.origin || matchCondition.originName,
+          destination: matchCondition.destination || matchCondition.destinationName,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
+          cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
+        },
+      };
+    },
+    billingRuleRanges(rule) {
+      const ranges = Array.isArray(rule?.limitRanges) ? rule.limitRanges : [];
+      if (ranges.length) {
+        return ranges
+          .map(
+            item => `${item.lowerLimit ?? '-'}~${item.upperLimit ?? '-'}：${item.unitPrice ?? '-'}`
+          )
+          .join('；');
+      }
+      if (rule?.lowerLimit !== undefined || rule?.upperLimit !== undefined) {
+        return `${rule.lowerLimit ?? '-'}~${rule.upperLimit ?? '-'}`;
+      }
+      return '-';
+    },
+    parseJsonValue(value) {
+      if (value === undefined || value === null || value === '') return null;
+      if (typeof value === 'object') return value;
+      if (typeof value !== 'string') return value;
+      try {
+        return JSON.parse(value);
+      } catch (error) {
+        return value;
+      }
+    },
+    parseObject(value) {
+      const parsed = this.parseJsonValue(value);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+    },
     async saveAdjustFee() {
       if (!this.adjustRows.length || !this.adjustDialog.row) {
         this.$message.warning('没有可调整的费用明细');
@@ -3011,6 +3236,28 @@ export default {
   padding-top: 16px;
 }
 
+.settlement-detail-page__billing-rule-cell {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  max-width: 100%;
+}
+
+.settlement-detail-page__billing-rule-icon {
+  flex: 0 0 auto;
+  color: var(--el-color-primary);
+  cursor: pointer;
+}
+
+.settlement-detail-page__billing-rule-detail {
+  margin-top: 12px;
+}
+
+.settlement-detail-page__billing-rule-match-title {
+  margin-top: 20px;
+}
+
 @media screen and (max-width: 992px) {
   .settlement-detail-page__detail-panel {
     left: 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 13/18] =?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(

From 1ac741f78588d5463c5c497c7a3ba4021eb25ac8 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 18 Oct 2026 20:35:28 +0800
Subject: [PATCH 14/18] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E5=96=84=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=BB=93=E7=AE=97=E5=8D=95=E6=98=8E=E7=BB=86=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E3=80=81=E8=8D=89=E7=A8=BF=E5=88=B7=E6=96=B0=E4=B8=8E?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=BF=90=E5=8D=95=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/api/settlement/settlementImport.js        |  10 +
 .../components/settlement-import-page.vue     | 253 ++++++++++++++++--
 src/views/settlement/settlement-import.vue    | 201 ++++++++++++--
 3 files changed, 425 insertions(+), 39 deletions(-)

diff --git a/src/api/settlement/settlementImport.js b/src/api/settlement/settlementImport.js
index 131493b..e59c23f 100644
--- a/src/api/settlement/settlementImport.js
+++ b/src/api/settlement/settlementImport.js
@@ -53,3 +53,13 @@ export const confirm = data =>
   request({ url: `${baseUrl}/confirm`, method: 'post', data, timeout: 120000 });
 
 export const voidBatch = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+
+export const removeDraft = id =>
+  request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
+
+export const getHistoryWaybills = params =>
+  request({
+    url: `${baseUrl}/history-waybills`,
+    method: 'get',
+    params,
+  });
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index e87995c..d417134 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -122,7 +122,7 @@
                     </div>
                     <div>
                       历史运单：按 项目+车号+运输完成日期+客户+承运商+起运地+目的地+货物名称
-                      匹配已有运单（命中 1 条自动绑定，多条需手工指定运单号）；提交时生成应收/应付明细与预/正式结算单，费用按导入单据，不新建运单
+                      匹配尚未生成应收/应付的运单（命中 1 条自动绑定，多条可点「选择」弹窗挑选）；提交时生成应收/应付明细与预/正式结算单，费用按导入单据，不新建运单
                     </div>
                   </template>
                   <el-icon class="settlement-import-create__label-tip"><QuestionFilled /></el-icon>
@@ -220,8 +220,32 @@
                 value-format="YYYY-MM-DD"
                 placeholder="请选择"
               />
+              <el-select
+                v-else-if="column.editor === 'select' && column.prop === 'transportType'"
+                v-model="row[column.prop]"
+                clearable
+                filterable
+                placeholder="请选择运输方式"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in transportTypeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <div
+                v-else-if="column.editor === 'waybillSelect'"
+                class="settlement-import-create__waybill-select"
+              >
+                <el-input v-model="row.waybillNo" clearable placeholder="运单号" />
+                <el-link type="primary" :underline="false" @click="openHistoryWaybillDialog(row)">
+                  选择
+                </el-link>
+              </div>
               <el-input
-                v-else-if="column.editor === 'number'"
+                v-else-if="column.editor === 'number' || column.editor === 'optionalNumber'"
                 :model-value="resolveCellValue(row, column)"
                 inputmode="decimal"
                 :placeholder="`请输入${column.label}`"
@@ -233,6 +257,14 @@
                 :placeholder="`请输入${column.label}`"
               />
             </template>
+            <template v-else-if="column.editor === 'waybillSelect' && !readonly">
+              <div class="settlement-import-create__waybill-select">
+                <span>{{ row.waybillNo || '-' }}</span>
+                <el-link type="primary" :underline="false" @click="openHistoryWaybillDialog(row)">
+                  选择
+                </el-link>
+              </div>
+            </template>
             <span v-else>{{ formatCell(row, column) }}</span>
           </template>
         </el-table-column>
@@ -268,6 +300,41 @@
         确认导入
       </el-button>
     </div>
+
+    <el-dialog
+      v-model="historyWaybillVisible"
+      title="选择历史运单"
+      width="960px"
+      append-to-body
+      destroy-on-close
+    >
+      <div class="settlement-import-create__history-tip">
+        仅展示相同项目、客户合同、承运商合同下，尚未生成当前结算类型应收/应付明细的运单
+      </div>
+      <el-table
+        v-loading="historyWaybillLoading"
+        :data="historyWaybillRows"
+        border
+        max-height="420"
+        highlight-current-row
+        @row-dblclick="selectHistoryWaybill"
+        @current-change="row => (historyWaybillCurrent = row)"
+      >
+        <el-table-column prop="waybillNo" label="运单号" min-width="140" />
+        <el-table-column prop="vehicleNo" label="车号" min-width="120" />
+        <el-table-column prop="departureAddress" label="起运地" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="arrivalAddress" label="目的地" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="cargoName" label="货物名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="actualEndDate" label="完成日期" min-width="120" />
+        <el-table-column prop="quantity" label="数量" width="90" />
+        <el-table-column prop="quantityUnit" label="数量单位" width="90" />
+        <el-table-column prop="mileage" label="里程" width="90" />
+      </el-table>
+      <template #footer>
+        <el-button @click="historyWaybillVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmHistoryWaybill">确定</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -279,6 +346,7 @@ import { QuestionFilled } from '@element-plus/icons-vue';
 import dayjs from 'dayjs';
 import * as api from '@/api/settlement/settlementImport';
 import { getList as getContractList } from '@/api/business/contract-manage';
+import { getDictionary } from '@/api/system/dictbiz';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadXls } from '@/utils/util';
 
@@ -301,6 +369,12 @@ const carrierContracts = ref([]);
 const draftLoading = ref(false);
 const confirmLoading = ref(false);
 const readonly = ref(false);
+const transportTypeOptions = ref([]);
+const historyWaybillVisible = ref(false);
+const historyWaybillLoading = ref(false);
+const historyWaybillRows = ref([]);
+const historyWaybillCurrent = ref(null);
+const historyWaybillTargetRow = ref(null);
 
 const createDefaultForm = () => ({
   id: undefined,
@@ -406,7 +480,6 @@ const loadContractsByProject = async (projectId, projectName = '') => {
 
 const fixedDetailColumns = [
   { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 140 },
-  { prop: 'batchNo', label: '运单批次号', editor: 'input', minWidth: 140 },
   { prop: 'originalNo', label: '原始单号', editor: 'input', minWidth: 130 },
   {
     prop: 'vehicleNo',
@@ -414,15 +487,30 @@ const fixedDetailColumns = [
     editor: 'input',
     minWidth: 190,
   },
-  { prop: 'driverName', label: '司机/船长', editor: 'input', minWidth: 120 },
-  { prop: 'transportType', label: '运输方式', editor: 'input', minWidth: 110 },
-  { prop: 'departureAddress', label: '起运地', editor: 'input', minWidth: 160 },
-  { prop: 'arrivalAddress', label: '目的地', editor: 'input', minWidth: 160 },
+  { prop: 'transportType', label: '运输方式', editor: 'select', minWidth: 120 },
+  { prop: 'driverName', label: '司机/船长姓名', editor: 'input', minWidth: 120 },
+  { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 140 },
+  { prop: 'departureAddress', label: '发货地址', editor: 'input', minWidth: 160 },
+  { prop: 'departureContact', label: '发货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'departurePhone', label: '发货联系人电话', editor: 'input', minWidth: 140 },
+  { prop: 'arrivalAddress', label: '到货地址', editor: 'input', minWidth: 160 },
+  { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 140 },
   { prop: 'cargoName', label: '货物名称', editor: 'input', minWidth: 140 },
-  { prop: 'actualStartDate', label: '开始时间', editor: 'date', minWidth: 140 },
-  { prop: 'actualEndDate', label: '运输完成日期', editor: 'date', minWidth: 140 },
-  { prop: 'unitPrice', label: '单价', editor: 'number', minWidth: 100, feeField: false },
-  { prop: 'transportFee', label: '运费', editor: 'number', minWidth: 100 },
+  { prop: 'cargoType', label: '货物类型', editor: 'input', minWidth: 120 },
+  { prop: 'packageType', label: '包装', editor: 'input', minWidth: 100 },
+  { prop: 'quantity', label: '数量', editor: 'number', minWidth: 100 },
+  { prop: 'quantityUnit', label: '数量单位', editor: 'input', minWidth: 100 },
+  { prop: 'specification', label: '规格', editor: 'input', minWidth: 110 },
+  { prop: 'model', label: '型号', editor: 'input', minWidth: 110 },
+  { prop: 'mileage', label: '里程(km)', editor: 'optionalNumber', minWidth: 110 },
+  { prop: 'unitPrice', label: '运输单价', editor: 'optionalNumber', minWidth: 100 },
+  { prop: 'transportFee', label: '运输费', editor: 'number', minWidth: 100 },
+  { prop: 'actualStartDate', label: '实际发货时间', editor: 'date', minWidth: 140 },
+  { prop: 'actualEndDate', label: '实际完成时间', editor: 'date', minWidth: 140 },
+  { prop: 'planStartDate', label: '预计发货时间', editor: 'date', minWidth: 140 },
+  { prop: 'planEndDate', label: '预计完成时间', editor: 'date', minWidth: 140 },
+  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 140 },
 ];
 
 const detailColumns = computed(() => {
@@ -439,8 +527,8 @@ const detailColumns = computed(() => {
           {
             prop: 'waybillNo',
             label: '运单号',
-            editor: 'input',
-            minWidth: 150,
+            editor: 'waybillSelect',
+            minWidth: 180,
           },
         ]
       : [];
@@ -532,9 +620,14 @@ const resolveCellValue = (row, column) => {
 
 const formatCell = (row, column) => {
   const value = resolveCellValue(row, column);
-  if (column.editor === 'number' || column.prop === 'settlementAmount') {
+  if (
+    column.editor === 'number' ||
+    column.editor === 'optionalNumber' ||
+    column.prop === 'settlementAmount'
+  ) {
     if (value === '' || value === null || value === undefined) return '';
-    return Number(value).toFixed(2);
+    const number = Number(value);
+    return Number.isFinite(number) ? number.toFixed(2) : '';
   }
   return value ?? '';
 };
@@ -560,11 +653,23 @@ const recalcSettlementAmount = row => {
 };
 
 const updateNumberCell = (row, column, value) => {
-  const [integer = '', decimal = ''] = String(value || '')
-    .replace(/[^\d.]/g, '')
-    .split('.');
+  const raw = String(value ?? '').trim();
+  if (!raw) {
+    if (column.isFeeItem) {
+      if (!row.feeItems) row.feeItems = {};
+      row.feeItems[column.prop] = '';
+      row[column.prop] = '';
+    } else {
+      row[column.prop] = column.editor === 'optionalNumber' ? '' : '';
+      if (column.prop === 'transportFee') row.freight = '';
+      if (column.prop === 'unitPrice') row.transportUnitPrice = '';
+    }
+    recalcSettlementAmount(row);
+    return;
+  }
+  const [integer = '', decimal = ''] = raw.replace(/[^\d.]/g, '').split('.');
   const normalized =
-    decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
+    decimal || raw.includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
   if (column.isFeeItem) {
     if (!row.feeItems) row.feeItems = {};
     row.feeItems[column.prop] = normalized;
@@ -637,6 +742,12 @@ const normalizeParsedRow = (item, index) => {
     loadingIdentifier: item.loadingIdentifier || item.loadingNo || '',
     transportFee: item.transportFee ?? item.freight ?? item['*运输费'] ?? item['运输费'] ?? '',
     unitPrice: item.unitPrice ?? item.transportUnitPrice ?? item['运输单价'] ?? item['单价'] ?? '',
+    mileage: item.mileage ?? item['里程(km)'] ?? item['里程'] ?? '',
+    quantity: item.quantity ?? item['*数量'] ?? item['数量'] ?? '',
+    quantityUnit: item.quantityUnit ?? item['*数量单位'] ?? item['数量单位'] ?? '',
+    model: item.model ?? item['型号'] ?? '',
+    specification: item.specification ?? item['规格'] ?? '',
+    cargoType: item.cargoType ?? item['*货物类型'] ?? item['货物类型'] ?? '',
     feeItems,
   };
   row.transportUnitPrice = row.unitPrice;
@@ -867,6 +978,74 @@ const leaveAfterConfirm = () => {
   router.push({ path: '/settlement/settlement-import' });
 };
 
+const openHistoryWaybillDialog = async row => {
+  if (!form.projectId || !form.customerContractId || !form.carrierContractId) {
+    ElMessage.warning('请先选择项目、客户合同和承运商合同');
+    return;
+  }
+  if (!form.settlementType) {
+    ElMessage.warning('请先选择结算类型');
+    return;
+  }
+  historyWaybillTargetRow.value = row;
+  historyWaybillCurrent.value = null;
+  historyWaybillVisible.value = true;
+  historyWaybillLoading.value = true;
+  try {
+    const response = await api.getHistoryWaybills({
+      projectId: form.projectId,
+      customerContractId: form.customerContractId,
+      carrierContractId: form.carrierContractId,
+      settlementType: form.settlementType,
+    });
+    historyWaybillRows.value = unwrapData(response) || [];
+  } catch (error) {
+    historyWaybillRows.value = [];
+    ElMessage.error(error?.message || '加载历史运单失败');
+  } finally {
+    historyWaybillLoading.value = false;
+  }
+};
+
+const applyHistoryWaybill = waybill => {
+  const target = historyWaybillTargetRow.value;
+  if (!target || !waybill) return;
+  target.waybillNo = waybill.waybillNo || '';
+  target.matchedWaybillId = waybill.id;
+  target.vehicleNo = waybill.vehicleNo || target.vehicleNo;
+  target.departureAddress = waybill.departureAddress || target.departureAddress;
+  target.arrivalAddress = waybill.arrivalAddress || target.arrivalAddress;
+  target.cargoName = waybill.cargoName || target.cargoName;
+  target.cargoType = waybill.cargoType || target.cargoType;
+  target.quantity = waybill.quantity ?? target.quantity;
+  target.quantityUnit = waybill.quantityUnit || target.quantityUnit;
+  target.model = waybill.model || target.model;
+  target.mileage =
+    waybill.mileage === null || waybill.mileage === undefined ? target.mileage : waybill.mileage;
+  target.actualStartDate = waybill.actualStartDate
+    ? dayjs(waybill.actualStartDate).format('YYYY-MM-DD')
+    : target.actualStartDate;
+  target.actualEndDate = waybill.actualEndDate
+    ? dayjs(waybill.actualEndDate).format('YYYY-MM-DD')
+    : target.actualEndDate;
+  target.driverName = waybill.driverName || target.driverName;
+  refreshDuplicateFlags();
+};
+
+const selectHistoryWaybill = row => {
+  applyHistoryWaybill(row);
+  historyWaybillVisible.value = false;
+};
+
+const confirmHistoryWaybill = () => {
+  if (!historyWaybillCurrent.value) {
+    ElMessage.warning('请选择一条运单');
+    return;
+  }
+  applyHistoryWaybill(historyWaybillCurrent.value);
+  historyWaybillVisible.value = false;
+};
+
 const downloadFailureExcel = async failureRows => {
   const response = await api.exportFailures({
     feeItemNames: [...feeItemNames.value],
@@ -910,7 +1089,7 @@ const saveDraft = async () => {
     if (batch.id) form.id = batch.id;
     if (batch.batchNo) form.batchNo = batch.batchNo;
     ElMessage.success('保存草稿成功');
-    goBack();
+    leaveAfterConfirm();
   } catch (error) {
     ElMessage.error(error?.message || '保存草稿失败');
   } finally {
@@ -959,10 +1138,32 @@ const confirmImport = async () => {
   }
 };
 
+const loadTransportTypeOptions = async () => {
+  try {
+    const response = await getDictionary({ code: 'transport_type' });
+    const list = unwrapData(response) || [];
+    transportTypeOptions.value = (Array.isArray(list) ? list : [])
+      .map(item => {
+        const label = item.dictValue || item.label || item.name || '';
+        const value = item.dictValue || item.dictKey || item.value || label;
+        return label ? { label, value } : null;
+      })
+      .filter(Boolean);
+  } catch (error) {
+    transportTypeOptions.value = [
+      { label: '公路运输', value: '公路运输' },
+      { label: '铁路运输', value: '铁路运输' },
+      { label: '水路运输', value: '水路运输' },
+      { label: '航空运输', value: '航空运输' },
+    ];
+  }
+};
+
 const loadOptions = async () => {
   const response = await api.getOptions();
   const options = unwrapData(response) || {};
   projects.value = (options.projects || []).map(normalizeProject).filter(Boolean);
+  await loadTransportTypeOptions();
 };
 
 const loadDetail = async id => {
@@ -1115,4 +1316,16 @@ onMounted(() => {
   padding-top: 16px;
   border-top: 1px solid #eff1f7;
 }
+
+.settlement-import-create__waybill-select {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.settlement-import-create__history-tip {
+  margin-bottom: 8px;
+  color: #909399;
+  font-size: 13px;
+}
 </style>
diff --git a/src/views/settlement/settlement-import.vue b/src/views/settlement/settlement-import.vue
index 6cf0d43..0d4bb95 100644
--- a/src/views/settlement/settlement-import.vue
+++ b/src/views/settlement/settlement-import.vue
@@ -23,8 +23,8 @@
             <el-input v-else v-model="query[field.prop]" clearable placeholder="请输入" />
           </el-form-item>
           <div class="settlement-import-page__search-actions">
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetSearch">重置</el-button>
+            <el-button type="primary" @click="handleSearch">搜索</el-button>
+            <el-button @click="resetSearch">清空</el-button>
             <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
               {{ searchExpanded ? '收起' : '展开' }}
             </el-button>
@@ -43,6 +43,7 @@
           >
             新增
           </el-button>
+          <el-button plain @click="refreshTable">刷新</el-button>
         </div>
       </div>
 
@@ -53,6 +54,13 @@
             <el-link type="primary" @click="openDetail(row)">{{ row.batchNo || '-' }}</el-link>
           </template>
         </el-table-column>
+        <el-table-column prop="importStatusName" label="状态" width="100" align="center">
+          <template #default="{ row }">
+            <el-tag :type="statusTagType(row.importStatus)" effect="plain">
+              {{ row.importStatusName || importStatusLabel(row.importStatus) }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="settlementTypeName" label="导入类型" min-width="100">
           <template #default="{ row }">
             {{ row.settlementTypeName || settlementTypeLabel(row.settlementType) }}
@@ -68,19 +76,35 @@
         <el-table-column prop="carrierName" label="承运商" min-width="140" show-overflow-tooltip />
         <el-table-column label="明细行数" width="100" align="center">
           <template #default="{ row }">
-            {{ row.waybillCount ?? row.detailCount ?? 0 }}
+            {{ row.detailCount ?? row.waybillCount ?? 0 }}
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" min-width="170" />
         <el-table-column prop="createUserName" label="创建人" min-width="120">
           <template #default="{ row }">{{ row.createUserName || '-' }}</template>
         </el-table-column>
-        <el-table-column label="操作" width="160" fixed="right">
+        <el-table-column label="操作" width="220" fixed="right">
           <template #default="{ row }">
             <div class="settlement-import-page__row-actions">
-              <el-link type="primary" @click="openDetail(row)">详情</el-link>
+              <el-link type="primary" @click="openDetail(row)">查看</el-link>
               <el-link
-                v-if="row.importStatus !== 'voided' && hasPermission('settlement_import_void')"
+                v-if="row.importStatus === 'draft'"
+                type="primary"
+                @click="editDraft(row)"
+              >
+                编辑
+              </el-link>
+              <el-link
+                v-if="row.importStatus === 'draft' && hasPermission('settlement_import_delete')"
+                type="danger"
+                @click="handleDelete(row)"
+              >
+                删除
+              </el-link>
+              <el-link
+                v-if="
+                  row.importStatus === 'completed' && hasPermission('settlement_import_void')
+                "
                 type="danger"
                 @click="openVoid(row)"
               >
@@ -105,9 +129,19 @@
       </div>
     </section>
 
-    <el-dialog v-model="detailVisible" title="导入结算单详情" width="640px" append-to-body>
-      <el-descriptions :column="2" border>
+    <el-dialog
+      v-model="detailVisible"
+      title="导入结算单详情"
+      width="1100px"
+      append-to-body
+      destroy-on-close
+      class="settlement-import-detail-dialog"
+    >
+      <el-descriptions :column="3" border>
         <el-descriptions-item label="导入批次号">{{ detail.batchNo || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="状态">
+          {{ detail.importStatusName || importStatusLabel(detail.importStatus) }}
+        </el-descriptions-item>
         <el-descriptions-item label="导入类型">
           {{ detail.settlementTypeName || settlementTypeLabel(detail.settlementType) }}
         </el-descriptions-item>
@@ -117,6 +151,9 @@
         <el-descriptions-item label="运单类型">
           {{ detail.waybillModeName || waybillModeLabel(detail.waybillMode) }}
         </el-descriptions-item>
+        <el-descriptions-item label="明细行数">
+          {{ detail.detailCount ?? detail.waybillCount ?? detailRows.length }}
+        </el-descriptions-item>
         <el-descriptions-item label="项目">{{ detail.projectName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="客户">{{ detail.customerName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="客户合同">
@@ -126,16 +163,10 @@
         <el-descriptions-item label="承运商合同">
           {{ detail.carrierContractName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="明细行数">
-          {{ detail.waybillCount ?? detail.detailCount ?? 0 }}
-        </el-descriptions-item>
-        <el-descriptions-item label="导入状态">
-          {{ detail.importStatusName || detail.importStatus || '-' }}
-        </el-descriptions-item>
         <el-descriptions-item label="创建人">{{ detail.createUserName || '-' }}</el-descriptions-item>
         <el-descriptions-item label="创建时间">{{ detail.createTime || '-' }}</el-descriptions-item>
         <el-descriptions-item label="备注" :span="2">{{ detail.remark || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="关联结算单" :span="2">
+        <el-descriptions-item label="关联结算单" :span="3">
           <el-link
             v-if="detail.formalSettlementId"
             type="primary"
@@ -153,6 +184,50 @@
           <span v-else>-</span>
         </el-descriptions-item>
       </el-descriptions>
+
+      <div class="dialog-section-title settlement-import-page__detail-title">导入明细</div>
+      <el-table
+        v-loading="detailLoading"
+        :data="detailRows"
+        border
+        max-height="420"
+        class="settlement-import-page__table"
+      >
+        <el-table-column type="index" label="序号" width="64" align="center" />
+        <el-table-column
+          v-if="detail.waybillMode === 'history'"
+          prop="waybillNo"
+          label="运单号"
+          min-width="130"
+        />
+        <el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" min-width="170" />
+        <el-table-column prop="transportType" label="运输方式" min-width="100" />
+        <el-table-column prop="departureAddress" label="发货地址" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="arrivalAddress" label="到货地址" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="cargoName" label="货物名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="cargoType" label="货物类型" min-width="100" />
+        <el-table-column prop="model" label="型号" min-width="100" />
+        <el-table-column prop="quantity" label="数量" width="90" />
+        <el-table-column prop="quantityUnit" label="数量单位" width="90" />
+        <el-table-column prop="mileage" label="里程(km)" width="100" />
+        <el-table-column prop="unitPrice" label="运输单价" width="100" />
+        <el-table-column prop="transportFee" label="运输费" width="100" />
+        <el-table-column
+          v-for="name in detailFeeItemNames"
+          :key="name"
+          :label="name"
+          min-width="100"
+        >
+          <template #default="{ row }">
+            {{ formatFeeAmount(row, name) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="settlementAmount" label="结算金额" width="110" />
+        <el-table-column prop="actualStartDate" label="实际发货时间" min-width="120" />
+        <el-table-column prop="actualEndDate" label="实际完成时间" min-width="120" />
+        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
+      </el-table>
+
       <template #footer>
         <el-button @click="detailVisible = false">关闭</el-button>
         <el-button
@@ -200,6 +275,7 @@ import * as api from '@/api/settlement/settlementImport';
 const emptyQuery = () => ({
   batchNo: '',
   settlementType: '',
+  importStatus: '',
   projectName: '',
   customerName: '',
   carrierName: '',
@@ -207,8 +283,15 @@ const emptyQuery = () => ({
 
 const SETTLEMENT_TYPE_OPTIONS = [
   { label: '全部', value: '' },
-  { label: '应收正式结算单', value: 'receivable' },
-  { label: '应付正式结算单', value: 'payable' },
+  { label: '应收', value: 'receivable' },
+  { label: '应付', value: 'payable' },
+];
+
+const IMPORT_STATUS_OPTIONS = [
+  { label: '全部', value: '' },
+  { label: '草稿', value: 'draft' },
+  { label: '已完成', value: 'completed' },
+  { label: '已作废', value: 'voided' },
 ];
 
 const SETTLEMENT_IMPORT_LIST_REFRESH_KEY = 'settlement-import-list-refresh';
@@ -227,7 +310,10 @@ export default {
       page: { current: 1, size: 10, total: 0 },
       batchNoOptions: [],
       detailVisible: false,
+      detailLoading: false,
       detail: {},
+      detailRows: [],
+      detailFeeItemNames: [],
       voidVisible: false,
       voidLoading: false,
       voidForm: { id: null, reason: '' },
@@ -253,6 +339,12 @@ export default {
           type: 'select',
           options: this.batchNoOptions,
         },
+        {
+          prop: 'importStatus',
+          label: '状态',
+          type: 'select',
+          options: IMPORT_STATUS_OPTIONS,
+        },
         {
           prop: 'settlementType',
           label: '导入类型',
@@ -298,6 +390,17 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
+    importStatusLabel(value) {
+      return (
+        IMPORT_STATUS_OPTIONS.find(item => item.value === value)?.label || value || '-'
+      );
+    },
+    statusTagType(status) {
+      if (status === 'draft') return 'info';
+      if (status === 'completed') return 'success';
+      if (status === 'voided') return 'danger';
+      return '';
+    },
     settlementTypeLabel(value) {
       return (
         SETTLEMENT_TYPE_OPTIONS.find(item => item.value === value)?.label || value || '-'
@@ -315,6 +418,13 @@ export default {
       const body = response?.data || response || {};
       return body?.data !== undefined ? body.data : body;
     },
+    formatFeeAmount(row, name) {
+      const feeItems = row?.feeItems || {};
+      const value = feeItems[name] ?? row?.[name];
+      if (value === null || value === undefined || value === '') return '';
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : value;
+    },
     async loadOptions() {
       try {
         const response = await api.getOptions();
@@ -341,6 +451,7 @@ export default {
         const response = await api.getList(this.page.current, this.page.size, {
           batchNo: this.query.batchNo || undefined,
           settlementType: this.query.settlementType || undefined,
+          importStatus: this.query.importStatus || undefined,
           projectName: this.query.projectName || undefined,
           customerName: this.query.customerName || undefined,
           carrierName: this.query.carrierName || undefined,
@@ -352,6 +463,10 @@ export default {
         this.loading = false;
       }
     },
+    refreshTable() {
+      this.loadOptions();
+      this.loadTable();
+    },
     handleSearch() {
       this.page.current = 1;
       this.loadTable();
@@ -372,13 +487,23 @@ export default {
     },
     async openDetail(row) {
       if (!row?.id) return;
+      this.detailVisible = true;
+      this.detailLoading = true;
+      this.detail = { ...row };
+      this.detailRows = [];
+      this.detailFeeItemNames = [];
       try {
         const response = await api.getDetail(row.id);
-        this.detail = this.unwrapData(response) || { ...row };
+        const detail = this.unwrapData(response) || { ...row };
+        this.detail = detail;
+        this.detailRows = Array.isArray(detail.rows) ? detail.rows : [];
+        this.detailFeeItemNames = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
       } catch (error) {
         this.detail = { ...row };
+        this.$message.error(error?.message || '加载详情失败');
+      } finally {
+        this.detailLoading = false;
       }
-      this.detailVisible = true;
     },
     editDraft(row) {
       this.detailVisible = false;
@@ -387,6 +512,21 @@ export default {
         query: { id: row.id },
       });
     },
+    async handleDelete(row) {
+      if (!row?.id) return;
+      try {
+        await this.$confirm('确认删除该草稿批次？删除后不可恢复。', '提示', {
+          type: 'warning',
+        });
+        await api.removeDraft(row.id);
+        this.$message.success('删除成功');
+        this.loadTable();
+        this.loadOptions();
+      } catch (error) {
+        if (error === 'cancel' || error === 'close') return;
+        this.$message.error(error?.message || '删除失败');
+      }
+    },
     goFormalSettlement(row) {
       if (!row?.formalSettlementId) return;
       this.detailVisible = false;
@@ -513,6 +653,29 @@ export default {
   padding: 12px 0;
 }
 
+.settlement-import-page__detail-title {
+  margin: 16px 0 8px;
+}
+
+.dialog-section-title {
+  position: relative;
+  padding-left: 12px;
+  color: #303133;
+  font-size: 16px;
+  font-weight: 600;
+
+  &::before {
+    position: absolute;
+    top: 2px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    border-radius: 2px;
+    background: #409eff;
+    content: '';
+  }
+}
+
 .settlement-import-page :deep(.basic-container__card > .el-card__body) {
   padding: 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 15/18] =?UTF-8?q?fix:=20=E4=BB=98=E6=AC=BE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A2=9E=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) {

From aee661772b582a3d1993c72e340ffd21950c75a7 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 19 Oct 2026 12:06:51 +0800
Subject: [PATCH 16/18] =?UTF-8?q?:sparkles:=20=E5=AE=8C=E5=96=84=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=A4=9A=E7=BB=93=E7=AE=97=E8=A1=8C?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E7=AE=97=E5=AF=BC=E5=85=A5=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=8E=E8=AE=A1=E8=B4=B9=E8=A7=84=E5=88=99=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/option/settlement/preSettlementTable.js   |   2 +
 src/utils/settlement-adjust-rule.js           |  30 ++
 .../payment/payment-application-form.vue      | 244 +++++++++++--
 .../components/formal-settlement-editor.vue   |  32 +-
 .../components/pre-settlement-editor.vue      | 190 +++++++---
 .../components/settlement-import-page.vue     | 328 +++++++++++++++---
 .../settlement/receivable-payable-detail.vue  | 188 ++++++----
 src/views/settlement/settlement-import.vue    |  87 +++--
 8 files changed, 884 insertions(+), 217 deletions(-)
 create mode 100644 src/utils/settlement-adjust-rule.js

diff --git a/src/option/settlement/preSettlementTable.js b/src/option/settlement/preSettlementTable.js
index 26c06ed..e3c6e55 100644
--- a/src/option/settlement/preSettlementTable.js
+++ b/src/option/settlement/preSettlementTable.js
@@ -52,6 +52,7 @@ export const settlementDetailColumns = [
   { label: '运输总量', prop: 'transportQuantityText', minWidth: 120 },
   { label: '里程（KM）', prop: 'mileage', minWidth: 120 },
   { label: '批次号', prop: 'batchNo', minWidth: 130 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '运输单价', prop: 'unitPrice', minWidth: 120, money: true },
   { label: '运费', prop: 'freightAmount', minWidth: 120, money: true },
   { label: '原金额', prop: 'originalAmount', minWidth: 120, money: true },
@@ -94,5 +95,6 @@ export const candidateDetailColumns = [
   { label: '货物名称', prop: 'cargoName', minWidth: 140 },
   { label: '货物类型', prop: 'cargoType', minWidth: 130 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '结算金额', prop: 'totalAmount', minWidth: 130, money: true },
 ];
diff --git a/src/utils/settlement-adjust-rule.js b/src/utils/settlement-adjust-rule.js
new file mode 100644
index 0000000..066cda3
--- /dev/null
+++ b/src/utils/settlement-adjust-rule.js
@@ -0,0 +1,30 @@
+export function isFreightFeeName(name) {
+  const text = String(name || '');
+  return text.includes('运费') || text.includes('运输费');
+}
+
+/** 运输单价对应的运费计费类型。 */
+export function freightBillingType(row = {}) {
+  const rule = row.billingRule || {};
+  const rules = Array.isArray(rule.rules) ? rule.rules : [];
+  const freightRule = rules.find(
+    item => isFreightFeeName(item?.feeItem) || isFreightFeeName(item?.feeType)
+  );
+  return freightRule?.billingType || row.billingType || rule.billingType || '';
+}
+
+export function isTierUnitPrice(row) {
+  return freightBillingType(row) === '阶梯单价';
+}
+
+export function isIntervalBilling(row) {
+  const type = freightBillingType(row);
+  return type === '区间单价' || (type.includes('区间') && type.includes('一口价'));
+}
+
+/** 阶梯单价、区间单价、区间一口价的运输单价不开放手工调整。 */
+export function isUnitPriceAdjustable(row) {
+  const type = freightBillingType(row);
+  if (!type) return true;
+  return !isTierUnitPrice(row) && !isIntervalBilling(row);
+}
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 9c69366..637a2df 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -121,7 +121,7 @@
               ><div class="payment-form-page__percentage-input">
                 <el-input-number
                   v-model="form.paymentRatio"
-                  :disabled="readonly"
+                  :disabled="readonly || multipleSettlementRows"
                   :min="0"
                   :max="100"
                   :precision="2"
@@ -134,7 +134,7 @@
             ><el-form-item label="申请付款金额" prop="appliedAmount"
               ><el-input-number
                 v-model="form.appliedAmount"
-                :disabled="readonly"
+                :disabled="readonly || multipleSettlementRows"
                 :min="0"
                 :precision="2"
                 :step="0.01"
@@ -241,15 +241,39 @@
           <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
             <template #default="{ row }">{{ formatMoney(row.payableAmount) }}</template>
           </el-table-column>
-          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="110">
+          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="160">
             <template #default="{ row }">
-              <span :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
+              <el-input-number
+                v-if="multipleSettlementRows && !readonly"
+                :model-value="row.paymentRatio"
+                :min="0"
+                :max="rowPaymentRatioMax(row)"
+                :precision="2"
+                :controls="false"
+                :value-on-clear="null"
+                style="width: 100%"
+                @update:model-value="value => handleRowPaymentRatioChange(row, value)"
+              />
+              <span v-else :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
                 {{ formatMoney(row.paymentRatio) }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="appliedAmount" label="付款金额" min-width="130">
-            <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
+          <el-table-column prop="appliedAmount" label="付款金额" min-width="160">
+            <template #default="{ row }">
+              <el-input-number
+                v-if="multipleSettlementRows && !readonly"
+                :model-value="row.appliedAmount"
+                :min="0"
+                :max="Number(row.payableAmount || 0)"
+                :precision="2"
+                :controls="false"
+                :value-on-clear="null"
+                style="width: 100%"
+                @update:model-value="value => handleRowAppliedAmountChange(row, value)"
+              />
+              <span v-else>{{ formatMoney(row.appliedAmount) }}</span>
+            </template>
           </el-table-column>
           <el-table-column prop="ratioRemark" label="备注" min-width="220" show-overflow-tooltip>
             <template #default="{ row }">
@@ -988,12 +1012,27 @@ export default {
     referenceSettlementCount() {
       return this.referenceSettlementNos.length;
     },
+    multipleSettlementRows() {
+      return this.referenceRows.length > 1;
+    },
     // 结算单号展示：单张显示单号；多张仅提示数量，明细在下方「结算信息」表，悬停可看全部单号
     referenceDisplayText() {
       if (this.referenceSettlementCount > 1) return `已选 ${this.referenceSettlementCount} 张结算单`;
       return this.referenceLabel;
     },
     settlementRows() {
+      if (this.referenceRows.length > 1) {
+        return this.referenceRows.map(item => {
+          const paymentRatio = item.paymentRatio ?? this.form.paymentRatio;
+          const appliedAmount = Number(item.appliedAmount || 0);
+          return {
+            ...item,
+            paymentRatio,
+            appliedAmount,
+            ...this.buildSettlementRatioHint({ ...item, paymentRatio }),
+          };
+        });
+      }
       if (this.referenceRows.length) {
         return this.referenceRows.map(item => {
           const appliedAmount =
@@ -1057,7 +1096,7 @@ export default {
     },
     'form.paymentRatio'(value) {
       this.checkContractPaymentRatio(value);
-      if (this.amountSyncing || !this.paymentAmountBase) return;
+      if (this.amountSyncing || this.multipleSettlementRows || !this.paymentAmountBase) return;
       this.amountSyncing = true;
       this.form.appliedAmount = Number(
         ((this.paymentAmountBase * Number(value || 0)) / 100).toFixed(2)
@@ -1067,7 +1106,7 @@ export default {
       });
     },
     'form.appliedAmount'(value) {
-      if (this.amountSyncing || !this.paymentAmountBase) return;
+      if (this.amountSyncing || this.multipleSettlementRows || !this.paymentAmountBase) return;
       this.amountSyncing = true;
       this.form.paymentRatio = Number(
         ((Number(value || 0) / this.paymentAmountBase) * 100).toFixed(2)
@@ -1080,6 +1119,7 @@ export default {
       if (
         this.amountSyncing ||
         this.form.paymentType === 'project_advance' ||
+        this.multipleSettlementRows ||
         !this.paymentAmountBase
       ) {
         return;
@@ -1292,6 +1332,7 @@ export default {
       }
       const referenceRow = this.createReferenceRow(data);
       this.referenceRows = this.restoreReferenceRows(data, referenceRow);
+      if (this.referenceRows.length > 1) this.syncHeaderPaymentFromRows();
       this.paymentRecords = data.paymentRecords || [];
     },
     async initialize() {
@@ -1315,6 +1356,7 @@ export default {
         };
         const referenceRow = this.createReferenceRow(data);
         this.referenceRows = this.restoreReferenceRows(data, referenceRow);
+        this.clearFormalReferenceWhenPreOnly();
         this.paymentRecords = data.paymentRecords || [];
         if (this.form.paymentType === 'project_advance') {
           await this.loadProjectOptions();
@@ -1322,6 +1364,7 @@ export default {
         }
         await this.fillBillTypeFromContract(this.form.contractId);
         await this.refreshSettlementPaymentSequences();
+        if (this.referenceRows.length > 1) this.syncHeaderPaymentFromRows();
         await this.loadAttachmentRuleData(await this.loadCurrentSettlementDetails());
         if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
       } else {
@@ -1489,6 +1532,7 @@ export default {
           fixedAppliedAmount: true,
         };
       });
+      this.seedMultipleRowPayments(referenceRows);
       const settlementAmount = referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1553,20 +1597,48 @@ export default {
         this.$refs.formRef?.clearValidate();
       });
     },
+    clearFormalReferenceWhenPreOnly() {
+      const progressAdvance = this.form.paymentType === 'progress_advance';
+      const onlyPre =
+        progressAdvance ||
+        (this.referenceRows.length > 0 &&
+          this.referenceRows.every(item => item.referenceType === 'pre'));
+      if (!onlyPre) return;
+      if (!this.form.preSettlementId) {
+        const preId =
+          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
+          (progressAdvance ? this.form.settlementId : null);
+        if (preId) {
+          this.form.preSettlementId = preId;
+          this.form.preSettlementIds = [preId];
+        }
+      }
+      this.form.settlementId = null;
+      this.form.settlementIds = [];
+      this.form.settlementNo = '';
+    },
     restoreReferenceRows(data, fallbackRow) {
       const relations = Array.isArray(data?.settlements) ? data.settlements : [];
       const rows = relations
         .map(item => {
-          const isPre = item.preSettlementId !== undefined && item.preSettlementId !== null && item.preSettlementId !== '';
+          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
           const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
           if (!settlementNo) return null;
           return {
-            id: isPre ? item.preSettlementId : item.formalSettlementId,
+            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
             settlementNo,
             referenceType: isPre ? 'pre' : 'formal',
             settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
             payableAmount: Number(Number(item.payableAmount ?? item.settlementAmount ?? 0).toFixed(2)),
             appliedAmount: Number(Number(item.appliedAmount || 0).toFixed(2)),
+            paymentRatio: Number(item.settlementAmount || 0)
+              ? Number(
+                  (
+                    (Number(item.appliedAmount || 0) / Number(item.settlementAmount || 0)) *
+                    100
+                  ).toFixed(2)
+                )
+              : null,
             fixedAppliedAmount: this.readonly,
           };
         })
@@ -1582,7 +1654,12 @@ export default {
     },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
-      const isPre = Boolean(row.preSettlementNo || row.preSettlementId || row.referenceType === 'pre');
+      const isPre = Boolean(
+        row.preSettlementNo ||
+          row.preSettlementId ||
+          row.referenceType === 'pre' ||
+          row.paymentType === 'progress_advance'
+      );
       const paymentSequence = Number(row.paymentSequence);
       // 可付款金额必须来自 referenceAmount 接口（已扣减占用中的付款申请）；缺失时置 0，避免误用未扣减结算金额
       const payableAmount =
@@ -1590,7 +1667,7 @@ export default {
           ? 0
           : Number(row.payableAmount || 0);
       return {
-        id: row.preSettlementId || row.settlementId || row.id,
+        id: row.preSettlementId || (isPre ? row.settlementId : null) || row.settlementId || row.id,
         settlementNo: row.preSettlementNo || row.formalSettlementNo || row.settlementNo || '',
         referenceType: isPre ? 'pre' : 'formal',
         settlementAmount: Number(Number(settlementAmount || 0).toFixed(2)),
@@ -1604,7 +1681,11 @@ export default {
      */
     buildSettlementRatioHint(row = {}) {
       const sequence = Number(row.paymentSequence || 1);
-      const paymentRatio = Number(this.form.paymentRatio);
+      const rawRatio =
+        row.paymentRatio !== undefined && row.paymentRatio !== null && row.paymentRatio !== ''
+          ? row.paymentRatio
+          : this.form.paymentRatio;
+      const paymentRatio = Number(rawRatio);
       const ratioConfig = this.contractPaymentRatioRows[sequence - 1];
       const ratioLimitValue = ratioConfig?.ratioLimit;
       const ratioLimit = Number(ratioLimitValue);
@@ -1614,9 +1695,9 @@ export default {
         String(ratioLimitValue).trim() !== '' &&
         Number.isFinite(ratioLimit);
       const hasPaymentRatio =
-        this.form.paymentRatio !== null &&
-        this.form.paymentRatio !== undefined &&
-        String(this.form.paymentRatio).trim() !== '' &&
+        rawRatio !== null &&
+        rawRatio !== undefined &&
+        String(rawRatio).trim() !== '' &&
         Number.isFinite(paymentRatio);
       const ratioExceeded = hasLimit && hasPaymentRatio && paymentRatio > ratioLimit;
       return {
@@ -1737,6 +1818,7 @@ export default {
         this.$message.error(error?.message || '可付款金额获取失败，请重试');
         return;
       }
+      this.seedMultipleRowPayments(this.referenceRows);
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1745,7 +1827,19 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
-      const paymentRatio = Number(this.form.paymentRatio || 0);
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
+      const multiple = this.referenceRows.length > 1;
+      const paymentRatio = multiple
+        ? settlementAmount
+          ? Number(((appliedAmount / settlementAmount) * 100).toFixed(2))
+          : 0
+        : Number(this.form.paymentRatio || 0);
+      const headerAppliedAmount = multiple
+        ? Number(appliedAmount.toFixed(2))
+        : Number(((payableAmount * paymentRatio) / 100).toFixed(2));
       // 尾款付款场景下选择预付结算单时保留尾款付款类型，不强制改为进度预付
       this.amountSyncing = true;
       Object.assign(this.form, {
@@ -1771,8 +1865,8 @@ export default {
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
         billType: '',
-        // 申请金额按可付款金额×比例，避免未扣减已申请额度
-        appliedAmount: Number(((payableAmount * paymentRatio) / 100).toFixed(2)),
+        paymentRatio,
+        appliedAmount: headerAppliedAmount,
       });
       this.paymentRecords = [];
       this.clearReceiptAccount();
@@ -2914,6 +3008,94 @@ export default {
         );
       });
     },
+    rowPaymentRatioMax(row) {
+      const settlementAmount = Number(row.settlementAmount || 0);
+      const payableAmount = Number(row.payableAmount || 0);
+      if (settlementAmount <= 0) return 100;
+      return Number(Math.min(100, (payableAmount / settlementAmount) * 100).toFixed(2));
+    },
+    seedMultipleRowPayments(rows = []) {
+      if (rows.length <= 1) return;
+      const ratio = Number(this.form.paymentRatio || 0);
+      rows.forEach(item => {
+        const settlementAmount = Number(item.settlementAmount || 0);
+        const payableAmount = Number(item.payableAmount || 0);
+        const hasRatio =
+          item.paymentRatio !== null && item.paymentRatio !== undefined && item.paymentRatio !== '';
+        if (hasRatio) return;
+        let applied = Number(item.appliedAmount || 0);
+        if (applied <= 0 && ratio > 0) {
+          applied = Number(((settlementAmount * ratio) / 100).toFixed(2));
+        }
+        if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
+        item.appliedAmount = Number(applied.toFixed(2));
+        item.paymentRatio = settlementAmount
+          ? Number(((item.appliedAmount / settlementAmount) * 100).toFixed(2))
+          : 0;
+      });
+    },
+    findReferenceRow(row) {
+      return this.referenceRows.find(
+        item =>
+          item.id === row.id &&
+          item.referenceType === row.referenceType &&
+          item.settlementNo === row.settlementNo
+      );
+    },
+    handleRowPaymentRatioChange(row, value) {
+      const target = this.findReferenceRow(row);
+      if (!target) return;
+      const settlementAmount = Number(target.settlementAmount || 0);
+      const payableAmount = Number(target.payableAmount || 0);
+      const ratio = value === null || value === undefined || value === '' ? 0 : Number(value);
+      let applied = Number(((settlementAmount * ratio) / 100).toFixed(2));
+      if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
+      target.appliedAmount = applied;
+      target.paymentRatio = settlementAmount
+        ? Number(((applied / settlementAmount) * 100).toFixed(2))
+        : Number(ratio.toFixed(2));
+      this.syncHeaderPaymentFromRows();
+    },
+    handleRowAppliedAmountChange(row, value) {
+      const target = this.findReferenceRow(row);
+      if (!target) return;
+      const settlementAmount = Number(target.settlementAmount || 0);
+      const payableAmount = Number(target.payableAmount || 0);
+      let applied = value === null || value === undefined || value === '' ? 0 : Number(value);
+      if (!Number.isFinite(applied) || applied < 0) applied = 0;
+      if (applied > payableAmount) applied = payableAmount;
+      target.appliedAmount = Number(applied.toFixed(2));
+      target.paymentRatio = settlementAmount
+        ? Number(((target.appliedAmount / settlementAmount) * 100).toFixed(2))
+        : 0;
+      this.syncHeaderPaymentFromRows();
+    },
+    syncHeaderPaymentFromRows() {
+      if (this.referenceRows.length <= 1) return;
+      const settlementAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.settlementAmount || 0),
+        0
+      );
+      const payableAmount = this.referenceRows.reduce(
+        (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));
+      this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+      this.form.paymentRatio = settlementAmount
+        ? Number(((appliedAmount / settlementAmount) * 100).toFixed(2))
+        : 0;
+      this.$nextTick(() => {
+        this.amountSyncing = false;
+        this.$refs.formRef?.validateField?.(['settlementAmount', 'paymentRatio', 'appliedAmount']);
+      });
+    },
     payload() {
       const {
         id,
@@ -2947,11 +3129,15 @@ export default {
         remark,
         invoices,
       } = this.form;
+      const usePreSettlementOnly =
+        paymentType === 'progress_advance' ||
+        (this.referenceRows.length > 0 &&
+          this.referenceRows.every(item => item.referenceType === 'pre'));
       return {
         id,
         paymentType,
-        settlementId,
-        settlementIds,
+        settlementId: usePreSettlementOnly ? null : settlementId,
+        settlementIds: usePreSettlementOnly ? [] : settlementIds,
         preSettlementId,
         preSettlementIds,
         projectId,
@@ -2968,6 +3154,12 @@ export default {
         billType,
         paymentRatio,
         appliedAmount,
+        settlementLines: (this.referenceRows || []).map(item => ({
+          formalSettlementId: item.referenceType === 'formal' ? item.id : null,
+          preSettlementId: item.referenceType === 'pre' ? item.id : null,
+          paymentRatio: item.paymentRatio,
+          appliedAmount: item.appliedAmount,
+        })),
         paymentMethod,
         billLedgerId,
         billNo,
@@ -3027,6 +3219,16 @@ export default {
         ElMessage.warning('申请付款金额必填且必须大于0');
         return false;
       }
+      if (this.multipleSettlementRows) {
+        const invalidRow = this.referenceRows.find(
+          item => Number(item.appliedAmount || 0) > Number(item.payableAmount || 0)
+        );
+        if (invalidRow) {
+          this.clearMessages();
+          ElMessage.warning(`${invalidRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
+          return false;
+        }
+      }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
         this.clearMessages();
         ElMessage.warning('请选择所属项目');
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 04a82d3..a4fce5b 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -860,11 +860,14 @@
         </el-table-column>
         <el-table-column label="运输单价" min-width="140" align="center">
           <template #default="{ row }">
+            <span v-if="isTierUnitPrice(row)">-</span>
             <el-input-number
+              v-else
               v-model="row.unitPrice"
               :min="0"
               :precision="2"
               :controls="false"
+              :disabled="!isUnitPriceAdjustable(row)"
               @change="recalculateAdjustRow(row, 'unitPrice')"
             />
           </template>
@@ -1037,6 +1040,7 @@ import { getDictionary } from '@/api/system/dictbiz';
 import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { normalizeCurrencyCode } from '@/utils/currency';
 import { downloadFileByUrl } from '@/utils/util';
 import {
@@ -1318,6 +1322,8 @@ export default {
     },
   },
   methods: {
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     formatContractOptionLabel,
     hasPermission(code) {
       if (this.isAdmin) return true;
@@ -2128,15 +2134,21 @@ export default {
         const settlementType = row.settlementType || this.form.settlementType || 'payable';
         const detailId = await resolveReceivablePayableDetailId(row, settlementType);
         if (!detailId) return this.$message.info('当前记录未找到对应的应收/应付明细');
-        this.$router.push({ path: settlementDetailPath(settlementType), query: { detailId } });
+        await this.$router.push({ path: settlementDetailPath(settlementType), query: { detailId } });
+        this.closeDetailDialog();
         return;
       }
       if (column.prop === 'waybillNo') {
         const waybillId = await resolveWaybillId(row);
         if (!waybillId) return this.$message.info('当前记录未找到对应的运单详情');
-        this.$router.push({ path: '/business/waybill-manage/detail', query: { id: waybillId } });
+        await this.$router.push({ path: '/business/waybill-manage/detail', query: { id: waybillId } });
+        this.closeDetailDialog();
       }
     },
+    closeDetailDialog() {
+      if (this.pageMode) return;
+      this.visible = false;
+    },
     resetDetailQuery(apply = true) {
       this.detailQuery = { documentNo: '', waybillNo: '', batchNo: '', cargoName: '' };
       if (apply) this.handleDetailQuery();
@@ -2260,11 +2272,16 @@ export default {
       row.settlementAmountTax = Number(
         (hasFreightItem ? feeItemTotal : Number(row.freightAmount || 0) + feeItemTotal).toFixed(2)
       );
-      if (changedField && this.adjust.sourceDetailId && (row.sourceFeeId || row.id)) {
-        this.scheduleSourceAdjustCalculation(row);
+      if (
+        ['transportQuantity', 'mileage', 'unitPrice'].includes(changedField) &&
+        this.adjust.sourceDetailId &&
+        (row.sourceFeeId || row.id) &&
+        (changedField !== 'unitPrice' || isUnitPriceAdjustable(row))
+      ) {
+        this.scheduleSourceAdjustCalculation(row, changedField);
       }
     },
-    scheduleSourceAdjustCalculation(row) {
+    scheduleSourceAdjustCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion = Number(row.adjustCalculateVersion || 0) + 1;
       row.calculating = true;
@@ -2277,6 +2294,8 @@ export default {
             feeId: row.sourceFeeId || row.id,
             transportQuantity: Number(row.transportQuantity || 0),
             mileage: Number(row.mileage || 0),
+            unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+            changedField,
             freightAmount: Number(row.freightAmount || 0),
             feeItems: Object.fromEntries(
               Object.entries(row.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
@@ -2288,6 +2307,9 @@ export default {
           row.feeItems = Object.fromEntries(
             Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
           );
+          if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+            row.unitPrice = Number(data.unitPrice);
+          }
           row.adjustAmount = Number(data.adjustAmount || 0);
           row.settlementAmountTax = Number(data.afterAmount || 0);
         } catch (error) {
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index ca9b5a6..80971bb 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -256,13 +256,23 @@
               show-overflow-tooltip
             >
               <template #default="{ row }">
-                <span v-if="item.kind === 'fee'">
-                  {{
-                    formatMoney(
-                      parseFeeItems(row.feeItemsJson)[item.name],
-                      row.currency || form.currency
-                    )
-                  }}
+                <span v-if="item.kind === 'fee'" class="pre-settlement-editor__billing-rule-cell">
+                  <span>
+                    {{
+                      formatMoney(
+                        parseFeeItems(row.feeItemsJson)[item.name],
+                        row.currency || form.currency
+                      )
+                    }}
+                  </span>
+                  <el-icon
+                    v-if="hasDetailBillingRule(row)"
+                    class="pre-settlement-editor__billing-rule-icon"
+                    title="查看计费规则详情"
+                    @click.stop="openDetailBillingRule(row, item.name)"
+                  >
+                    <InfoFilled />
+                  </el-icon>
                 </span>
                 <el-link
                   v-else-if="item.column.link && row[item.column.prop] && !publicMode"
@@ -274,6 +284,20 @@
                 <span v-else-if="item.column.money && item.column.prop === 'unitPrice'">
                   {{ formatUnitPrice(row) }}
                 </span>
+                <span
+                  v-else-if="item.column.prop === 'freightAmount'"
+                  class="pre-settlement-editor__billing-rule-cell"
+                >
+                  <span>{{ formatMoney(row[item.column.prop], row.currency || form.currency) }}</span>
+                  <el-icon
+                    v-if="hasDetailBillingRule(row)"
+                    class="pre-settlement-editor__billing-rule-icon"
+                    title="查看计费规则详情"
+                    @click.stop="openDetailBillingRule(row, '运输费')"
+                  >
+                    <InfoFilled />
+                  </el-icon>
+                </span>
                 <span v-else-if="item.column.money">
                   {{ formatMoney(row[item.column.prop], row.currency || form.currency) }}
                 </span>
@@ -781,12 +805,14 @@
       </el-table-column>
       <el-table-column label="运输单价" min-width="140" align="center">
         <template #default="{ row }">
+          <span v-if="isTierUnitPrice(row)">-</span>
           <el-input-number
+            v-else
             v-model="row.unitPrice"
             :min="0"
             :precision="2"
             :controls="false"
-            :disabled="adjustDialog.readonly"
+            :disabled="adjustDialog.readonly || !isUnitPriceAdjustable(row)"
             @change="recalculateAdjustRow(row, 'unitPrice')"
           />
         </template>
@@ -799,10 +825,7 @@
         align="center"
       >
         <template #default="{ row }">
-          <div
-            v-if="isFreightFeeItem(feeItem)"
-            class="pre-settlement-editor__billing-rule-cell"
-          >
+          <div class="pre-settlement-editor__billing-rule-cell">
             <el-input-number
               v-model="row.feeItems[feeItem]"
               :min="0"
@@ -815,20 +838,11 @@
               v-if="hasBillingRule(row)"
               class="pre-settlement-editor__billing-rule-icon"
               title="查看计费规则详情"
-              @click="openBillingRuleInfo(row)"
+              @click="openBillingRuleInfo(row, feeItem)"
             >
               <InfoFilled />
             </el-icon>
           </div>
-          <el-input-number
-            v-else
-            v-model="row.feeItems[feeItem]"
-            :min="0"
-            :precision="2"
-            :controls="false"
-            :disabled="adjustDialog.readonly"
-            @change="recalculateAdjustRow(row, feeItem)"
-          />
         </template>
       </el-table-column>
       <el-table-column label="结算金额（含税）" min-width="170" align="center">
@@ -986,6 +1000,7 @@ import {
   settlementSummaryColumns,
 } from '@/option/settlement/preSettlementTable';
 import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { normalizeCurrencyCode } from '@/utils/currency';
 import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
@@ -1234,8 +1249,14 @@ export default {
       });
       return Array.from(names);
     },
+    // 费用项里已有运输费/运费时，不再单独展示运费列，避免和应收应付费用项重复。
+    showStandaloneFreightColumn() {
+      return !this.detailFeeItemNames.some(name => this.isFreightFeeItem(name));
+    },
     detailDisplayColumns() {
-      const columns = this.visibleDetailColumns;
+      const columns = this.visibleDetailColumns.filter(
+        column => this.showStandaloneFreightColumn || column.prop !== 'freightAmount'
+      );
       const unitPriceIndex = columns.findIndex(column => column.prop === 'unitPrice');
       const beforeColumns = unitPriceIndex < 0 ? columns : columns.slice(0, unitPriceIndex + 1);
       const afterColumns = unitPriceIndex < 0 ? [] : columns.slice(unitPriceIndex + 1);
@@ -1306,6 +1327,8 @@ export default {
     },
   },
   methods: {
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     formatContractOptionLabel,
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
@@ -2321,11 +2344,38 @@ export default {
           rule.matchCondition?.cargoType
       );
     },
-    openBillingRuleInfo(row) {
-      this.billingRuleDialog.rule = this.normalizeBillingRule(row);
+    detailFeeRows(row = {}) {
+      return this.detailFeeCache[row.id] || this.detailFeeCache[row.preSettlementDetailId] || [];
+    },
+    hasDetailBillingRule(row) {
+      if (this.hasBillingRule(row)) return true;
+      return this.detailFeeRows(row).some(fee => this.hasBillingRule(fee));
+    },
+    openDetailBillingRule(row, feeName = '') {
+      const fees = this.detailFeeRows(row);
+      const matched = fees.find(fee =>
+        this.collectBillingRules(fee).some(rule =>
+          this.feeNamesMatch(this.ruleFeeName(rule), feeName)
+        )
+      );
+      const source = matched || fees.find(fee => this.hasBillingRule(fee)) || row;
+      this.openBillingRuleInfo(source, feeName);
+    },
+    openBillingRuleInfo(row, feeName = '') {
+      this.billingRuleDialog.rule = this.normalizeBillingRule(row, feeName);
       this.billingRuleDialog.visible = true;
     },
-    normalizeBillingRule(row) {
+    ruleFeeName(rule = {}) {
+      return String(rule.feeItem || rule.feeItemName || rule.name || '').trim();
+    },
+    feeNamesMatch(left, right) {
+      const source = String(left || '').trim();
+      const target = String(right || '').trim();
+      if (!source || !target) return false;
+      if (source === target) return true;
+      return this.isFreightFeeItem(source) && this.isFreightFeeItem(target);
+    },
+    collectBillingRules(row = {}) {
       const source = row || {};
       const nested = [
         source.billingRule,
@@ -2338,28 +2388,63 @@ export default {
         source.rule,
       ].find(value => value !== undefined && value !== null && value !== '');
       const parsedNested = this.parseJsonValue(nested);
-      const matchedRules = Array.isArray(parsedNested)
+      return Array.isArray(parsedNested)
         ? parsedNested.filter(item => item && typeof item === 'object')
         : [];
-      let rule = this.parseObject(matchedRules[0] || parsedNested || nested);
-      if (!Object.keys(rule).length && typeof nested === 'string') rule = { name: nested };
+    },
+    normalizeBillingRule(row, feeName = '') {
+      const source = row || {};
+      const nested = [
+        source.billingRule,
+        source.billingRuleInfo,
+        source.billingRuleJson,
+        source.billingRulesJson,
+        source.billingRules,
+        source.billingPlanRule,
+        source.feeRule,
+        source.rule,
+      ].find(value => value !== undefined && value !== null && value !== '');
+      const parsedNested = this.parseJsonValue(nested);
+      const parsedRules = this.collectBillingRules(source);
+      const requestedFeeName = String(feeName || '').trim();
+      const matchedRules = requestedFeeName
+        ? parsedRules.filter(item => this.feeNamesMatch(this.ruleFeeName(item), requestedFeeName))
+        : parsedRules;
+      const sharedRule =
+        parsedRules.length === 1 && !this.ruleFeeName(parsedRules[0]) ? parsedRules[0] : null;
+      const ruleSource =
+        matchedRules[0] || sharedRule || (!requestedFeeName ? parsedNested || nested : null);
+      let rule = this.parseObject(ruleSource);
+      if (!Object.keys(rule).length && typeof nested === 'string' && !requestedFeeName) {
+        rule = { name: nested };
+      }
       const matchCondition = this.parseObject(
-        source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
+        requestedFeeName
+          ? (rule.matchCondition ?? source.matchCondition ?? source.billingMatchCondition)
+          : (source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition)
       );
       return {
         ...rule,
-        feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
-        billingElement:
-          source.billingElement ||
-          source.billingFactor ||
-          rule.billingElement ||
-          rule.billingFactor,
-        billingType: source.billingType || rule.billingType,
-        billingUnit: source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
-        unitPrice: source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice,
-        minimumBillingWeight:
-          source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit,
-        remark: source.billingRuleRemark || source.ruleRemark || rule.remark,
+        feeItem: requestedFeeName || source.billingFeeItem || source.feeItem || rule.feeItem,
+        billingElement: requestedFeeName
+          ? rule.billingElement || rule.billingFactor || ''
+          : source.billingElement ||
+            source.billingFactor ||
+            rule.billingElement ||
+            rule.billingFactor,
+        billingType: requestedFeeName ? rule.billingType || '' : source.billingType || rule.billingType,
+        billingUnit: requestedFeeName
+          ? rule.billingUnit || rule.priceUnit || ''
+          : source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
+        unitPrice: requestedFeeName
+          ? (rule.unitPrice ?? '')
+          : (source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice),
+        minimumBillingWeight: requestedFeeName
+          ? (rule.minimumBillingWeight ?? rule.lowerLimit ?? '')
+          : (source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit),
+        remark: requestedFeeName
+          ? rule.remark || ''
+          : source.billingRuleRemark || source.ruleRemark || rule.remark,
         rules: matchedRules,
         matchCondition: {
           ...matchCondition,
@@ -2404,11 +2489,16 @@ export default {
       row.settlementAmountTax = Number(
         (hasFreightItem ? feeItemTotal : Number(row.freightAmount || 0) + feeItemTotal).toFixed(2)
       );
-      if (changedField && this.adjustDialog.sourceDetailId && row.id) {
-        this.scheduleSourceAdjustCalculation(row);
+      if (
+        ['transportQuantity', 'mileage', 'unitPrice'].includes(changedField) &&
+        this.adjustDialog.sourceDetailId &&
+        row.id &&
+        (changedField !== 'unitPrice' || isUnitPriceAdjustable(row))
+      ) {
+        this.scheduleSourceAdjustCalculation(row, changedField);
       }
     },
-    scheduleSourceAdjustCalculation(row) {
+    scheduleSourceAdjustCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion += 1;
       row.calculating = true;
@@ -2421,6 +2511,8 @@ export default {
             feeId: row.id,
             transportQuantity: Number(row.transportQuantity || 0),
             mileage: Number(row.mileage || 0),
+            unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+            changedField,
             freightAmount: Number(row.freightAmount || 0),
             feeItems: Object.fromEntries(
               Object.entries(row.feeItems || {}).map(([name, amount]) => [
@@ -2435,6 +2527,9 @@ export default {
           row.feeItems = Object.fromEntries(
             Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
           );
+          if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+            row.unitPrice = Number(data.unitPrice);
+          }
           row.adjustAmount = Number(data.adjustAmount || 0);
           row.settlementAmountTax = Number(data.afterAmount || 0);
         } catch (error) {
@@ -2630,9 +2725,12 @@ export default {
           运输总量: this.formatQuantity(row),
           '里程（KM）': row.mileage,
           批次号: row.batchNo,
+          计费方式: row.billingType,
           运输单价: this.formatMoney(row.unitPrice, row.currency || this.form.currency),
-          运费: this.formatMoney(row.freightAmount, row.currency || this.form.currency),
         };
+        if (this.showStandaloneFreightColumn) {
+          result['运费'] = this.formatMoney(row.freightAmount, row.currency || this.form.currency);
+        }
         dynamicFeeItems.forEach(name => {
           result[name] = this.formatMoney(feeItems[name], row.currency || this.form.currency);
         });
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index d417134..3b0d6b9 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -208,12 +208,13 @@
           :prop="column.prop"
           :label="column.label"
           :min-width="column.minWidth || 120"
-          show-overflow-tooltip
+          :show-overflow-tooltip="readonly || !column.editor || column.readonly"
         >
           <template #default="{ row }">
-            <template v-if="row._editing && column.editor && !column.readonly">
+            <template v-if="!readonly && column.editor && !column.readonly">
               <el-date-picker
                 v-if="column.editor === 'date'"
+                :key="`${row._key}-${column.prop}`"
                 v-model="row[column.prop]"
                 type="date"
                 format="YYYY-MM-DD"
@@ -222,6 +223,7 @@
               />
               <el-select
                 v-else-if="column.editor === 'select' && column.prop === 'transportType'"
+                :key="`${row._key}-${column.prop}`"
                 v-model="row[column.prop]"
                 clearable
                 filterable
@@ -244,8 +246,21 @@
                   选择
                 </el-link>
               </div>
+              <el-cascader
+                v-else-if="column.editor === 'cargoType'"
+                :key="`${row._key}-${column.prop}`"
+                :model-value="resolveCargoTypePath(row)"
+                :options="cargoTypeSelectOptions(row)"
+                :props="cargoTypeCascaderProps"
+                clearable
+                filterable
+                placeholder="请选择货物类型"
+                style="width: 100%"
+                @change="value => handleCargoTypeChange(row, value)"
+              />
               <el-input
                 v-else-if="column.editor === 'number' || column.editor === 'optionalNumber'"
+                :key="`${row._key}-${column.prop}`"
                 :model-value="resolveCellValue(row, column)"
                 inputmode="decimal"
                 :placeholder="`请输入${column.label}`"
@@ -253,8 +268,10 @@
               />
               <el-input
                 v-else
+                :key="`${row._key}-${column.prop}`"
                 v-model="row[column.prop]"
                 :placeholder="`请输入${column.label}`"
+                @update:model-value="value => syncEditedText(row, column, value)"
               />
             </template>
             <template v-else-if="column.editor === 'waybillSelect' && !readonly">
@@ -268,20 +285,13 @@
             <span v-else>{{ formatCell(row, column) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="!readonly" label="操作" width="180" fixed="right">
+        <el-table-column v-if="!readonly" label="操作" width="120" fixed="right">
           <template #default="{ row }">
             <div class="settlement-import-create__row-actions">
-              <template v-if="row._editing">
-                <el-link type="primary" @click="saveRow(row)">保存</el-link>
-                <el-link type="primary" @click="cancelRow(row)">取消</el-link>
-              </template>
-              <template v-else>
-                <el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)">
-                  确认
-                </el-link>
-                <el-link type="primary" @click="editRow(row)">编辑</el-link>
-                <el-link type="danger" @click="deleteRow(row)">删除</el-link>
-              </template>
+              <el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)">
+                确认
+              </el-link>
+              <el-link type="danger" @click="deleteRow(row)">删除</el-link>
             </div>
           </template>
         </el-table-column>
@@ -345,6 +355,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { QuestionFilled } from '@element-plus/icons-vue';
 import dayjs from 'dayjs';
 import * as api from '@/api/settlement/settlementImport';
+import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { getList as getContractList } from '@/api/business/contract-manage';
 import { getDictionary } from '@/api/system/dictbiz';
 import { formatContractOptionLabel } from '@/utils/contract';
@@ -363,6 +374,7 @@ const parseLoading = ref(false);
 const rowSelection = ref([]);
 const previewTab = ref('all');
 const feeItemNames = ref([]);
+const parsedHeaders = ref([]);
 const projects = ref([]);
 const customerContracts = ref([]);
 const carrierContracts = ref([]);
@@ -370,6 +382,14 @@ const draftLoading = ref(false);
 const confirmLoading = ref(false);
 const readonly = ref(false);
 const transportTypeOptions = ref([]);
+const cargoTypeOptions = ref([]);
+const cargoTypeFlatOptions = ref([]);
+const cargoTypeCascaderProps = {
+  label: 'cargoName',
+  value: 'id',
+  children: 'children',
+  emitPath: true,
+};
 const historyWaybillVisible = ref(false);
 const historyWaybillLoading = ref(false);
 const historyWaybillRows = ref([]);
@@ -478,18 +498,18 @@ const loadContractsByProject = async (projectId, projectName = '') => {
     .filter(Boolean);
 };
 
-const fixedDetailColumns = [
-  { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 140 },
+const columnsBeforeFee = [
   { prop: 'originalNo', label: '原始单号', editor: 'input', minWidth: 130 },
+  { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 140 },
   {
     prop: 'vehicleNo',
     label: '车牌号/航班号/船号/班列号',
     editor: 'input',
     minWidth: 190,
   },
-  { prop: 'transportType', label: '运输方式', editor: 'select', minWidth: 120 },
-  { prop: 'driverName', label: '司机/船长姓名', editor: 'input', minWidth: 120 },
-  { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 140 },
+  { prop: 'transportType', label: '运输方式', editor: 'select', minWidth: 140 },
+  { prop: 'driverName', label: '司机/船长姓名', editor: 'input', minWidth: 130 },
+  { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 150 },
   { prop: 'departureAddress', label: '发货地址', editor: 'input', minWidth: 160 },
   { prop: 'departureContact', label: '发货联系人', editor: 'input', minWidth: 120 },
   { prop: 'departurePhone', label: '发货联系人电话', editor: 'input', minWidth: 140 },
@@ -497,30 +517,97 @@ const fixedDetailColumns = [
   { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 120 },
   { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 140 },
   { prop: 'cargoName', label: '货物名称', editor: 'input', minWidth: 140 },
-  { prop: 'cargoType', label: '货物类型', editor: 'input', minWidth: 120 },
+  { prop: 'cargoType', label: '货物类型', editor: 'cargoType', minWidth: 200 },
   { prop: 'packageType', label: '包装', editor: 'input', minWidth: 100 },
   { prop: 'quantity', label: '数量', editor: 'number', minWidth: 100 },
-  { prop: 'quantityUnit', label: '数量单位', editor: 'input', minWidth: 100 },
+  { prop: 'quantityUnit', label: '数量单位', editor: 'input', minWidth: 110 },
   { prop: 'specification', label: '规格', editor: 'input', minWidth: 110 },
   { prop: 'model', label: '型号', editor: 'input', minWidth: 110 },
   { prop: 'mileage', label: '里程(km)', editor: 'optionalNumber', minWidth: 110 },
-  { prop: 'unitPrice', label: '运输单价', editor: 'optionalNumber', minWidth: 100 },
-  { prop: 'transportFee', label: '运输费', editor: 'number', minWidth: 100 },
-  { prop: 'actualStartDate', label: '实际发货时间', editor: 'date', minWidth: 140 },
-  { prop: 'actualEndDate', label: '实际完成时间', editor: 'date', minWidth: 140 },
-  { prop: 'planStartDate', label: '预计发货时间', editor: 'date', minWidth: 140 },
-  { prop: 'planEndDate', label: '预计完成时间', editor: 'date', minWidth: 140 },
-  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 140 },
+  { prop: 'unitPrice', label: '运输单价', editor: 'optionalNumber', minWidth: 110 },
+  { prop: 'transportFee', label: '运输费', editor: 'number', minWidth: 110 },
+];
+const columnsAfterFee = [
+  { prop: 'actualStartDate', label: '实际发货时间', editor: 'date', minWidth: 150 },
+  { prop: 'actualEndDate', label: '实际完成时间', editor: 'date', minWidth: 150 },
+  { prop: 'planStartDate', label: '预计发货时间', editor: 'date', minWidth: 150 },
+  { prop: 'planEndDate', label: '预计完成时间', editor: 'date', minWidth: 150 },
+  { prop: 'remark', label: '备注', editor: 'input', minWidth: 160 },
+  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
 
-const detailColumns = computed(() => {
-  const feeColumns = feeItemNames.value.map(name => ({
+const headerColumnMap = {};
+[...columnsBeforeFee, ...columnsAfterFee].forEach(column => {
+  headerColumnMap[column.label] = column;
+  headerColumnMap[`*${column.label}`] = column;
+});
+headerColumnMap['结算金额'] = {
+  prop: 'settlementAmount',
+  label: '结算金额',
+  editor: 'number',
+  minWidth: 120,
+};
+headerColumnMap['里程'] = headerColumnMap['里程(km)'];
+headerColumnMap['单价'] = headerColumnMap['运输单价'];
+headerColumnMap['运输类型'] = headerColumnMap['运输方式'];
+headerColumnMap['*运输类型'] = headerColumnMap['运输方式'];
+
+const VEHICLE_ALIAS_KEYS = [
+  '*车牌号/航班号/船号/班列号',
+  '车牌号/航班号/船号/班列号',
+  '*车牌号/船班号/船次号/班次号',
+  '车牌号/船班号/船次号/班次号',
+  '车号',
+];
+
+const readFilledText = value => {
+  const text = String(value ?? '').trim();
+  return text;
+};
+
+const applyVehicleNo = (row, value) => {
+  const vehicleNo = readFilledText(value);
+  row.vehicleNo = vehicleNo;
+  VEHICLE_ALIAS_KEYS.forEach(key => {
+    row[key] = vehicleNo;
+  });
+};
+
+const syncEditedText = (row, column, value) => {
+  if (column.prop !== 'vehicleNo') return;
+  applyVehicleNo(row, value);
+};
+  prop: name,
+  label: name,
+  editor: 'number',
+  minWidth: 110,
+  isFeeItem: true,
+});
+
+const columnFromHeader = header => {
+  const name = String(header || '').trim();
+  if (!name || name === '序号') return null;
+  if (feeItemNames.value.includes(name)) return feeColumn(name);
+  const mapped = headerColumnMap[name];
+  if (mapped) return { ...mapped, label: mapped.label || name.replace(/^\*/, '') };
+  return {
     prop: name,
-    label: name,
-    editor: 'number',
-    minWidth: 110,
-    isFeeItem: true,
-  }));
+    label: name.replace(/^\*/, ''),
+    editor: 'input',
+    minWidth: 140,
+  };
+};
+
+const dedupeColumns = columns => {
+  const seen = new Set();
+  return columns.filter(column => {
+    if (!column?.prop || seen.has(column.prop)) return false;
+    seen.add(column.prop);
+    return true;
+  });
+};
+
+const detailColumns = computed(() => {
   const historyColumns =
     form.waybillMode === 'history'
       ? [
@@ -532,19 +619,20 @@ const detailColumns = computed(() => {
           },
         ]
       : [];
-  return [
-    ...historyColumns,
-    ...fixedDetailColumns,
-    ...feeColumns,
+  const fallback = [
+    ...columnsBeforeFee,
+    ...feeItemNames.value.map(name => feeColumn(name)),
     {
       prop: 'settlementAmount',
       label: '结算金额',
       editor: 'number',
-      readonly: true,
       minWidth: 120,
     },
-    { prop: 'remark', label: '备注', editor: 'input', minWidth: 140 },
+    ...columnsAfterFee,
   ];
+  const uploaded = parsedHeaders.value.map(columnFromHeader).filter(Boolean);
+  const columns = dedupeColumns(uploaded.length ? uploaded : fallback);
+  return [...historyColumns, ...columns];
 });
 
 const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
@@ -664,6 +752,11 @@ const updateNumberCell = (row, column, value) => {
       if (column.prop === 'transportFee') row.freight = '';
       if (column.prop === 'unitPrice') row.transportUnitPrice = '';
     }
+    if (column.prop === 'settlementAmount') {
+      row.settlementAmount = '';
+      row.freightTotal = '';
+      return;
+    }
     recalcSettlementAmount(row);
     return;
   }
@@ -682,6 +775,11 @@ const updateNumberCell = (row, column, value) => {
     if (column.prop === 'unitPrice') {
       row.transportUnitPrice = normalized;
     }
+    if (column.prop === 'settlementAmount') {
+      row.freightTotal = normalized;
+      row['运费合计'] = normalized;
+      return;
+    }
   }
   recalcSettlementAmount(row);
 };
@@ -748,11 +846,22 @@ const normalizeParsedRow = (item, index) => {
     model: item.model ?? item['型号'] ?? '',
     specification: item.specification ?? item['规格'] ?? '',
     cargoType: item.cargoType ?? item['*货物类型'] ?? item['货物类型'] ?? '',
+    settlementAmount:
+      item.settlementAmount ?? item['结算金额'] ?? '',
     feeItems,
   };
+  const vehicleNo =
+    item.vehicleNo !== undefined && item.vehicleNo !== null
+      ? readFilledText(item.vehicleNo)
+      : readFilledText(VEHICLE_ALIAS_KEYS.map(key => item[key]).find(value => readFilledText(value)));
+  applyVehicleNo(row, vehicleNo);
   row.transportUnitPrice = row.unitPrice;
   row.freight = row.transportFee;
-  recalcSettlementAmount(row);
+  if (row.settlementAmount === '' || row.settlementAmount === null || row.settlementAmount === undefined) {
+    recalcSettlementAmount(row);
+  } else {
+    row.freightTotal = row.settlementAmount;
+  }
   return row;
 };
 
@@ -863,6 +972,7 @@ const resetUploadState = () => {
   form.file = null;
   rows.value = [];
   feeItemNames.value = [];
+  parsedHeaders.value = [];
   rowSelection.value = [];
 };
 
@@ -918,6 +1028,7 @@ const parseSelectedFile = async (raw, displayName = '') => {
     const response = await api.parseFile(raw);
     const data = unwrapData(response) || {};
     feeItemNames.value = Array.isArray(data.feeItemNames) ? data.feeItemNames : [];
+    parsedHeaders.value = Array.isArray(data.headers) ? data.headers : [];
     const parsedRows = Array.isArray(data.rows) ? data.rows : [];
     rows.value = parsedRows.map((item, index) => normalizeParsedRow(item, index));
     refreshDuplicateFlags();
@@ -938,22 +1049,115 @@ const parseSelectedFile = async (raw, displayName = '') => {
   }
 };
 
-const editRow = row => {
-  row._editSnapshot = JSON.parse(JSON.stringify(row));
-  row._editing = true;
+const formatCargoTypeLabel = item =>
+  item?.cargoName || item?.name || item?.typeName || item?.label || '';
+
+const buildCargoTypeTree = cargoTypes => {
+  const flatCargoTypes = [];
+  const collectCargoTypes = list => {
+    (list || []).forEach(item => {
+      flatCargoTypes.push({ ...item, children: undefined });
+      if (item.children?.length) collectCargoTypes(item.children);
+    });
+  };
+  collectCargoTypes(cargoTypes);
+  const nodeMap = new Map();
+  const codeMap = new Map();
+  flatCargoTypes.forEach(item => {
+    const id = item.id ?? item.cargoCode ?? item.code;
+    if (id === undefined || id === null) return;
+    const node = {
+      ...item,
+      id: String(id),
+      cargoName: formatCargoTypeLabel(item),
+      cargoCode: item.cargoCode || item.code || '',
+      parentId: item.parentId === undefined || item.parentId === null ? '' : String(item.parentId),
+      parentCargoCode: item.parentCargoCode || item.parentCode || '',
+      children: [],
+    };
+    nodeMap.set(node.id, node);
+    if (node.cargoCode) codeMap.set(String(node.cargoCode), node);
+  });
+  const rootNodes = [];
+  nodeMap.forEach(node => {
+    const parent =
+      nodeMap.get(node.parentId) ||
+      codeMap.get(String(node.parentCargoCode || '')) ||
+      codeMap.get(String(node.parentId || ''));
+    if (parent && parent !== node && Number(node.typeLevel) !== 1) parent.children.push(node);
+    else rootNodes.push(node);
+  });
+  const normalize = (cargoType, level = 1, parentPath = []) => {
+    if (level > 2) return null;
+    const id = String(cargoType.id);
+    const path = [...parentPath, id];
+    const children =
+      level === 1
+        ? (cargoType.children || []).map(item => normalize(item, level + 1, path)).filter(Boolean)
+        : [];
+    return {
+      ...cargoType,
+      id,
+      cargoName: formatCargoTypeLabel(cargoType),
+      path,
+      leaf: level === 2,
+      children: children.length ? children : undefined,
+    };
+  };
+  return rootNodes.map(item => normalize(item, 1)).filter(Boolean);
 };
 
-const saveRow = row => {
-  recalcSettlementAmount(row);
-  row._editing = false;
-  delete row._editSnapshot;
-  refreshDuplicateFlags();
+const flattenCargoTypeOptions = options => {
+  const result = [];
+  const collect = list =>
+    (list || []).forEach(item => {
+      result.push(item);
+      if (item.children?.length) collect(item.children);
+    });
+  collect(options);
+  return result;
 };
 
-const cancelRow = row => {
-  if (row._editSnapshot) Object.assign(row, row._editSnapshot);
-  row._editing = false;
-  delete row._editSnapshot;
+const resolveCargoTypePath = row => {
+  if (Array.isArray(row.cargoTypePath) && row.cargoTypePath.length) return row.cargoTypePath;
+  const current = String(row.cargoType || row.cargoTypeCode || '').trim();
+  if (!current) return [];
+  const matched = cargoTypeFlatOptions.value.find(item =>
+    [item.cargoName, item.name, item.typeName, item.cargoCode, item.code].some(
+      value => String(value || '').trim() === current
+    )
+  );
+  if (matched?.path?.length) return matched.path;
+  return [`custom:${current}`];
+};
+
+const cargoTypeSelectOptions = row => {
+  const path = resolveCargoTypePath(row);
+  const customId = path.find(value => String(value).startsWith('custom:'));
+  if (!customId) return cargoTypeOptions.value;
+  const name = String(customId).slice('custom:'.length);
+  return [{ id: customId, cargoName: name, leaf: true }, ...cargoTypeOptions.value];
+};
+
+const handleCargoTypeChange = (row, value) => {
+  const path = Array.isArray(value) ? value : [];
+  const leafId = path.length ? String(path[path.length - 1]) : '';
+  if (!leafId) {
+    row.cargoTypePath = [];
+    row.cargoType = '';
+    row.cargoTypeCode = '';
+    return;
+  }
+  if (leafId.startsWith('custom:')) {
+    row.cargoTypePath = path;
+    row.cargoType = leafId.slice('custom:'.length);
+    row.cargoTypeCode = '';
+    return;
+  }
+  const cargoType = cargoTypeFlatOptions.value.find(item => String(item.id) === leafId);
+  row.cargoTypePath = cargoType?.path || path;
+  row.cargoType = cargoType?.cargoName || '';
+  row.cargoTypeCode = cargoType?.cargoCode || cargoType?.code || '';
 };
 
 const deleteRow = row => {
@@ -1159,11 +1363,24 @@ const loadTransportTypeOptions = async () => {
   }
 };
 
+const loadCargoTypeOptions = async () => {
+  try {
+    const response = await getCargoTypeList(1, 9999);
+    const body = unwrapData(response) || {};
+    const records = Array.isArray(body) ? body : body.records || body.data || [];
+    cargoTypeOptions.value = buildCargoTypeTree(records);
+    cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
+  } catch (error) {
+    cargoTypeOptions.value = [];
+    cargoTypeFlatOptions.value = [];
+  }
+};
+
 const loadOptions = async () => {
   const response = await api.getOptions();
   const options = unwrapData(response) || {};
   projects.value = (options.projects || []).map(normalizeProject).filter(Boolean);
-  await loadTransportTypeOptions();
+  await Promise.all([loadTransportTypeOptions(), loadCargoTypeOptions()]);
 };
 
 const loadDetail = async id => {
@@ -1190,6 +1407,7 @@ const loadDetail = async id => {
     await loadContractsByProject(detail.projectId, detail.projectName || '');
   }
   feeItemNames.value = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
+  parsedHeaders.value = [];
   const detailRows = Array.isArray(detail.rows) ? detail.rows : [];
   rows.value = detailRows.map((item, index) => normalizeParsedRow(item, index));
   refreshDuplicateFlags();
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 8ad92aa..6042fcf 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -149,7 +149,7 @@
                 >
                   <template #default="{ row }">
                     <div
-                      v-if="isFreightFeeColumn(column)"
+                      v-if="isChargeFeeColumn(column)"
                       class="settlement-detail-page__billing-rule-cell"
                     >
                       <span>{{ formatFeeDetailCell(row, column.prop) }}</span>
@@ -157,7 +157,7 @@
                         v-if="hasBillingRule(row)"
                         class="settlement-detail-page__billing-rule-icon"
                         title="查看计费规则详情"
-                        @click.stop="openBillingRuleInfo(row)"
+                        @click.stop="openBillingRuleInfo(row, chargeFeeName(column))"
                       >
                         <InfoFilled />
                       </el-icon>
@@ -376,12 +376,14 @@
                   inputmode="decimal"
                   @input="value => handleAdjustDecimalInput(row, 'transportQuantity', value)"
                 />
+                <span v-else-if="column.prop === 'unitPrice' && isTierUnitPrice(row)">-</span>
                 <el-input
                   v-else-if="column.prop === 'unitPrice'"
                   class="settlement-detail-page__adjust-input"
                   :model-value="row.unitPrice"
+                  :disabled="!isUnitPriceAdjustable(row)"
                   inputmode="decimal"
-                  @input="value => handleAdjustDecimalInput(row, 'unitPrice', value)"
+                  @input="value => handleAdjustDecimalInput(row, 'unitPrice', value, 'unitPrice')"
                 />
                 <el-input
                   v-else-if="column.prop === 'mileage'"
@@ -1034,6 +1036,7 @@ import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
 import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
 import {
@@ -1221,7 +1224,9 @@ export default {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
     feeDetailColumns() {
-      const baseColumns = feeDetailBaseColumns.filter(column => column.prop !== 'freightAmount');
+      const baseColumns = feeDetailBaseColumns.filter(
+        column => !['freightAmount', 'billingFactor', 'billingType'].includes(column.prop)
+      );
       const hasAdjustment = this.feeRows.some(row => Number(row.adjustAmount || 0) !== 0);
       const tailColumns = feeDetailTailColumns.map(col =>
         col.prop === 'originalAmountText' && hasAdjustment
@@ -1302,17 +1307,13 @@ export default {
       this.openRouteDetail();
     },
     isBottomPanelOpen() {
-      this.$nextTick(() => this.updateListTableHeight());
+      this.updateListTableHeight();
     },
     searchVisible() {
-      if (this.isBottomPanelOpen) {
-        this.$nextTick(() => this.updateListTableHeight());
-      }
+      this.updateListTableHeight();
     },
     searchExpanded() {
-      if (this.isBottomPanelOpen) {
-        this.$nextTick(() => this.updateListTableHeight());
-      }
+      this.updateListTableHeight();
     },
     displayTableColumns: {
       immediate: true,
@@ -1343,6 +1344,10 @@ export default {
     this.loadPriceUnitOptions();
     await this.loadTable();
     await this.openRouteDetail();
+    this.updateListTableHeight();
+  },
+  activated() {
+    this.updateListTableHeight();
   },
   // 标签切走（keep-alive 缓存）或销毁时，收起 teleport/append-to-body 弹层，避免残留盖住其它页面
   deactivated() {
@@ -1353,6 +1358,8 @@ export default {
     this.closeInnerDialogs();
   },
   methods: {
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     closeInnerDialogs() {
       this.closeDetailPanel();
       this.closeAdjustPanel();
@@ -1363,24 +1370,38 @@ export default {
       this.previewDialog.visible = false;
       this.generateContractDialog.visible = false;
     },
-    /** 底部面板打开时按剩余视口压缩主表高度，关闭后恢复自适应 */
+    /** 表格和分页撑满剩余可视区域；单据详情展开时贴住详情面板，关闭后恢复 */
     updateListTableHeight() {
-      if (!this.isBottomPanelOpen) {
-        this.listTableHeight = undefined;
-        this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
-        return;
+      this.$nextTick(() => {
+        window.requestAnimationFrame(() => this.applyListTableHeight());
+      });
+    },
+    applyListTableHeight() {
+      const tableElement = this.$refs.mainTableRef?.$el;
+      if (!tableElement) return;
+      const pagination = this.$el?.querySelector?.('.settlement-detail-page__pagination');
+      const paginationHeight = pagination?.offsetHeight || 0;
+      const tableTop = tableElement.getBoundingClientRect().top;
+      const view = this.$el?.closest?.('#avue-view');
+      const viewRect = view?.getBoundingClientRect?.();
+      let bottomEdge = viewRect ? viewRect.bottom - 12 : window.innerHeight;
+      if (this.isBottomPanelOpen) {
+        const panelRect = document
+          .querySelector('.settlement-detail-page__detail-panel')
+          ?.getBoundingClientRect?.();
+        if (panelRect && panelRect.height > 0) {
+          bottomEdge = panelRect.top;
+          this.listTableHeightRetry = 0;
+        } else if ((this.listTableHeightRetry || 0) < 5) {
+          this.listTableHeightRetry = (this.listTableHeightRetry || 0) + 1;
+          window.requestAnimationFrame(() => this.applyListTableHeight());
+          return;
+        }
+      } else {
+        this.listTableHeightRetry = 0;
       }
-      const tablePanel = this.$el?.querySelector?.('.settlement-detail-page__table-panel');
-      const toolbar = tablePanel?.querySelector('.settlement-detail-page__toolbar');
-      const pagination = tablePanel?.querySelector('.settlement-detail-page__pagination');
-      const panelTop = tablePanel?.getBoundingClientRect?.()?.top ?? 200;
-      const toolbarHeight = toolbar?.offsetHeight ?? 56;
-      const paginationHeight = pagination?.offsetHeight ?? 64;
-      // 与 .settlement-detail-page__detail-panel 的 max-height: min(60vh, 560px) 对齐
-      const bottomPanelHeight = Math.min(window.innerHeight * 0.6, 560);
-      const available =
-        window.innerHeight - panelTop - toolbarHeight - paginationHeight - bottomPanelHeight - 8;
-      this.listTableHeight = Math.max(180, Math.floor(available));
+      const gap = this.isBottomPanelOpen ? 8 : 0;
+      this.listTableHeight = Math.max(180, Math.floor(bottomEdge - tableTop - paginationHeight - gap));
       this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
     },
     contractCategoryName(value) {
@@ -1982,8 +2003,9 @@ export default {
     },
     handleAdjustDecimalInput(row, prop, value, changedField) {
       row[prop] = this.normalizeAdjustDecimal(value);
-      if (!row.manualFee && row.id && ['transportQuantity', 'mileage'].includes(prop)) {
-        this.scheduleAdjustFeeCalculation(row);
+      if (!row.manualFee && row.id && ['transportQuantity', 'mileage', 'unitPrice'].includes(prop)) {
+        if (prop === 'unitPrice' && !isUnitPriceAdjustable(row)) return;
+        this.scheduleAdjustFeeCalculation(row, prop);
         return;
       }
       this.recalculateAdjustRow(row, changedField);
@@ -2010,23 +2032,25 @@ export default {
       );
       row.adjustAmount = Number((row.afterAmount - Number(row.originalAmount || 0)).toFixed(2));
     },
-    scheduleAdjustFeeCalculation(row) {
+    scheduleAdjustFeeCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion += 1;
       row.calculating = true;
       const version = row.adjustCalculateVersion;
       row.adjustCalculateTimer = setTimeout(() => {
         row.adjustCalculateTimer = null;
-        this.calculateAdjustRow(row, version);
+        this.calculateAdjustRow(row, version, changedField);
       }, 300);
     },
-    async calculateAdjustRow(row, version) {
+    async calculateAdjustRow(row, version, changedField) {
       try {
         const res = await api.calculateAdjustedFee({
           detailId: this.adjustDialog.row?.id,
           feeId: row.id,
           transportQuantity: Number(row.transportQuantity || 0),
           mileage: Number(row.mileage || 0),
+          unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+          changedField,
           freightAmount: Number(row.freightAmount || 0),
           feeItems: Object.fromEntries(
             Object.entries(row.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
@@ -2034,18 +2058,24 @@ export default {
         });
         if (version !== row.adjustCalculateVersion || !this.adjustDialog.visible) return;
         const data = res.data?.data || res.data || res || {};
-        row.freightAmount = Number(data.freightAmount || 0);
-        row.feeItems = Object.fromEntries(
-          Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
-        );
-        row.adjustAmount = Number(data.adjustAmount || 0);
-        row.afterAmount = Number(data.afterAmount || 0);
+        this.applyCalculatedAdjustRow(row, data);
       } catch (error) {
         row.calculateError = error.message;
       } finally {
         if (version === row.adjustCalculateVersion) row.calculating = false;
       }
     },
+    applyCalculatedAdjustRow(row, data) {
+      row.freightAmount = Number(data.freightAmount || 0);
+      row.feeItems = Object.fromEntries(
+        Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
+      );
+      if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+        row.unitPrice = Number(data.unitPrice);
+      }
+      row.adjustAmount = Number(data.adjustAmount || 0);
+      row.afterAmount = Number(data.afterAmount || 0);
+    },
     clearAdjustCalculations() {
       this.adjustRows.forEach(row => {
         if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
@@ -2057,12 +2087,14 @@ export default {
     isFreightFeeItem(name) {
       return String(name || '').includes('运费') || String(name || '').includes('运输费');
     },
-    isFreightFeeColumn(column = {}) {
-      return (
-        column.prop === 'freightAmount' ||
-        this.isFreightFeeItem(column.label) ||
-        this.isFreightFeeItem(column.feeItemName)
-      );
+    isChargeFeeColumn(column = {}) {
+      if (column.prop === 'priceUnit') return false;
+      if (column.prop === 'freightAmount') return true;
+      return String(column.prop || '').startsWith('feeItem');
+    },
+    chargeFeeName(column = {}) {
+      if (column.prop === 'freightAmount') return column.label || '运输费';
+      return column.label || '';
     },
     hasBillingRule(row) {
       const rule = this.normalizeBillingRule(row);
@@ -2078,11 +2110,21 @@ export default {
           rule.matchCondition?.cargoType
       );
     },
-    openBillingRuleInfo(row) {
-      this.billingRuleDialog.rule = this.normalizeBillingRule(row);
+    openBillingRuleInfo(row, feeName = '') {
+      this.billingRuleDialog.rule = this.normalizeBillingRule(row, feeName);
       this.billingRuleDialog.visible = true;
     },
-    normalizeBillingRule(row) {
+    ruleFeeName(rule = {}) {
+      return String(rule.feeItem || rule.feeItemName || rule.name || '').trim();
+    },
+    feeNamesMatch(left, right) {
+      const source = String(left || '').trim();
+      const target = String(right || '').trim();
+      if (!source || !target) return false;
+      if (source === target) return true;
+      return this.isFreightFeeItem(source) && this.isFreightFeeItem(target);
+    },
+    normalizeBillingRule(row, feeName = '') {
       const source = row || {};
       const nested = [
         source.billingRule,
@@ -2095,28 +2137,48 @@ export default {
         source.rule,
       ].find(value => value !== undefined && value !== null && value !== '');
       const parsedNested = this.parseJsonValue(nested);
-      const matchedRules = Array.isArray(parsedNested)
+      const parsedRules = Array.isArray(parsedNested)
         ? parsedNested.filter(item => item && typeof item === 'object')
         : [];
-      let rule = this.parseObject(matchedRules[0] || parsedNested || nested);
-      if (!Object.keys(rule).length && typeof nested === 'string') rule = { name: nested };
+      const requestedFeeName = String(feeName || '').trim();
+      const matchedRules = requestedFeeName
+        ? parsedRules.filter(item => this.feeNamesMatch(this.ruleFeeName(item), requestedFeeName))
+        : parsedRules;
+      const sharedRule =
+        parsedRules.length === 1 && !this.ruleFeeName(parsedRules[0]) ? parsedRules[0] : null;
+      const ruleSource =
+        matchedRules[0] || sharedRule || (!requestedFeeName ? parsedNested || nested : null);
+      let rule = this.parseObject(ruleSource);
+      if (!Object.keys(rule).length && typeof nested === 'string' && !requestedFeeName) {
+        rule = { name: nested };
+      }
       const matchCondition = this.parseObject(
-        source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
+        requestedFeeName
+          ? (rule.matchCondition ?? source.matchCondition ?? source.billingMatchCondition)
+          : (source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition)
       );
       return {
         ...rule,
-        feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
-        billingElement:
-          source.billingElement ||
-          source.billingFactor ||
-          rule.billingElement ||
-          rule.billingFactor,
-        billingType: source.billingType || rule.billingType,
-        billingUnit: source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
-        unitPrice: source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice,
-        minimumBillingWeight:
-          source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit,
-        remark: source.billingRuleRemark || source.ruleRemark || rule.remark,
+        feeItem: requestedFeeName || source.billingFeeItem || source.feeItem || rule.feeItem,
+        billingElement: requestedFeeName
+          ? rule.billingElement || rule.billingFactor || ''
+          : source.billingElement ||
+            source.billingFactor ||
+            rule.billingElement ||
+            rule.billingFactor,
+        billingType: requestedFeeName ? rule.billingType || '' : source.billingType || rule.billingType,
+        billingUnit: requestedFeeName
+          ? rule.billingUnit || rule.priceUnit || ''
+          : source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
+        unitPrice: requestedFeeName
+          ? (rule.unitPrice ?? '')
+          : (source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice),
+        minimumBillingWeight: requestedFeeName
+          ? (rule.minimumBillingWeight ?? rule.lowerLimit ?? '')
+          : (source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit),
+        remark: requestedFeeName
+          ? rule.remark || ''
+          : source.billingRuleRemark || source.ruleRemark || rule.remark,
         rules: matchedRules,
         matchCondition: {
           ...matchCondition,
diff --git a/src/views/settlement/settlement-import.vue b/src/views/settlement/settlement-import.vue
index 0d4bb95..cca1957 100644
--- a/src/views/settlement/settlement-import.vue
+++ b/src/views/settlement/settlement-import.vue
@@ -195,37 +195,17 @@
       >
         <el-table-column type="index" label="序号" width="64" align="center" />
         <el-table-column
-          v-if="detail.waybillMode === 'history'"
-          prop="waybillNo"
-          label="运单号"
-          min-width="130"
-        />
-        <el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" min-width="170" />
-        <el-table-column prop="transportType" label="运输方式" min-width="100" />
-        <el-table-column prop="departureAddress" label="发货地址" min-width="140" show-overflow-tooltip />
-        <el-table-column prop="arrivalAddress" label="到货地址" min-width="140" show-overflow-tooltip />
-        <el-table-column prop="cargoName" label="货物名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="cargoType" label="货物类型" min-width="100" />
-        <el-table-column prop="model" label="型号" min-width="100" />
-        <el-table-column prop="quantity" label="数量" width="90" />
-        <el-table-column prop="quantityUnit" label="数量单位" width="90" />
-        <el-table-column prop="mileage" label="里程(km)" width="100" />
-        <el-table-column prop="unitPrice" label="运输单价" width="100" />
-        <el-table-column prop="transportFee" label="运输费" width="100" />
-        <el-table-column
-          v-for="name in detailFeeItemNames"
-          :key="name"
-          :label="name"
-          min-width="100"
+          v-for="column in detailDisplayColumns"
+          :key="column.prop"
+          :prop="column.fee ? undefined : column.prop"
+          :label="column.label"
+          :min-width="column.minWidth || 120"
+          show-overflow-tooltip
         >
           <template #default="{ row }">
-            {{ formatFeeAmount(row, name) }}
+            {{ column.fee ? formatFeeAmount(row, column.prop) : formatDetailCell(row, column) }}
           </template>
         </el-table-column>
-        <el-table-column prop="settlementAmount" label="结算金额" width="110" />
-        <el-table-column prop="actualStartDate" label="实际发货时间" min-width="120" />
-        <el-table-column prop="actualEndDate" label="实际完成时间" min-width="120" />
-        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
       </el-table>
 
       <template #footer>
@@ -359,6 +339,52 @@ export default {
     visibleSearchFields() {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
+    detailDisplayColumns() {
+      const before = [
+        { prop: 'originalNo', label: '原始单号', minWidth: 130 },
+        { prop: 'loadingIdentifier', label: '配载标识号', minWidth: 140 },
+        { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号', minWidth: 190 },
+        { prop: 'transportType', label: '运输方式', minWidth: 120 },
+        { prop: 'driverName', label: '司机/船长姓名', minWidth: 130 },
+        { prop: 'driverPhone', label: '司机/船长手机号', minWidth: 150 },
+        { prop: 'departureAddress', label: '发货地址', minWidth: 160 },
+        { prop: 'departureContact', label: '发货联系人', minWidth: 120 },
+        { prop: 'departurePhone', label: '发货联系人电话', minWidth: 140 },
+        { prop: 'arrivalAddress', label: '到货地址', minWidth: 160 },
+        { prop: 'arrivalContact', label: '收货联系人', minWidth: 120 },
+        { prop: 'arrivalPhone', label: '收货联系人电话', minWidth: 140 },
+        { prop: 'cargoName', label: '货物名称', minWidth: 140 },
+        { prop: 'cargoType', label: '货物类型', minWidth: 120 },
+        { prop: 'packageType', label: '包装', minWidth: 100 },
+        { prop: 'quantity', label: '数量', minWidth: 90 },
+        { prop: 'quantityUnit', label: '数量单位', minWidth: 100 },
+        { prop: 'specification', label: '规格', minWidth: 110 },
+        { prop: 'model', label: '型号', minWidth: 110 },
+        { prop: 'mileage', label: '里程(km)', minWidth: 110 },
+        { prop: 'unitPrice', label: '运输单价', minWidth: 110 },
+        { prop: 'transportFee', label: '运输费', minWidth: 110, money: true },
+      ];
+      const fees = (this.detailFeeItemNames || []).map(name => ({
+        prop: name,
+        label: name,
+        minWidth: 110,
+        fee: true,
+      }));
+      const after = [
+        { prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
+        { prop: 'actualStartDate', label: '实际发货时间', minWidth: 140 },
+        { prop: 'actualEndDate', label: '实际完成时间', minWidth: 140 },
+        { prop: 'planStartDate', label: '预计发货时间', minWidth: 140 },
+        { prop: 'planEndDate', label: '预计完成时间', minWidth: 140 },
+        { prop: 'remark', label: '备注', minWidth: 140 },
+        { prop: 'waybillIdentifier', label: '同一运单标识号', minWidth: 150 },
+      ];
+      const history =
+        this.detail.waybillMode === 'history'
+          ? [{ prop: 'waybillNo', label: '运单号', minWidth: 140 }]
+          : [];
+      return [...history, ...before, ...fees, ...after];
+    },
   },
   created() {
     this.loadOptions();
@@ -418,6 +444,13 @@ export default {
       const body = response?.data || response || {};
       return body?.data !== undefined ? body.data : body;
     },
+    formatDetailCell(row, column) {
+      const value = row?.[column.prop];
+      if (value === null || value === undefined || value === '') return '';
+      if (!column.money) return value;
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : value;
+    },
     formatFeeAmount(row, name) {
       const feeItems = row?.feeItems || {};
       const value = feeItems[name] ?? row?.[name];

From 5cb7eb16d5bb6b72ceeaf17d999bd93ea043280d Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 19 Oct 2026 16:56:03 +0800
Subject: [PATCH 17/18] =?UTF-8?q?:zap:=20=E4=BF=AE=E5=A4=8D=E8=BF=90?=
 =?UTF-8?q?=E8=BE=93=E8=AE=A1=E5=88=92/=E5=8F=91=E8=B4=A7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=E7=BC=93=E5=AD=98=E4=B8=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9F=A5=E7=9C=8B=E4=B8=8E=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/option/system/user.js                     |   1 +
 .../components/shipping-template-page.vue     | 197 ++++++++++++---
 .../components/transport-plan-page.vue        |  86 +++++--
 src/views/business/transport-plan-import.vue  |   2 +
 .../components/settlement-import-page.vue     |  27 +-
 .../settlement/receivable-payable-detail.vue  |  81 ++++--
 .../settlement/settlement-import-form.vue     |   5 +-
 src/views/settlement/settlement-import.vue    | 231 +-----------------
 src/views/system/user.vue                     |   1 +
 9 files changed, 320 insertions(+), 311 deletions(-)

diff --git a/src/option/system/user.js b/src/option/system/user.js
index 93e3152..cd0a0ee 100644
--- a/src/option/system/user.js
+++ b/src/option/system/user.js
@@ -72,6 +72,7 @@ export const userOption = safe => {
       },
       { label: '岗位', prop: 'postName', overHidden: true, display: false },
       { label: '性别', prop: 'sexName', width: 80, display: false },
+      { label: 'OA登录名', prop: 'oaLoginId', minWidth: 140, overHidden: true, display: false },
       { label: 'OA人员id', prop: 'oaPersonId', minWidth: 120, overHidden: true, display: false },
       { label: '备注', prop: 'remark', minWidth: 160, overHidden: true, display: false },
       {
diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue
index 21f0015..5b4df82 100644
--- a/src/views/business/components/shipping-template-page.vue
+++ b/src/views/business/components/shipping-template-page.vue
@@ -388,7 +388,7 @@
                           :disabled="dialogReadonly"
                           @visible-change="visible => visible && loadFeeUnitOptions()"
                           ><el-option
-                            v-for="unit in feeUnitOptions"
+                            v-for="unit in feeUnitSelectOptions"
                             :key="unit.value"
                             :label="unit.label"
                             :value="unit.value" /></el-select
@@ -1124,6 +1124,10 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary } from '@/api/system/dictbiz';
 import { packageOptions } from '@/option/business/common';
 import { formatContractOptionLabel } from '@/utils/contract';
+import {
+  mapFeeUnitOptions,
+  resolvePriceUnitByQuantityUnit,
+} from '@/utils/currency';
 import { loadMeasurementUnitOptions } from '@/utils/measurement-unit';
 import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
@@ -1264,6 +1268,10 @@ const PageAvueForm = {
   },
 };
 
+const shippingTemplateListRoute = '/business/shipping-template';
+const shippingTemplateFormRoute = '/business/shipping-template/form';
+const shippingTemplateListRefreshKey = 'shipping-template-list-refresh';
+
 export default {
   name: 'ShippingTemplatePage',
   components: { PageAvueForm, ElImageViewer, OpenFileViewer },
@@ -1280,6 +1288,9 @@ export default {
     return {
       Location,
       OfficeBuilding,
+      // 实例所属路由快照，避免 keep-alive 列表实例被全局 $route 误判成表单页。
+      routePathLocked: this.$route.path,
+      isFormPageInstance: this.$route.path === shippingTemplateFormRoute,
       form: {},
       query: {},
       loading: true,
@@ -1401,13 +1412,18 @@ export default {
     isStandaloneBusinessPage() {
       return (
         this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
+        (this.isFormPageInstance ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.routePathLocked) ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.$route.path))
       );
     },
     isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
     },
     formPageTitle() {
       return this.isStandaloneFormPage
@@ -1464,6 +1480,12 @@ export default {
       );
       return this.currencyUnit(option?.label || this.shippingTemplateFreight.currency);
     },
+    feeUnitSelectOptions() {
+      return mapFeeUnitOptions(
+        this.feeUnitOptions,
+        this.shippingTemplateFreight.currency || 'RMB'
+      );
+    },
     roadFreightTotal() {
       const total = this.shippingTemplateFreight.freightItems.reduce(
         (sum, item) => sum + Number(this.freightAmount(item) || 0),
@@ -1530,6 +1552,18 @@ export default {
   },
   watch: {
     $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === shippingTemplateListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(shippingTemplateListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
       if (
         this.isStandaloneFormPage &&
         (to.query.mode !== from?.query?.mode ||
@@ -1550,6 +1584,10 @@ export default {
       this.handleTransportTypeChange(value);
       this.syncFreightItems();
     },
+    'form.templateType'() {
+      // 切换到运单模板时立即按货物数量单位生成公路运费明细。
+      this.$nextTick(() => this.syncFreightItems());
+    },
   },
   created() {
     this.loadProjectOptions();
@@ -1559,8 +1597,16 @@ export default {
     this.loadCurrencyOptions();
     if (this.isStandaloneFormPage) this.$nextTick(() => this.initStandaloneFormPage());
   },
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(shippingTemplateListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
   methods: {
     formatContractOptionLabel,
+    markShippingTemplateListNeedRefresh() {
+      sessionStorage.setItem(shippingTemplateListRefreshKey, '1');
+    },
     loadQuantityUnitOptions() {
       if (this.quantityUnitLoading) return this.quantityUnitLoadPromise;
       this.quantityUnitLoading = true;
@@ -1591,12 +1637,8 @@ export default {
         });
       }
       if (this.menuWidth != null) next.menuWidth = this.menuWidth;
-      if (
-        this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
-      ) {
+      // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+      if (this.standaloneFormPage && this.$route.path === shippingTemplateFormRoute) {
         next.dialogAppendToBody = false;
         next.dialogModal = false;
         next.dialogCustomClass = 'shipping-template-form-page-dialog';
@@ -1776,13 +1818,22 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
       this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
       this.api
-        .getList(page.currentPage, page.pageSize, { ...this.query, ...params })
+        .getList(currentPage, pageSize, { ...this.query, ...params })
         .then(res => {
-          const data = res?.data?.data || {};
-          this.data = extractRecords(res);
-          this.page.total = data.total || this.data.length;
+          const data = res?.data?.data || res?.data || {};
+          const records = extractRecords(res);
+          this.data = records;
+          this.page.total = Number(data.total ?? records.length) || 0;
+        })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
         })
         .finally(() => {
           this.loading = false;
@@ -1821,9 +1872,10 @@ export default {
         .submit(submit)
         .then(() => {
           this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
           done?.();
           this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
         })
         .catch(() => loading?.());
     },
@@ -1837,9 +1889,10 @@ export default {
         .submit(submit)
         .then(() => {
           this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
           done?.();
           this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
         })
         .catch(() => loading?.());
     },
@@ -1883,6 +1936,8 @@ export default {
         this.attachmentRows = [];
         this.shippingTemplateFreight = defaultFreight();
         this.loadCurrencyOptions();
+        this.loadFeeUnitOptions();
+        this.$nextTick(() => this.syncFreightItems());
         if (typeof this.api.nextCode === 'function')
           this.api
             .nextCode()
@@ -2005,20 +2060,47 @@ export default {
         return false;
       }
       if (this.transportMode === 'road') {
-        const invalid = this.shippingTemplateFreight.freightItems.findIndex(
-          item =>
-            Number(item.unitPrice || 0) < 0 ||
-            !item.priceUnit ||
-            (!this.isFreightAutoCalculable(item) &&
-              (item.freightAmount === '' ||
-                item.freightAmount === null ||
-                item.freightAmount === undefined)) ||
-            Number(item.freightAmount || 0) < 0
-        );
-        if (invalid > -1) {
-          this.$message.warning(`第${invalid + 1}条货物的单价、计价单位或运费无效`);
+        if (!this.shippingTemplateFreight.freightItems.length) {
+          this.$message.warning('请先完善货物数量单位，以便生成运费明细');
           return false;
         }
+        for (const [index, item] of this.shippingTemplateFreight.freightItems.entries()) {
+          const label = `第${index + 1}条运费明细`;
+          if (
+            item.unitPrice === '' ||
+            item.unitPrice === null ||
+            item.unitPrice === undefined
+          ) {
+            this.$message.warning(`请填写${label}的单价`);
+            return false;
+          }
+          if (Number(item.unitPrice) < 0) {
+            this.$message.warning(`${label}的单价不能小于0`);
+            return false;
+          }
+          if (!String(item.priceUnit || '').trim()) {
+            this.$message.warning(`请选择${label}的计价单位`);
+            return false;
+          }
+          if (this.isFreightAutoCalculable(item)) {
+            if (!item.freightAmountManual) {
+              item.freightAmount = this.freightAmount(item);
+            }
+          } else if (
+            item.freightAmount === '' ||
+            item.freightAmount === null ||
+            item.freightAmount === undefined
+          ) {
+            this.$message.warning(
+              `${label}的计价单位与货物数量单位不匹配，无法自动计算运费，请手动填写运费`
+            );
+            return false;
+          }
+          if (Number(item.freightAmount || 0) < 0) {
+            this.$message.warning(`${label}的运费不能小于0`);
+            return false;
+          }
+        }
       } else if (Number(this.shippingTemplateFreight.freightAmount || 0) < 0) {
         this.$message.warning('运费不能小于0');
         return false;
@@ -2033,8 +2115,11 @@ export default {
       return true;
     },
     closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
-        this.$router.push({ path: '/business/shipping-template', query: {} });
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markShippingTemplateListNeedRefresh();
+        this.$router.$avueRouter?.closeTag?.();
+        this.$router.push({ path: shippingTemplateListRoute, query: {} });
         return;
       }
       this.$refs.crud?.closeDialog?.();
@@ -2294,7 +2379,16 @@ export default {
     },
     loadFeeUnitOptions() {
       getDictionary({ code: 'unit_fee' }).then(res => {
-        this.feeUnitOptions = this.normalizeDictOptions(res?.data?.data || []);
+        // 计价单位必须保存可读文案（如 元/吨），才能与货物数量单位匹配并自动计算运费。
+        this.feeUnitOptions = (res?.data?.data || []).map(item => {
+          const label = String(item.dictValue || item.label || item.value || '').trim();
+          const key = String(item.dictKey || item.value || '').trim();
+          return {
+            label: label || key,
+            value: label.includes('/') ? label : key || label,
+            remark: item.remark || '',
+          };
+        });
       });
     },
     loadCurrencyOptions() {
@@ -3098,24 +3192,53 @@ export default {
         : [];
       const quantityUnits = [];
       this.transportCargoRows.forEach(row => {
-        const quantityUnit = row.quantityUnit || '';
+        const quantityUnit = String(row.quantityUnit || '').trim();
+        if (!quantityUnit) return;
         if (!quantityUnits.some(unit => unit === quantityUnit)) quantityUnits.push(quantityUnit);
       });
+      const currency = this.shippingTemplateFreight.currency || 'RMB';
       this.shippingTemplateFreight.freightItems = quantityUnits.map((quantityUnit, index) => {
         const matched =
           previousItems.find(item => String(item.quantityUnit || '') === String(quantityUnit)) ||
           previousItems[index] ||
           {};
+        const defaultPriceUnit = resolvePriceUnitByQuantityUnit(quantityUnit, currency);
+        const priceUnit = this.normalizeFreightPriceUnit(
+          matched.priceUnit || defaultPriceUnit || '',
+          quantityUnit,
+          currency
+        );
         return {
           quantityUnit,
           unitPrice: matched.unitPrice || '',
-          priceUnit: matched.priceUnit || '',
+          priceUnit,
           freightAmount: matched.freightAmount ?? '',
           freightAmountManual:
             matched.freightAmountManual === true || matched.manualFreightAmount === true,
         };
       });
     },
+    normalizeFreightPriceUnit(priceUnit, quantityUnit, currency = 'RMB') {
+      const text = this.resolvePriceUnitText(priceUnit);
+      if (text && this.priceUnitMatchesQuantity(text, quantityUnit)) return text;
+      return (
+        resolvePriceUnitByQuantityUnit(quantityUnit, currency) ||
+        text ||
+        String(priceUnit || '').trim()
+      );
+    },
+    resolvePriceUnitText(priceUnit) {
+      const raw = String(priceUnit || '').trim();
+      if (!raw) return '';
+      if (raw.includes('/')) return raw;
+      const options = this.feeUnitSelectOptions.length
+        ? this.feeUnitSelectOptions
+        : this.feeUnitOptions;
+      const matched = options.find(
+        item => String(item.value) === raw || String(item.label) === raw
+      );
+      return matched?.label || raw;
+    },
     quantityUnits() {
       return [
         ...new Set(
@@ -3131,7 +3254,7 @@ export default {
           .replace(/\s+/g, '')
           .replace(/立方米|立方公尺|方/g, '立方');
       const unit = normalizeUnit(quantityUnit).replace(/[·*.]/g, '');
-      const value = String(priceUnit || '')
+      const value = String(this.resolvePriceUnitText(priceUnit) || '')
         .trim()
         .toLowerCase()
         .replace(/\s+/g, '');
@@ -3163,6 +3286,10 @@ export default {
         return this.formatFreightNumber(item.freightAmount);
       }
       if (!this.isFreightAutoCalculable(item)) {
+        // 无法自动计算且未手工填写时返回空，避免把空值显示成 0 造成“已填写”的错觉。
+        if (item.freightAmount === '' || item.freightAmount === null || item.freightAmount === undefined) {
+          return '';
+        }
         return this.formatFreightNumber(item.freightAmount);
       }
       return this.formatFreightNumber(
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index 4d12b86..e4af27c 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -2807,8 +2807,11 @@ import 'nprogress/nprogress.css';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 let amapLoader;
+const transportPlanListRoute = '/business/transport-plan';
+const transportPlanFormRoute = '/business/transport-plan/form';
+const transportPlanListRefreshKey = 'transport-plan-list-refresh';
 const standaloneTransportPlanFormRoutes = {
-  '/business/transport-plan': '/business/transport-plan/form',
+  [transportPlanListRoute]: transportPlanFormRoute,
 };
 const standaloneTransportPlanFormPaths = [
   ...Object.keys(standaloneTransportPlanFormRoutes),
@@ -3072,6 +3075,10 @@ export default {
       // 必须放 data：Options API 的顺序是 data → computed → watch(immediate) → created，
       // 放 created 的话首个 immediate watcher 会读到空值，把首次加载也挡掉。
       routePathLocked: this.$route.path,
+      // 表单页实例在创建时锁定，避免 keep-alive 列表实例随全局 $route 误切到表单态。
+      isFormPageInstance: Object.values(standaloneTransportPlanFormRoutes).includes(
+        this.$route.path
+      ),
       form: {},
       suppressTransportTypeClear: false,
       query: {},
@@ -3112,10 +3119,11 @@ export default {
       option: (() => {
         const opt = this.cloneOption(this.crudOption, estimateMenuButtonCount(this.config));
         if (this.menuWidth != null) opt.menuWidth = this.menuWidth;
-        if (
-          this.standaloneFormPage &&
-          standaloneTransportPlanFormPaths.includes(this.$route.path)
-        ) {
+        // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+        const isFormInstance = Object.values(standaloneTransportPlanFormRoutes).includes(
+          this.$route.path
+        );
+        if (this.standaloneFormPage && isFormInstance) {
           opt.dialogAppendToBody = false;
           opt.dialogModal = false;
           opt.dialogCustomClass = 'transport-plan-form-page-dialog';
@@ -3289,6 +3297,12 @@ export default {
     }
     this.loadTaskQuantityUnitOptions();
   },
+  // keep-alive 重新激活列表时强制刷新，避免缓存脏数据；标记位用于兼容旧跳转逻辑。
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(transportPlanListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     permissionList() {
@@ -3300,10 +3314,20 @@ export default {
       return this.config.detailSections || [];
     },
     isStandaloneBusinessPage() {
-      return this.standaloneFormPage && standaloneTransportPlanFormPaths.includes(this.$route.path);
+      return (
+        this.standaloneFormPage &&
+        (this.isFormPageInstance ||
+          standaloneTransportPlanFormPaths.includes(this.routePathLocked) ||
+          standaloneTransportPlanFormPaths.includes(this.$route.path))
+      );
     },
     isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
     },
     formPageTitle() {
       if (this.isStandaloneFormPage) {
@@ -3752,6 +3776,18 @@ export default {
   },
   watch: {
     $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === transportPlanListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(transportPlanListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
       if (!this.isStandaloneFormPage) return;
       if (
         to.query.mode !== from?.query?.mode ||
@@ -4484,6 +4520,9 @@ export default {
         loading();
       }
     },
+    markTransportPlanListNeedRefresh() {
+      sessionStorage.setItem(transportPlanListRefreshKey, '1');
+    },
     rowSave(row, done, loading) {
       const submitRow = this.normalizeRow(row);
       if (!submitRow) {
@@ -4492,6 +4531,7 @@ export default {
       }
       this.getSaveRequest()(submitRow).then(
         () => {
+          this.markTransportPlanListNeedRefresh();
           this.onLoad(this.page);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
@@ -4511,6 +4551,7 @@ export default {
       }
       this.getSaveRequest()(submitRow).then(
         () => {
+          this.markTransportPlanListNeedRefresh();
           this.onLoad(this.page);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
@@ -4540,7 +4581,7 @@ export default {
         .submit(submitRow)
         .then(() => {
           this.$message.success(action === 'draft' ? '暂存成功' : '创建成功');
-          this.onLoad(this.page, this.query);
+          this.markTransportPlanListNeedRefresh();
           this.closeCrudDialog();
         })
         .finally(() => {
@@ -4548,12 +4589,14 @@ export default {
         });
     },
     closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markTransportPlanListNeedRefresh();
         this.$router.$avueRouter?.closeTag?.();
         const listPath =
           Object.entries(standaloneTransportPlanFormRoutes).find(
-            ([, formPath]) => formPath === this.$route.path
-          )?.[0] || this.$route.path;
+            ([, formPath]) => formPath === this.$route.path || formPath === this.routePathLocked
+          )?.[0] || transportPlanListRoute;
         this.$router.push({ path: listPath, query: {} });
         return;
       }
@@ -6634,20 +6677,33 @@ export default {
       return query;
     },
     onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
       this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
       const query = this.normalizeQueryParams({
         ...params,
         ...this.query,
         allDept: 0,
       });
       this.api
-        .getList(page.currentPage, page.pageSize, query)
+        .getList(currentPage, pageSize, query)
         .then(res => {
-          const result = res.data.data;
-          this.page.total = result.total;
-          this.data = result.records;
+          const result = res?.data?.data || res?.data || {};
+          const records = Array.isArray(result.records)
+            ? result.records
+            : Array.isArray(result)
+              ? result
+              : [];
+          this.page.total = Number(result.total ?? records.length) || 0;
+          this.data = records;
           this.selectionClear();
         })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
+        })
         .finally(() => {
           this.loading = false;
         });
diff --git a/src/views/business/transport-plan-import.vue b/src/views/business/transport-plan-import.vue
index 4944c48..f49195a 100644
--- a/src/views/business/transport-plan-import.vue
+++ b/src/views/business/transport-plan-import.vue
@@ -602,6 +602,8 @@ export default {
           if (result.code !== 200) throw new Error(result.msg || '导入失败');
           this.$message.success('导入完成');
         }
+        // 与运单/配载一致：通知 keep-alive 列表实例重新拉取
+        sessionStorage.setItem('transport-plan-list-refresh', '1');
         this.$router.push('/business/transport-plan');
       } catch (error) {
         this.$message.error(error.message || '导入失败');
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
index 3b0d6b9..7c3d6a4 100644
--- a/src/views/settlement/components/settlement-import-page.vue
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -135,7 +135,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="结算单上传" prop="file">
+            <el-form-item v-if="!readonly" label="结算单上传" prop="file">
               <div class="settlement-import-create__upload">
                 <el-upload
                   ref="uploadRef"
@@ -143,13 +143,13 @@
                   accept=".xls,.xlsx"
                   :auto-upload="false"
                   :limit="1"
-                  :disabled="readonly || !formReady"
+                  :disabled="!formReady"
                   :file-list="files"
                   :on-change="onFileChange"
                   :on-exceed="onFileExceed"
                   :on-remove="onFileRemove"
                 >
-                  <el-button type="primary" :disabled="readonly || !formReady">上传 Excel</el-button>
+                  <el-button type="primary" :disabled="!formReady">上传 Excel</el-button>
                 </el-upload>
                 <el-link type="primary" :underline="false" @click="downloadTemplate">
                   下载模板
@@ -298,15 +298,10 @@
       </el-table>
     </section>
 
-    <div class="settlement-import-create__footer">
+    <div v-if="!readonly" class="settlement-import-create__footer">
       <el-button @click="goBack">取消</el-button>
-      <el-button v-if="!readonly" :loading="draftLoading" @click="saveDraft">保存草稿</el-button>
-      <el-button
-        v-if="!readonly"
-        type="primary"
-        :loading="confirmLoading"
-        @click="confirmImport"
-      >
+      <el-button :loading="draftLoading" @click="saveDraft">保存草稿</el-button>
+      <el-button type="primary" :loading="confirmLoading" @click="confirmImport">
         确认导入
       </el-button>
     </div>
@@ -577,6 +572,8 @@ const syncEditedText = (row, column, value) => {
   if (column.prop !== 'vehicleNo') return;
   applyVehicleNo(row, value);
 };
+
+const feeColumn = name => ({
   prop: name,
   label: name,
   editor: 'number',
@@ -1411,12 +1408,18 @@ const loadDetail = async id => {
   const detailRows = Array.isArray(detail.rows) ? detail.rows : [];
   rows.value = detailRows.map((item, index) => normalizeParsedRow(item, index));
   refreshDuplicateFlags();
-  readonly.value = detail.importStatus && detail.importStatus !== 'draft';
+  // 查看模式始终只读；编辑时仅草稿可改，已完成/已作废强制只读
+  readonly.value =
+    route.query.mode === 'view' ||
+    Boolean(detail.importStatus && detail.importStatus !== 'draft');
 };
 
 const initPage = async () => {
   await loadOptions();
   const id = route.query.id;
+  if (route.query.mode === 'view') {
+    readonly.value = true;
+  }
   if (id) {
     await loadDetail(id);
     return;
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 6042fcf..6fc1e97 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -450,32 +450,48 @@
         class="settlement-detail-page__dialog-form"
       >
         <el-form-item label="更新范围" prop="contractId">
-          <el-input
-            :model-value="updateContractName"
-            class="settlement-detail-page__generate-select"
-            readonly
-            placeholder="请选择合同"
+          <el-tooltip
+            :content="updateContractName"
+            :disabled="!updateContractName"
+            placement="top"
+            :show-after="200"
           >
-            <template #append>
-              <el-button @click="openUpdateContractDialog">选择</el-button>
-            </template>
-          </el-input>
+            <el-input
+              :model-value="updateContractName"
+              class="settlement-detail-page__update-fee-control"
+              readonly
+              placeholder="请选择合同"
+            >
+              <template #append>
+                <el-button @click="openUpdateContractDialog">选择</el-button>
+              </template>
+            </el-input>
+          </el-tooltip>
         </el-form-item>
         <el-form-item label="合同计费方案" prop="billingPlanId">
-          <el-select
-            v-model="updateFeeForm.billingPlanId"
-            clearable
-            filterable
-            :disabled="!updateFeeForm.contractId"
-            placeholder="请选择"
+          <el-tooltip
+            :content="updateBillingPlanName"
+            :disabled="!updateBillingPlanName"
+            placement="top"
+            :show-after="200"
           >
-            <el-option
-              v-for="item in billingPlanOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
+            <el-select
+              v-model="updateFeeForm.billingPlanId"
+              class="settlement-detail-page__update-fee-control"
+              clearable
+              filterable
+              :disabled="!updateFeeForm.contractId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in billingPlanOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :title="item.name"
+              />
+            </el-select>
+          </el-tooltip>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -1203,6 +1219,14 @@ export default {
       );
       return formatContractOptionLabel(contract);
     },
+    updateBillingPlanName() {
+      const billingPlanId = this.updateFeeForm.billingPlanId;
+      if (!billingPlanId) return '';
+      const plan = this.billingPlanOptions.find(
+        item => String(item.id) === String(billingPlanId)
+      );
+      return plan?.name || '';
+    },
     generateContractCategory() {
       return this.settlementType === 'payable' ? '承运商合同' : '客户合同';
     },
@@ -3144,11 +3168,24 @@ export default {
     }
   }
 
+  :deep(.el-form-item__content) {
+    min-width: 0;
+  }
+
+  :deep(.el-tooltip__trigger) {
+    display: block;
+    width: 100%;
+  }
+
   :deep(.el-select) {
     width: 100%;
   }
 }
 
+.settlement-detail-page__update-fee-control {
+  width: 100%;
+}
+
 .settlement-detail-page__adjust-input {
   width: 100%;
   min-width: 0;
diff --git a/src/views/settlement/settlement-import-form.vue b/src/views/settlement/settlement-import-form.vue
index 77f982f..6d0799f 100644
--- a/src/views/settlement/settlement-import-form.vue
+++ b/src/views/settlement/settlement-import-form.vue
@@ -11,7 +11,10 @@ import { useRoute } from 'vue-router';
 import SettlementImportPage from './components/settlement-import-page.vue';
 
 const route = useRoute();
-const pageTitle = computed(() => (route.query.id ? '编辑导入结算单' : '新增导入结算单'));
+const pageTitle = computed(() => {
+  if (route.query.mode === 'view') return '查看导入结算单';
+  return route.query.id ? '编辑导入结算单' : '新增导入结算单';
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/settlement/settlement-import.vue b/src/views/settlement/settlement-import.vue
index cca1957..ebafec8 100644
--- a/src/views/settlement/settlement-import.vue
+++ b/src/views/settlement/settlement-import.vue
@@ -129,97 +129,6 @@
       </div>
     </section>
 
-    <el-dialog
-      v-model="detailVisible"
-      title="导入结算单详情"
-      width="1100px"
-      append-to-body
-      destroy-on-close
-      class="settlement-import-detail-dialog"
-    >
-      <el-descriptions :column="3" border>
-        <el-descriptions-item label="导入批次号">{{ detail.batchNo || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="状态">
-          {{ detail.importStatusName || importStatusLabel(detail.importStatus) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="导入类型">
-          {{ detail.settlementTypeName || settlementTypeLabel(detail.settlementType) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="结算单">
-          {{ detail.settlementBillTypeName || settlementBillTypeLabel(detail.settlementBillType) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="运单类型">
-          {{ detail.waybillModeName || waybillModeLabel(detail.waybillMode) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="明细行数">
-          {{ detail.detailCount ?? detail.waybillCount ?? detailRows.length }}
-        </el-descriptions-item>
-        <el-descriptions-item label="项目">{{ detail.projectName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="客户">{{ detail.customerName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="客户合同">
-          {{ detail.customerContractName || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="承运商">{{ detail.carrierName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="承运商合同">
-          {{ detail.carrierContractName || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="创建人">{{ detail.createUserName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="创建时间">{{ detail.createTime || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="备注" :span="2">{{ detail.remark || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="关联结算单" :span="3">
-          <el-link
-            v-if="detail.formalSettlementId"
-            type="primary"
-            @click="goFormalSettlement(detail)"
-          >
-            {{ detail.formalSettlementNo || detail.formalSettlementId }}
-          </el-link>
-          <el-link
-            v-else-if="detail.preSettlementId"
-            type="primary"
-            @click="goPreSettlement(detail)"
-          >
-            {{ detail.preSettlementNo || detail.preSettlementId }}
-          </el-link>
-          <span v-else>-</span>
-        </el-descriptions-item>
-      </el-descriptions>
-
-      <div class="dialog-section-title settlement-import-page__detail-title">导入明细</div>
-      <el-table
-        v-loading="detailLoading"
-        :data="detailRows"
-        border
-        max-height="420"
-        class="settlement-import-page__table"
-      >
-        <el-table-column type="index" label="序号" width="64" align="center" />
-        <el-table-column
-          v-for="column in detailDisplayColumns"
-          :key="column.prop"
-          :prop="column.fee ? undefined : column.prop"
-          :label="column.label"
-          :min-width="column.minWidth || 120"
-          show-overflow-tooltip
-        >
-          <template #default="{ row }">
-            {{ column.fee ? formatFeeAmount(row, column.prop) : formatDetailCell(row, column) }}
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <template #footer>
-        <el-button @click="detailVisible = false">关闭</el-button>
-        <el-button
-          v-if="detail.importStatus === 'draft'"
-          type="primary"
-          @click="editDraft(detail)"
-        >
-          编辑草稿
-        </el-button>
-      </template>
-    </el-dialog>
-
     <el-dialog v-model="voidVisible" title="作废导入结算单" width="480px" append-to-body>
       <el-form
         ref="voidFormRef"
@@ -289,11 +198,6 @@ export default {
       rows: [],
       page: { current: 1, size: 10, total: 0 },
       batchNoOptions: [],
-      detailVisible: false,
-      detailLoading: false,
-      detail: {},
-      detailRows: [],
-      detailFeeItemNames: [],
       voidVisible: false,
       voidLoading: false,
       voidForm: { id: null, reason: '' },
@@ -339,52 +243,6 @@ export default {
     visibleSearchFields() {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
-    detailDisplayColumns() {
-      const before = [
-        { prop: 'originalNo', label: '原始单号', minWidth: 130 },
-        { prop: 'loadingIdentifier', label: '配载标识号', minWidth: 140 },
-        { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号', minWidth: 190 },
-        { prop: 'transportType', label: '运输方式', minWidth: 120 },
-        { prop: 'driverName', label: '司机/船长姓名', minWidth: 130 },
-        { prop: 'driverPhone', label: '司机/船长手机号', minWidth: 150 },
-        { prop: 'departureAddress', label: '发货地址', minWidth: 160 },
-        { prop: 'departureContact', label: '发货联系人', minWidth: 120 },
-        { prop: 'departurePhone', label: '发货联系人电话', minWidth: 140 },
-        { prop: 'arrivalAddress', label: '到货地址', minWidth: 160 },
-        { prop: 'arrivalContact', label: '收货联系人', minWidth: 120 },
-        { prop: 'arrivalPhone', label: '收货联系人电话', minWidth: 140 },
-        { prop: 'cargoName', label: '货物名称', minWidth: 140 },
-        { prop: 'cargoType', label: '货物类型', minWidth: 120 },
-        { prop: 'packageType', label: '包装', minWidth: 100 },
-        { prop: 'quantity', label: '数量', minWidth: 90 },
-        { prop: 'quantityUnit', label: '数量单位', minWidth: 100 },
-        { prop: 'specification', label: '规格', minWidth: 110 },
-        { prop: 'model', label: '型号', minWidth: 110 },
-        { prop: 'mileage', label: '里程(km)', minWidth: 110 },
-        { prop: 'unitPrice', label: '运输单价', minWidth: 110 },
-        { prop: 'transportFee', label: '运输费', minWidth: 110, money: true },
-      ];
-      const fees = (this.detailFeeItemNames || []).map(name => ({
-        prop: name,
-        label: name,
-        minWidth: 110,
-        fee: true,
-      }));
-      const after = [
-        { prop: 'settlementAmount', label: '结算金额', minWidth: 120, money: true },
-        { prop: 'actualStartDate', label: '实际发货时间', minWidth: 140 },
-        { prop: 'actualEndDate', label: '实际完成时间', minWidth: 140 },
-        { prop: 'planStartDate', label: '预计发货时间', minWidth: 140 },
-        { prop: 'planEndDate', label: '预计完成时间', minWidth: 140 },
-        { prop: 'remark', label: '备注', minWidth: 140 },
-        { prop: 'waybillIdentifier', label: '同一运单标识号', minWidth: 150 },
-      ];
-      const history =
-        this.detail.waybillMode === 'history'
-          ? [{ prop: 'waybillNo', label: '运单号', minWidth: 140 }]
-          : [];
-      return [...history, ...before, ...fees, ...after];
-    },
   },
   created() {
     this.loadOptions();
@@ -436,28 +294,10 @@ export default {
       if (value === 'pre') return '预结算单';
       return '正式结算单';
     },
-    waybillModeLabel(value) {
-      if (value === 'history') return '历史运单';
-      return '新运单';
-    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data !== undefined ? body.data : body;
     },
-    formatDetailCell(row, column) {
-      const value = row?.[column.prop];
-      if (value === null || value === undefined || value === '') return '';
-      if (!column.money) return value;
-      const number = Number(value);
-      return Number.isFinite(number) ? number.toFixed(2) : value;
-    },
-    formatFeeAmount(row, name) {
-      const feeItems = row?.feeItems || {};
-      const value = feeItems[name] ?? row?.[name];
-      if (value === null || value === undefined || value === '') return '';
-      const number = Number(value);
-      return Number.isFinite(number) ? number.toFixed(2) : value;
-    },
     async loadOptions() {
       try {
         const response = await api.getOptions();
@@ -518,28 +358,14 @@ export default {
     openCreate() {
       this.$router.push({ path: '/settlement/settlement-import/form' });
     },
-    async openDetail(row) {
+    openDetail(row) {
       if (!row?.id) return;
-      this.detailVisible = true;
-      this.detailLoading = true;
-      this.detail = { ...row };
-      this.detailRows = [];
-      this.detailFeeItemNames = [];
-      try {
-        const response = await api.getDetail(row.id);
-        const detail = this.unwrapData(response) || { ...row };
-        this.detail = detail;
-        this.detailRows = Array.isArray(detail.rows) ? detail.rows : [];
-        this.detailFeeItemNames = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
-      } catch (error) {
-        this.detail = { ...row };
-        this.$message.error(error?.message || '加载详情失败');
-      } finally {
-        this.detailLoading = false;
-      }
+      this.$router.push({
+        path: '/settlement/settlement-import/form',
+        query: { id: row.id, mode: 'view' },
+      });
     },
     editDraft(row) {
-      this.detailVisible = false;
       this.$router.push({
         path: '/settlement/settlement-import/form',
         query: { id: row.id },
@@ -560,30 +386,6 @@ export default {
         this.$message.error(error?.message || '删除失败');
       }
     },
-    goFormalSettlement(row) {
-      if (!row?.formalSettlementId) return;
-      this.detailVisible = false;
-      this.$router.push({
-        path: '/settlement/formal-settlement/form',
-        query: {
-          mode: 'view',
-          id: row.formalSettlementId,
-          name: '正式结算详情',
-        },
-      });
-    },
-    goPreSettlement(row) {
-      if (!row?.preSettlementId) return;
-      this.detailVisible = false;
-      this.$router.push({
-        path: '/settlement/pre-settlement/form',
-        query: {
-          mode: 'view',
-          id: row.preSettlementId,
-          name: '预结算详情',
-        },
-      });
-    },
     openVoid(row) {
       this.voidForm = { id: row.id, reason: '' };
       this.voidVisible = true;
@@ -686,29 +488,6 @@ export default {
   padding: 12px 0;
 }
 
-.settlement-import-page__detail-title {
-  margin: 16px 0 8px;
-}
-
-.dialog-section-title {
-  position: relative;
-  padding-left: 12px;
-  color: #303133;
-  font-size: 16px;
-  font-weight: 600;
-
-  &::before {
-    position: absolute;
-    top: 2px;
-    left: 0;
-    width: 4px;
-    height: 16px;
-    border-radius: 2px;
-    background: #409eff;
-    content: '';
-  }
-}
-
 .settlement-import-page :deep(.basic-container__card > .el-card__body) {
   padding: 0;
 }
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 0d1c589..57782f0 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -172,6 +172,7 @@
                   </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>
                 <el-col :span="18"><el-form-item label="数据权限范围"><el-radio-group v-model="form.dataScopeRange" :disabled="isUserViewMode"><el-radio :value="1">仅所属组织</el-radio><el-radio :value="2">全部组织</el-radio><el-radio :value="3">自定义</el-radio></el-radio-group></el-form-item></el-col>
                 <el-col :span="18"><el-form-item label="数据层级范围"><el-radio-group v-model="form.dataLevelRange" :disabled="isUserViewMode"><el-radio :value="1">包含下级</el-radio><el-radio :value="2">仅本级</el-radio></el-radio-group></el-form-item></el-col>

From 0e57de5c718e0f2a7c7a1b9dc102d08029fb1cfd Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Mon, 19 Oct 2026 17:12:24 +0800
Subject: [PATCH 18/18] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E6=B5=81=E6=B0=B4=E7=BB=A7=E7=BB=AD=E8=AE=A4=E9=A2=86?=
 =?UTF-8?q?=E9=A2=84=E5=A1=AB=E4=B8=8E=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=A2=84=E7=BB=93=E7=AE=97=E5=BC=95=E7=94=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

部分认领打开时预填历史关联结算单，可认领上限按公告未认领与收款金额取小；付款申请提交前清理误存正式结算单引用。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../payment/payment-application-form.vue      | 18 +++++++++++++--
 src/views/payment/receipt-flow-batch-form.vue |  5 ++++-
 src/views/payment/receipt-flow-form.vue       | 22 +++++++++++++------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 637a2df..acec661 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -3097,6 +3097,8 @@ export default {
       });
     },
     payload() {
+      // 驳回重提前再清一次：避免历史误存的正式结算单 ID 盖过预结算引用
+      this.clearFormalReferenceWhenPreOnly();
       const {
         id,
         paymentType,
@@ -3133,13 +3135,25 @@ export default {
         paymentType === 'progress_advance' ||
         (this.referenceRows.length > 0 &&
           this.referenceRows.every(item => item.referenceType === 'pre'));
+      // 进度预付 / 仅预结算引用：强制不传正式结算单 ID，并兜底恢复预结算单 ID
+      const resolvedPreSettlementId =
+        preSettlementId ||
+        preSettlementIds?.[0] ||
+        (usePreSettlementOnly ? settlementId : null) ||
+        null;
+      const resolvedPreSettlementIds =
+        preSettlementIds?.length > 0
+          ? preSettlementIds
+          : resolvedPreSettlementId
+            ? [resolvedPreSettlementId]
+            : [];
       return {
         id,
         paymentType,
         settlementId: usePreSettlementOnly ? null : settlementId,
         settlementIds: usePreSettlementOnly ? [] : settlementIds,
-        preSettlementId,
-        preSettlementIds,
+        preSettlementId: usePreSettlementOnly ? resolvedPreSettlementId : preSettlementId,
+        preSettlementIds: usePreSettlementOnly ? resolvedPreSettlementIds : preSettlementIds,
         projectId,
         projectName,
         deptId,
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index 156a5f5..547a956 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -302,7 +302,10 @@ export default {
       );
     },
     flowRemaining(flow) {
-      return Math.max(Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0), 0);
+      const unclaimed = Number(flow.unclaimedAmount || 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);
     },
     maxAllocation(row) {
       const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 2171f28..8497954 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -252,10 +252,11 @@ export default {
       );
     },
     claimableAmount() {
-      return Math.max(
-        Number(this.form.unclaimedAmount || 0) - Number(this.form.claimedAmount || 0),
-        0
-      );
+      const unclaimed = Number(this.form.unclaimedAmount || 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);
     },
   },
   created() {
@@ -274,14 +275,21 @@ export default {
       }
       const data = this.unwrapData(await api.getDetail(this.flowId));
       const userInfo = this.$store.getters.userInfo || {};
+      // 部分认领继续认领：预填本流水历史关联且仍有剩余可认领金额的结算单
+      const relatedSettlements = (data?.relatedSettlements || []).map(item => ({
+        ...item,
+        formalSettlementId: item.id,
+        settlementId: item.id,
+        allocatedReceiptAmount: 0,
+      }));
       this.form = {
         ...emptyForm(),
         ...data,
         claimerName: userInfo.realName || userInfo.userName || data.claimerName || '',
         claimerDeptName: userInfo.deptName || userInfo.dept_name || data.claimerDeptName || '',
         claimDate: this.$dayjs().format('YYYY-MM-DD'),
-        settlementIds: [],
-        settlements: [],
+        settlementIds: relatedSettlements.map(item => item.formalSettlementId),
+        settlements: relatedSettlements,
         attachments: [],
       };
     },
@@ -347,7 +355,7 @@ export default {
         return;
       }
       if (this.allocatedTotal > this.claimableAmount + 0.001) {
-        this.$message.warning('累计认领金额不能超过公告未认领金额（剩余可认领金额）');
+        this.$message.warning('累计认领金额不能超过剩余可认领金额');
         return;
       }
       for (const row of this.form.settlements)