diff --git a/src/api/payment/paymentApplication.js b/src/api/payment/paymentApplication.js
index 3e4c802..59c9aa1 100644
--- a/src/api/payment/paymentApplication.js
+++ b/src/api/payment/paymentApplication.js
@@ -10,6 +10,13 @@ export const getReferenceAmount = (paymentType, referenceId, excludeId) =>
     method: 'get',
     params: { paymentType, referenceId, excludeId: excludeId || undefined },
   });
+/** 按合同查询可选项目预付核销列表（审批通过且仍有可核销余额） */
+export const getProjectAdvanceWriteOffOptions = params =>
+  request({
+    url: `${baseUrl}/project-advance-write-off-options`,
+    method: 'get',
+    params,
+  });
 export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
 export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
diff --git a/src/api/settlement/settlementImport.js b/src/api/settlement/settlementImport.js
new file mode 100644
index 0000000..131493b
--- /dev/null
+++ b/src/api/settlement/settlementImport.js
@@ -0,0 +1,55 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/settlement-import';
+
+export const getOptions = () => request({ url: `${baseUrl}/options`, method: 'get' });
+
+export const getNextCode = () => request({ url: `${baseUrl}/next-code`, method: 'get' });
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: { current, size, ...params },
+  });
+
+export const getDetail = id =>
+  request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
+
+export const exportTemplate = () =>
+  request({
+    url: `${baseUrl}/export-template`,
+    method: 'get',
+    responseType: 'blob',
+  });
+
+export const parseFile = file => {
+  const data = new FormData();
+  data.append('file', file);
+  return request({
+    url: `${baseUrl}/parse`,
+    method: 'post',
+    data,
+    timeout: 120000,
+  });
+};
+
+export const validate = data =>
+  request({ url: `${baseUrl}/validate`, method: 'post', data, timeout: 120000 });
+
+export const exportFailures = data =>
+  request({
+    url: `${baseUrl}/export-failures`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 120000,
+  });
+
+export const saveDraft = data =>
+  request({ url: `${baseUrl}/draft`, method: 'post', data, timeout: 120000 });
+
+export const confirm = data =>
+  request({ url: `${baseUrl}/confirm`, method: 'post', data, timeout: 120000 });
+
+export const voidBatch = data => request({ url: `${baseUrl}/void`, method: 'post', data });
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 11d72aa..546ffb2 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -119,6 +119,21 @@ export default [
       },
     ],
   },
+  {
+    path: '/settlement/settlement-import/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增导入结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/settlement-import',
+        },
+        component: loadView(() => import('@/views/settlement/settlement-import-form.vue')),
+      },
+    ],
+  },
   {
     path: '/settlement/transport-reconciliation/form',
     component: Layout,
diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js
index 60ee800..83806da 100644
--- a/src/utils/mk-approval.js
+++ b/src/utils/mk-approval.js
@@ -61,9 +61,18 @@ export const MK_BIZ = {
 
 const MK_SWITCH_NAME = '开启MK';
 
-async function loadMkTemplateList() {
+/** 进程内缓存，避免每次提交都打字典；登录后同一会话开关一般不变 */
+let mkEnabledCache = null;
+let mkEnabledPromise = null;
+let mkTemplateListCache = null;
+
+async function loadMkTemplateList(force = false) {
+  if (!force && mkTemplateListCache) {
+    return mkTemplateListCache;
+  }
   const res = await getDictionary({ code: 'mk_template' });
-  return res?.data?.data || [];
+  mkTemplateListCache = res?.data?.data || [];
+  return mkTemplateListCache;
 }
 
 /** 业务字典 mk_template：名称「开启MK」且键值为 1 时才请求 MK */
@@ -72,10 +81,37 @@ export function isMkEnabled(list = []) {
   return String(matched?.dictKey ?? '').trim() === '1';
 }
 
-/** 加载业务字典并判断是否开启 MK */
-export async function loadMkEnabled() {
-  const list = await loadMkTemplateList();
-  return isMkEnabled(list);
+/** 清除 MK 开关缓存（字典变更后可调用） */
+export function clearMkEnabledCache() {
+  mkEnabledCache = null;
+  mkEnabledPromise = null;
+  mkTemplateListCache = null;
+}
+
+/**
+ * 加载业务字典并判断是否开启 MK
+ * @param {boolean} [force=false] 是否强制刷新缓存
+ */
+export async function loadMkEnabled(force = false) {
+  if (!force && mkEnabledCache !== null) {
+    return mkEnabledCache;
+  }
+  if (!force && mkEnabledPromise) {
+    return mkEnabledPromise;
+  }
+  mkEnabledPromise = loadMkTemplateList(force)
+    .then(list => {
+      mkEnabledCache = isMkEnabled(list);
+      return mkEnabledCache;
+    })
+    .catch(error => {
+      mkEnabledCache = false;
+      throw error;
+    })
+    .finally(() => {
+      mkEnabledPromise = null;
+    });
+  return mkEnabledPromise;
 }
 
 export async function resolveMkTemplateCode(dictName, list) {
@@ -99,19 +135,22 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
 }
 
 /**
- * 提交 MK 审核流
+ * 提交 MK 审核流。未开启 MK 时直接跳过，不请求流程实例相关接口。
  * @param {Object} options
  * @param {string} options.bizType 业务类型
- * @param {string|number} options.bizId 业务主键（后端据此生成/复用 formInstanceId）
+ * @param {string|number} options.bizId 业务主键
  * @param {string} [options.subjectName] 标题后缀
- * @param {string} [options.approvalStatus] 提交前的审批状态（须在业务 submit 改状态前取值；通过态强制新建实例）
+ * @param {string} [options.approvalStatus] 提交前的审批状态
+ * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
+ * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
  */
 export async function submitMkApprovalFlow({
   bizType,
   bizId,
   subjectName = '',
   approvalStatus = '',
-}) {
+  mkEnabled,
+} = {}) {
   const conf = MK_BIZ[bizType];
   if (!conf) {
     return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
@@ -119,17 +158,29 @@ export async function submitMkApprovalFlow({
   if (bizId == null || bizId === '') {
     return Promise.reject(new Error('业务id不能为空'));
   }
+
+  // 调用方显式关闭，或字典未开启：不请求 hasMkProcessInstance / processSubmit 等 MK 接口
+  if (mkEnabled === false) {
+    return false;
+  }
+  const enabled = mkEnabled === true ? true : await loadMkEnabled();
+  if (!enabled) {
+    return false;
+  }
+
   const list = await loadMkTemplateList();
   if (!isMkEnabled(list)) {
-    return;
+    mkEnabledCache = false;
+    return false;
   }
+
   const bizIdText = String(bizId);
   const forceNewFormInstance = isMkApprovedStatus(bizType, approvalStatus);
   // 审核通过后再提交必须新建流程；其余场景已有有效实例则跳过
   if (!forceNewFormInstance) {
     const existsRes = await hasMkProcessInstance({ bizId: bizIdText });
     if (existsRes?.data?.data) {
-      return;
+      return true;
     }
   }
   if ((conf.rejected || []).includes(approvalStatus)) {
@@ -139,11 +190,12 @@ export async function submitMkApprovalFlow({
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${bizIdText}`;
-  return processSubmit({
+  await processSubmit({
     templateCode,
     bizId: bizIdText,
     subject,
     bizType,
     forceNewFormInstance,
   });
+  return true;
 }
diff --git a/src/utils/search-range.js b/src/utils/search-range.js
index e5723cd..34865bb 100644
--- a/src/utils/search-range.js
+++ b/src/utils/search-range.js
@@ -1,3 +1,35 @@
+/**
+ * 合并列表搜索条件：新条件覆盖旧条件，本次显式清空的字段从查询中移除。
+ */
+export const applyIncomingSearch = (current = {}, incoming = {}) => {
+  const merged = { ...current, ...incoming };
+  Object.keys(incoming || {}).forEach(key => {
+    const value = incoming[key];
+    if (
+      value === '' ||
+      value === null ||
+      value === undefined ||
+      (Array.isArray(value) && value.length === 0)
+    ) {
+      delete merged[key];
+    }
+  });
+  return merged;
+};
+
+/**
+ * 启停状态下拉「全部」在数字类型下会被转成 0/-1，不能当作查询条件。
+ * 状态 0 表示草稿等有效值的页面不要调用。
+ */
+export const omitInvalidListStatus = (params = {}) => {
+  const values = { ...params };
+  const status = values.status;
+  if (status === 0 || status === '0' || status === -1 || status === '-1') {
+    delete values.status;
+  }
+  return values;
+};
+
 export const normalizeSearchRangeParams = (params = {}, rangeMap = {}) => {
   const values = { ...params };
 
diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue
index 3c94260..9969378 100644
--- a/src/views/base/airport-master.vue
+++ b/src/views/base/airport-master.vue
@@ -150,6 +150,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1182,7 +1183,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue
index 0ad39fe..903fae0 100644
--- a/src/views/base/currency.vue
+++ b/src/views/base/currency.vue
@@ -104,6 +104,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken } from '@/utils/auth';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -507,7 +508,7 @@ export default {
       this.onLoad(this.page, this.query);
     },
     buildQuery(params = {}) {
-      const values = { ...params, ...this.query };
+      const values = omitInvalidListStatus({ ...params, ...this.query });
       const rangeMap = {
         effectiveDateRange: ['effectiveDateStart', 'effectiveDateEnd'],
         expiryDateRange: ['expiryDateStart', 'expiryDateEnd'],
diff --git a/src/views/base/customer-type.vue b/src/views/base/customer-type.vue
index fb68968..6653a85 100644
--- a/src/views/base/customer-type.vue
+++ b/src/views/base/customer-type.vue
@@ -63,6 +63,7 @@
 
 <script>
 import { getList, getDetail, submit, remove, changeStatus } from '@/api/base/customer-type';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -290,7 +291,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus(Object.assign(params, this.query))).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/base/fee-item.vue b/src/views/base/fee-item.vue
index 3693a3d..da2f71b 100644
--- a/src/views/base/fee-item.vue
+++ b/src/views/base/fee-item.vue
@@ -97,6 +97,7 @@ import { exportBlob } from '@/api/common';
 import { getDictionaryAll } from '@/api/system/dictbiz';
 import { getDeptTree } from '@/api/system/dept';
 import { downloadXls } from '@/utils/util';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken } from '@/utils/auth';
 import { Download } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
@@ -569,7 +570,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus(Object.assign(params, this.query))).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/base/measurement-unit.vue b/src/views/base/measurement-unit.vue
index 4034d01..707eb56 100644
--- a/src/views/base/measurement-unit.vue
+++ b/src/views/base/measurement-unit.vue
@@ -82,6 +82,7 @@
 import { mapGetters } from 'vuex';
 import { changeStatus, getDetail, getList, remove, submit } from '@/api/base/measurement-unit';
 import { createOption } from '@/option/base/measurement-unit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { isAdministrator } from '@/utils/auth';
 
 export default {
@@ -218,7 +219,7 @@ export default {
     },
     onLoad(page = this.page, params = this.query) {
       this.loading = true;
-      return getList(page.currentPage, page.pageSize, params)
+      return getList(page.currentPage, page.pageSize, omitInvalidListStatus(params))
         .then(res => {
           const pageData = res.data.data || {};
           this.data = pageData.records || [];
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 5d4e631..4f73bd6 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -270,6 +270,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1636,7 +1637,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue
index 4abfe97..8670593 100644
--- a/src/views/base/railway-station.vue
+++ b/src/views/base/railway-station.vue
@@ -150,6 +150,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1157,7 +1158,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/business/common-route.vue b/src/views/business/common-route.vue
index 99095ac..15b8cba 100644
--- a/src/views/business/common-route.vue
+++ b/src/views/business/common-route.vue
@@ -396,8 +396,11 @@ export default {
       return this.selectionList.map(item => item.id).join(',');
     },
   },
-  created() {
-    this.applyDefaultDeptSearch();
+    created() {
+    // 超管默认查全部组织，不预填组织筛选；普通用户预填当前组织。
+    if (!this.isAdmin) {
+      this.applyDefaultDeptSearch();
+    }
     this.initDeptTree();
   },
   methods: {
@@ -455,10 +458,23 @@ export default {
     normalizeListQuery(params = {}) {
       // 搜索条件优先于缓存的 query，避免默认组织 ID 覆盖用户新选择的组织。
       const query = { ...this.query, ...params };
-      const rawDeptId = query.deptId ?? query.searchDeptId;
+      // 本次搜索显式带了组织字段时，以本次为准（含清空）；否则沿用缓存。
+      const hasDeptInParams =
+        Object.prototype.hasOwnProperty.call(params, 'deptId') ||
+        Object.prototype.hasOwnProperty.call(params, 'searchDeptId');
+      const rawDeptId = hasDeptInParams
+        ? params.deptId ?? params.searchDeptId
+        : query.deptId ?? query.searchDeptId;
       delete query.searchDeptId;
       if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') {
-        query.deptId = String(rawDeptId).split(',')[0].trim();
+        // 级联可能回传路径数组，统一取末级并保持字符串，避免雪花 ID 精度丢失。
+        const deptValue = Array.isArray(rawDeptId) ? rawDeptId.at(-1) : rawDeptId;
+        query.deptId = String(deptValue ?? '')
+          .split(',')[0]
+          .trim();
+        if (!query.deptId) {
+          delete query.deptId;
+        }
       } else {
         delete query.deptId;
       }
@@ -466,6 +482,23 @@ export default {
       return query;
     },
     applyDefaultDeptSearch() {
+      // 超管默认不限组织，避免预填组织后新增落在其他组织时列表看不见。
+      if (this.isAdmin) {
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.searchValue = undefined;
+        }
+        const nextQuery = { ...this.query };
+        delete nextQuery.deptId;
+        delete nextQuery.searchDeptId;
+        this.query = nextQuery;
+        this.$nextTick(() => {
+          if (this.$refs.crud?.searchForm) {
+            this.$refs.crud.searchForm.searchDeptId = undefined;
+          }
+        });
+        return;
+      }
       const deptId = this.defaultDeptId();
       const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
       if (!deptId || !deptColumn) return;
@@ -477,6 +510,11 @@ export default {
         }
       });
     },
+    resolveDeptName(deptId) {
+      if (!deptId) return '';
+      const matched = this.deptOptions.find(item => String(item.value) === String(deptId));
+      return matched ? String(matched.label || '').trim() : '';
+    },
     resetAddressQuery() {
       this.addressQuery = {
         addressName: '',
@@ -933,7 +971,8 @@ export default {
       }
       api.submit(submitRow).then(
         () => {
-          this.onLoad(this.page);
+          this.page.currentPage = 1;
+          this.onLoad(this.page, this.query);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
         },
@@ -951,7 +990,7 @@ export default {
       }
       api.submit(submitRow).then(
         () => {
-          this.onLoad(this.page);
+          this.onLoad(this.page, this.query);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
         },
@@ -1006,7 +1045,13 @@ export default {
     beforeOpen(done, type) {
       this.dialogReadonly = type === 'view';
       if (type === 'add') {
-        this.form = {};
+        const form = {};
+        // 超管若当前按某组织筛选，新增默认归属该组织，避免保存后被筛选条件滤掉。
+        if (this.isAdmin && this.query.deptId) {
+          form.deptId = String(this.query.deptId);
+          form.deptName = this.resolveDeptName(form.deptId);
+        }
+        this.form = form;
         done();
         return;
       }
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index 016efb8..344a997 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -332,7 +332,7 @@
 
 <script>
 import * as api from '@/api/business/contract-manage';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
   isContractSealMaterialLocation,
@@ -738,7 +738,7 @@ export default {
     removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
     validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
     validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
-    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
+    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected', mkEnabled: await loadMkEnabled().catch(() => false) }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
 </script>
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 088ea83..3623a5e 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -1986,7 +1986,9 @@ export default {
                 bizType: 'contract-manage',
                 bizId: id,
                 subjectName: saved.contractName || submit.contractName || '',
-                approvalStatus: previousApprovalStatus || saved.approvalStatus || submit.approvalStatus || '',
+                approvalStatus:
+                  previousApprovalStatus || saved.approvalStatus || submit.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
               })
             );
           }
@@ -2025,6 +2027,7 @@ export default {
             bizId: payload.id || this.form.id,
             subjectName: payload.contractName || this.form.contractName || '',
             approvalStatus: this.form.approvalStatus || 'change_rejected',
+            mkEnabled: this.mkEnabled,
           }).then(() => {
             this.$message.success('已重新提交变更审批');
             this.closeForm();
@@ -3001,6 +3004,7 @@ export default {
                   bizId: row.id,
                   subjectName: row.contractName || '',
                   approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
                 })
               )
             : request();
@@ -3338,7 +3342,7 @@ export default {
 
   :deep(.el-form-item) {
     align-items: center;
-    margin-bottom: 24px;
+    //margin-bottom: 24px;
   }
 
   :deep(.el-form-item__label) {
diff --git a/src/views/business/process-config.vue b/src/views/business/process-config.vue
index 4cf9f31..d676238 100644
--- a/src/views/business/process-config.vue
+++ b/src/views/business/process-config.vue
@@ -416,6 +416,7 @@ import { getList as getProjectList } from '@/api/business/project-apply';
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { config, option } from '@/option/business/process-config';
+import { applyIncomingSearch } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
 import { mapGetters } from 'vuex';
@@ -603,7 +604,8 @@ export default {
       });
     },
     normalizeListQuery(params = {}) {
-      const query = { ...params, ...this.query };
+      // 新条件覆盖旧条件，清空的筛选项不再沿用上一次的值。
+      const query = applyIncomingSearch(this.query, params);
       const rawDeptId = query.deptId ?? query.searchDeptId;
       delete query.searchDeptId;
       if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') {
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 4580fd0..e05c03d 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -1750,6 +1750,7 @@ export default {
                 bizId: row.id,
                 subjectName: row.projectName || '',
                 approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
               }).then(() => request())
             : request();
         afterMk.then(res => {
@@ -1956,6 +1957,7 @@ export default {
                 bizId: id,
                 subjectName: name,
                 approvalStatus: status,
+                mkEnabled: this.mkEnabled,
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2027,6 +2029,7 @@ export default {
               bizId: id,
               subjectName: this.form.projectName || '',
               approvalStatus: this.form.approvalStatus || 'change_rejected',
+              mkEnabled: this.mkEnabled,
             }).then(() => {
               this.$message.success('提交成功!');
               this.closeProjectForm();
@@ -2503,8 +2506,9 @@ export default {
         const list = res.data.data || [];
         this.platformCompanyOptions = list.map(item => ({
           label: item.deptName || item.fullName || item.title || item.name,
-          value: item.id,
-        }));
+          // 雪花 ID 必须以字符串绑定，避免 JS Number 精度丢失导致多选提交异常
+          value: item.id == null || item.id === '' ? '' : String(item.id),
+        })).filter(item => item.value);
         this.ensureCurrentPlatformOption();
       });
     },
diff --git a/src/views/payment/bill-payment-form.vue b/src/views/payment/bill-payment-form.vue
index c8654a9..77297ed 100644
--- a/src/views/payment/bill-payment-form.vue
+++ b/src/views/payment/bill-payment-form.vue
@@ -140,7 +140,7 @@ import * as api from '@/api/payment/billPayment';
 import * as billLedgerApi from '@/api/payment/billLedger';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyForm = () => ({
   id: null,
@@ -348,6 +348,7 @@ export default {
           bizId: this.form.id,
           subjectName: this.form.paymentNo || this.form.billNo || '',
           approvalStatus: previousApprovalStatus,
+          mkEnabled: await loadMkEnabled().catch(() => false),
         });
         this.$message.success('提交成功');
         this.goBack();
diff --git a/src/views/payment/bill-payment.vue b/src/views/payment/bill-payment.vue
index d44acbd..defddf9 100644
--- a/src/views/payment/bill-payment.vue
+++ b/src/views/payment/bill-payment.vue
@@ -132,6 +132,7 @@ export default {
         bizId: row.id,
         subjectName: row.paymentNo || row.billNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 0f47253..0c6f4cd 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -492,7 +492,7 @@ import { getDictionary } from '@/api/system/dictbiz';
 import { invoiceApplicationDetailColumns } from '@/option/payment/invoiceApplication';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 let localId = 0;
 const emptyLine = () => ({
@@ -1208,6 +1208,7 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.applicationNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
       this.goBack();
diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue
index 8cc072b..0deb659 100644
--- a/src/views/payment/invoice-application.vue
+++ b/src/views/payment/invoice-application.vue
@@ -384,6 +384,7 @@ export default {
         bizId: row.id,
         subjectName: row.applicationNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
@@ -504,6 +505,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index ac424da..1d06b34 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -219,7 +219,7 @@ import * as api from '@/api/payment/invoiceReceipt';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyForm = () => ({
   id: null,
@@ -571,6 +571,7 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.invoiceNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
       this.goBack();
diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue
index 02b2ad1..8710449 100644
--- a/src/views/payment/invoice-receipt.vue
+++ b/src/views/payment/invoice-receipt.vue
@@ -341,6 +341,7 @@ export default {
         bizId: row.id,
         subjectName: row.invoiceNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index acee4e5..a3e337d 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -673,7 +673,7 @@ import {
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadFileByUrl } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
   downloadKingdeeInvoiceFile,
   isKingdeePathAttachment,
@@ -688,6 +688,9 @@ const attachmentViewerPlugins = [
   fallbackPlugin(),
 ];
 
+const paymentApplicationListRoute = '/payment/payment-application';
+const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
+
 const ATTACHMENT_MATERIALS = {
   weighingSlip: { key: 'weighingSlip', label: '磅单', keywords: ['磅单'] },
   entrustOrder: { key: 'entrustOrder', label: '委托单', keywords: ['委托单'] },
@@ -1230,7 +1233,7 @@ export default {
         ];
       }
       const referenceRow = this.createReferenceRow(data);
-      this.referenceRows = referenceRow.settlementNo ? [referenceRow] : [];
+      this.referenceRows = this.restoreReferenceRows(data, referenceRow);
       this.paymentRecords = data.paymentRecords || [];
     },
     async initialize() {
@@ -1253,7 +1256,7 @@ export default {
           invoices: data.invoices || [],
         };
         const referenceRow = this.createReferenceRow(data);
-        this.referenceRows = referenceRow.settlementNo ? [referenceRow] : [];
+        this.referenceRows = this.restoreReferenceRows(data, referenceRow);
         this.paymentRecords = data.paymentRecords || [];
         if (this.form.paymentType === 'project_advance') {
           await this.loadProjectOptions();
@@ -1471,6 +1474,33 @@ export default {
         this.$refs.formRef?.clearValidate();
       });
     },
+    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 settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
+          if (!settlementNo) return null;
+          return {
+            id: isPre ? item.preSettlementId : 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)),
+            fixedAppliedAmount: this.readonly,
+          };
+        })
+        .filter(Boolean);
+      if (rows.length > 1) {
+        this.form.preSettlementIds = rows.filter(item => item.referenceType === 'pre').map(item => item.id);
+        this.form.settlementIds = rows.filter(item => item.referenceType === 'formal').map(item => item.id);
+        if (this.form.preSettlementIds.length) this.form.preSettlementId = this.form.preSettlementIds[0];
+        if (this.form.settlementIds.length) this.form.settlementId = this.form.settlementIds[0];
+        return rows;
+      }
+      return fallbackRow?.settlementNo ? [fallbackRow] : [];
+    },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
       const appliedAmount = Number(row.advanceAppliedAmount || row.appliedPaymentAmount || 0);
@@ -1479,11 +1509,13 @@ export default {
         id: row.preSettlementId || row.settlementId || row.id,
         settlementNo: row.preSettlementNo || row.formalSettlementNo || row.settlementNo || '',
         referenceType: isPre ? 'pre' : 'formal',
-        settlementAmount,
-        payableAmount:
-          row.payableAmount === undefined || row.payableAmount === null
+        settlementAmount: Number(Number(settlementAmount || 0).toFixed(2)),
+        payableAmount: Number(
+          (row.payableAmount === undefined || row.payableAmount === null
             ? Math.max(0, settlementAmount - appliedAmount)
-            : Number(row.payableAmount || 0),
+            : Number(row.payableAmount || 0)
+          ).toFixed(2)
+        ),
       };
     },
     createInvoiceRows(invoices = [], settlementNo = '') {
@@ -1541,9 +1573,24 @@ export default {
       }
       const first = rows[0];
       this.form.invoices = [];
-      this.referenceRows = rows.map(item =>
-        this.createReferenceRow({ ...item, referenceType: 'pre' })
+      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,
+        });
+      });
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1554,8 +1601,6 @@ export default {
       );
       const paymentRatio = Number(this.form.paymentRatio || 0);
       // 尾款付款场景下选择预结算单时保留尾款付款类型，不强制改为进度预付
-      const paymentType =
-        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
       this.amountSyncing = true;
       Object.assign(this.form, {
         paymentType,
@@ -2709,14 +2754,17 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.paymentNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
+      // 通知列表页（keep-alive）重新拉取数据
+      sessionStorage.setItem(paymentApplicationListRefreshKey, '1');
       this.goBack();
     },
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
       this.$router.$avueRouter?.closeTag?.();
-      this.$router.push('/payment/payment-application');
+      this.$router.push(paymentApplicationListRoute);
     },
     formatMoney(value) {
       const amount = Number(value);
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 90b6915..44cde10 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -152,6 +152,9 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
+const paymentApplicationListRoute = '/payment/payment-application';
+const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
+
 export default {
   name: 'PaymentApplication',
   mixins: [organizationSearch],
@@ -193,7 +196,28 @@ export default {
         this.mkEnabled = false;
       });
   },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === paymentApplicationListRoute &&
+        from?.path?.includes('/payment-application/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
   methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(paymentApplicationListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(paymentApplicationListRefreshKey);
+      this.onLoad(this.page);
+    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -296,6 +320,7 @@ export default {
         bizId: row.id,
         subjectName: row.paymentNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.refreshChange();
@@ -441,6 +466,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：后端按 unlocked 锁记录回填（付款申请不作废，仅此标识可区分金蝶删单与推送失败）
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index b7f0bd8..156a5f5 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -46,6 +46,9 @@
           <el-table-column label="金蝶未认领金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
           </el-table-column>
+          <el-table-column label="剩余可认领金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
+          </el-table-column>
           <el-table-column prop="summary" label="摘要" min-width="180" show-overflow-tooltip />
         </el-table>
         <el-row :gutter="32" class="receipt-claim-batch-form-page__claim-info">
@@ -298,10 +301,21 @@ export default {
         0
       );
     },
+    flowRemaining(flow) {
+      return Math.max(Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0), 0);
+    },
     maxAllocation(row) {
       const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
       const otherTotal = this.settlementAllocatedTotal(row.settlement) - current;
-      return Math.max(this.settlementRemaining(row.settlement) - otherTotal, 0);
+      // 流水维度：该流水其余分摊已占用部分同样挤占剩余可认领金额
+      const flowOtherTotal = this.flowAllocatedTotal(row.flow.id) - current;
+      return Math.max(
+        Math.min(
+          this.settlementRemaining(row.settlement) - otherTotal,
+          this.flowRemaining(row.flow) - flowOtherTotal
+        ),
+        0
+      );
     },
     handleAllocationChange(settlement) {
       const total = this.settlementAllocatedTotal(settlement);
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index b9d29d3..930e2a1 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -252,31 +252,36 @@
             :index="detailIndexMethod"
           />
           <el-table-column
-            v-for="column in detailTableColumns"
-            :key="column.prop"
-            v-bind="column"
+            v-for="item in detailDisplayColumns"
+            :key="item.key"
+            :label="item.kind === 'fee' ? item.name : item.column.label"
+            :prop="item.kind === 'fee' ? undefined : item.column.prop"
+            :min-width="item.kind === 'fee' ? 130 : item.column.minWidth"
             align="center"
             show-overflow-tooltip
           >
             <template #default="{ row }">
+              <span v-if="item.kind === 'fee'">
+                {{ formatMoney(parseFeeItems(row.feeItemsJson || row.feeItems)[item.name]) }}
+              </span>
               <el-link
-                v-if="column.link && row[column.prop] && !publicMode"
+                v-else-if="item.column.link && row[item.column.prop] && !publicMode"
                 type="primary"
-                @click.stop="handleDetailLink(row, column)"
+                @click.stop="handleDetailLink(row, item.column)"
               >
-                {{ row[column.prop] }}
+                {{ row[item.column.prop] }}
               </el-link>
-              <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
-              <span v-else-if="column.prop === 'transportQuantity'">
-                {{ formatDetailTransportQuantity(row[column.prop]) }}
+              <span v-else-if="item.column.money">{{ formatMoney(row[item.column.prop]) }}</span>
+              <span v-else-if="item.column.prop === 'transportQuantity'">
+                {{ formatDetailTransportQuantity(row[item.column.prop]) }}
               </span>
-              <span v-else-if="column.prop === 'mileage'">
-                {{ formatDetailMileage(row[column.prop]) }}
+              <span v-else-if="item.column.prop === 'mileage'">
+                {{ formatDetailMileage(row[item.column.prop]) }}
               </span>
-              <span v-else-if="column.prop === 'transportType'">
-                {{ transportTypeName(row[column.prop]) }}
+              <span v-else-if="item.column.prop === 'transportType'">
+                {{ transportTypeName(row[item.column.prop]) }}
               </span>
-              <span v-else>{{ displayValue(row[column.prop]) }}</span>
+              <span v-else>{{ displayValue(row[item.column.prop]) }}</span>
             </template>
           </el-table-column>
           <el-table-column v-if="editable" label="操作" width="150" fixed="right" align="center">
@@ -391,6 +396,16 @@
         </div>
       </section-card>
 
+      <project-advance-write-off
+        ref="projectAdvanceWriteOffRef"
+        v-model="projectAdvanceWriteOffs"
+        :editable="editable"
+        :contract-id="form.contractId"
+        :settlement-amount="form.settlementAmount"
+        settlement-type="formal"
+        :settlement-id="form.id"
+      />
+
       <section-card title="发票信息">
         <div class="formal-editor__invoice-claim">
           <el-form inline label-position="right" label-width="auto" @submit.prevent>
@@ -1030,6 +1045,7 @@ import {
   viewKingdeeInvoiceFile,
 } from '@/utils/kingdee-attachment';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
+import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
 
@@ -1038,7 +1054,7 @@ const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'local
 
 export default {
   name: 'FormalSettlementEditor',
-  components: { InfoFilled, KingdeeInvoicePoolDialog },
+  components: { InfoFilled, KingdeeInvoicePoolDialog, ProjectAdvanceWriteOff },
   props: {
     modelValue: Boolean,
     recordId: [String, Number],
@@ -1067,6 +1083,7 @@ export default {
       receiptClaims: [],
       adjustments: [],
       changeRecords: [],
+      projectAdvanceWriteOffs: [],
       attachments: [],
       selectedAttachmentRows: [],
       invoices: [],
@@ -1205,6 +1222,26 @@ export default {
     title() {
       return this.readonly ? '查看正式结算单' : this.recordId ? '编辑正式结算单' : '新增正式结算单';
     },
+    detailFeeItemNames() {
+      const names = new Set();
+      this.details.forEach(row => {
+        Object.keys(this.parseFeeItems(row.feeItemsJson || row.feeItems)).forEach(name =>
+          names.add(name)
+        );
+      });
+      return Array.from(names);
+    },
+    detailDisplayColumns() {
+      const columns = this.detailTableColumns;
+      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);
+      return [
+        ...beforeColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+        ...this.detailFeeItemNames.map(name => ({ kind: 'fee', key: `fee-${name}`, name })),
+        ...afterColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+      ];
+    },
     // 币种为空按人民币处理，与后端预结算/正式结算对空币种的默认取值一致
     isLocalCurrencySettlement() {
       return normalizeCurrencyCode(this.form.currency) === 'RMB';
@@ -1305,6 +1342,13 @@ export default {
       }
       this.adjustments = data.adjustments || [];
       this.changeRecords = data.changeRecords || [];
+      this.projectAdvanceWriteOffs = (data.projectAdvanceWriteOffs || []).map(row => ({
+        ...row,
+        writeOffAmount: Number(row.writeOffAmount || 0),
+        projectAdvanceAmount: Number(row.projectAdvanceAmount || 0),
+        availableWriteOffAmount: Number(row.availableWriteOffAmount || 0),
+        createTime: row.paymentCreateTime || row.createTime,
+      }));
       this.attachments = this.parseAttachments(data.attachmentsJson);
       this.selectedAttachmentRows = [];
       this.invoices = data.invoices || [];
@@ -1335,6 +1379,7 @@ export default {
       this.receiptClaims = [];
       this.adjustments = [];
       this.changeRecords = [];
+      this.projectAdvanceWriteOffs = [];
       this.attachments = [];
       this.selectedAttachmentRows = [];
       this.invoices = [];
@@ -2594,6 +2639,7 @@ export default {
           matchedAmount: Number(row.matchedAmount || 0),
           attachmentJson: row.attachmentJson || '',
         })),
+        projectAdvanceWriteOffs: this.$refs.projectAdvanceWriteOffRef?.toSavePayload?.() || [],
         remark: this.form.remark,
       };
     },
@@ -2602,6 +2648,9 @@ export default {
     },
     async handleDraftSave() {
       // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       this.draftSaving = true;
       try {
         await save({
@@ -2629,6 +2678,9 @@ export default {
         return this.$message.warning('请完善手工费用的费用类型和费用项');
       }
       if (!this.validateInvoices()) return;
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       // 附件类型仅做提示，不阻断正式结算单新增/保存提交。
       // this.validateAttachments();
       this.saving = true;
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 8d0d028..9108e5c 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -295,6 +295,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 17310ff..5d5ad8e 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -247,60 +247,52 @@
               :index="detailIndexMethod"
             />
             <el-table-column
-              v-for="column in visibleDetailColumns"
-              :key="column.prop"
-              :label="column.label"
-              :prop="column.prop"
-              :min-width="column.minWidth"
+              v-for="item in detailDisplayColumns"
+              :key="item.key"
+              :label="item.kind === 'fee' ? item.name : item.column.label"
+              :prop="item.kind === 'fee' ? undefined : item.column.prop"
+              :min-width="item.kind === 'fee' ? 130 : item.column.minWidth"
               align="center"
               show-overflow-tooltip
             >
               <template #default="{ row }">
+                <span v-if="item.kind === 'fee'">
+                  {{
+                    formatMoney(
+                      parseFeeItems(row.feeItemsJson)[item.name],
+                      row.currency || form.currency
+                    )
+                  }}
+                </span>
                 <el-link
-                  v-if="column.link && row[column.prop] && !publicMode"
+                  v-else-if="item.column.link && row[item.column.prop] && !publicMode"
                   type="primary"
-                  @click.stop="handleDetailLink(row, column)"
+                  @click.stop="handleDetailLink(row, item.column)"
                 >
-                  {{ row[column.prop] }}
+                  {{ row[item.column.prop] }}
                 </el-link>
-                <span v-else-if="column.money && column.prop === 'unitPrice'">
+                <span v-else-if="item.column.money && item.column.prop === 'unitPrice'">
                   {{ formatUnitPrice(row) }}
                 </span>
-                <span v-else-if="column.money">
-                  {{ formatMoney(row[column.prop], row.currency || form.currency) }}
+                <span v-else-if="item.column.money">
+                  {{ formatMoney(row[item.column.prop], row.currency || form.currency) }}
                 </span>
-                <span v-else-if="column.prop === 'transportQuantityText'">
+                <span v-else-if="item.column.prop === 'transportQuantityText'">
                   {{ formatQuantity(row) }}
                 </span>
-                <span v-else-if="pageMode && column.prop === 'mileage'">
-                  {{ formatDetailMileage(row[column.prop]) }}
+                <span v-else-if="item.column.prop === 'mileage'">
+                  {{ formatDetailMileage(row[item.column.prop]) }}
                 </span>
-                <span v-else-if="column.prop === 'transportType'">
-                  {{ transportTypeName(row[column.prop]) }}
+                <span v-else-if="item.column.prop === 'transportType'">
+                  {{ transportTypeName(row[item.column.prop]) }}
                 </span>
-                <span v-else-if="column.prop === 'cargoName'">
+                <span v-else-if="item.column.prop === 'cargoName'">
                   {{ formatCargoNames(row) }}
                 </span>
-                <span v-else-if="column.prop === 'cargoType'">
+                <span v-else-if="item.column.prop === 'cargoType'">
                   {{ formatCargoTypes(row) }}
                 </span>
-                <span v-else>{{ displayValue(row[column.prop]) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-for="feeItem in detailFeeItemNames"
-              :key="`fee-${feeItem}`"
-              :label="feeItem"
-              min-width="130"
-              align="center"
-            >
-              <template #default="{ row }">
-                {{
-                  formatMoney(
-                    parseFeeItems(row.feeItemsJson)[feeItem],
-                    row.currency || form.currency
-                  )
-                }}
+                <span v-else>{{ displayValue(row[item.column.prop]) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" :width="editable ? 150 : 90" fixed="right" align="center">
@@ -425,6 +417,16 @@
         </div>
       </section-card>
 
+      <project-advance-write-off
+        ref="projectAdvanceWriteOffRef"
+        v-model="projectAdvanceWriteOffs"
+        :editable="editable"
+        :contract-id="form.contractId"
+        :settlement-amount="form.settlementAmount"
+        settlement-type="pre"
+        :settlement-id="form.id"
+      />
+
       <section-card v-if="form.id && readonly" title="预付信息">
         <el-table :data="advances" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
@@ -780,12 +782,13 @@
       </el-table-column>
       <el-table-column label="里程（KM）" min-width="140" align="center">
         <template #default="{ row }">
+          <span v-if="adjustDialog.readonly">{{ formatDetailMileage(row.mileage) }}</span>
           <el-input-number
+            v-else
             v-model="row.mileage"
             :min="0"
             :precision="2"
             :controls="false"
-            :disabled="adjustDialog.readonly"
             @change="recalculateAdjustRow(row, 'mileage')"
           />
         </template>
@@ -943,6 +946,7 @@ import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { InfoFilled } from '@element-plus/icons-vue';
 import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
+import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
@@ -987,7 +991,7 @@ import {
 import { formatContractOptionLabel } from '@/utils/contract';
 import { normalizeCurrencyCode } from '@/utils/currency';
 import { downloadFileByUrl } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
 
@@ -996,7 +1000,7 @@ const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'local
 
 export default {
   name: 'PreSettlementEditor',
-  components: { InfoFilled, ChangeRecordDetailDialog },
+  components: { InfoFilled, ChangeRecordDetailDialog, ProjectAdvanceWriteOff },
   props: {
     modelValue: {
       type: Boolean,
@@ -1099,6 +1103,7 @@ export default {
         size: 10,
       },
       advances: [],
+      projectAdvanceWriteOffs: [],
       changeRecords: [],
       attachments: [],
       attachmentTypeOptions: [],
@@ -1232,6 +1237,17 @@ export default {
       });
       return Array.from(names);
     },
+    detailDisplayColumns() {
+      const columns = this.visibleDetailColumns;
+      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);
+      return [
+        ...beforeColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+        ...this.detailFeeItemNames.map(name => ({ kind: 'fee', key: `fee-${name}`, name })),
+        ...afterColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+      ];
+    },
     // 按 preSettlementDetailId 分组的明细数据（用于拼接货物名称和类型）
     groupedDetails() {
       const groups = {};
@@ -1445,6 +1461,7 @@ export default {
       this.appliedDetailQuery = { ...this.detailQuery };
       this.detailPage = { current: 1, size: 10 };
       this.advances = [];
+      this.projectAdvanceWriteOffs = [];
       this.changeRecords = [];
       this.attachments = [];
       this.selectedAttachmentRows = [];
@@ -1484,6 +1501,13 @@ export default {
           createUserName: row.createUserName || detail.createUserName,
           createTime: row.createTime || detail.createTime,
         }));
+        this.projectAdvanceWriteOffs = (detail.projectAdvanceWriteOffs || []).map(row => ({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+          projectAdvanceAmount: Number(row.projectAdvanceAmount || 0),
+          availableWriteOffAmount: Number(row.availableWriteOffAmount || 0),
+          createTime: row.paymentCreateTime || row.createTime,
+        }));
         this.changeRecords = detail.changeRecords || [];
         this.attachments = this.parseAttachments(detail.attachmentsJson);
         this.sortAttachments();
@@ -1628,6 +1652,7 @@ export default {
         this.form.payerName = '';
         this.form.payeeName = '';
         this.summaryFees = [];
+        this.projectAdvanceWriteOffs = [];
         return;
       }
       this.form.contractId = contract.id;
@@ -1643,6 +1668,7 @@ export default {
       if (contract.partyB) this.form.payeeName = contract.partyB;
       this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
+      this.projectAdvanceWriteOffs = [];
       if (this.form.currency !== 'RMB') {
         this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
         this.fetchBfiExchangeRate();
@@ -1663,6 +1689,9 @@ export default {
         this.$message.warning(`请完善结算合计第${invalidManualFeeIndex + 1}行的费用类型和费用项`);
         return;
       }
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       const stateKey = shouldSubmit ? 'submitting' : 'saving';
       this[stateKey] = true;
       try {
@@ -1673,13 +1702,14 @@ export default {
         if (shouldSubmit) {
           const previousApprovalStatus = this.form.approvalStatus || '';
           await submit({ id: this.form.id });
-          await submitMkApprovalFlow({
+          const mkStarted = await submitMkApprovalFlow({
             bizType: 'pre-settlement',
             bizId: this.form.id,
             subjectName: this.form.preSettlementNo || this.form.contractName || '',
             approvalStatus: previousApprovalStatus,
+            mkEnabled: await loadMkEnabled().catch(() => false),
           });
-          this.$message.success('审批流程已发起');
+          this.$message.success(mkStarted ? '审批流程已发起' : '提交成功');
           this.visible = false;
           this.$emit('success', this.form.id);
           return;
@@ -1709,6 +1739,7 @@ export default {
           remark: row.remark,
           manualFlag: row.manualFlag || 0,
         })),
+        projectAdvanceWriteOffs: this.$refs.projectAdvanceWriteOffRef?.toSavePayload?.() || [],
       };
     },
     addSummaryFee() {
@@ -1765,7 +1796,7 @@ export default {
       return option?.dictValue || value;
     },
     formatDetailMileage(value) {
-      if (value === undefined || value === null || value === '' || Number(value) === -1) return '';
+      if (value === undefined || value === null || value === '' || Number(value) === -1) return '-';
       return value;
     },
     removeSummaryFee(index) {
diff --git a/src/views/settlement/components/project-advance-write-off.vue b/src/views/settlement/components/project-advance-write-off.vue
new file mode 100644
index 0000000..a273121
--- /dev/null
+++ b/src/views/settlement/components/project-advance-write-off.vue
@@ -0,0 +1,300 @@
+<template>
+  <section-card title="项目预付核销">
+    <template v-if="editable" #extra>
+      <el-button type="primary" :disabled="!contractId" @click="openSelectDialog">选择</el-button>
+    </template>
+    <el-table :data="rows" border>
+      <el-table-column type="index" label="序号" width="64" align="center" />
+      <el-table-column
+        prop="paymentNo"
+        label="预付单号"
+        min-width="160"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column label="项目预付金额" min-width="140" align="center">
+        <template #default="{ row }">{{ formatMoney(row.projectAdvanceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="可核销金额" min-width="140" align="center">
+        <template #default="{ row }">{{ formatMoney(row.availableWriteOffAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="本次核销金额" min-width="160" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="editable"
+            v-model="row.writeOffAmount"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            class="project-advance-write-off__amount"
+            @change="handleAmountChange(row)"
+          />
+          <span v-else>{{ formatMoney(row.writeOffAmount) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="kingdeeBillNo"
+        label="金蝶预付单号"
+        min-width="160"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">{{ row.kingdeeBillNo || '-' }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="createUserName"
+        label="创建人"
+        min-width="120"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">{{ row.createUserName || '-' }}</template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
+        <template #default="{ row }">{{ formatDateTime(row.createTime || row.paymentCreateTime) }}</template>
+      </el-table-column>
+      <el-table-column v-if="editable" label="操作" width="90" align="center" fixed="right">
+        <template #default="{ $index }">
+          <el-link type="danger" @click="removeRow($index)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      v-model="dialog.visible"
+      title="选择项目预付单"
+      width="960px"
+      append-to-body
+      destroy-on-close
+      class="dialog-form-title"
+      @closed="handleDialogClosed"
+    >
+      <el-table
+        v-loading="dialog.loading"
+        :data="dialog.rows"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" :selectable="rowSelectable" />
+        <el-table-column type="index" label="序号" width="64" align="center" />
+        <el-table-column
+          prop="paymentNo"
+          label="预付单号"
+          min-width="160"
+          align="center"
+          show-overflow-tooltip
+        />
+        <el-table-column label="项目预付金额" min-width="140" align="center">
+          <template #default="{ row }">{{ formatMoney(row.projectAdvanceAmount) }}</template>
+        </el-table-column>
+        <el-table-column label="可核销金额" min-width="140" align="center">
+          <template #default="{ row }">{{ formatMoney(row.availableWriteOffAmount) }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="kingdeeBillNo"
+          label="金蝶预付单号"
+          min-width="160"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">{{ row.kingdeeBillNo || '-' }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="createUserName"
+          label="创建人"
+          min-width="120"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">{{ row.createUserName || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
+          <template #default="{ row }">{{ formatDateTime(row.createTime) }}</template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <el-button @click="dialog.visible = false">取消</el-button>
+        <el-button type="primary" :disabled="!dialog.selection.length" @click="confirmSelect">
+          确定
+        </el-button>
+      </template>
+    </el-dialog>
+  </section-card>
+</template>
+
+<script>
+import { getProjectAdvanceWriteOffOptions } from '@/api/payment/paymentApplication';
+
+export default {
+  name: 'ProjectAdvanceWriteOff',
+  props: {
+    modelValue: {
+      type: Array,
+      default: () => [],
+    },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
+    contractId: {
+      type: [String, Number],
+      default: '',
+    },
+    settlementAmount: {
+      type: [String, Number],
+      default: 0,
+    },
+    settlementType: {
+      type: String,
+      required: true,
+    },
+    settlementId: {
+      type: [String, Number],
+      default: '',
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      dialog: {
+        visible: false,
+        loading: false,
+        rows: [],
+        selection: [],
+      },
+    };
+  },
+  computed: {
+    rows: {
+      get() {
+        return Array.isArray(this.modelValue) ? this.modelValue : [];
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    formatMoney(value) {
+      const amount = Number(value);
+      return Number.isFinite(amount) ? amount.toFixed(2) : '0.00';
+    },
+    formatDateTime(value) {
+      if (!value) return '-';
+      return this.$dayjs(value).format('YYYY-MM-DD HH:mm:ss');
+    },
+    money(value) {
+      const amount = Number(value);
+      return Number.isFinite(amount) ? Number(amount.toFixed(2)) : 0;
+    },
+    openSelectDialog() {
+      if (!this.contractId) {
+        this.$message.warning('请先选择合同');
+        return;
+      }
+      this.dialog.visible = true;
+      this.loadOptions();
+    },
+    async loadOptions() {
+      this.dialog.loading = true;
+      try {
+        const res = await getProjectAdvanceWriteOffOptions({
+          contractId: this.contractId,
+          excludeSettlementType: this.settlementType,
+          excludeSettlementId: this.settlementId || undefined,
+        });
+        this.dialog.rows = res?.data?.data || [];
+      } finally {
+        this.dialog.loading = false;
+      }
+    },
+    rowSelectable(row) {
+      const selectedIds = new Set(this.rows.map(item => String(item.paymentApplicationId)));
+      return !selectedIds.has(String(row.paymentApplicationId));
+    },
+    handleSelectionChange(list) {
+      this.dialog.selection = list || [];
+    },
+    confirmSelect() {
+      const nextRows = [...this.rows];
+      const existed = new Set(nextRows.map(item => String(item.paymentApplicationId)));
+      this.dialog.selection.forEach(item => {
+        const id = String(item.paymentApplicationId);
+        if (existed.has(id)) return;
+        nextRows.push({
+          paymentApplicationId: item.paymentApplicationId,
+          paymentNo: item.paymentNo,
+          projectAdvanceAmount: this.money(item.projectAdvanceAmount),
+          availableWriteOffAmount: this.money(item.availableWriteOffAmount),
+          writeOffAmount: this.money(item.availableWriteOffAmount),
+          kingdeeBillNo: item.kingdeeBillNo || '',
+          createUserName: item.createUserName || '',
+          createTime: item.createTime,
+          paymentCreateTime: item.createTime,
+        });
+      });
+      this.rows = nextRows;
+      this.dialog.visible = false;
+      this.validateTotal();
+    },
+    handleDialogClosed() {
+      this.dialog.rows = [];
+      this.dialog.selection = [];
+    },
+    handleAmountChange(row) {
+      const available = this.money(row.availableWriteOffAmount);
+      let amount = this.money(row.writeOffAmount);
+      if (amount < 0) amount = 0;
+      if (amount > available) {
+        amount = available;
+        this.$message.warning('本次核销金额不能超过可核销金额');
+      }
+      row.writeOffAmount = amount;
+      this.validateTotal();
+    },
+    validateTotal() {
+      const total = this.rows.reduce((sum, row) => sum + this.money(row.writeOffAmount), 0);
+      const settlementAmount = this.money(this.settlementAmount);
+      if (settlementAmount > 0 && total > settlementAmount) {
+        this.$message.warning('项目预付核销合计不能超过结算单金额');
+        return false;
+      }
+      return true;
+    },
+    validateBeforeSave() {
+      for (const row of this.rows) {
+        const amount = this.money(row.writeOffAmount);
+        if (amount <= 0) {
+          this.$message.warning(`预付单${row.paymentNo || ''}本次核销金额必须大于0`);
+          return false;
+        }
+        if (amount > this.money(row.availableWriteOffAmount)) {
+          this.$message.warning(`预付单${row.paymentNo || ''}本次核销金额不能超过可核销金额`);
+          return false;
+        }
+      }
+      return this.validateTotal();
+    },
+    removeRow(index) {
+      const nextRows = [...this.rows];
+      nextRows.splice(index, 1);
+      this.rows = nextRows;
+    },
+    toSavePayload() {
+      return this.rows.map(row => ({
+        paymentApplicationId: row.paymentApplicationId,
+        writeOffAmount: this.money(row.writeOffAmount),
+      }));
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.project-advance-write-off__amount {
+  width: 100%;
+}
+:deep(.project-advance-write-off__amount .el-input__inner) {
+  text-align: right;
+}
+</style>
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
new file mode 100644
index 0000000..e9a2475
--- /dev/null
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -0,0 +1,1118 @@
+<template>
+  <div class="settlement-import-create" :class="{ 'is-readonly': readonly }">
+    <section class="settlement-import-create__form-panel">
+      <el-form
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        label-position="right"
+        label-width="auto"
+        class="settlement-import-create__form"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="项目" prop="projectId">
+              <el-select
+                v-model="form.projectId"
+                filterable
+                clearable
+                :disabled="readonly"
+                placeholder="请选择项目"
+                @change="onProjectChange"
+              >
+                <el-option
+                  v-for="item in projects"
+                  :key="item.id"
+                  :label="item.projectName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算类型" prop="settlementType">
+              <el-select
+                v-model="form.settlementType"
+                :disabled="readonly"
+                clearable
+                placeholder="请选择结算类型"
+                style="width: 100%"
+                @change="onSettlementTypeChange"
+              >
+                <el-option label="应收" value="receivable" />
+                <el-option label="应付" value="payable" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算单" prop="settlementBillType">
+              <el-select
+                v-model="form.settlementBillType"
+                :disabled="readonly || form.settlementType !== 'payable'"
+                placeholder="请选择结算单"
+                style="width: 100%"
+              >
+                <el-option label="正式结算单" value="formal" />
+                <el-option
+                  v-if="form.settlementType === 'payable'"
+                  label="预结算单"
+                  value="pre"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户合同" prop="customerContractId">
+              <el-select
+                v-model="form.customerContractId"
+                filterable
+                clearable
+                :disabled="readonly || !form.projectId"
+                style="width: 100%"
+                :placeholder="form.projectId ? '请选择客户合同' : '请先选择项目'"
+                @change="onCustomerContractChange"
+              >
+                <el-option
+                  v-for="item in filteredCustomerContracts"
+                  :key="item.id"
+                  :label="formatContractLabel(item)"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户">
+              <el-input v-model="form.customerName" disabled placeholder="选择客户合同后自动填充" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承运商合同" prop="carrierContractId">
+              <el-select
+                v-model="form.carrierContractId"
+                filterable
+                clearable
+                :disabled="readonly || !form.projectId"
+                style="width: 100%"
+                :placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
+                @change="onCarrierContractChange"
+              >
+                <el-option
+                  v-for="item in filteredCarrierContracts"
+                  :key="item.id"
+                  :label="formatContractLabel(item)"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承运商">
+              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item prop="waybillMode" class="settlement-import-create__waybill-mode">
+              <template #label>
+                <span>运单类型</span>
+                <el-tooltip placement="top">
+                  <template #content>
+                    <div>
+                      新运单：提交时同步生成运单、应收/应付明细、预/正式结算单；费用项目与金额按导入单据
+                    </div>
+                    <div>
+                      历史运单：按 项目+车号+运输完成日期+客户+承运商+起运地+目的地+货物名称
+                      匹配已有运单（命中 1 条自动绑定，多条需手工指定运单号）；提交时生成应收/应付明细与预/正式结算单，费用按导入单据，不新建运单
+                    </div>
+                  </template>
+                  <el-icon class="settlement-import-create__label-tip"><QuestionFilled /></el-icon>
+                </el-tooltip>
+              </template>
+              <el-radio-group v-model="form.waybillMode" :disabled="readonly">
+                <el-radio value="new">新运单</el-radio>
+                <el-radio value="history">历史运单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="结算单上传" prop="file">
+              <div class="settlement-import-create__upload">
+                <el-upload
+                  ref="uploadRef"
+                  action="#"
+                  accept=".xls,.xlsx"
+                  :auto-upload="false"
+                  :limit="1"
+                  :disabled="readonly || !formReady"
+                  :file-list="files"
+                  :on-change="onFileChange"
+                  :on-exceed="onFileExceed"
+                  :on-remove="onFileRemove"
+                >
+                  <el-button type="primary" :disabled="readonly || !formReady">上传 Excel</el-button>
+                </el-upload>
+                <el-link type="primary" :underline="false" @click="downloadTemplate">
+                  下载模板
+                </el-link>
+                <span class="settlement-import-create__upload-tip">仅支持 .xls / .xlsx</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                :rows="2"
+                maxlength="200"
+                show-word-limit
+                :disabled="readonly"
+                placeholder="请输入备注"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </section>
+
+    <section v-if="rows.length" class="settlement-import-create__detail-panel">
+      <div class="settlement-import-create__detail-head">
+        <div class="dialog-section-title">导入数据明细</div>
+        <el-button
+          v-if="!readonly"
+          type="danger"
+          plain
+          :disabled="!rowSelection.length"
+          @click="removeSelectedRows"
+        >
+          批量删除
+        </el-button>
+      </div>
+      <el-tabs v-model="previewTab">
+        <el-tab-pane :label="`运单数（${rows.length}）`" name="all" />
+        <el-tab-pane :label="`疑似重复（${duplicateRows.length}）`" name="duplicate" />
+      </el-tabs>
+      <el-table
+        :data="previewRows"
+        border
+        max-height="480"
+        class="settlement-import-create__table"
+        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
+        @selection-change="rowSelection = $event"
+      >
+        <el-table-column v-if="!readonly" type="selection" width="48" fixed="left" />
+        <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+        <el-table-column
+          v-for="column in detailColumns"
+          :key="column.prop"
+          :prop="column.prop"
+          :label="column.label"
+          :min-width="column.minWidth || 120"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">
+            <template v-if="row._editing && column.editor && !column.readonly">
+              <el-date-picker
+                v-if="column.editor === 'date'"
+                v-model="row[column.prop]"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择"
+              />
+              <el-input
+                v-else-if="column.editor === 'number'"
+                :model-value="resolveCellValue(row, column)"
+                inputmode="decimal"
+                :placeholder="`请输入${column.label}`"
+                @input="value => updateNumberCell(row, column, value)"
+              />
+              <el-input
+                v-else
+                v-model="row[column.prop]"
+                :placeholder="`请输入${column.label}`"
+              />
+            </template>
+            <span v-else>{{ formatCell(row, column) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="!readonly" label="操作" width="180" 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>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </section>
+
+    <div 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>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed, getCurrentInstance, onMounted, reactive, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+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 getContractList } from '@/api/business/contract-manage';
+import { formatContractOptionLabel } from '@/utils/contract';
+import { downloadXls } from '@/utils/util';
+
+const route = useRoute();
+const router = useRouter();
+const instance = getCurrentInstance();
+const settlementImportListRefreshKey = 'settlement-import-list-refresh';
+
+const formRef = ref();
+const uploadRef = ref();
+const files = ref([]);
+const rows = ref([]);
+const parseLoading = ref(false);
+const rowSelection = ref([]);
+const previewTab = ref('all');
+const feeItemNames = ref([]);
+const projects = ref([]);
+const customerContracts = ref([]);
+const carrierContracts = ref([]);
+const draftLoading = ref(false);
+const confirmLoading = ref(false);
+const readonly = ref(false);
+
+const createDefaultForm = () => ({
+  id: undefined,
+  batchNo: '',
+  projectId: '',
+  projectName: '',
+  settlementType: '',
+  settlementBillType: 'formal',
+  customerContractId: '',
+  customerContractName: '',
+  customerName: '',
+  carrierContractId: '',
+  carrierContractName: '',
+  carrierName: '',
+  waybillMode: 'new',
+  remark: '',
+  file: null,
+});
+
+const form = reactive(createDefaultForm());
+
+const validateFile = (rule, value, callback) => {
+  if (rows.value.length || form.file) {
+    callback();
+    return;
+  }
+  callback(new Error('请上传结算单 Excel'));
+};
+
+const rules = {
+  projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  settlementType: [{ required: true, message: '请选择结算类型', trigger: 'change' }],
+  settlementBillType: [{ required: true, message: '请选择结算单', trigger: 'change' }],
+  customerContractId: [{ required: true, message: '请选择客户合同', trigger: 'change' }],
+  carrierContractId: [{ required: true, message: '请选择承运商合同', trigger: 'change' }],
+  waybillMode: [{ required: true, message: '请选择运单类型', trigger: 'change' }],
+  file: [{ required: true, validator: validateFile, trigger: 'change' }],
+};
+
+const formReady = computed(
+  () =>
+    Boolean(form.projectId) &&
+    Boolean(form.settlementType) &&
+    Boolean(form.settlementBillType) &&
+    Boolean(form.customerContractId) &&
+    Boolean(form.carrierContractId)
+);
+
+const filteredCustomerContracts = computed(() => customerContracts.value);
+
+const filteredCarrierContracts = computed(() => carrierContracts.value);
+
+const extractRecords = response => {
+  const data = response?.data || response;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const isSelectableContract = item => {
+  const approvalStatus = String(item?.approvalStatus || '').trim();
+  const contractStage = String(item?.contractStage || '').trim();
+  return (
+    ['approved', 'change_approved'].includes(approvalStatus) && contractStage !== 'terminated'
+  );
+};
+
+/** 按项目加载客户合同、承运商合同（与运单导入一致，保证项目绑定可选） */
+const loadContractsByProject = async (projectId, projectName = '') => {
+  if (!projectId) {
+    customerContracts.value = [];
+    carrierContracts.value = [];
+    return;
+  }
+  const [customerRes, carrierRes] = await Promise.all([
+    getContractList(1, 9999, {
+      projectId,
+      projectName: projectName || form.projectName || undefined,
+      contractCategory: '客户合同',
+    }),
+    getContractList(1, 9999, {
+      projectId,
+      projectName: projectName || form.projectName || undefined,
+      contractCategory: '承运商合同',
+    }),
+  ]);
+  const matchProject = item => String(item.projectId ?? '') === String(projectId);
+  customerContracts.value = extractRecords(customerRes)
+    .filter(item => String(item.contractCategory || '').trim() === '客户合同')
+    .filter(matchProject)
+    .filter(isSelectableContract)
+    .map(normalizeContract)
+    .filter(Boolean);
+  carrierContracts.value = extractRecords(carrierRes)
+    .filter(item => String(item.contractCategory || '').trim() === '承运商合同')
+    .filter(matchProject)
+    .filter(isSelectableContract)
+    .map(normalizeContract)
+    .filter(Boolean);
+};
+
+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',
+    label: '车牌号/航班号/船号/班列号',
+    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: '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 },
+];
+
+const detailColumns = computed(() => {
+  const feeColumns = feeItemNames.value.map(name => ({
+    prop: name,
+    label: name,
+    editor: 'number',
+    minWidth: 110,
+    isFeeItem: true,
+  }));
+  const historyColumns =
+    form.waybillMode === 'history'
+      ? [
+          {
+            prop: 'waybillNo',
+            label: '运单号',
+            editor: 'input',
+            minWidth: 150,
+          },
+        ]
+      : [];
+  return [
+    ...historyColumns,
+    ...fixedDetailColumns,
+    ...feeColumns,
+    {
+      prop: 'settlementAmount',
+      label: '结算金额',
+      editor: 'number',
+      readonly: true,
+      minWidth: 120,
+    },
+    { prop: 'remark', label: '备注', editor: 'input', minWidth: 140 },
+  ];
+});
+
+const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
+const previewRows = computed(() =>
+  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
+);
+
+const unwrapData = response => {
+  const body = response?.data || response || {};
+  return body?.data !== undefined ? body.data : body;
+};
+
+const normalizeOptionItem = (item, nameKeys = ['name', 'label']) => {
+  if (item == null) return null;
+  if (typeof item === 'string' || typeof item === 'number') {
+    return { id: item, name: String(item) };
+  }
+  const id = item.id ?? item.value ?? item.key;
+  let name = '';
+  for (const key of nameKeys) {
+    if (item[key] != null && String(item[key]).trim()) {
+      name = String(item[key]).trim();
+      break;
+    }
+  }
+  return { ...item, id, name: name || String(id ?? '') };
+};
+
+const normalizeProject = item => {
+  const normalized = normalizeOptionItem(item, ['projectName', 'label', 'name']);
+  if (!normalized) return null;
+  return {
+    ...normalized,
+    id: normalized.id,
+    projectName: normalized.projectName || normalized.name || normalized.label || '',
+  };
+};
+
+const normalizeContract = item => {
+  const normalized = normalizeOptionItem(item, ['contractName', 'label', 'name']);
+  if (!normalized) return null;
+  return {
+    ...normalized,
+    id: normalized.id,
+    contractName: normalized.contractName || normalized.name || '',
+    contractNo: normalized.contractNo || '',
+    projectId: normalized.projectId,
+    partyA: normalized.partyA || '',
+    partyB: normalized.partyB || '',
+    customerName: normalized.customerName || normalized.partyA || '',
+    carrierName: normalized.carrierName || normalized.partyB || '',
+  };
+};
+
+const formatContractLabel = item => {
+  const label = formatContractOptionLabel(item);
+  return label || item.contractName || item.name || String(item.id || '');
+};
+
+const toNumber = value => {
+  if (value === null || value === undefined || value === '') return 0;
+  const number = Number(value);
+  return Number.isFinite(number) ? number : 0;
+};
+
+const resolveCellValue = (row, column) => {
+  if (column.isFeeItem) {
+    const feeItems = row.feeItems || {};
+    return feeItems[column.prop] ?? row[column.prop] ?? '';
+  }
+  return row[column.prop] ?? '';
+};
+
+const formatCell = (row, column) => {
+  const value = resolveCellValue(row, column);
+  if (column.editor === 'number' || column.prop === 'settlementAmount') {
+    if (value === '' || value === null || value === undefined) return '';
+    return Number(value).toFixed(2);
+  }
+  return value ?? '';
+};
+
+const recalcSettlementAmount = row => {
+  const transportFee = toNumber(row.transportFee ?? row.freight);
+  row.transportFee = transportFee;
+  row.freight = transportFee;
+  if (!row.feeItems || typeof row.feeItems !== 'object') {
+    row.feeItems = {};
+  }
+  let feeSum = 0;
+  feeItemNames.value.forEach(name => {
+    const amount = toNumber(row.feeItems[name] ?? row[name]);
+    row.feeItems[name] = amount;
+    row[name] = amount;
+    feeSum += amount;
+  });
+  const settlementAmount = Number((transportFee + feeSum).toFixed(2));
+  row.settlementAmount = settlementAmount;
+  row.otherFeeTotal = Number(feeSum.toFixed(2));
+  row.freightTotal = settlementAmount;
+};
+
+const updateNumberCell = (row, column, value) => {
+  const [integer = '', decimal = ''] = String(value || '')
+    .replace(/[^\d.]/g, '')
+    .split('.');
+  const normalized =
+    decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
+  if (column.isFeeItem) {
+    if (!row.feeItems) row.feeItems = {};
+    row.feeItems[column.prop] = normalized;
+    row[column.prop] = normalized;
+  } else {
+    row[column.prop] = normalized;
+    if (column.prop === 'transportFee') {
+      row.freight = normalized;
+    }
+    if (column.prop === 'unitPrice') {
+      row.transportUnitPrice = normalized;
+    }
+  }
+  recalcSettlementAmount(row);
+};
+
+const importFieldText = value => String(value ?? '').trim();
+
+/** 疑似重复：与历史运单匹配维度一致（项目/客户/承运商为表单级，行内比车号+完成日期+起运地+目的地+货物名称）。 */
+const duplicateSignature = row =>
+  [
+    importFieldText(form.projectId),
+    importFieldText(form.customerContractId),
+    importFieldText(form.carrierContractId),
+    importFieldText(row.vehicleNo),
+    importFieldText(row.actualEndDate).slice(0, 10),
+    importFieldText(row.departureAddress),
+    importFieldText(row.arrivalAddress),
+    importFieldText(row.cargoName),
+  ].join('\u0001');
+
+const refreshDuplicateFlags = (list = rows.value) => {
+  const groups = new Map();
+  list.forEach(row => {
+    const signature = duplicateSignature(row);
+    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
+      row._duplicateConfirmed = false;
+    }
+    row._duplicateSignature = signature;
+    const group = groups.get(signature) || [];
+    group.push(row);
+    groups.set(signature, group);
+  });
+  groups.forEach(group => {
+    const duplicated = group.length > 1;
+    group.forEach(row => {
+      row._duplicate = duplicated && !row._duplicateConfirmed;
+    });
+  });
+};
+
+const confirmDuplicateRow = row => {
+  row._duplicateConfirmed = true;
+  refreshDuplicateFlags();
+  ElMessage.success('已确认，该行将按正常数据导入');
+};
+
+const normalizeParsedRow = (item, index) => {
+  const feeItems =
+    item.feeItems && typeof item.feeItems === 'object' ? { ...item.feeItems } : {};
+  feeItemNames.value.forEach(name => {
+    if (feeItems[name] == null && item[name] != null) {
+      feeItems[name] = item[name];
+    }
+  });
+  const row = {
+    _key: `${Date.now()}-${index}`,
+    ...item,
+    batchNo: item.batchNo || form.batchNo || '',
+    loadingIdentifier: item.loadingIdentifier || item.loadingNo || '',
+    transportFee: item.transportFee ?? item.freight ?? item['*运输费'] ?? item['运输费'] ?? '',
+    unitPrice: item.unitPrice ?? item.transportUnitPrice ?? item['运输单价'] ?? item['单价'] ?? '',
+    feeItems,
+  };
+  row.transportUnitPrice = row.unitPrice;
+  row.freight = row.transportFee;
+  recalcSettlementAmount(row);
+  return row;
+};
+
+const stripInternalRowFields = row => {
+  const {
+    _key,
+    _duplicate,
+    _duplicateConfirmed,
+    _duplicateSignature,
+    _editing,
+    _editSnapshot,
+    ...data
+  } = row;
+  const feeItems = { ...(data.feeItems || {}) };
+  feeItemNames.value.forEach(name => {
+    if (feeItems[name] == null && data[name] != null) {
+      feeItems[name] = data[name];
+    }
+  });
+  return {
+    ...data,
+    transportUnitPrice: data.transportUnitPrice ?? data.unitPrice,
+    transportFee: data.transportFee ?? data.freight,
+    unitPrice: data.unitPrice ?? data.transportUnitPrice,
+    freight: data.freight ?? data.transportFee,
+    feeItems,
+    settlementAmount: data.settlementAmount,
+  };
+};
+
+const buildPayload = () => {
+  const { file, ...batch } = form;
+  return {
+    ...batch,
+    settlementBillType: form.settlementType === 'payable' ? form.settlementBillType || 'formal' : 'formal',
+    waybillMode: form.waybillMode === 'history' ? 'history' : 'new',
+    feeItemNames: [...feeItemNames.value],
+    rows: rows.value.map(stripInternalRowFields),
+  };
+};
+
+const onSettlementTypeChange = () => {
+  // 应收固定正式结算单；应付默认可选正式/预结算
+  if (form.settlementType !== 'payable') {
+    form.settlementBillType = 'formal';
+  } else if (!form.settlementBillType) {
+    form.settlementBillType = 'formal';
+  }
+};
+
+const autoSelectSingleContracts = () => {
+  const customers = filteredCustomerContracts.value;
+  if (customers.length === 1 && !form.customerContractId) {
+    form.customerContractId = customers[0].id;
+    onCustomerContractChange(customers[0].id);
+  }
+  const carriers = filteredCarrierContracts.value;
+  if (carriers.length === 1 && !form.carrierContractId) {
+    form.carrierContractId = carriers[0].id;
+    onCarrierContractChange(carriers[0].id);
+  }
+};
+
+const onProjectChange = async id => {
+  const item = projects.value.find(row => String(row.id) === String(id));
+  form.projectName = item?.projectName || '';
+  form.customerContractId = '';
+  form.customerContractName = '';
+  form.customerName = '';
+  form.carrierContractId = '';
+  form.carrierContractName = '';
+  form.carrierName = '';
+  customerContracts.value = [];
+  carrierContracts.value = [];
+  if (!id) return;
+  try {
+    await loadContractsByProject(id, form.projectName);
+    autoSelectSingleContracts();
+  } catch (error) {
+    ElMessage.error(error?.message || '加载项目合同失败');
+  }
+};
+
+const onCustomerContractChange = id => {
+  const item = filteredCustomerContracts.value.find(row => String(row.id) === String(id));
+  form.customerContractName = item?.contractName || '';
+  form.customerName = item?.customerName || item?.partyA || '';
+};
+
+const onCarrierContractChange = id => {
+  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
+  form.carrierContractName = item?.contractName || '';
+  form.carrierName = item?.carrierName || item?.partyB || '';
+};
+
+const downloadTemplate = async () => {
+  try {
+    const response = await api.exportTemplate();
+    downloadXls(response.data, '导入结算单模板.xlsx');
+    ElMessage.success('模板下载成功');
+  } catch (error) {
+    ElMessage.error('模板下载失败');
+  }
+};
+
+const resetUploadState = () => {
+  files.value = [];
+  form.file = null;
+  rows.value = [];
+  feeItemNames.value = [];
+  rowSelection.value = [];
+};
+
+const onFileRemove = () => {
+  resetUploadState();
+};
+
+/** limit=1 时再次选择文件会走 on-exceed，需主动替换并重新解析 */
+const onFileExceed = uploadFiles => {
+  const file = Array.isArray(uploadFiles) ? uploadFiles[0] : uploadFiles;
+  if (!file) return;
+  uploadRef.value?.clearFiles?.();
+  parseSelectedFile(file, file.name);
+};
+
+const onFileChange = (uploadFile, fileList) => {
+  // 移除、失败等状态不触发解析；仅处理新选中的文件
+  if (uploadFile?.status && !['ready', 'success'].includes(uploadFile.status)) {
+    return;
+  }
+  const raw = uploadFile?.raw;
+  if (!raw) return;
+  files.value = (fileList || []).slice(-1);
+  parseSelectedFile(raw, uploadFile?.name || raw.name);
+};
+
+const parseSelectedFile = async (raw, displayName = '') => {
+  if (!formReady.value) {
+    ElMessage.warning('请先完善项目、结算类型、客户合同与承运商合同');
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    return;
+  }
+  const fileName = String(displayName || raw?.name || '').toLowerCase();
+  if (!/\.(xls|xlsx)$/.test(fileName)) {
+    ElMessage.error('请上传 .xls 或 .xlsx 文件');
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    return;
+  }
+  files.value = [
+    {
+      name: displayName || raw.name,
+      raw,
+      uid: Date.now(),
+      status: 'ready',
+    },
+  ];
+  form.file = raw;
+  if (parseLoading.value) return;
+  parseLoading.value = true;
+  try {
+    const response = await api.parseFile(raw);
+    const data = unwrapData(response) || {};
+    feeItemNames.value = Array.isArray(data.feeItemNames) ? data.feeItemNames : [];
+    const parsedRows = Array.isArray(data.rows) ? data.rows : [];
+    rows.value = parsedRows.map((item, index) => normalizeParsedRow(item, index));
+    refreshDuplicateFlags();
+    formRef.value?.validateField('file');
+    if (Array.isArray(data.warnings) && data.warnings.length) {
+      ElMessage.warning(data.warnings.slice(0, 3).join('；'));
+    } else if (!rows.value.length) {
+      ElMessage.warning('解析成功，但未识别到有效明细行，请检查表头是否包含「*运输费」及数据行');
+    } else {
+      ElMessage.success(`解析成功，共 ${rows.value.length} 行`);
+    }
+  } catch (error) {
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    ElMessage.error(error?.message || '解析失败，请检查文件后重试');
+  } finally {
+    parseLoading.value = false;
+  }
+};
+
+const editRow = row => {
+  row._editSnapshot = JSON.parse(JSON.stringify(row));
+  row._editing = true;
+};
+
+const saveRow = row => {
+  recalcSettlementAmount(row);
+  row._editing = false;
+  delete row._editSnapshot;
+  refreshDuplicateFlags();
+};
+
+const cancelRow = row => {
+  if (row._editSnapshot) Object.assign(row, row._editSnapshot);
+  row._editing = false;
+  delete row._editSnapshot;
+};
+
+const deleteRow = row => {
+  rows.value = rows.value.filter(item => item !== row);
+  refreshDuplicateFlags();
+};
+
+const removeSelectedRows = () => {
+  const keys = new Set(rowSelection.value.map(row => row._key));
+  rows.value = rows.value.filter(row => !keys.has(row._key));
+  rowSelection.value = [];
+  refreshDuplicateFlags();
+};
+
+const goBack = () => {
+  router.push({ path: '/settlement/settlement-import' });
+};
+
+const leaveAfterConfirm = () => {
+  sessionStorage.setItem(settlementImportListRefreshKey, '1');
+  instance?.proxy?.$router?.$avueRouter?.closeTag?.();
+  router.push({ path: '/settlement/settlement-import' });
+};
+
+const downloadFailureExcel = async failureRows => {
+  const response = await api.exportFailures({
+    feeItemNames: [...feeItemNames.value],
+    rows: failureRows,
+  });
+  const blob = response.data || response;
+  downloadXls(blob, `导入结算单失败明细${dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+};
+
+const collectValidationErrors = async () => {
+  const payload = buildPayload();
+  const response = await api.validate(payload);
+  const result = unwrapData(response) || {};
+  const errorMap = new Map();
+  if (result?.success === false || (Array.isArray(result?.errors) && result.errors.length)) {
+    (result.errors || []).forEach(error => {
+      const index = Number(error.rowIndex);
+      if (Number.isNaN(index) || index < 0 || index >= rows.value.length) return;
+      errorMap.set(index, error.errorMessage || '校验失败');
+    });
+  }
+  return errorMap;
+};
+
+const saveDraft = async () => {
+  await formRef.value?.validateField([
+    'projectId',
+    'settlementType',
+    'settlementBillType',
+    'customerContractId',
+    'carrierContractId',
+  ]);
+  if (!rows.value.length) {
+    ElMessage.warning('请先上传并解析结算单明细');
+    return;
+  }
+  draftLoading.value = true;
+  try {
+    const response = await api.saveDraft(buildPayload());
+    const batch = unwrapData(response) || {};
+    if (batch.id) form.id = batch.id;
+    if (batch.batchNo) form.batchNo = batch.batchNo;
+    ElMessage.success('保存草稿成功');
+    goBack();
+  } catch (error) {
+    ElMessage.error(error?.message || '保存草稿失败');
+  } finally {
+    draftLoading.value = false;
+  }
+};
+
+const confirmImport = async () => {
+  await formRef.value?.validate();
+  if (!rows.value.length) {
+    ElMessage.warning('请先上传并解析结算单明细');
+    return;
+  }
+  const duplicateCount = rows.value.filter(row => row._duplicate).length;
+  if (duplicateCount) {
+    await ElMessageBox.confirm(
+      `当前导入有${duplicateCount}条疑似重复数据，是否确认导入？`,
+      '提示',
+      { type: 'warning' }
+    );
+  }
+  confirmLoading.value = true;
+  try {
+    const errorMap = await collectValidationErrors();
+    if (errorMap.size) {
+      const failureRows = [...errorMap.entries()]
+        .sort((left, right) => left[0] - right[0])
+        .map(([index, errorMessage]) => ({
+          ...stripInternalRowFields(rows.value[index]),
+          errorMessage,
+        }));
+      await downloadFailureExcel(failureRows);
+      ElMessage.warning('部分数据校验失败，已下载失败明细');
+      return;
+    }
+    const response = await api.confirm(buildPayload());
+    const batch = unwrapData(response) || {};
+    if (batch.batchNo) form.batchNo = batch.batchNo;
+    ElMessage.success('确认导入成功');
+    leaveAfterConfirm();
+  } catch (error) {
+    if (error === 'cancel' || error === 'close') return;
+    ElMessage.error(error?.message || '确认导入失败');
+  } finally {
+    confirmLoading.value = false;
+  }
+};
+
+const loadOptions = async () => {
+  const response = await api.getOptions();
+  const options = unwrapData(response) || {};
+  projects.value = (options.projects || []).map(normalizeProject).filter(Boolean);
+};
+
+const loadDetail = async id => {
+  const response = await api.getDetail(id);
+  const detail = unwrapData(response) || {};
+  Object.assign(form, {
+    id: detail.id,
+    batchNo: detail.batchNo || '',
+    projectId: detail.projectId || '',
+    projectName: detail.projectName || '',
+    settlementType: detail.settlementType || '',
+    settlementBillType: detail.settlementBillType || 'formal',
+    customerContractId: detail.customerContractId || '',
+    customerContractName: detail.customerContractName || '',
+    customerName: detail.customerName || '',
+    carrierContractId: detail.carrierContractId || '',
+    carrierContractName: detail.carrierContractName || '',
+    carrierName: detail.carrierName || '',
+    waybillMode: detail.waybillMode || 'new',
+    remark: detail.remark || '',
+    file: null,
+  });
+  if (detail.projectId) {
+    await loadContractsByProject(detail.projectId, detail.projectName || '');
+  }
+  feeItemNames.value = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
+  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';
+};
+
+const initPage = async () => {
+  await loadOptions();
+  const id = route.query.id;
+  if (id) {
+    await loadDetail(id);
+    return;
+  }
+  try {
+    const codeResponse = await api.getNextCode();
+    form.batchNo = unwrapData(codeResponse) || '';
+  } catch (error) {
+    form.batchNo = '';
+  }
+};
+
+onMounted(() => {
+  initPage().catch(error => {
+    ElMessage.error(error?.message || '页面初始化失败');
+  });
+});
+</script>
+
+<style scoped lang="scss">
+.settlement-import-create {
+  padding: 16px 24px 24px;
+  background: #fff;
+}
+
+.settlement-import-create__form-panel {
+  margin-bottom: 8px;
+}
+
+.settlement-import-create__form :deep(.el-form-item) {
+  margin-bottom: 16px;
+}
+
+.settlement-import-create__waybill-mode :deep(.el-form-item__label) {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.settlement-import-create__label-tip {
+  color: #909399;
+  cursor: help;
+  font-size: 14px;
+}
+
+.settlement-import-create__upload {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 12px;
+}
+
+.settlement-import-create__upload-tip {
+  color: #909399;
+  font-size: 12px;
+}
+
+.settlement-import-create__detail-panel {
+  margin-top: 8px;
+}
+
+.settlement-import-create__detail-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 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-create__table {
+  --el-table-border-color: #eff1f7;
+}
+
+.settlement-import-create__table :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+.settlement-import-create__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+.settlement-import-create__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+  background: #fafafa;
+}
+
+.settlement-import-create__table :deep(.is-duplicate-row > td.el-table__cell) {
+  background: #fef0f0 !important;
+}
+
+.settlement-import-create__row-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.settlement-import-create__footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px solid #eff1f7;
+}
+</style>
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index b65d98c..c4b9da0 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -368,6 +368,7 @@ export default {
         bizId: row.id,
         subjectName: row.formalSettlementNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue
index 414acc6..75caf7a 100644
--- a/src/views/settlement/pre-settlement.vue
+++ b/src/views/settlement/pre-settlement.vue
@@ -661,6 +661,7 @@ export default {
         bizId: row.id,
         subjectName: row.preSettlementNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index aae040e..b0a39ef 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -2691,12 +2691,12 @@ export default {
       return `${Number(value).toFixed(2)} ${currency}`;
     },
     formatDetailCell(row, prop) {
+      if (prop === 'mileage' && Number(row?.[prop]) === -1) {
+        return '-';
+      }
       if (
         prop === 'mileage' &&
-        (row?.[prop] === null ||
-          row?.[prop] === undefined ||
-          row?.[prop] === '' ||
-          Number(row[prop]) === -1)
+        (row?.[prop] === null || row?.[prop] === undefined || row?.[prop] === '')
       ) {
         return '';
       }
diff --git a/src/views/settlement/settlement-import-form.vue b/src/views/settlement/settlement-import-form.vue
new file mode 100644
index 0000000..77f982f
--- /dev/null
+++ b/src/views/settlement/settlement-import-form.vue
@@ -0,0 +1,49 @@
+<template>
+  <basic-container class="settlement-import-form-page">
+    <div class="settlement-import-form-page__title">{{ pageTitle }}</div>
+    <settlement-import-page />
+  </basic-container>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import SettlementImportPage from './components/settlement-import-page.vue';
+
+const route = useRoute();
+const pageTitle = computed(() => (route.query.id ? '编辑导入结算单' : '新增导入结算单'));
+</script>
+
+<style scoped lang="scss">
+.settlement-import-form-page {
+  :deep(.basic-container__card) {
+    background: #fff;
+  }
+
+  :deep(.basic-container__card > .el-card__body) {
+    padding: 0;
+    background: #fff;
+  }
+}
+
+.settlement-import-form-page__title {
+  position: relative;
+  padding: 16px 24px 12px 36px;
+  border-bottom: 1px solid #eff1f7;
+  background: #fff;
+  color: #303133;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    position: absolute;
+    top: 16px;
+    left: 24px;
+    width: 4px;
+    height: 22px;
+    border-radius: 2px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>
diff --git a/src/views/settlement/settlement-import.vue b/src/views/settlement/settlement-import.vue
new file mode 100644
index 0000000..6cf0d43
--- /dev/null
+++ b/src/views/settlement/settlement-import.vue
@@ -0,0 +1,531 @@
+<template>
+  <basic-container class="settlement-import-page">
+    <section v-show="searchVisible" class="settlement-import-page__search">
+      <el-form :model="query" label-position="right" label-width="160px" @submit.prevent>
+        <div class="settlement-import-page__search-grid">
+          <el-form-item v-for="field in visibleSearchFields" :key="field.prop" :label="field.label">
+            <el-select
+              v-if="field.type === 'select'"
+              v-model="query[field.prop]"
+              clearable
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in field.options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <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 text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
+              {{ searchExpanded ? '收起' : '展开' }}
+            </el-button>
+          </div>
+        </div>
+      </el-form>
+    </section>
+
+    <section class="settlement-import-page__table-panel">
+      <div class="settlement-import-page__toolbar">
+        <div class="settlement-import-page__toolbar-left">
+          <el-button
+            v-if="hasPermission('settlement_import_add')"
+            type="primary"
+            @click="openCreate"
+          >
+            新增
+          </el-button>
+        </div>
+      </div>
+
+      <el-table v-loading="loading" :data="rows" border class="settlement-import-page__table">
+        <el-table-column type="index" label="序号" width="64" align="center" />
+        <el-table-column prop="batchNo" label="导入批次号" min-width="160">
+          <template #default="{ row }">
+            <el-link type="primary" @click="openDetail(row)">{{ row.batchNo || '-' }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="settlementTypeName" label="导入类型" min-width="100">
+          <template #default="{ row }">
+            {{ row.settlementTypeName || settlementTypeLabel(row.settlementType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="settlementBillTypeName" label="结算单" min-width="110">
+          <template #default="{ row }">
+            {{ row.settlementBillTypeName || settlementBillTypeLabel(row.settlementBillType) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="projectName" label="项目" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip />
+        <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 }}
+          </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">
+          <template #default="{ row }">
+            <div class="settlement-import-page__row-actions">
+              <el-link type="primary" @click="openDetail(row)">详情</el-link>
+              <el-link
+                v-if="row.importStatus !== 'voided' && hasPermission('settlement_import_void')"
+                type="danger"
+                @click="openVoid(row)"
+              >
+                作废
+              </el-link>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="settlement-import-page__pagination">
+        <el-pagination
+          background
+          v-model:current-page="page.current"
+          v-model:page-size="page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="page.total"
+          @current-change="loadTable"
+          @size-change="handleSizeChange"
+        />
+      </div>
+    </section>
+
+    <el-dialog v-model="detailVisible" title="导入结算单详情" width="640px" append-to-body>
+      <el-descriptions :column="2" border>
+        <el-descriptions-item label="导入批次号">{{ detail.batchNo || '-' }}</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.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.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-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>
+      <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"
+        :model="voidForm"
+        :rules="voidRules"
+        label-position="right"
+        label-width="auto"
+      >
+        <el-form-item label="作废原因" prop="reason">
+          <el-input
+            v-model="voidForm.reason"
+            type="textarea"
+            :rows="4"
+            maxlength="200"
+            show-word-limit
+            placeholder="请输入作废原因"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="voidVisible = false">取消</el-button>
+        <el-button type="danger" :loading="voidLoading" @click="submitVoid">确认作废</el-button>
+      </template>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
+import { mapGetters } from 'vuex';
+import * as api from '@/api/settlement/settlementImport';
+
+const emptyQuery = () => ({
+  batchNo: '',
+  settlementType: '',
+  projectName: '',
+  customerName: '',
+  carrierName: '',
+});
+
+const SETTLEMENT_TYPE_OPTIONS = [
+  { label: '全部', value: '' },
+  { label: '应收正式结算单', value: 'receivable' },
+  { label: '应付正式结算单', value: 'payable' },
+];
+
+const SETTLEMENT_IMPORT_LIST_REFRESH_KEY = 'settlement-import-list-refresh';
+
+export default {
+  name: 'SettlementImport',
+  data() {
+    return {
+      ArrowDown,
+      ArrowUp,
+      searchVisible: true,
+      searchExpanded: false,
+      loading: false,
+      query: emptyQuery(),
+      rows: [],
+      page: { current: 1, size: 10, total: 0 },
+      batchNoOptions: [],
+      detailVisible: false,
+      detail: {},
+      voidVisible: false,
+      voidLoading: false,
+      voidForm: { id: null, reason: '' },
+      voidRules: {
+        reason: [
+          { required: true, message: '请输入作废原因', trigger: 'blur' },
+          { max: 200, message: '作废原因不能超过200个字', trigger: 'blur' },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo']),
+    isAdmin() {
+      const authority = this.userInfo?.authority || '';
+      return String(authority).includes('admin');
+    },
+    searchFields() {
+      return [
+        {
+          prop: 'batchNo',
+          label: '导入批次号',
+          type: 'select',
+          options: this.batchNoOptions,
+        },
+        {
+          prop: 'settlementType',
+          label: '导入类型',
+          type: 'select',
+          options: SETTLEMENT_TYPE_OPTIONS,
+        },
+        { prop: 'projectName', label: '项目', type: 'input' },
+        { prop: 'customerName', label: '客户', type: 'input' },
+        { prop: 'carrierName', label: '承运商', type: 'input' },
+      ];
+    },
+    visibleSearchFields() {
+      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
+    },
+  },
+  created() {
+    this.loadOptions();
+    this.loadTable();
+  },
+  activated() {
+    this.consumeListRefresh();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === '/settlement/settlement-import' &&
+        from?.path === '/settlement/settlement-import/form'
+      ) {
+        this.consumeListRefresh();
+      }
+    },
+  },
+  methods: {
+    consumeListRefresh() {
+      if (sessionStorage.getItem(SETTLEMENT_IMPORT_LIST_REFRESH_KEY) !== '1') {
+        return;
+      }
+      sessionStorage.removeItem(SETTLEMENT_IMPORT_LIST_REFRESH_KEY);
+      this.page.current = 1;
+      this.loadOptions();
+      this.loadTable();
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission?.[code], false);
+    },
+    settlementTypeLabel(value) {
+      return (
+        SETTLEMENT_TYPE_OPTIONS.find(item => item.value === value)?.label || value || '-'
+      );
+    },
+    settlementBillTypeLabel(value) {
+      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;
+    },
+    async loadOptions() {
+      try {
+        const response = await api.getOptions();
+        const options = this.unwrapData(response) || {};
+        const batchNos = Array.isArray(options.batchNos) ? options.batchNos : [];
+        this.batchNoOptions = [
+          { label: '全部', value: '' },
+          ...batchNos.map(item => {
+            if (typeof item === 'string') {
+              return { label: item, value: item };
+            }
+            const value = item.id ?? item.value ?? item.name ?? item.batchNo ?? '';
+            const label = item.name ?? item.label ?? item.batchNo ?? value;
+            return { label: String(label || ''), value: String(value || '') };
+          }),
+        ];
+      } catch (error) {
+        this.batchNoOptions = [{ label: '全部', value: '' }];
+      }
+    },
+    async loadTable() {
+      this.loading = true;
+      try {
+        const response = await api.getList(this.page.current, this.page.size, {
+          batchNo: this.query.batchNo || undefined,
+          settlementType: this.query.settlementType || undefined,
+          projectName: this.query.projectName || undefined,
+          customerName: this.query.customerName || undefined,
+          carrierName: this.query.carrierName || undefined,
+        });
+        const data = this.unwrapData(response) || {};
+        this.rows = data.records || [];
+        this.page.total = Number(data.total || 0);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleSearch() {
+      this.page.current = 1;
+      this.loadTable();
+    },
+    resetSearch() {
+      this.query = emptyQuery();
+      this.handleSearch();
+    },
+    toggleSearch() {
+      this.searchExpanded = !this.searchExpanded;
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.loadTable();
+    },
+    openCreate() {
+      this.$router.push({ path: '/settlement/settlement-import/form' });
+    },
+    async openDetail(row) {
+      if (!row?.id) return;
+      try {
+        const response = await api.getDetail(row.id);
+        this.detail = this.unwrapData(response) || { ...row };
+      } catch (error) {
+        this.detail = { ...row };
+      }
+      this.detailVisible = true;
+    },
+    editDraft(row) {
+      this.detailVisible = false;
+      this.$router.push({
+        path: '/settlement/settlement-import/form',
+        query: { id: row.id },
+      });
+    },
+    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;
+      this.$nextTick(() => this.$refs.voidFormRef?.clearValidate());
+    },
+    async submitVoid() {
+      await this.$refs.voidFormRef?.validate();
+      this.voidLoading = true;
+      try {
+        await api.voidBatch({
+          id: this.voidForm.id,
+          reason: String(this.voidForm.reason || '').trim(),
+        });
+        this.$message.success('作废成功');
+        this.voidVisible = false;
+        this.loadTable();
+        this.loadOptions();
+      } finally {
+        this.voidLoading = false;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.settlement-import-page__search {
+  padding: 12px 12px 4px;
+  background: #fff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+
+.settlement-import-page__search-grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 8px 24px;
+  align-items: start;
+}
+
+.settlement-import-page__search :deep(.el-form-item) {
+  margin-bottom: 8px;
+}
+
+.settlement-import-page__search :deep(.el-form-item__label) {
+  white-space: nowrap;
+}
+
+.settlement-import-page__search :deep(.el-input),
+.settlement-import-page__search :deep(.el-select) {
+  width: 100%;
+}
+
+.settlement-import-page__search-actions {
+  grid-column: 1 / -1;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 8px;
+}
+
+.settlement-import-page__table-panel {
+  margin-top: 8px;
+  background: #fff;
+}
+
+.settlement-import-page__toolbar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 0 0;
+}
+
+.settlement-import-page__toolbar-left {
+  display: flex;
+  gap: 8px;
+}
+
+.settlement-import-page__table {
+  --el-table-border-color: #eff1f7;
+}
+
+.settlement-import-page__table :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+.settlement-import-page__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+.settlement-import-page__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+  background: #fafafa;
+}
+
+.settlement-import-page__row-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.settlement-import-page__pagination {
+  display: flex;
+  justify-content: flex-end;
+  padding: 12px 0;
+}
+
+.settlement-import-page :deep(.basic-container__card > .el-card__body) {
+  padding: 0;
+}
+
+@media (max-width: 1200px) {
+  .settlement-import-page__search-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (max-width: 760px) {
+  .settlement-import-page__search-grid {
+    grid-template-columns: 1fr;
+  }
+}
+</style>
diff --git a/src/views/vehicle/accident-record.vue b/src/views/vehicle/accident-record.vue
index c62761b..82d4283 100644
--- a/src/views/vehicle/accident-record.vue
+++ b/src/views/vehicle/accident-record.vue
@@ -158,7 +158,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/accident-record';
@@ -550,7 +550,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/credit-score-quantification.vue b/src/views/vehicle/credit-score-quantification.vue
index ec5d126..3a145b2 100644
--- a/src/views/vehicle/credit-score-quantification.vue
+++ b/src/views/vehicle/credit-score-quantification.vue
@@ -468,7 +468,11 @@ import {
   publish,
   changeStatus,
 } from '@/api/vehicle/credit-score-quantification';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import {
+  applyIncomingSearch,
+  normalizeSearchRangeParams,
+  omitInvalidListStatus,
+} from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 import { isAdministrator } from '@/utils/auth';
 
@@ -1324,7 +1328,9 @@ export default {
       });
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return omitInvalidListStatus(
+        normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap)
+      );
     },
   },
 };
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 53156a8..510fa24 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -208,7 +208,7 @@
           v-if="
             hasPermission('customer_archive_sync') &&
             row.approvalStatus === 'approved' &&
-            row.kingdeeStatus === 'failed'
+            !['synced', 'exist'].includes(row.kingdeeStatus)
           "
           @click="handleSyncKingdee(row)"
         >
@@ -1791,6 +1791,8 @@ export default {
       },
       /** 业务字典 mk_template「开启MK」=1 */
       mkEnabled: false,
+      /** 是否已完成 MK 开关加载，避免提交时误判 */
+      _mkEnabledResolved: false,
       formRules: {
         customerCode: [{ max: 20, message: '客商编号最多20个字符', trigger: 'blur' }],
         fullName: [{ required: true, message: '请输入客商名称', trigger: 'blur' }],
@@ -1871,7 +1873,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 320,
+        menuWidth: 400,
         column: [
           {
             label: '客商编号',
@@ -2041,7 +2043,6 @@ export default {
             search: true,
             searchOrder: 6,
             searchValue: '',
-            dataType: 'number',
             minWidth: 100,
             dicData: [
               { label: '全部', value: '' },
@@ -2340,7 +2341,13 @@ export default {
       sessionStorage.setItem(customerArchiveListRefreshKey, '1');
     },
     hasPermission(code) {
-      return this.isAdmin || this.validData(this.permission[code], false);
+      if (this.isAdmin) {
+        return true;
+      }
+      const permission = this.permission || {};
+      const value = permission[code];
+      // 不依赖 Avue validData，避免权限值为 true 以外的真值时被误判
+      return value === true || value === 'true' || value === 1 || value === '1';
     },
     mergeSelectOptions(target, values) {
       const list = Array.isArray(values) ? values : values ? [values] : [];
@@ -3100,12 +3107,15 @@ export default {
       });
     },
     initMkEnabled() {
+      this._mkEnabledResolved = false;
       loadMkEnabled()
         .then(enabled => {
           this.mkEnabled = !!enabled;
+          this._mkEnabledResolved = true;
         })
         .catch(() => {
           this.mkEnabled = false;
+          this._mkEnabledResolved = true;
         });
     },
     initScoreQuantificationOptions() {
@@ -4481,15 +4491,34 @@ export default {
       });
     },
     /**
-     * 列表 / 新增 / 编辑提交共用：开启 MK 时提交审核流，并更新客商审批状态
+     * 列表 / 新增 / 编辑提交共用：
+     * 未开启 MK 时仅走本地提交审批（与新增一致，不请求 MK 流程）；
+     * 开启 MK 时先提交审核流，再更新客商审批状态。
      */
     submitCustomerApproval(id, fullName = '', approvalStatus = '') {
-      return submitMkApprovalFlow({
-        bizType: 'customer-archive',
-        bizId: id,
-        subjectName: fullName,
-        approvalStatus,
-      }).then(() => submitApproval(id));
+      const submitLocal = () => submitApproval(id);
+      const run = enabled => {
+        this.mkEnabled = !!enabled;
+        this._mkEnabledResolved = true;
+        if (!this.mkEnabled) {
+          return submitLocal();
+        }
+        return submitMkApprovalFlow({
+          bizType: 'customer-archive',
+          bizId: id,
+          subjectName: fullName,
+          approvalStatus,
+          mkEnabled: true,
+        }).then(submitLocal);
+      };
+
+      // 与列表按钮一致：以页面 mkEnabled 为准，未开启时不请求 MK
+      if (this._mkEnabledResolved) {
+        return run(this.mkEnabled);
+      }
+      return loadMkEnabled()
+        .then(enabled => run(enabled))
+        .catch(() => run(false));
     },
     openReviewScore() {
       const scores = this.archiveForm.scores || [];
@@ -5194,17 +5223,20 @@ export default {
           this.$message.error('获取审核跳转地址失败');
         });
     },
-    handleApprove(row) {
-      this.$confirm('是否确认审核通过?', '提示', {
+    async handleApprove(row) {
+      await this.$confirm('是否确认审核通过?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => approve(row.id))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({ type: 'success', message: '审核通过!' });
-        });
+      });
+      const res = await approve(row.id);
+      // data=false 表示审核已通过但推送金蝶失败，msg 带具体原因
+      if (res.data.data === false) {
+        this.$message.warning(res.data.msg);
+      } else {
+        this.$message.success(res.data.msg || '审核通过!');
+      }
+      this.onLoad(this.page);
     },
     async handleSyncKingdee(row) {
       if (this.kingdeeSyncingId) return;
@@ -5264,19 +5296,9 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      // 搜索区所属组织级联返回的是 ID 路径数组，取末级 ID 转成部门名称传给后端（与列表接口 deptName 字段一致）
-      if (Array.isArray(params.deptName)) {
-        const path = params.deptName.filter(
-          item => item !== undefined && item !== null && item !== ''
-        );
-        const deptId = path.length ? path[path.length - 1] : '';
-        params.deptName = deptId
-          ? this.deptOptions.find(item => String(item.value) === String(deptId))?.rawLabel || ''
-          : '';
-      }
       this.query = this.buildQuery(params);
       this.page.currentPage = 1;
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
       done();
     },
     selectionChange(list) {
@@ -5337,7 +5359,38 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      // 新条件覆盖旧条件；本次显式清空的字段必须从查询里去掉，避免第二次搜索仍带着上一次的客商名称。
+      const merged = { ...this.query, ...params };
+      Object.keys(params).forEach(key => {
+        const value = params[key];
+        if (
+          value === '' ||
+          value === null ||
+          value === undefined ||
+          (Array.isArray(value) && value.length === 0)
+        ) {
+          delete merged[key];
+        }
+      });
+      if (Array.isArray(merged.deptName)) {
+        const path = merged.deptName.filter(
+          item => item !== undefined && item !== null && item !== ''
+        );
+        const deptId = path.length ? path[path.length - 1] : '';
+        merged.deptName = deptId
+          ? this.deptOptions.find(item => String(item.value) === String(deptId))?.rawLabel || ''
+          : '';
+        if (!merged.deptName) {
+          delete merged.deptName;
+        }
+      }
+      const values = normalizeSearchRangeParams(merged, createTimeRangeMap);
+      // 状态下拉「全部」会被数字类型转成 0/-1，二次搜索会把列表滤空。
+      const status = values.status;
+      if (status === 0 || status === '0' || status === -1 || status === '-1') {
+        delete values.status;
+      }
+      return values;
     },
   },
 };
diff --git a/src/views/vehicle/insurance-record.vue b/src/views/vehicle/insurance-record.vue
index 5a6f1cc..ac574be 100644
--- a/src/views/vehicle/insurance-record.vue
+++ b/src/views/vehicle/insurance-record.vue
@@ -220,7 +220,7 @@ import { downloadXls } from '@/utils/util';
 import { handleImportExcel } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 import { ElLoading } from 'element-plus';
 import { excelOption, exportColumns, option } from '@/option/vehicle/insurance-record';
@@ -409,7 +409,7 @@ export default {
         : integerPart;
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     validateRow(row) {
       if (row.startDate && row.endDate && row.endDate < row.startDate) {
diff --git a/src/views/vehicle/maintenance-plan.vue b/src/views/vehicle/maintenance-plan.vue
index 2612cd1..89f4bf1 100644
--- a/src/views/vehicle/maintenance-plan.vue
+++ b/src/views/vehicle/maintenance-plan.vue
@@ -195,7 +195,7 @@ import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -903,7 +903,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/maintenance-record.vue b/src/views/vehicle/maintenance-record.vue
index 05feed6..886c483 100644
--- a/src/views/vehicle/maintenance-record.vue
+++ b/src/views/vehicle/maintenance-record.vue
@@ -168,7 +168,7 @@ import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -831,7 +831,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/mileage-record.vue b/src/views/vehicle/mileage-record.vue
index 0c9c5c4..a443be6 100644
--- a/src/views/vehicle/mileage-record.vue
+++ b/src/views/vehicle/mileage-record.vue
@@ -210,7 +210,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/mileage-record';
@@ -607,7 +607,7 @@ export default {
     },
     buildQuery(params = {}) {
       return normalizeSearchRangeParams(
-        { ...params, ...this.query, vehicleType: '车辆' },
+        { ...applyIncomingSearch(this.query, params), vehicleType: '车辆' },
         createTimeRangeMap
       );
     },
diff --git a/src/views/vehicle/tire-replacement-record.vue b/src/views/vehicle/tire-replacement-record.vue
index 08fea1a..f5b457f 100644
--- a/src/views/vehicle/tire-replacement-record.vue
+++ b/src/views/vehicle/tire-replacement-record.vue
@@ -155,7 +155,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/tire-replacement-record';
@@ -500,7 +500,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/transport-change-record.vue b/src/views/vehicle/transport-change-record.vue
index 202bd0e..28839c3 100644
--- a/src/views/vehicle/transport-change-record.vue
+++ b/src/views/vehicle/transport-change-record.vue
@@ -130,7 +130,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/transport-change-record';
@@ -478,7 +478,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/violation-record.vue b/src/views/vehicle/violation-record.vue
index 0ee312d..79a4eef 100644
--- a/src/views/vehicle/violation-record.vue
+++ b/src/views/vehicle/violation-record.vue
@@ -197,7 +197,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -673,7 +673,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/vite.config.mjs b/vite.config.mjs
index b59a8be..3e0426e 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -49,28 +49,28 @@ export default ({ mode, command }) => {
       __VUE_I18N_LEGACY_API__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
     },
-     server: {
-       port: 2888,
-       proxy: {
-         '/api': {
-           // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
-           // 注意：本机 8080 一般是 Nacos，不是业务网关
-           target: 'http://localhost',
-           // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
-           changeOrigin: true,
-           rewrite: path => path.replace(/^\/api/, ''),
-         },
-       },
-     },
-    //server: {
-    //  port: 2889,
-    //  proxy: {
-    //    '/api': {
-    //      target: 'http://172.16.203.221:8000',
-    //      changeOrigin: true,
-    //    },
-    //  },
-    //},
+    server: {
+      port: 2888,
+      proxy: {
+        '/api': {
+          // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
+          // 注意：本机 8080 一般是 Nacos，不是业务网关
+          target: 'http://localhost',
+          // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
+          changeOrigin: true,
+          rewrite: path => path.replace(/^\/api/, ''),
+        },
+      },
+    },
+    // server: {
+    //   port: 2889,
+    //   proxy: {
+    //     '/api': {
+    //       target: 'http://172.16.203.228:8000',
+    //       changeOrigin: true,
+    //     },
+    //   },
+    // },
     resolve: {
       alias: {
         '~': resolve(__dirname, './'),