🐛 运输计划调度确认生成不再强制司机与手机号

司机与手机号对全部承运类型（承运商/自运/平台）均为选填，仅校验已填内容的格式与长度。
🔀 合并主干 master 到 dev
2026-11-07 04:29:43 +08:00 · 2026-11-07 02:16:20 +08:00 · 2026-11-06 14:57:30 +08:00 · 2026-11-06 09:36:51 +08:00 · 2026-11-06 09:32:50 +08:00 · 2026-11-06 09:32:36 +08:00
35 changed files with 1685 additions and 416 deletions
@@ -95,3 +95,5 @@ export const exportImportFailures = data =>
  });
 export const confirmImport = data =>
  request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });
+export const checkImportDuplicates = data =>
+  request({ url: `${baseUrl}/import-batch/duplicates`, method: 'post', data, timeout: 120000 });
@@ -91,3 +91,14 @@ export const recognizeBaiduOcr = (imageUrl, type, side = '') => {
    },
  });
 };
+
+export const recognizeQualificationCertificateOcr = imageUrl => {
+  return request({
+    url: '/blade-transport/baidu-ocr/qualification-certificate',
+    method: 'post',
+    timeout: 60000,
+    params: {
+      imageUrl,
+    },
+  });
+};
@@ -152,6 +152,34 @@ export const getScoreTemplate = quantificationId => {
  });
 };

+/** 线下评分 Excel 模板下载 */
+export const downloadScoreExcelTemplate = quantificationId => {
+  return request({
+    url: '/blade-transport/customer-archive/score-excel-template',
+    method: 'get',
+    responseType: 'blob',
+    params: {
+      quantificationId,
+    },
+  });
+};
+
+/** 线下评分 Excel 导入（成功返回评分明细 JSON；失败返回失败明细 Excel 流） */
+export const importScoreExcel = (quantificationId, file) => {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request({
+    url: '/blade-transport/customer-archive/score-import',
+    method: 'post',
+    data: formData,
+    responseType: 'blob',
+    timeout: 60000,
+    params: {
+      quantificationId,
+    },
+  });
+};
+
 export const queryKingdeeCustomer = creditCode => {
  return request({
    url: '/blade-transport/bfi/customer/query-by-credit-code',
@@ -1,4 +1,4 @@
-import { getDeptTree } from '@/api/system/dept';
+import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
 import { ElCascader } from 'element-plus';
 import { h } from 'vue';

@@ -14,6 +14,10 @@ import { h } from 'vue';
 *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
 *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
 *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
+ *   5. 表单「所属组织」只允许选平台公司的页面（运力管理）在 data 里置
+ *      restrictFormOrgToPlatformCompany: true，表单级联样式改用
+ *      buildFormOrganizationTree(...) 的结果，并在打开表单时把回显的组织名写进
+ *      formOrganizationLegacyName；只影响表单，搜索栏仍是全量组织
 *
 * 说明：
 *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -34,6 +38,11 @@ const ORG_PROPS = ['organizationName', 'deptName'];
 // 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
 const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';

+// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到
+// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、
+// 保存即把原值丢掉。
+const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
+
 export default {
  data() {
    return {
@@ -44,6 +53,14 @@ export default {
      organizationLoading: false,
      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
      enableUnassignedOrgFilter: false,
+      // 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效
+      restrictFormOrgToPlatformCompany: false,
+      // 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取
+      platformCompanyOrgIds: [],
+      // 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项
+      formOrganizationLegacyName: '',
+      // 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重）
+      organizationOptionsPromise: null,
    };
  },
  computed: {
@@ -54,9 +71,12 @@ export default {
        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
        : this.organizationTreeOptions;
    },
-    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
+    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。
+    // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
+    // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
+    // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
    organizationCascaderProps() {
-      return {
+      const props = {
        value: 'id',
        label: 'label',
        children: 'children',
@@ -64,15 +84,25 @@ export default {
        checkStrictly: true,
        expandTrigger: 'click',
      };
+      if (this.restrictFormOrgToPlatformCompany) {
+        props.disabled = data => this.platformCompanyOrgDisabled(data);
+      }
+      return props;
    },
  },
  methods: {
    loadOrganizationOptions() {
-      if (this.organizationLoading) return;
+      // 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve
+      if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
      this.organizationLoading = true;
      const tenantId = this.userInfo?.tenantId;
-      getDeptTree(tenantId)
-        .then(res => {
+      // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
+      const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
+        ? getPlatformCompanySelect().catch(() => null)
+        : Promise.resolve(null);
+      this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
+        .then(([res, platformRes]) => {
+          this.applyPlatformCompanyOptions(platformRes);
          const source = res.data?.data || res.data || [];
          const tree = this.excludeExternalOrganization
            ? this.excludeExternalOrganization(source)
@@ -90,7 +120,21 @@ export default {
        })
        .finally(() => {
          this.organizationLoading = false;
+          this.organizationOptionsPromise = null;
        });
+      return this.organizationOptionsPromise;
+    },
+    // 组织树与平台公司列表就绪后执行回调；已加载过则立即执行
+    whenOrganizationOptionsReady(callback) {
+      const pending = this.organizationTreeFlatOptions.length
+        ? Promise.resolve()
+        : this.loadOrganizationOptions();
+      return Promise.resolve(pending).then(callback, () => callback());
+    },
+    applyPlatformCompanyOptions(res) {
+      if (!res) return;
+      const list = res.data?.data || res.data || [];
+      this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id));
    },
    // 默认排除「外部组织」节点；页面可覆盖
    excludeExternalOrganization(tree = []) {
@@ -143,7 +187,9 @@ export default {
      for (const node of tree || []) {
        const path = [...parents, String(node.id)];
        if (String(node.id) === String(target)) return path;
-        const matched = this.findOrgPath(target, node.children, path);
+        // 必须显式传 node.children || []：叶节点的 children 是 undefined，
+        // 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
+        const matched = this.findOrgPath(target, node.children || [], path);
        if (matched) return matched;
      }
      return null;
@@ -152,6 +198,52 @@ export default {
    findOrgName(id) {
      return this.findOrgById(id)?.rawLabel || '';
    },
+    // 级联节点的 disabled 判定：只有平台公司可选。页面自建 props 时也复用它
+    platformCompanyOrgDisabled(data) {
+      return !this.platformCompanyOrgIds.includes(String(data?.id ?? ''));
+    },
+    // 组织名对应的节点是否为平台公司；名称在树里不存在时按「不是」处理
+    isPlatformCompanyOrgName(name) {
+      const value = String(name ?? '').trim();
+      if (!value) return false;
+      const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
+      return !!node && this.platformCompanyOrgIds.includes(String(node.id));
+    },
+    // 新增表单的默认组织：只有落在平台公司上才预填，否则留空（不能让用户从默认值
+    // 直接带出一个选不中的组织名）
+    defaultFormOrganizationName(name) {
+      return this.isPlatformCompanyOrgName(name) ? String(name).trim() : '';
+    },
+    // 表单级联的选项树：限定平台公司时，把回显的原组织名补成一个只读节点，
+    // 否则存量记录的组织在树里找不到，编辑时显示为空、保存即丢原值
+    buildFormOrganizationTree(tree = this.organizationTreeOptions) {
+      const source = tree || [];
+      if (!this.restrictFormOrgToPlatformCompany) return source;
+      const name = String(this.formOrganizationLegacyName || '').trim();
+      if (!name) return source;
+      if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source;
+      return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }];
+    },
+    // 表单级联回显用的路径：树里有该组织就用真实路径，否则落到原组织兜底节点
+    resolveFormOrgPath(name) {
+      const path = this.resolveOrgPath(name);
+      if (path.length) return path;
+      const value = String(name ?? '').trim();
+      if (!value) return [];
+      return value === String(this.formOrganizationLegacyName || '').trim()
+        ? [FORM_LEGACY_ORG_ID]
+        : [];
+    },
+    // 记录表单当前回显的组织名：能匹配真实节点（或已清空）就不需要兜底节点，
+    // 否则记下来，由 buildFormOrganizationTree 补成只读选项
+    syncFormOrganizationLegacy(name) {
+      const value = String(name ?? '').trim();
+      if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) {
+        this.formOrganizationLegacyName = '';
+        return;
+      }
+      this.formOrganizationLegacyName = value;
+    },
    // 组织名称 → 级联路径（表单回显用；部门树异步加载完成后会自动重算）
    resolveOrgPath(name) {
      const value = String(name ?? '').trim();
@@ -164,7 +256,13 @@ export default {
      const value = Array.isArray(path)
        ? path.filter(item => item !== undefined && item !== null && item !== '')
        : [];
-      return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
+      if (!value.length) return '';
+      const node = this.findOrgById(value);
+      if (node) return node.rawLabel || '';
+      // 原组织兜底节点不在扁平表里，直接取它代表的历史名称
+      return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID
+        ? String(this.formOrganizationLegacyName || '').trim()
+        : '';
    },
    // 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤）
    normalizeOrganizationSearch(params, prop = 'organizationName') {
@@ -253,16 +253,18 @@ export const option = createCrudOption([
    label: '客商',
    prop: 'partyName',
    search: true,
-    searchOrder: 11,
-    searchPlaceholder: '请输入',
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
    hide: true,
    display: false,
+    addDisplay: false,
+    editDisplay: false,
  },
  {
    label: '合同编号',
    prop: 'contractNo',
    search: true,
-    searchOrder: 6,
+    searchOrder: 8,
    searchPlaceholder: '请输入',
    order: 185,
    maxlength: 100,
@@ -287,7 +289,7 @@ export const option = createCrudOption([
    label: '所属项目',
    prop: 'projectName',
    search: true,
-    searchOrder: 8,
+    searchOrder: 11,
    searchType: 'select',
    searchPlaceholder: '请选择',
    formslot: true,
@@ -334,7 +336,7 @@ export const option = createCrudOption([
    prop: 'contractCategory',
    type: 'select',
    search: true,
-    searchOrder: 9,
+    searchOrder: 12,
    searchPlaceholder: '请选择',
    order: 170,
    dicData: contractCategoryOptions,
@@ -346,7 +348,7 @@ export const option = createCrudOption([
    prop: 'signType',
    type: 'select',
    search: true,
-    searchOrder: 10,
+    searchOrder: 13,
    searchPlaceholder: '请选择',
    span: 8,
    order: 190,
@@ -359,7 +361,7 @@ export const option = createCrudOption([
    prop: 'effectiveType',
    type: 'select',
    search: true,
-    searchOrder: 5,
+    searchOrder: 6,
    searchPlaceholder: '请选择',
    dicData: effectiveTypeOptions,
    hide: true,
@@ -630,7 +632,7 @@ export const option = createCrudOption([
    prop: 'hcsSyncStatus',
    type: 'select',
    search: true,
-    searchOrder: 6,
+    searchOrder: 7,
    searchPlaceholder: '请选择',
    slot: true,
    dicData: hcsSyncStatusOptions,
@@ -660,7 +662,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -672,7 +674,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
  const text = Object.entries(groups)
    .map(([unit, group]) => {
      const quantity = formatGoodsQuantity(group.quantity);
-      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
+      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
    })
    .join('； ');

@@ -207,6 +208,9 @@ export const config = {
  transportPlanImportTitle: '导入运输计划',
  transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
  attachmentTitle: '附件',
+  defaultForm: {
+    transportType: 'road',
+  },
  searchRangeMap: {
    planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
@@ -118,7 +118,7 @@ export const formalSettlementOption = (settlementType = '') => ({
  emptyBtnText: '重置',
  searchShow: true,
  searchIcon: true,
-  searchLabelWidth: 88,
+  searchLabelWidth: 100,
  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
  searchMenuSpan: 4,
  searchIndex: 4,
@@ -8,8 +8,20 @@ export const preSettlementFormFields = [
  { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
  { label: '合同编号', prop: 'contractNo', readonly: true },
  { label: '项目名称', prop: 'projectName', readonly: true },
-  { label: '收款方', prop: 'payeeName', readonly: true },
-  { label: '付款方', prop: 'payerName', readonly: true },
+  {
+    label: '收款方',
+    prop: 'payeeName',
+    type: 'select',
+    optionsKey: 'payeeOptions',
+    required: true,
+  },
+  {
+    label: '付款方',
+    prop: 'payerName',
+    type: 'select',
+    optionsKey: 'payerOptions',
+    required: true,
+  },
  { label: '结算类型', prop: 'settlementType', readonly: true },
  { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
  { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
@@ -24,6 +36,8 @@ export const preSettlementFormFields = [

 export const preSettlementFormRules = {
  contractId: [{ required: true, message: '请选择合同名称', trigger: 'change' }],
+  payeeName: [{ required: true, message: '请选择收款方', trigger: 'change' }],
+  payerName: [{ required: true, message: '请选择付款方', trigger: 'change' }],
  exchangeRateDate: [
    {
      validator: (_rule, value, callback, source) => {
@@ -129,7 +129,39 @@ export default [
        name: '新增编辑结算单',
        meta: {
          keepAlive: false,
-          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          // 付款结算单表单入口，高亮付款结算单菜单
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 收款结算单表单入口：与付款结算单共用表单组件，仅高亮菜单不同
+    path: '/settlement/receipt-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑收款结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/receipt-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 付款结算单表单入口：与 settlementListPath('payable') + '/form' 对应
+    path: '/settlement/payment-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑付款结算单',
+        meta: {
+          keepAlive: false,
          activeMenu: '/settlement/payment-settlement',
        },
        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
@@ -6,6 +6,7 @@
      :data="data"
      ref="crud"
      v-model="form"
+      v-model:page="page"
      :permission="permissionList"
      :before-open="beforeOpen"
      @row-del="rowDel"
@@ -729,7 +730,9 @@ export default {
    onLoad(page, params = {}) {
      this.loading = true;
      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        this.data = res.data.data;
+        const data = res.data.data || {};
+        this.data = data.records || [];
+        this.page.total = data.total || 0;
        this.loading = false;
        this.selectionClear();
      });
@@ -1861,7 +1861,7 @@
                />
              </el-select>
            </el-form-item>
-            <el-form-item label="司机" required>
+            <el-form-item label="司机">
              <el-autocomplete
                v-model="dispatchItemForm.driverName"
                placeholder="请输入"
@@ -1878,7 +1878,6 @@
            </el-form-item>
            <el-form-item
              :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
-              required
            >
              <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
            </el-form-item>
@@ -2104,7 +2103,7 @@
              />
            </el-select>
          </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
+          <el-form-item v-if="dispatchIsRoadTransport" label="司机">
            <el-autocomplete
              v-model="dispatchItemForm.driverName"
              placeholder="请输入"
@@ -2115,7 +2114,7 @@
              @select="item => handleTaskDriverSelect('dispatch', item)"
            />
          </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
+          <el-form-item v-if="dispatchIsRoadTransport" label="手机号">
            <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
          </el-form-item>
          <el-form-item
@@ -3949,9 +3948,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatDispatchQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -7549,12 +7548,13 @@ export default {
      }, {});

      const cargoInfo = Object.values(groups)
-        .map(
-          group =>
-            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
-              group.quantity
-            )}${group.unit ? ` ${group.unit}` : ''}`
-        )
+        .map(group => {
+          const typeName =
+            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
+          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
+        })
        .join('； ');
      return cargoInfo || plan.goodsInfo || '';
    },
@@ -8364,19 +8364,7 @@ export default {
      }
      const fullEntry = row.taskEntryMode === 'full';
      const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
-      if (fullEntry) {
-        // 公路运输时司机/手机号一律必填（含承运类型为承运商）
-        if (roadTransport && row.carrierType) {
-          requiredFields.push(['driverName', '司机']);
-          requiredFields.push(['driverPhone', '手机号']);
-        }
-      } else if (row.carrierType) {
-        requiredFields.push(['driverName', '司机']);
-        requiredFields.push([
-          'driverPhone',
-          row.carrierType === '承运商' ? '手机号' : '司机手机号',
-        ]);
-      }
+      // 司机与手机号对全部承运类型（承运商 / 自运 / 平台）都是选填，填了才校验格式与长度
      const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
      if (emptyField) return requiredMessage(emptyField[1]);

@@ -484,20 +484,24 @@
      </div>
      <el-tabs v-model="previewTab"
        ><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane
-          :label="`疑似重复（${duplicateRows.length}）`"
-          name="duplicate" /></el-tabs
+          :label="`Excel内重复（${duplicateRows.length}）`"
+          name="duplicate" /><el-tab-pane
+          :label="`与已有运单重复（${historyDuplicateRows.length}）`"
+          name="history" /></el-tabs
      ><el-table
        :data="previewRows"
        border
        max-height="440"
-        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
+        :row-class-name="
+          ({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
+        "
        @selection-change="rowSelection = $event"
        ><el-table-column type="selection" width="55" /><el-table-column
          type="index"
          label="序号"
          width="65"
        /><el-table-column
-          v-for="column in detailColumns"
+          v-for="column in previewColumns"
          :key="column.prop"
          :prop="column.prop"
          :label="column.label"
@@ -583,8 +587,6 @@
                ><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
@@ -716,9 +718,12 @@ const transportTypeOptions = ref([]),
 const rowSelection = ref([]),
  previewTab = ref('all');
 const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
-const previewRows = computed(() =>
-  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
-);
+const historyDuplicateRows = computed(() => rows.value.filter(row => row._historyWaybillNo));
+const previewRows = computed(() => {
+  if (previewTab.value === 'duplicate') return duplicateRows.value;
+  if (previewTab.value === 'history') return historyDuplicateRows.value;
+  return rows.value;
+});
 const carrierContractsLoaded = ref(false),
  hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
@@ -795,6 +800,16 @@ const detailColumns = [
  { prop: 'remark', label: '备注', editor: 'textarea', minWidth: 200 },
  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
+// 与已有运单重复页签的列与明细一致，只在运单批次号后多一列已有运单号。
+const previewColumns = computed(() =>
+  previewTab.value === 'history'
+    ? [
+        detailColumns[0],
+        { prop: '_historyWaybillNo', label: '已有运单号', minWidth: 220 },
+        ...detailColumns.slice(1),
+      ]
+    : detailColumns
+);
 const requiredDetailFields = [
  { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
  { prop: 'transportType', label: '运输方式' },
@@ -1187,6 +1202,7 @@ const loadBatchRows = async batchId => {
    batchNo: item.batchNo || form.batchNo,
  }));
  refreshDuplicateFlags();
+  await refreshHistoryDuplicates();
  rowSelection.value = [];
  previewTab.value = 'all';
 };
@@ -1509,6 +1525,8 @@ const fileChange = async (file, list) => {
  if (isValid) {
    // 校验通过，填充表格数据
    rows.value = parsedRows;
+    // 传 rows.value（响应式代理），否则后续写入不触发重新渲染
+    await refreshHistoryDuplicates(rows.value);
  } else {
    // 校验失败，清空数据
    rows.value = [];
@@ -1526,16 +1544,12 @@ const IMPORT_BATCH_SIZE = 100;

 const importFieldText = value => String(value ?? '').trim();

-/** 同一运单批次号下，全部导入字段一致时标记为疑似重复。已在线确认的行不再标为重复。 */
+/** 同一运单批次号下，全部导入字段一致时标记为 Excel 内重复。 */
 const refreshDuplicateFlags = (list = rows.value) => {
  const groups = new Map();
  list.forEach(row => {
    const signature = detailColumns.map(column => importFieldText(row[column.prop])).join('\u0001');
    const batchNo = importFieldText(row.batchNo || form.batchNo);
-    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
-      row._duplicateConfirmed = false;
-    }
-    row._duplicateSignature = signature;
    const groupKey = `${batchNo}\u0002${signature}`;
    const group = groups.get(groupKey) || [];
    group.push(row);
@@ -1544,19 +1558,39 @@ const refreshDuplicateFlags = (list = rows.value) => {
  groups.forEach(group => {
    const duplicated = group.length > 1;
    group.forEach(row => {
-      row._duplicate = duplicated && !row._duplicateConfirmed;
+      row._duplicate = duplicated;
    });
  });
 };

-const confirmDuplicateRow = row => {
-  row._duplicateConfirmed = true;
-  refreshDuplicateFlags();
-  ElMessage.success('已确认，该行将按正常数据导入');
+/** 逐行提交给后端与项目下已有运单比对，命中的行带上已有运单号。比对失败不影响导入。 */
+const refreshHistoryDuplicates = async (list = rows.value) => {
+  if (!list.length || !form.projectId) {
+    list.forEach(row => {
+      row._historyWaybillNo = '';
+    });
+    return;
+  }
+  let duplicates = [];
+  try {
+    const res = await api.checkImportDuplicates(buildImportPayload(form.status, list));
+    const data = res?.data?.data ?? res?.data ?? res;
+    duplicates = Array.isArray(data) ? data : [];
+  } catch (error) {
+    console.error('与已有运单重复校验失败:', error);
+    duplicates = [];
+  }
+  const numbersByRow = new Map(
+    duplicates.map(item => [item.rowIndex, (item.waybillNos || []).filter(Boolean)])
+  );
+  list.forEach((row, index) => {
+    row._historyWaybillNo = (numbersByRow.get(index) || []).join('、');
+  });
 };

 const stripInternalRowFields = row => {
-  const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
+  const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, _historyWaybillNo, ...data } =
+    row;
  return data;
 };

@@ -1771,6 +1805,7 @@ const saveRow = row => {
  row._editing = false;
  delete row._editSnapshot;
  refreshDuplicateFlags();
+  refreshHistoryDuplicates();
 };
 const cancelRow = row => {
  if (row._editSnapshot) Object.assign(row, row._editSnapshot);
@@ -1780,12 +1815,14 @@ const cancelRow = row => {
 const deleteRow = row => {
  rows.value = rows.value.filter(item => item !== row);
  refreshDuplicateFlags();
+  refreshHistoryDuplicates();
 };
 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();
+  refreshHistoryDuplicates();
 };
 const normalizeOptionalPlanId = value => {
  if (value === undefined || value === null || value === '') return null;
@@ -1849,7 +1886,11 @@ const confirmImport = async () => {
  await formRef.value?.validate();
  if (!validateImportRows()) return;
  const count = rows.value.filter(row => row._duplicate).length;
-  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
+  if (count)
+    await ElMessageBox.confirm(`当前导入有${count}条Excel内重复数据，是否确认导入？`, '提示');
+  const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
+  if (historyCount)
+    await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
  if (form.importType === 'settlement' && form.status === 'completed')
    await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');

@@ -1337,7 +1337,7 @@
              <el-form-item label="规格">
                <el-input
                  v-model="form.specification"
-                  placeholder="选择货物自动回填"
+                  placeholder="请填写规格"
                  clearable
                  :disabled="dialogReadonly"
                />
@@ -1345,7 +1345,7 @@
              <el-form-item label="型号">
                <el-input
                  v-model="form.model"
-                  placeholder="选择货物自动回填"
+                  placeholder="请填写型号"
                  clearable
                  :disabled="dialogReadonly"
                />
@@ -5018,9 +5018,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
+          const typeName =
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
        })
        .join('； ');
    },
@@ -8453,7 +8453,6 @@ export default {
      }
      if (!this.isTaskFullMode) {
        requiredFields.push(['cargoName', '货物名称']);
-        requiredFields.push(['model', '型号']);
        requiredFields.push(['quantity', '数量']);
      }
      const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
@@ -3084,7 +3084,7 @@ export default {
          const message =
            error?.response?.data?.msg ||
            error?.message ||
-            '部门合同前缀未配置，无法自动生成，请手动输入合同编号';
+            '业务部门配置中未维护该平台公司与业务部门的合同编码前缀，无法自动生成，请先在业务部门配置中维护或手动输入合同编号';
          this.$message.warning(message);
        });
    },
@@ -2545,9 +2545,9 @@ export default {
        Object.values(groups)
          .map(group => {
            const quantity = this.formatGoodsQuantity(group.quantity);
-            return `${group.typeName}等${group.count}种货物 | ${quantity}${
-              group.unit ? ` ${group.unit}` : ''
-            }`;
+            const typeName =
+              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
          })
          .join('； ') || '-'
      );
@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
  },
 ];

+// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
+// 到场没有货量开关，不能拿它顶替货量采集
+const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
+const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
+const CARGO_NODE_KEYS = ['load', 'dispatch'];
+
 export default {
  data() {
    return {
@@ -916,8 +922,24 @@ export default {
        this.$message.warning('备注不能超过500个字符');
        return false;
      }
-      if (!this.enabledNodes.length) {
-        this.$message.warning('请至少选择一个过程节点');
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
        return false;
      }
      const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -577,7 +577,7 @@ export default {
          this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
          return;
        }
-        // 司机是否必填由调度明细弹窗按承运类型判定（承运商承运时司机选填），此处不再重复校验
+        // 司机与手机号对全部承运类型都是选填，由调度明细弹窗校验已填部分的格式，此处不重复校验
        if (!row.vehicleNo) {
          this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
          return;
@@ -389,6 +389,18 @@
              v-model="batchQuery.batchNo"
              clearable
              placeholder="请输入" /></el-form-item></el-col
+        ><el-col :span="12"
+          ><el-form-item label="项目"
+            ><el-select
+              v-model="batchQuery.projectId"
+              filterable
+              clearable
+              placeholder="请选择"
+              ><el-option
+                v-for="item in projectOptions"
+                :key="item.id"
+                :label="item.projectName"
+                :value="item.id" /></el-select></el-form-item></el-col
        ><el-col :span="12"
          ><el-form-item label="创建日期"
            ><el-date-picker
@@ -428,6 +440,10 @@
        prop="batchNo"
        label="运单批次号"
        min-width="240" /><el-table-column
+        prop="projectName"
+        label="项目"
+        min-width="180"
+        show-overflow-tooltip /><el-table-column
        prop="createTime"
        label="创建时间"
        min-width="180" /><el-table-column label="运单数" width="120"
@@ -694,7 +710,12 @@ const selectedBatches = ref([]),
  batchRows = ref([]),
  batchSelection = ref([]),
  batchCreateRange = ref([]);
-const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
+const batchQuery = reactive({
+  batchNo: '',
+  projectId: '',
+  createUser: '',
+  waybillCount: undefined,
+});
 const batchPage = reactive({ current: 1, size: 10, total: 0 });
 const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
 const progressPage = reactive({ current: 1, size: 10, total: 0 });
@@ -1023,7 +1044,12 @@ const openBatchDialog = async row => {
  batchDialogMode.value = voucher?.id ? 'change' : 'upload';
  batchTarget.value = voucher?.id ? voucher : undefined;
  batchSelection.value = [];
+  // 弹窗内的搜索条件是模块级状态，不重置就会带着上一次的筛选条件打开。
+  resetBatchSearch();
+  batchRows.value = [];
+  batchPage.total = 0;
  batchVisible.value = true;
+  if (!projectOptions.value.length) await loadProjects();
  await loadBatches();
  if (voucher?.waybillBatchNo) {
    const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
@@ -1033,6 +1059,7 @@ const openBatchDialog = async row => {
 const loadBatches = async () => {
  const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
    batchNo: batchQuery.batchNo,
+    projectId: batchQuery.projectId,
    createUser: batchQuery.createUser,
    waybillCount: batchQuery.waybillCount,
    createTimeStart: batchCreateRange.value?.[0] ? `${batchCreateRange.value[0]} 00:00:00` : '',
@@ -1053,10 +1080,18 @@ const handleWaybillCountInput = value => {
    batchQuery.waybillCount = filtered.replace(/^0+/, '');
  }
 };
-const resetBatchQuery = () => {
-  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
+const resetBatchSearch = () => {
+  Object.assign(batchQuery, {
+    batchNo: '',
+    projectId: '',
+    createUser: '',
+    waybillCount: undefined,
+  });
  batchCreateRange.value = [];
  batchPage.current = 1;
+};
+const resetBatchQuery = () => {
+  resetBatchSearch();
  loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {
@@ -494,6 +494,9 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

+// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+
 let localId = 0;
 const emptyLine = () => ({
  localId: ++localId,
@@ -1227,6 +1230,7 @@ export default {
        mkEnabled: await loadMkEnabled().catch(() => false),
      });
      this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceApplicationListRefreshKey, '1');
      this.goBack();
    },
    async syncReferenceData() {
@@ -250,6 +250,11 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { kingdeeStatusType } from '@/utils/kingdee';
+import { settlementListPath } from '@/utils/settlement-menu';
+
+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+const invoiceApplicationListRoute = '/payment/invoice-application';

 const emptyQuery = () => ({
  applicationNo: '',
@@ -308,7 +313,28 @@ export default {
        this.mkEnabled = false;
      });
  },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceApplicationListRoute &&
+        from?.path?.includes('/invoice-application/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
  methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceApplicationListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceApplicationListRefreshKey);
+      this.loadTable();
+    },
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -372,12 +398,18 @@ export default {
          item => String(item.formalSettlementNo || '').trim() === normalizedNo
        );
        if (!row?.id) {
-          this.$message.warning('未找到对应的付款结算单');
+          this.$message.warning('未找到对应的结算单');
          return;
        }
+        // 开票申请关联的多为收款结算单，按单据类型路由到对应表单入口，避免误落付款结算单
        this.$router.push({
-          path: '/settlement/formal-settlement/form',
-          query: { mode: 'view', id: row.id, name: '查看正式结算' },
+          path: settlementListPath(row.settlementType) + '/form',
+          query: {
+            mode: 'view',
+            id: row.id,
+            settlementType: row.settlementType,
+            name: '查看正式结算',
+          },
        });
      } catch (error) {
        this.$message.error('正式结算单详情加载失败');
@@ -100,18 +100,28 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
-            <el-form-item label="结算组织" prop="deptId">
-              <el-cascader
-                v-if="!readonly"
-                :model-value="deptCascaderValue"
-                :options="deptTreeOptions"
-                :props="deptCascaderProps"
-                placeholder="请选择结算组织（合同承办部门）"
-                filterable
-                clearable
-                @change="handleDeptChange"
-              />
-              <el-input v-else :model-value="form.deptName" disabled />
+            <el-form-item label="所属合同" prop="contractNo">
+              <el-tooltip
+                :content="form.contractName"
+                :disabled="!form.contractName"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input :model-value="form.contractNo" readonly placeholder="请选择承运商合同">
+                    <template v-if="!readonly" #append>
+                      <el-tooltip content="选择承运商合同" placement="top">
+                        <el-button :icon="Search" @click="openContractDialog" />
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </div>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承办部门">
+              <el-input :model-value="form.deptName" disabled placeholder="从所属合同带出" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -214,6 +224,48 @@
      :query-api="apiQueryInvoicePool"
      @confirm="handleInvoicePicked"
    />
+
+    <el-dialog v-model="contractDialog.visible" title="选择承运商合同" width="920px" append-to-body>
+      <el-form :model="contractDialog.query" label-position="right" label-width="auto" inline @submit.prevent>
+        <el-form-item label="合同编号">
+          <el-input
+            v-model="contractDialog.query.contractNo"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input
+            v-model="contractDialog.query.contractName"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :icon="Search" @click="searchContracts">查询</el-button>
+          <el-button @click="resetContractQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="contractDialog.loading" :data="contractDialog.rows" border>
+        <el-table-column prop="contractNo" label="合同编号" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="contractName" label="合同名称" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="organizationName" label="承办部门" min-width="160" show-overflow-tooltip />
+        <el-table-column label="操作" width="80" align="center">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="pickContract(row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        v-model:current-page="contractDialog.page.current"
+        v-model:page-size="contractDialog.page.size"
+        :total="contractDialog.page.total"
+        layout="total, prev, pager, next"
+        @current-change="loadContracts"
+      />
+    </el-dialog>
  </basic-container>
 </template>

@@ -221,7 +273,7 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
-import { getDeptTree } from '@/api/system/dept';
+import { getList as getContractList } from '@/api/business/contract-manage';
 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';
@@ -247,6 +299,8 @@ const emptyForm = () => ({
  customerEmails: [],
  departmentEmails: [],
  projectName: '',
+  contractNo: '',
+  contractName: '',
  deptId: null,
  deptName: '',
  payerName: '',
@@ -269,16 +323,19 @@ export default {
      customerEmailOptions: [],
      departmentEmailOptions: [],
      invoiceItems: [],
-      deptTreeOptions: [],
-      deptMap: new Map(),
-      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
-      deptCascaderProps: { checkStrictly: true, emitPath: true },
+      contractDialog: {
+        visible: false,
+        loading: false,
+        rows: [],
+        page: { current: 1, size: 10, total: 0 },
+        query: { contractNo: '', contractName: '' },
+      },
      invoiceDialog: {
        visible: false,
      },
      rules: {
        invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
-        deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }],
+        contractNo: [{ required: true, validator: this.validateContract, trigger: 'change' }],
        customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
        departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
      },
@@ -299,12 +356,6 @@ export default {
      const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
      return this.hasPermission(code);
    },
-    deptCascaderValue() {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        return [];
-      }
-      return [String(this.form.deptId)];
-    },
  },
  created() {
    this.initialize();
@@ -339,7 +390,6 @@ export default {
        .filter(Boolean);
    },
    async initialize() {
-      this.loadDepartments();
      if (this.isPublicViewPage) {
        await this.loadPublicDetail();
        return;
@@ -380,9 +430,9 @@ export default {
      }
      callback();
    },
-    validateDept(rule, value, callback) {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        callback(new Error('请选择结算组织'));
+    validateContract(rule, value, callback) {
+      if (!this.form.contractNo) {
+        callback(new Error('请选择所属合同'));
        return;
      }
      callback();
@@ -454,47 +504,43 @@ export default {
        this.invoiceItems = [];
      }
    },
-    loadDepartments() {
-      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
-      getDeptTree(this.userInfo?.tenantId)
-        .then(response => {
-          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
-          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
-          this.deptMap = new Map();
-          this.flattenDepartments(rows).forEach(item =>
-            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
-          );
-        })
-        .catch(() => {});
+    // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
+    openContractDialog() {
+      this.contractDialog.visible = true;
+      this.searchContracts();
    },
-    excludeExternalOrganization(list = []) {
-      return list.reduce((result, item) => {
-        const deptName = item.title || item.deptName || item.name;
-        if (String(deptName || '').trim() === '外部组织') return result;
-        result.push({
-          ...item,
-          children: item.children?.length
-            ? this.excludeExternalOrganization(item.children)
-            : item.children,
+    searchContracts() {
+      this.contractDialog.page.current = 1;
+      this.loadContracts();
+    },
+    resetContractQuery() {
+      this.contractDialog.query = { contractNo: '', contractName: '' };
+      this.searchContracts();
+    },
+    async loadContracts() {
+      this.contractDialog.loading = true;
+      try {
+        const res = await getContractList(this.contractDialog.page.current, this.contractDialog.page.size, {
+          ...this.contractDialog.query,
+          contractCategory: '承运商合同',
+          approvalStatuses: 'approved,change_approved',
        });
-        return result;
-      }, []);
+        const data = this.unwrapData(res) || {};
+        this.contractDialog.rows = data.records || [];
+        this.contractDialog.page.total = Number(data.total || 0);
+      } finally {
+        this.contractDialog.loading = false;
+      }
    },
-    toDeptCascaderOptions(list = []) {
-      return list.map(item => ({
-        label: item.title || item.deptName || item.name,
-        value: item.id == null || item.id === '' ? '' : String(item.id),
-        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
-      }));
-    },
-    flattenDepartments(rows) {
-      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
-    },
-    handleDeptChange(value) {
-      const deptId = Array.isArray(value) ? value.at(-1) : value;
-      this.form.deptId = deptId || null;
-      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
-      this.$refs.formRef?.validateField('deptId').catch(() => {});
+    pickContract(row) {
+      if (!row) return;
+      Object.assign(this.form, {
+        contractNo: row.contractNo,
+        contractName: row.contractName,
+        deptName: row.organizationName,
+      });
+      this.contractDialog.visible = false;
+      this.$refs.formRef?.validateField('contractNo').catch(() => {});
    },
    openSettlementDetail(row) {
      const id = row.formalSettlementId || row.settlementId || row.id;
@@ -527,9 +573,8 @@ export default {
        departmentEmails: this.form.departmentEmails.join(';'),
        attachmentsJson: JSON.stringify(this.form.attachments || []),
        remark: this.form.remark,
-        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
-        deptId: this.form.deptId,
-        deptName: this.form.deptName,
+        // 所属合同仅传编号，合同名称/承办部门由后端按编号带出（结算组织=合同承办部门）
+        contractNo: this.form.contractNo,
      };
    },
    async saveDraft() {
@@ -1296,9 +1296,11 @@ export default {
      this.form = {
        ...emptyForm(),
        ...data,
+        // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+        preSettlementId: this.isValidReferenceId(data.preSettlementId) ? data.preSettlementId : null,
        preSettlementIds: data.preSettlementIds?.length
          ? data.preSettlementIds
-          : data.preSettlementId
+          : this.isValidReferenceId(data.preSettlementId)
          ? [data.preSettlementId]
          : [],
        attachments: this.parse(data.attachmentsJson),
@@ -1344,9 +1346,13 @@ export default {
        this.form = {
          ...emptyForm(),
          ...data,
+          // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+          preSettlementId: this.isValidReferenceId(data.preSettlementId)
+            ? data.preSettlementId
+            : null,
          preSettlementIds: data.preSettlementIds?.length
            ? data.preSettlementIds
-            : data.preSettlementId
+            : this.isValidReferenceId(data.preSettlementId)
            ? [data.preSettlementId]
            : [],
          attachments: this.parse(data.attachmentsJson),
@@ -1587,17 +1593,22 @@ export default {
      });
    },
    clearFormalReferenceWhenPreOnly() {
+      // 纯预付引用才收敛为预付；-1 占位 id 不得充当预付关联
      const progressAdvance = this.form.paymentType === 'progress_advance';
      const onlyPre =
        progressAdvance ||
        (this.referenceRows.length > 0 &&
          this.referenceRows.every(item => item.referenceType === 'pre'));
      if (!onlyPre) return;
-      if (!this.form.preSettlementId) {
+      if (!this.isValidReferenceId(this.form.preSettlementId)) {
        const preId =
-          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
-          (progressAdvance ? this.form.settlementId : null);
-        if (preId) {
+          this.referenceRows.find(
+            item => item.referenceType === 'pre' && this.isValidReferenceId(item.id)
+          )?.id ||
+          (progressAdvance && this.isValidReferenceId(this.form.settlementId)
+            ? this.form.settlementId
+            : null);
+        if (this.isValidReferenceId(preId)) {
          this.form.preSettlementId = preId;
          this.form.preSettlementIds = [preId];
        }
@@ -1608,13 +1619,16 @@ export default {
    },
    restoreReferenceRows(data, fallbackRow) {
      const relations = Array.isArray(data?.settlements) ? data.settlements : [];
+      // 行级预付/正式类型以过滤占位 id 后的关联为准，决定点击结算单号的跳转目标
      const rows = relations
        .map(item => {
-          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
+          // 后端用 -1 占位空 id，必须先过滤再判预付，否则正式结算行会被误标为预付
+          const preId = this.isValidReferenceId(item.preSettlementId) ? item.preSettlementId : null;
+          const isPre = Boolean(preId || item.preSettlementNo);
          const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
          if (!settlementNo) return null;
          return {
-            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
+            id: isPre ? preId || item.formalSettlementId : item.formalSettlementId,
            settlementNo,
            referenceType: isPre ? 'pre' : 'formal',
            settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
@@ -1642,9 +1656,10 @@ export default {
    },
    createReferenceRow(row) {
      const settlementAmount = Number(row.settlementAmount || 0);
+      // 后端以 -1 占位空预付 id，必须先校验否则正式结算行会被误判为预付
      const isPre = Boolean(
        row.preSettlementNo ||
-          row.preSettlementId ||
+          this.isValidReferenceId(row.preSettlementId) ||
          row.referenceType === 'pre' ||
          row.paymentType === 'progress_advance'
      );
@@ -2770,23 +2785,26 @@ export default {
    },
    async openSettlementDetail(row = {}) {
      const settlementNo = String(row.settlementNo || '').trim();
+      // 行上 referenceType 优先；发票行等只带单号的，按单号回查引用行；都缺省才回落表单级推断
+      const matchedReference = this.referenceRows.find(
+        item => String(item.settlementNo || '').trim() === settlementNo
+      );
+      const referenceType = row.referenceType || matchedReference?.referenceType;
      const isPre =
-        row.referenceType === 'pre' ||
-        this.form.paymentType === 'progress_advance' ||
-        Boolean(this.form.preSettlementId || this.form.preSettlementNo);
+        referenceType === 'pre' ||
+        (!referenceType &&
+          (this.form.paymentType === 'progress_advance' ||
+            Boolean(
+              this.isValidReferenceId(this.form.preSettlementId) || this.form.preSettlementNo
+            )));
      let id =
        row.id ||
        row.preSettlementId ||
        row.settlementId ||
+        matchedReference?.id ||
        (isPre
          ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
          : this.form.settlementId || this.form.settlementIds?.[0]);
-      if (!id && settlementNo) {
-        const matched = this.referenceRows.find(
-          item => String(item.settlementNo || '').trim() === settlementNo
-        );
-        id = matched?.id;
-      }
      if (!id && settlementNo) {
        try {
          const listApi = isPre ? preApi.getList : formalApi.getList;
@@ -989,6 +989,7 @@ import {
  save,
  submit,
 } from '@/api/settlement/preSettlement';
+import { getDetail as getContractDetail } from '@/api/business/contract-manage';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import {
  resolveReceivablePayableDetailId,
@@ -1072,6 +1073,8 @@ export default {
      changeTableColumns: changeRecordColumns,
      candidateColumns: candidateDetailColumns,
      contractOptions: [],
+      payerOptions: [],
+      payeeOptions: [],
      contractCategoryOptions,
      signTypeOptions,
      effectiveTypeOptions,
@@ -1391,18 +1394,34 @@ export default {
      const first = rows[0];
      const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
      const contractId = first.contractId || '';
-      let contractPartyA = first.payerName || '';
-      let contractPartyB = first.payeeName || '';
-      if (contractId && (!contractPartyA || !contractPartyB)) {
+      let contractPartyA = '';
+      let contractPartyB = '';
+      let contractPartyAJson = '';
+      let contractPartyBJson = '';
+      if (contractId) {
        try {
-          const { data } = await getContractOptions(first.contractNo || '');
-          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
-          contractPartyA = contractPartyA || matched?.partyA || '';
-          contractPartyB = contractPartyB || matched?.partyB || '';
+          const contractDetail = await this.fetchContractPartyDetail(contractId);
+          if (contractDetail) {
+            contractPartyA = contractDetail.partyA || '';
+            contractPartyB = contractDetail.partyB || '';
+            contractPartyAJson = contractDetail.partyAJson || '';
+            contractPartyBJson = contractDetail.partyBJson || '';
+          }
        } catch (error) {
          contractPartyA = '';
          contractPartyB = '';
        }
+        if (!contractPartyA && !contractPartyB) {
+          try {
+            const { data } = await getContractOptions(first.contractNo || '');
+            const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
+            contractPartyA = matched?.partyA || '';
+            contractPartyB = matched?.partyB || '';
+          } catch (error) {
+            contractPartyA = first.payerName || '';
+            contractPartyB = first.payeeName || '';
+          }
+        }
      }
      if (!this.contractOptions.some(item => String(item.id) === String(contractId))) {
        this.contractOptions.push({
@@ -1416,6 +1435,8 @@ export default {
          settlementType,
          partyA: contractPartyA,
          partyB: contractPartyB,
+          partyAJson: contractPartyAJson,
+          partyBJson: contractPartyBJson,
        });
      }
      this.handleContractChange(contractId);
@@ -1427,12 +1448,12 @@ export default {
        projectName: first.projectName || this.form.projectName,
        deptId: first.deptId || this.form.deptId,
        deptName: first.deptName || this.form.deptName,
-        payerName: this.form.payerName || contractPartyA,
-        payeeName: this.form.payeeName || contractPartyB,
        settlementType,
        currency: first.currency || 'RMB',
        localCurrency: first.localCurrency || 'RMB',
      });
+      // 明细带入的收付方若为单值且在选项中，优先保留；多方拼接值由下拉默认首项承接
+      this.applyPartySelection(first.payerName, first.payeeName);
      this.details = rows.map(row => this.normalizeSourceDetail(row));
      this.detailPage.current = 1;
      this.loading = true;
@@ -1516,6 +1537,8 @@ export default {
      this.billingRuleDialog.visible = false;
      this.billingRuleDialog.rule = null;
      this.contractOptions = [];
+      this.payerOptions = [];
+      this.payeeOptions = [];
      this.contractDialog.visible = false;
      this.contractDialog.expanded = false;
      this.contractDialog.rows = [];
@@ -1552,21 +1575,20 @@ export default {
        this.attachments = this.parseAttachments(detail.attachmentsJson);
        this.sortAttachments();
        this.selectedAttachmentRows = [];
-        if (
-          detail.contractId &&
-          !this.contractOptions.some(item => item.id === detail.contractId)
-        ) {
-          this.contractOptions.push({
-            id: detail.contractId,
+        if (detail.contractId) {
+          await this.ensureContractPartyOptions(detail.contractId, {
            contractNo: detail.contractNo,
            contractName: detail.contractName,
            projectId: detail.projectId,
            projectName: detail.projectName,
            deptId: detail.deptId,
            deptName: detail.deptName,
-            partyA: detail.payerName,
-            partyB: detail.payeeName,
+            settlementType: detail.settlementType,
          });
+          this.applyPartySelection(detail.payerName, detail.payeeName);
+        } else {
+          this.payerOptions = [];
+          this.payeeOptions = [];
        }
        if (this.publicMode && detail.detailFees) {
          Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
@@ -1640,6 +1662,8 @@ export default {
        deptName: row.deptName || row.organizationName,
        partyA: row.partyA || row.payerName,
        partyB: row.partyB || row.payeeName,
+        partyAJson: row.partyAJson || '',
+        partyBJson: row.partyBJson || '',
        settlementType:
          row.settlementType || (row.contractCategory === '客户合同' ? 'receivable' : 'payable'),
      };
@@ -1649,7 +1673,7 @@ export default {
      this.handleContractChange(contract.id);
      this.contractDialog.visible = false;
      this.contractDialog.current = null;
-      this.$refs.formRef?.clearValidate('contractId');
+      this.$refs.formRef?.clearValidate(['contractId', 'payerName', 'payeeName']);
    },
    contractCategoryName(value) {
      return (
@@ -1714,6 +1738,8 @@ export default {
        this.form.deptName = '';
        this.form.payerName = '';
        this.form.payeeName = '';
+        this.payerOptions = [];
+        this.payeeOptions = [];
        this.summaryFees = [];
        this.projectAdvanceWriteOffs = [];
        return;
@@ -1726,9 +1752,8 @@ export default {
      this.form.deptId = contract.deptId;
      this.form.deptName = contract.deptName;
      this.form.settlementType = contract.settlementType || 'payable';
-      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
-      if (contract.partyA) this.form.payerName = contract.partyA;
-      if (contract.partyB) this.form.payeeName = contract.partyB;
+      this.syncPartyOptionsFromContract(contract);
+      this.applyPartySelection('', '');
      this.form.currency = contract.settlementCurrency || 'RMB';
      this.summaryFees = [];
      this.projectAdvanceWriteOffs = [];
@@ -1737,6 +1762,152 @@ export default {
        this.fetchBfiExchangeRate();
      }
    },
+    parsePartyNames(partyJson, fallbackName) {
+      try {
+        const parsed = partyJson ? JSON.parse(partyJson) : [];
+        if (Array.isArray(parsed) && parsed.length) {
+          const names = parsed
+            .map(item => String(item?.customerName || '').trim())
+            .filter(Boolean);
+          if (names.length) return [...new Set(names)];
+        }
+      } catch (error) {
+        // JSON 解析失败时回退到名称拆分
+      }
+      return [
+        ...new Set(
+          String(fallbackName || '')
+            .split(/[、,，]/)
+            .map(name => name.trim())
+            .filter(Boolean)
+        ),
+      ];
+    },
+    buildPartySelectOptions(names) {
+      return (names || []).map(name => ({ dictKey: name, dictValue: name }));
+    },
+    resolveContractPartyNames(contract) {
+      const settlementType = contract?.settlementType || this.form.settlementType || 'payable';
+      const partyANames = this.parsePartyNames(contract?.partyAJson, contract?.partyA);
+      const partyBNames = this.parsePartyNames(contract?.partyBJson, contract?.partyB);
+      if (settlementType === 'receivable') {
+        return { payerNames: partyBNames, payeeNames: partyANames };
+      }
+      return { payerNames: partyANames, payeeNames: partyBNames };
+    },
+    syncPartyOptionsFromContract(contract) {
+      const { payerNames, payeeNames } = this.resolveContractPartyNames(contract || {});
+      this.payerOptions = this.buildPartySelectOptions(payerNames);
+      this.payeeOptions = this.buildPartySelectOptions(payeeNames);
+    },
+    isJoinedPartyName(value) {
+      return /[、,，]/.test(String(value || ''));
+    },
+    pickPartyValue(names, currentValue) {
+      const options = Array.isArray(names) ? names : [];
+      const current = String(currentValue || '').trim();
+      if (!options.length) {
+        // 无线上选项时（如公开查看拉不到合同），保留已有单值，丢弃多方拼接脏值
+        return this.isJoinedPartyName(current) ? '' : current;
+      }
+      if (current && !this.isJoinedPartyName(current) && options.includes(current)) {
+        return current;
+      }
+      return options[0] || '';
+    },
+    applyPartySelection(payerName, payeeName) {
+      const payerNames = this.payerOptions.map(item => item.dictKey);
+      const payeeNames = this.payeeOptions.map(item => item.dictKey);
+      this.form.payerName = this.pickPartyValue(payerNames, payerName);
+      this.form.payeeName = this.pickPartyValue(payeeNames, payeeName);
+      // 编辑历史单值不在合同多方中时，仍保留展示，避免下拉空白
+      if (
+        this.form.payerName &&
+        !this.payerOptions.some(item => item.dictKey === this.form.payerName)
+      ) {
+        this.payerOptions = [
+          ...this.payerOptions,
+          { dictKey: this.form.payerName, dictValue: this.form.payerName },
+        ];
+      }
+      if (
+        this.form.payeeName &&
+        !this.payeeOptions.some(item => item.dictKey === this.form.payeeName)
+      ) {
+        this.payeeOptions = [
+          ...this.payeeOptions,
+          { dictKey: this.form.payeeName, dictValue: this.form.payeeName },
+        ];
+      }
+    },
+    async fetchContractPartyDetail(contractId) {
+      if (!contractId) return null;
+      const { data } = await getContractDetail(contractId);
+      return data?.data || null;
+    },
+    async ensureContractPartyOptions(contractId, fallback = {}) {
+      if (!contractId) {
+        this.payerOptions = [];
+        this.payeeOptions = [];
+        return null;
+      }
+      let contract = this.contractOptions.find(item => String(item.id) === String(contractId));
+      const needDetail =
+        !contract ||
+        !(contract.partyAJson || contract.partyBJson) ||
+        this.isJoinedPartyName(contract.partyA) ||
+        this.isJoinedPartyName(contract.partyB) ||
+        (!contract.partyA && !contract.partyB);
+      if (needDetail) {
+        try {
+          const detail = await this.fetchContractPartyDetail(contractId);
+          if (detail) {
+            contract = {
+              ...(contract || {}),
+              id: contractId,
+              contractNo: detail.contractNo || fallback.contractNo || contract?.contractNo,
+              contractName: detail.contractName || fallback.contractName || contract?.contractName,
+              projectId: detail.projectId || fallback.projectId || contract?.projectId,
+              projectName: detail.projectName || fallback.projectName || contract?.projectName,
+              deptId:
+                detail.organizationId ||
+                detail.deptId ||
+                fallback.deptId ||
+                contract?.deptId,
+              deptName:
+                detail.organizationName ||
+                detail.deptName ||
+                fallback.deptName ||
+                contract?.deptName,
+              partyA: detail.partyA || contract?.partyA || '',
+              partyB: detail.partyB || contract?.partyB || '',
+              partyAJson: detail.partyAJson || contract?.partyAJson || '',
+              partyBJson: detail.partyBJson || contract?.partyBJson || '',
+              settlementType:
+                fallback.settlementType ||
+                contract?.settlementType ||
+                (detail.contractCategory === '客户合同' ? 'receivable' : 'payable'),
+              settlementCurrency: detail.settlementCurrency || contract?.settlementCurrency,
+            };
+          }
+        } catch (error) {
+          // 合同详情失败时仍用现有快照拆分多方名称
+        }
+      }
+      if (!contract) {
+        contract = {
+          id: contractId,
+          ...fallback,
+          partyA: fallback.partyA || '',
+          partyB: fallback.partyB || '',
+        };
+      }
+      const index = this.contractOptions.findIndex(item => String(item.id) === String(contractId));
+      if (index >= 0) this.contractOptions.splice(index, 1, contract);
+      else this.contractOptions.push(contract);
+      this.syncPartyOptionsFromContract(contract);
+      return contract;
+    },
    async saveDraft(shouldSubmit) {
      await this.$refs.formRef?.validate();
      if (shouldSubmit && !this.details.length) {
@@ -436,8 +436,9 @@ export default {
      (handlers[type] || (() => {}))();
    },
    openCreate() {
+      // 按列表锁定的结算类型路由到对应表单入口，保证菜单高亮与关闭回落列表正确
      this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(this.activeSettlementType) + '/form',
        query: {
          mode: 'add',
          name: `新增${this.billLabel}`,
@@ -448,8 +449,9 @@ export default {
    },
    openEdit(row) {
      const settlementType = row.settlementType || this.activeSettlementType;
+      // 行类型可能与列表锁定类型不同，按行类型路由
      this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(settlementType) + '/form',
        query: {
          mode: 'edit',
          id: row.id,
@@ -1,7 +1,7 @@
 <template>
  <basic-container class="pre-settlement-page">
    <section v-show="searchVisible" class="pre-settlement-page__search">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+      <el-form :model="query" label-position="right" label-width="100px" @submit.prevent>
        <div class="pre-settlement-page__search-grid">
          <template v-for="field in visibleSearchFields" :key="field.prop">
            <el-form-item :label="field.label">
@@ -108,6 +108,7 @@
        :data="rows"
        :size="tableSize"
        border
+        height="100%"
        class="pre-settlement-page__table"
        @selection-change="handleSelectionChange"
      >
@@ -768,8 +769,27 @@ export default {
 </script>

 <style lang="scss" scoped>
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单 avue 高度自适应对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$pre_page_height: calc(100vh - 114px);
+
 .pre-settlement-page {
+  height: $pre_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
  &__search {
+    flex-shrink: 0;
    padding: 12px 12px 4px;
    background: #fff;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -801,6 +821,10 @@ export default {
  }

  &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
    margin-top: 8px;
  }

@@ -823,8 +847,14 @@ export default {
    justify-content: center;
  }

+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
+
  &__pagination {
    display: flex;
+    flex-shrink: 0;
    justify-content: flex-end;
    padding: 12px;
  }
@@ -507,7 +507,13 @@
      </template>
    </el-dialog>

-    <el-dialog v-model="transferDialog.visible" title="批量转结算" width="86%" append-to-body>
+    <el-dialog
+      v-model="transferDialog.visible"
+      title="批量转结算"
+      width="72%"
+      append-to-body
+      align-center
+    >
      <div class="settlement-detail-page__transfer-form">
        <el-form :model="transferQuery" inline label-position="right" label-width="120px">
          <el-form-item label="转结算类型">
@@ -548,9 +554,10 @@
        :data="transferRows"
        row-key="id"
        border
+        max-height="50vh"
        @selection-change="transferSelectionChange"
      >
-        <el-table-column type="selection" width="52" align="center" reserve-selection />
+        <el-table-column type="selection" width="52" align="center" reserve-selection fixed />
        <el-table-column
          type="index"
          label="序号"
@@ -1060,6 +1067,8 @@ import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
+import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
 import {
  contractApprovalStatusOptions,
  contractCategoryOptions,
@@ -1913,8 +1922,9 @@ export default {
        this.openSettlementDetail('/settlement/pre-settlement', row.preSettlementNo);
        return;
      }
-      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
+      // 正式结算单号：跳转付款/收款结算单表单页并打开详情（与开票申请等入口一致）
+      if (column.prop === 'formalSettlementNo') {
+        this.openFormalSettlementDetail(row.formalSettlementNo);
        return;
      }
      this.openDetailDialog(row);
@@ -1926,6 +1936,42 @@ export default {
      }
      this.$router.push({ path, query: { detailNo } });
    },
+    async openFormalSettlementDetail(formalSettlementNo) {
+      const normalizedNo = String(formalSettlementNo || '')
+        .split(/[、,，]/)
+        .map(item => item.trim())
+        .find(Boolean);
+      if (!normalizedNo) {
+        this.$message.info('当前记录未关联结算单详情');
+        return;
+      }
+      try {
+        const data = this.unwrapPage(
+          await getFormalSettlementList(1, 10, { formalSettlementNo: normalizedNo })
+        );
+        const row = (data.records || []).find(
+          item => String(item.formalSettlementNo || '').trim() === normalizedNo
+        );
+        if (!row?.id) {
+          this.$message.warning('未找到对应的正式结算单');
+          return;
+        }
+        const settlementType = row.settlementType || this.settlementType || 'payable';
+        const listPath = settlementListPath(settlementType);
+        await this.$router.push({
+          path: `${listPath}/form`,
+          query: {
+            mode: 'view',
+            id: row.id,
+            settlementType,
+            listPath,
+            name: `查看${settlementBillLabel(settlementType)}`,
+          },
+        });
+      } catch (error) {
+        this.$message.error('正式结算单详情加载失败');
+      }
+    },
    async openRouteDetail(detailId = this.$route.query.detailId) {
      // 结算明细点「单据号」会带 detailId 跳到本页；只有当前停在应收/应付明细页时才自动展开详情
      const routePath =
@@ -2659,10 +2705,11 @@ export default {
        });
        const isPreSettlement = settlementBillType === 'pre';
        this.transferDialog.visible = false;
+        // 按结算类型路由到对应表单入口，保证收款/付款菜单各自高亮正确
        await this.$router.push({
          path: isPreSettlement
            ? '/settlement/pre-settlement/form'
-            : '/settlement/formal-settlement/form',
+            : settlementListPath(this.settlementType) + '/form',
          query: {
            mode: 'add',
            transferToken,
@@ -69,6 +69,8 @@
        :data="rows"
        :size="tableSize"
        border
+        height="100%"
+        class="settlement-adjustment-page__table"
        @selection-change="selection = $event"
      >
        <el-table-column type="selection" width="52" fixed="left" align="center" /><el-table-column
@@ -389,8 +391,27 @@ export default {
 </script>

 <style scoped lang="scss">
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$adjustment_page_height: calc(100vh - 114px);
+
 .settlement-adjustment-page {
+  height: $adjustment_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
  &__search {
+    flex-shrink: 0;
    padding: 12px 12px 4px;
    background: #fff;
    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -417,6 +438,10 @@ export default {
    margin-bottom: 8px;
  }
  &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
    margin-top: 8px;
  }
  &__toolbar {
@@ -431,8 +456,13 @@ export default {
    justify-content: center;
    gap: 8px;
  }
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
  &__pagination {
    display: flex;
+    flex-shrink: 0;
    justify-content: flex-end;
    padding: 12px;
  }
@@ -195,7 +195,8 @@ export default {
            formslot: true,
            addDisplay: true,
            editDisplay: true,
-            hide: true,
+            // 列表展示，维护入口在组织管理的平台公司
+            hide: false,
          },
          {
            label: '初始流水号',
@@ -206,6 +207,7 @@ export default {
            minRows: 1,
            maxRows: 999,
            controls: false,
+            clearable: true,
            slot: true,
            placeholder: '如果系统已有相同流水号，则跳过这个流水号',
          },
@@ -259,6 +261,14 @@ export default {
      };
    },
  },
+  watch: {
+    // Avue number 清空后可能回写成 -1，统一清成空，避免未填却落库 -1
+    'form.initialSerial'(value) {
+      if (value === -1 || value === '-1') {
+        this.form.initialSerial = undefined;
+      }
+    },
+  },
  created() {
    this.loadSelectOptions();
  },
@@ -283,14 +293,26 @@ export default {
      }));
    },
    formatSerial(value) {
-      if (value === null || value === undefined || value === '') return '-';
+      // Avue number 空值常落成 -1，历史脏数据也按空展示
+      if (value === null || value === undefined || value === '' || value === -1 || value === '-1') {
+        return '';
+      }
      const number = Number(value);
-      if (!Number.isInteger(number) || number < 1) return String(value);
+      if (!Number.isInteger(number) || number < 1) return '';
      return String(number).padStart(3, '0');
    },
+    /** 初始流水号空值归一：未填 / -1 都按空处理，禁止自动落库 -1 */
+    normalizeInitialSerial(value) {
+      if (value === '' || value === undefined || value === null || value === -1 || value === '-1') {
+        return null;
+      }
+      const number = Number(value);
+      return Number.isFinite(number) ? number : null;
+    },
    handlePlatformCompanyChange(value) {
      const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
      this.form.platformCompanyName = matched ? matched.label : '';
+      // 只读回填组织中平台公司的金蝶公司代码
      this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
    },
    handleBusinessDeptChange(value) {
@@ -298,47 +320,63 @@ export default {
      this.form.businessDeptName = matched ? matched.label : '';
    },
    beforeOpen(done, type) {
-      this.loadSelectOptions();
+      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
      if (['edit', 'view'].includes(type) && this.form.id) {
-        getDetail(this.form.id).then(res => {
-          const detail = res.data?.data || {};
+        Promise.all([loadOptions, getDetail(this.form.id)]).then(([, detailRes]) => {
+          const detail = detailRes.data?.data || {};
+          const platformCompanyId = detail.platformCompanyId ? String(detail.platformCompanyId) : '';
+          const platformMatched = this.platformCompanyOptions.find(
+            item => String(item.value) === platformCompanyId
+          );
          this.form = {
            ...detail,
-            platformCompanyId: detail.platformCompanyId ? String(detail.platformCompanyId) : '',
+            platformCompanyId,
            businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
+            // 展示以组织当前配置为准，避免配置表镜像滞后
+            kingdeeCompanyCode: platformMatched?.kingdeeDeptCode || detail.kingdeeCompanyCode || '',
+            // 历史 -1 / 无效值在表单中显示为空，避免 Avue number 回显 -1
+            initialSerial: this.normalizeInitialSerial(detail.initialSerial) ?? undefined,
          };
          done();
        });
        return;
      }
-      if (type === 'add') {
-        this.form = {
-          platformCompanyId: '',
-          platformCompanyName: '',
-          businessDeptId: '',
-          businessDeptName: '',
-          contractCodePrefix: '',
-          initialSerial: undefined,
-          kingdeeCompanyCode: '',
-          kingdeeDeptCode: '',
-          remark: '',
-        };
-      }
-      done();
+      loadOptions.finally(() => {
+        if (type === 'add') {
+          this.form = {
+            platformCompanyId: '',
+            platformCompanyName: '',
+            businessDeptId: '',
+            businessDeptName: '',
+            contractCodePrefix: '',
+            initialSerial: undefined,
+            kingdeeCompanyCode: '',
+            kingdeeDeptCode: '',
+            remark: '',
+          };
+        }
+        done();
+      });
    },
    normalizeSubmitRow(row) {
-      const initialSerial =
-        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
-          ? null
-          : Number(row.initialSerial);
      return {
        ...row,
        platformCompanyId: row.platformCompanyId || null,
        businessDeptId: row.businessDeptId || null,
        contractCodePrefix: String(row.contractCodePrefix || '').trim(),
+        // 金蝶公司代码由后端按平台公司组织配置覆盖，前端仅展示
        kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
        remark: String(row.remark || '').trim(),
-        initialSerial: Number.isFinite(initialSerial) ? initialSerial : null,
+        initialSerial: this.normalizeInitialSerial(row.initialSerial),
      };
    },
    rowSave(row, done, loading) {
@@ -408,6 +408,7 @@ export default {
            searchOrder: 2,
            searchPlaceholder: '请选择是否平台公司',
            formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
+            change: ({ value }) => this.handlePlatformCompanyChange(value),
            rules: [
              {
                validator: (rule, value, callback) => {
@@ -421,6 +422,37 @@ export default {
              },
            ],
          },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeDeptCode',
+            minWidth: 140,
+            order: 35,
+            maxlength: 64,
+            showWordLimit: true,
+            // 仅平台公司维护/展示金蝶公司代码；非平台公司列表留空
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            formatter: row =>
+              Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
+            rules: [
+              {
+                validator: (rule, value, callback) => {
+                  const code = String(value || '').trim();
+                  if (!code) {
+                    callback();
+                    return;
+                  }
+                  if (code.length > 64) {
+                    callback(new Error('金蝶公司代码不能超过64个字符'));
+                    return;
+                  }
+                  callback();
+                },
+                trigger: 'blur',
+              },
+            ],
+          },
          {
            label: '是否业务部门',
            prop: 'isBusinessDept',
@@ -961,6 +993,21 @@ export default {
    normalizeYesNoFlag(value) {
      return Number(value) === 1 ? 1 : 0;
    },
+    handlePlatformCompanyChange(value) {
+      const isPlatform = Number(value) === 1;
+      this.syncKingdeeCompanyCodeDisplay(isPlatform);
+      if (!isPlatform && this.form) {
+        this.form.kingdeeDeptCode = '';
+      }
+    },
+    syncKingdeeCompanyCodeDisplay(isPlatformCompany) {
+      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
+      if (!column) return;
+      const visible = Number(isPlatformCompany) === 1;
+      column.addDisplay = visible;
+      column.editDisplay = visible;
+      column.viewDisplay = visible;
+    },
    resolveDeptCategoryValue(value) {
      if (value === null || value === undefined || value === '') {
        this.$message.warning('请选择组织类型');
@@ -1261,6 +1308,9 @@ export default {
    rowSave(row, done, loading) {
      row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
      row.deptCode = String(row.deptCode || '').trim();
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
      row.leaderId = func.join(row.leaderId);
      this.normalizeTopParent(row);
      if (!this.prepareDeptSubmitRow(row)) {
@@ -1306,6 +1356,9 @@ export default {
    rowUpdate(row, index, done, loading) {
      row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
      row.deptCode = String(row.deptCode || '').trim();
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
      row.leaderId = func.join(row.leaderId);
      this.normalizeTopParent(row);
      if (!this.prepareDeptSubmitRow(row)) {
@@ -1414,6 +1467,7 @@ export default {
        this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
+        this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
        this.initData(this.form.tenantId);
        this.loadParentDeptCode(this.form.parentId);
        done();
@@ -1435,6 +1489,7 @@ export default {
            if (this.form.parentId === '0') {
              this.form.parentId = '';
            }
+            this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
            this.loadParentDeptCode(this.form.parentId);
            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
              const splitResult = func.split(this.form.leaderId);
@@ -66,17 +66,21 @@
        />
      </template>
      <template #dataScopeDeptIds-form>
-        <el-tree
+        <!-- 与用户管理「数据管理权限」一致：组织多选级联，数据源同左侧组织树 -->
+        <el-cascader
          v-if="Number(form.dataScopeRange) === 3"
-          ref="dataScopeTree"
-          :data="permissionDeptTree"
-          show-checkbox
-          node-key="id"
-          :default-checked-keys="form.dataScopeDeptIds || []"
-          :props="{ label: 'title', children: 'children' }"
-          @check="handleDataScopeCheck"
+          v-model="dataScopeCascaderValue"
+          :options="permissionDeptTree"
+          :props="deptCascaderProps"
+          :disabled="isViewMode"
+          clearable
+          filterable
+          collapse-tags
+          collapse-tags-tooltip
+          placeholder="请选择数据权限组织（可多选）"
+          style="width: 100%"
        />
-        <span v-else class="form-tip">选择「自定义」后可勾选数据权限组织</span>
+        <span v-else class="form-tip">选择「自定义」后可选择数据权限组织</span>
      </template>
      <template #menu="{ row, index }">
        <el-link
@@ -193,6 +197,26 @@ export default {
            : [];
      },
    },
+    // 自定义数据权限组织：与用户管理数据管理权限相同的多选级联
+    dataScopeCascaderValue: {
+      get() {
+        const ids = Array.isArray(this.form.dataScopeDeptIds)
+          ? this.form.dataScopeDeptIds
+          : this.form.dataScopeDeptIds
+            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
+            : [];
+        return ids
+          .filter(item => item !== undefined && item !== null && item !== '')
+          .map(item => (typeof item === 'number' ? item : String(item)));
+      },
+      set(value) {
+        this.form.dataScopeDeptIds = Array.isArray(value)
+          ? value.filter(item => item !== undefined && item !== null && item !== '')
+          : value
+            ? [value]
+            : [];
+      },
+    },
  },
  created() {
    this.sensitiveManager = sensitive.create({
@@ -228,12 +252,6 @@ export default {
        this.permissionDeptTree = res.data.data || [];
      });
    },
-    handleDataScopeCheck(_, checked) {
-      if (this.isViewMode) {
-        return;
-      }
-      this.form.dataScopeDeptIds = checked.checkedKeys || [];
-    },
    normalizeSubmitRow(row = {}, isUpdate = false) {
      let payload = { ...row };
      // 编辑时剔除未改动的脱敏字段，避免把 138****8000 写回库
@@ -278,17 +296,19 @@ export default {
            detail.identities = detail.identities.split(',').filter(Boolean);
          }
          const deptIds = func.split(detail.deptId || '');
+          const dataScopeDeptIds = Array.isArray(detail.dataScopeDeptIds)
+            ? detail.dataScopeDeptIds.map(item => String(item))
+            : detail.dataScopeDeptIds
+              ? String(detail.dataScopeDeptIds).split(',').filter(Boolean)
+              : [];
          this.form = {
            ...detail,
            deptId: Array.isArray(deptIds) ? deptIds : [],
            dataScopeRange: detail.dataScopeRange || 1,
            dataLevelRange: detail.dataLevelRange || 1,
-            dataScopeDeptIds: detail.dataScopeDeptIds || [],
+            dataScopeDeptIds,
          };
          this.sensitiveManager?.saveInitialData(this.form);
-          this.$nextTick(() => {
-            this.$refs.dataScopeTree?.setCheckedKeys?.(this.form.dataScopeDeptIds || []);
-          });
          done();
        });
        return;
@@ -589,7 +589,7 @@
              <el-form-item label="所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -689,6 +689,7 @@ import {
  recognitionIDCard,
  recognitionTransportCertificates,
  recognizeBaiduOcr,
+  recognizeQualificationCertificateOcr,
 } from '@/api/transportCapacity/driver';
 import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
 import { getDeptTree } from '@/api/system/dept';
@@ -796,6 +797,8 @@ export default {
      driverBox: false,
      // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
      enableUnassignedOrgFilter: true,
+      // 表单「所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
      vehicleSelectorVisible: false,
      vehicleSelectorLoading: false,
      vehicleSelectorOption,
@@ -920,13 +923,19 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
    // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveOrgPath(this.driverForm.organizationName);
+        return this.resolveFormOrgPath(this.driverForm.organizationName);
      },
      set(path) {
-        this.driverForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.driverForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    isAdmin() {
@@ -964,8 +973,8 @@ export default {
    },
  },
  created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
-    this.loadOrganizationOptions();
    this.initRegionOptions();
    this.initQualificationTypeOptions();
  },
@@ -983,9 +992,7 @@ export default {
          'organizationName'
        );
        vehicleColumn.dicData = this.organizationOptions;
-        if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
-          this.driverForm.organizationName = this.getCurrentOrganizationName();
-        }
+        return this.loadOrganizationOptions();
      });
    },
    initQualificationTypeOptions() {
@@ -1015,6 +1022,11 @@ export default {
      });
      return result;
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空，
+    // 不能让默认值带出一个在表单里选不中的组织名
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    getCurrentOrganizationName() {
      const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id;
      const currentDept = this.organizationOptions.find(
@@ -1202,8 +1214,16 @@ export default {
      this.submitAttempted = false;
      if (!row?.id) {
        this.driverForm = emptyForm();
-        this.driverForm.organizationName = this.getCurrentOrganizationName();
+        // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
+        this.driverForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.driverBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return;
+          const name = this.getDefaultOrganizationName();
+          this.driverForm.organizationName = name;
+          this.syncFormOrganizationLegacy(name);
+        });
        return;
      }
      getDetail(row.id).then(res => {
@@ -1217,11 +1237,13 @@ export default {
          postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [],
        };
        this.syncAddressRegionPath();
+        this.syncFormOrganizationLegacy(this.driverForm.organizationName);
        this.driverBox = true;
      });
    },
    resetDriver() {
      this.driverForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.drivingLicenseUploads = {};
      this.readonly = false;
      this.submitAttempted = false;
@@ -1322,9 +1344,29 @@ export default {
    },
    handleQualificationUploadSuccess(prop, url) {
      this.setImage(prop, url);
-      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
-        this.applyQualificationRecognition(data);
+      this.recognizeQualificationCertificate(url);
+    },
+    recognizeQualificationCertificate(url) {
+      if (!url) {
+        this.$message.warning('从业资格证图片上传成功，未获取到图片地址，无法自动识别');
+        return;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: '从业资格证识别中',
+        background: 'rgba(255, 255, 255, 0.7)',
      });
+      recognizeQualificationCertificateOcr(url)
+        .then(res => {
+          this.applyQualificationRecognition(res?.data?.data || {});
+          this.$message.success('从业资格证识别完成');
+        })
+        .catch(() => {
+          this.$message.warning('从业资格证图片上传成功，自动识别失败，请手动填写相关信息');
+        })
+        .finally(() => {
+          loading.close();
+        });
    },
    recognizeBaiduOcr(url, type, side, documentName, applyRecognition) {
      if (!url) {
@@ -1614,25 +1656,43 @@ export default {
      return typeof value === 'object' ? value.words || value.value || '' : value || '';
    },
    applyQualificationRecognition(data = {}) {
-      const qualificationType = this.getQualificationType(data);
-      const qualificationNo = this.getQualificationNo(data);
+      const fields = this.normalizeQualificationOcrFields(data);
+      const qualificationType = this.getQualificationOcrValue(fields, [
+        'qualification_category',
+        '从业资格类别',
+        '从业资格类型',
+      ]).replace(/[，,；;]+$/, '');
+      const qualificationNo = this.getQualificationOcrValue(fields, [
+        'certificate_no',
+        '证号',
+        '从业资格证号',
+        '资格证号',
+        '证书编号',
+      ]);
+      const validFrom = this.getQualificationOcrValue(fields, ['valid_from', '有效起始日期']);
+      const validUntil = this.getQualificationOcrValue(fields, ['valid_until', '有效期限', '有效期']);
      const matchedType = this.matchQualificationType(qualificationType);
      if (matchedType) {
        this.driverForm.qualificationType = matchedType;
      } else if (qualificationType && !this.qualificationTypeOptions.length) {
        this.driverForm.qualificationType = qualificationType;
      }
-      if (qualificationNo && !this.driverForm.qualificationNo) {
+      if (qualificationNo) {
        this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
      }
-      const words = this.getBaiduOcrWords(data).join(' ');
-      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
-      if (/(长期|永久有效)/.test(words)) {
+      const startDate = this.normalizeBirthday(validFrom);
+      if (startDate) {
+        this.driverForm.qualificationStartDate = startDate;
+      }
+      if (/(长期|永久)/.test(validUntil)) {
        this.driverForm.qualificationLongTerm = 1;
        this.driverForm.qualificationEndDate = '';
-      } else if (dateList.length) {
-        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
-        this.driverForm.qualificationLongTerm = 0;
+      } else {
+        const endDate = this.normalizeBirthday(validUntil);
+        if (endDate) {
+          this.driverForm.qualificationEndDate = endDate;
+          this.driverForm.qualificationLongTerm = 0;
+        }
      }
      this.$nextTick(() => {
        ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1640,22 +1700,25 @@ export default {
        });
      });
    },
-    getQualificationType(data = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
-      if (fieldValue) return String(fieldValue).trim();
-      const words = this.getBaiduOcrWords(data);
-      const labelIndex = words.findIndex(word => /从业资格类别|从业资格类型/.test(word));
-      if (labelIndex < 0) return '';
-      const firstValue = words[labelIndex].replace(/^.*?(?:从业资格类别|从业资格类型)\s*[:：]?/, '').trim();
-      const values = firstValue ? [firstValue] : [];
-      for (let index = labelIndex + 1; index < words.length; index += 1) {
-        const word = String(words[index] || '').trim();
-        if (!word || /^(有效起始日期|有效期限|核发机关|继续教育信息|诚信考核信息)/.test(word)) {
-          break;
-        }
-        values.push(word);
+    normalizeQualificationOcrFields(result = {}) {
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+        return result.fields;
      }
-      return values.join('').replace(/[，,；;]+$/, '').trim();
+      const keyInfos = result.key_info || result.keyInfo || result.keyInfos || [];
+      if (!Array.isArray(keyInfos)) return {};
+      return Object.fromEntries(
+        keyInfos
+          .filter(item => item && item.key)
+          .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
+          .filter(([, value]) => value)
+      );
+    },
+    getQualificationOcrValue(fields = {}, keys = []) {
+      const normalizedKeys = keys.map(key => String(key).toLowerCase());
+      const entry = Object.entries(fields).find(([key]) =>
+        normalizedKeys.includes(String(key).toLowerCase())
+      );
+      return entry ? String(entry[1] || '').trim() : '';
    },
    matchQualificationType(value = '') {
      const text = String(value || '').replace(/\s/g, '');
@@ -1673,27 +1736,6 @@ export default {
      );
      return matched?.value || '';
    },
-    getQualificationNo(data = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格证号', '资格证号', '证书编号']);
-      if (fieldValue) return fieldValue;
-      const words = this.getBaiduOcrWords(data);
-      const labelIndex = words.findIndex(word => /^(?:(?:从业)?资格证号?|证书编号)[:：]?$/.test(word));
-      if (labelIndex >= 0 && words[labelIndex + 1]) {
-        return words[labelIndex + 1];
-      }
-      const certificateLine = words.find(word => /(?:从业)?资格证号?|证书编号/.test(word));
-      const match = certificateLine?.match(/(?:(?:从业)?资格证号?|证书编号)\s*[:：]?\s*([A-Z0-9-]{6,})/i);
-      return match?.[1] || '';
-    },
-    getBaiduOcrWords(data = {}) {
-      const wordsResult = data.words_result || data.wordsResult || {};
-      if (Array.isArray(wordsResult)) {
-        return wordsResult.map(item => item.words || item.value || '').filter(Boolean);
-      }
-      return Object.values(wordsResult)
-        .map(item => (typeof item === 'object' ? item.words || item.value || '' : item || ''))
-        .filter(Boolean);
-    },
    normalizeNation(value = '') {
      const nation = String(value || '').trim();
      if (!nation) return '';
@@ -147,7 +147,7 @@
              <el-form-item label="船舶所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -664,6 +664,8 @@ export default {
      shipForm: emptyForm(),
      uploadHeaders: getUploadHeaders(),
      organizationOptions: [],
+      // 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
      formRules: {
        organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
        shipName: [
@@ -710,13 +712,19 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
    // 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveOrgPath(this.shipForm.organizationName);
+        return this.resolveFormOrgPath(this.shipForm.organizationName);
      },
      set(path) {
-        this.shipForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.shipForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    isAdmin() {
@@ -744,8 +752,8 @@ export default {
    },
  },
  created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
-    this.loadOrganizationOptions();
  },
  methods: {
    hasPermission(code) {
@@ -756,9 +764,7 @@ export default {
        this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
        const column = this.findColumn(this.option.column, 'organizationName');
        column.dicData = this.organizationOptions;
-        if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
-          this.shipForm.organizationName = this.getCurrentOrganizationName();
-        }
+        return this.loadOrganizationOptions();
      });
    },
    flattenDeptOptions(tree = [], level = 0) {
@@ -784,6 +790,10 @@ export default {
      );
      return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    validateField(prop) {
      this.$refs.shipForm?.validateField(prop);
    },
@@ -875,12 +885,19 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.shipForm = emptyForm();
-        this.shipForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.shipForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.shipBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return;
+          this.shipForm.organizationName = this.getDefaultOrganizationName();
+        });
        return;
      }
      getDetail(row.id).then(res => {
        this.shipForm = { ...emptyForm(), ...(res.data.data || {}) };
+        this.syncFormOrganizationLegacy(this.shipForm.organizationName);
        this.shipBox = true;
      });
    },
@@ -890,6 +907,7 @@ export default {
    },
    resetShip() {
      this.shipForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.readonly = false;
      this.submitLoading = false;
      this.$refs.shipForm?.clearValidate();
@@ -347,7 +347,7 @@
                    <el-cascader
                      v-model="organizationCascaderValue"
                      :options="organizationFormTreeOptions"
-                      :props="formOrgCascaderProps"
+                      :props="organizationFormCascaderProps"
                      filterable
                      clearable
                      placeholder="请选择"
@@ -702,6 +702,8 @@ export default {
      // 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
      organizationCascaderPath: [],
      useDepartmentCascaderPath: [],
+      // 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
+      restrictFormOrgToPlatformCompany: true,
      formOrgCascaderProps: {
        value: 'id',
        label: 'label',
@@ -757,11 +759,17 @@ export default {
    },
    // 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
    organizationFormTreeOptions() {
-      return this.cloneOrgTree(this.organizationTreeOptions);
+      return this.cloneOrgTree(this.buildFormOrganizationTree());
    },
    useDepartmentFormTreeOptions() {
      return this.cloneOrgTree(this.organizationTreeOptions);
    },
+    // 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
+    organizationFormCascaderProps() {
+      return this.restrictFormOrgToPlatformCompany
+        ? { ...this.formOrgCascaderProps, disabled: data => this.platformCompanyOrgDisabled(data) }
+        : this.formOrgCascaderProps;
+    },
    // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
    organizationCascaderValue: {
      get() {
@@ -769,7 +777,9 @@ export default {
      },
      set(path) {
        this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
-        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
+        const name = this.resolveOrgName(this.organizationCascaderPath);
+        this.vehicleForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
      },
    },
    // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -810,7 +820,6 @@ export default {
  },
  created() {
    this.initDeptTree();
-    this.loadOrganizationOptions();
  },
  watch: {
    organizationTreeOptions() {
@@ -852,17 +861,15 @@ export default {
      }));
    },
    syncOrgCascaderPaths() {
-      this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
+      this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
      this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
    },
    initDeptTree() {
+      this.loadOrganizationOptions();
      getDeptTree(this.userInfo.tenantId).then(res => {
        this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
        const column = this.findColumn(this.option.column, 'organizationName');
        column.dicData = this.organizationOptions;
-        if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
-          this.vehicleForm.organizationName = this.getCurrentOrganizationName();
-        }
        if (this.vehicleBox && !this.vehicleForm.useDepartment) {
          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        }
@@ -894,6 +901,10 @@ export default {
      );
      return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
    },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
    digitsOnly(value = '') {
      return String(value).replace(/\D/g, '');
    },
@@ -961,11 +972,18 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.vehicleForm = emptyForm();
-        this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.vehicleForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
        this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        this.syncOrgCascaderPaths();
        this.syncPlateNo(false);
        this.vehicleBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return;
+          this.vehicleForm.organizationName = this.getDefaultOrganizationName();
+          this.syncOrgCascaderPaths();
+        });
        return;
      }
      getDetail(row.id).then(res => {
@@ -977,6 +995,7 @@ export default {
        if (!this.vehicleForm.useDepartment) {
          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        }
+        this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
        this.syncOrgCascaderPaths();
        this.splitPlateNo();
        this.syncPlateNo(false);
@@ -989,6 +1008,7 @@ export default {
    },
    resetVehicle() {
      this.vehicleForm = emptyForm();
+      this.formOrganizationLegacyName = '';
      this.organizationCascaderPath = [];
      this.useDepartmentCascaderPath = [];
      this.vehicleCertificateUploads = {};
@@ -1610,6 +1630,16 @@ export default {
  }
 }

+// 列表组织列超长时单行省略
+.org-cell-text {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
 // 编辑弹窗：灰底 + section-card 白卡分组
 .vehicle-form {
  :deep(.el-form-item__label) {
@@ -1641,18 +1671,7 @@ export default {
    flex: 0 0 calc(4em + 24px) !important;
    width: calc(4em + 24px) !important;
  }
-}

-.org-cell-text {
-  display: inline-block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  vertical-align: bottom;
-}
-
-.vehicle-form {
  .org-cascader-tooltip {
    width: 100%;
  }
@@ -1012,7 +1012,9 @@ export default {
        this.$message.warning('得分率下限必须小于上限');
        return;
      }
+      // F 级无授信允许额度上下限均为 0；其余等级仍要求下限严格小于上限
      if (
+        !this.isZeroCreditLimitRange(this.standardForm) &&
        Number(this.standardForm.creditLimitLower) >= Number(this.standardForm.creditLimitUpper)
      ) {
        this.$message.warning('授信额度下限必须小于上限');
@@ -1033,7 +1035,7 @@ export default {
        this.$message.warning('评估标准中的得分率区间不能重叠');
        return;
      }
-      if (this.hasRangeOverlap(nextStandards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(nextStandards)) {
        this.$message.warning('评估标准中的授信额度区间不能重叠');
        return;
      }
@@ -1083,6 +1085,17 @@ export default {
        return next && range.upper > next.lower;
      });
    },
+    /** F 级无授信：额度上下限均为 0 */
+    isZeroCreditLimitRange(standard = {}) {
+      return (
+        Number(standard.creditLimitLower) === 0 && Number(standard.creditLimitUpper) === 0
+      );
+    },
+    /** 授信额度区间重叠校验：跳过 0~0 无授信区间，避免与 E 级 0~500 冲突 */
+    hasCreditLimitOverlap(list = []) {
+      const ranges = list.filter(item => !this.isZeroCreditLimitRange(item));
+      return this.hasRangeOverlap(ranges, 'creditLimitLower', 'creditLimitUpper');
+    },
    validateConfig() {
      if (!this.configForm.name || !this.configForm.name.trim()) {
        this.$message.warning('请输入评定表名称');
@@ -1219,7 +1232,10 @@ export default {
          this.$message.warning(`${standard.creditLevel}信用等级得分率下限必须小于上限`);
          return false;
        }
-        if (Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)) {
+        if (
+          !this.isZeroCreditLimitRange(standard) &&
+          Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)
+        ) {
          this.$message.warning(`${standard.creditLevel}信用等级授信额度下限必须小于上限`);
          return false;
        }
@@ -1234,7 +1250,7 @@ export default {
        this.$message.warning('评估标准中的得分率区间不能重叠');
        return false;
      }
-      if (this.hasRangeOverlap(standards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(standards)) {
        this.$message.warning('评估标准中的授信额度区间不能重叠');
        return false;
      }
@@ -42,6 +42,21 @@
          >批量删除
        </el-button>
      </template>
+      <template #header>
+        <el-tabs
+          v-model="query.expireStatus"
+          type="card"
+          class="customer-archive-page__expiry-tabs"
+          @tab-change="handleExpireChange"
+        >
+          <el-tab-pane
+            v-for="item in expiryTagOptions"
+            :key="item.value"
+            :label="item.label"
+            :name="item.value"
+          />
+        </el-tabs>
+      </template>
      <template #customerCode="{ row }">
        <el-button type="primary" link @click="viewArchive(row)">
          {{ row.customerCode }}
@@ -84,10 +99,15 @@
        </el-tag>
      </template>
      <template #businessEndDate="{ row }">
-        <span :class="{ 'business-license-expiring': isBusinessLicenseExpiringSoon(row) }">
+        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期') }">
          {{ formatBusinessLicenseValidPeriod(row) }}
        </span>
      </template>
+      <template #nextEvaluateDate="{ row }">
+        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.nextEvaluateDate) }">
+          {{ row.nextEvaluateDate || '-' }}
+        </span>
+      </template>
      <template #fundUseRate="{ row }">
        {{ formatFundUseRate(row) }}
      </template>
@@ -1301,6 +1321,19 @@
          class="score-detail-form"
        >
          <el-row :gutter="42">
+            <el-col :span="12">
+              <el-form-item label="评分方式" required>
+                <el-radio-group
+                  v-model="currentScore.evaluateMode"
+                  :disabled="readonly"
+                  @change="handleEvaluateModeChange"
+                >
+                  <el-radio value="online">线上评估</el-radio>
+                  <el-radio value="offline">线下评估</el-radio>
+                </el-radio-group>
+                <span v-if="isOfflineScore" class="score-offline-tip">线下请上传评分表 Excel</span>
+              </el-form-item>
+            </el-col>
            <el-col :span="6">
              <el-form-item label="评定日期" required>
                <el-date-picker
@@ -1311,59 +1344,12 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
-              <el-form-item label="拟申请总资金使用额度" required>
-                <el-input
-                  v-model="currentScore.applyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最终得分">
-                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最大资金使用额度">
-                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="信用等级">
-                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度">
-                <el-input
-                  v-model="currentScore.tempApplyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度有效期起">
+              <el-form-item label="下次评定日期" required>
                <el-date-picker
-                  v-model="currentScore.tempCreditStartDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度有效期止">
-                <el-date-picker
-                  v-model="currentScore.tempCreditEndDate"
+                  v-model="currentScore.nextEvaluateDate"
                  type="date"
                  value-format="YYYY-MM-DD"
+                  placeholder="请选择"
                />
              </el-form-item>
            </el-col>
@@ -1386,6 +1372,109 @@
                </el-select>
              </el-form-item>
            </el-col>
+            <el-col v-if="isOfflineScore" :span="12">
+              <el-form-item label="评分表">
+                <div class="score-offline-actions">
+                  <el-button
+                    type="primary"
+                    plain
+                    :disabled="!currentScore.quantificationId || readonly"
+                    @click="downloadScoreTemplate"
+                  >
+                    下载模板
+                  </el-button>
+                  <el-upload
+                    :show-file-list="false"
+                    :disabled="!currentScore.quantificationId || readonly || scoreImporting"
+                    accept=".xls,.xlsx"
+                    :http-request="uploadScoreExcel"
+                  >
+                    <el-button
+                      type="primary"
+                      :loading="scoreImporting"
+                      :disabled="!currentScore.quantificationId || readonly"
+                    >
+                      上传 Excel
+                    </el-button>
+                  </el-upload>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="信用等级">
+                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="自评得分" :required="isOfflineScore">
+                <el-input
+                  v-if="isOfflineScore"
+                  :model-value="formatScoreValue(currentScore.selfScore)"
+                  maxlength="10"
+                  :disabled="readonly"
+                  placeholder="请输入自评得分"
+                  @input="handleOfflineSelfScoreInput"
+                  @blur="recalculateOfflineScore"
+                >
+                  <template #suffix>分</template>
+                </el-input>
+                <el-input v-else :model-value="formatScoreValue(currentScore.selfScore)" disabled>
+                  <template #suffix>分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最终得分">
+                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="拟申请总资金使用额度" required>
+                <el-input
+                  v-model="currentScore.applyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最大资金使用额度">
+                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度">
+                <el-input
+                  v-model="currentScore.tempApplyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度有效期起">
+                <el-date-picker
+                  v-model="currentScore.tempCreditStartDate"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度有效期止">
+                <el-date-picker
+                  v-model="currentScore.tempCreditEndDate"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
            <el-col :span="24">
              <el-form-item label="备注">
                <el-input v-model="currentScore.remark" maxlength="200" :rows="2" type="textarea" />
@@ -1395,7 +1484,7 @@
        </el-form>

        <el-table
-          v-if="currentScore.quantificationId"
+          v-if="!isOfflineScore && currentScore.quantificationId"
          ref="scoreCategoryTable"
          :data="scoreCategoryRows"
          border
@@ -1617,6 +1706,8 @@ import {
  changeStatus,
  remove,
  getScoreTemplate,
+  downloadScoreExcelTemplate,
+  importScoreExcel,
  recognizeBusinessLicenseOcr,
  queryKingdeeBank,
  queryKingdeeBankByNumber,
@@ -1637,6 +1728,12 @@ import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
+import {
+  isExcelResponse,
+  isBusinessJson,
+  parseBlobJson,
+  resolveImportErrorMessage,
+} from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
 import { normalizeSearchRangeParams } from '@/utils/search-range';
@@ -1723,9 +1820,10 @@ export default {
    };
    return {
      form: {},
-      query: {},
+      query: { expireStatus: 'all' },
      deptSearchInitialized: false,
      loading: true,
+      scoreImporting: false,
      data: [],
      archiveNameRisky: false,
      archiveNameRiskTip: '',
@@ -2069,6 +2167,12 @@ export default {
            slot: true,
            minWidth: 140,
          },
+          {
+            label: '下次评定日期',
+            prop: 'nextEvaluateDate',
+            slot: true,
+            minWidth: 130,
+          },
          {
            label: '资金使用情况',
            prop: 'fundUseRate',
@@ -2386,9 +2490,15 @@ export default {
      ];
      const rows = categoryMap.map((category, index) => {
        const details = this.getScoreCategoryDetails(category.categoryCode);
-        let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
-        let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
-        // 暂定：加分/减分合计最高按 15 分计
+        const sumCategoryScore = prop =>
+          details.reduce((sum, item) => {
+            if (this.isBlankScore(item[prop])) return sum;
+            const value = Number(item[prop]);
+            return sum + (Number.isFinite(value) ? value : 0);
+          }, 0);
+        let selfScore = sumCategoryScore('selfScore');
+        let reviewScore = sumCategoryScore('reviewScore');
+        // 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
        if (category.categoryCode === 'plus') {
          selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
          reviewScore = Math.min(reviewScore, HARDCODED_MAX_PLUS_SCORE);
@@ -2406,6 +2516,16 @@ export default {
      });
      return rows;
    },
+    isOfflineScore() {
+      return String(this.currentScore?.evaluateMode || 'online') === 'offline';
+    },
+    expiryTagOptions() {
+      return [
+        { label: '全部', value: 'all' },
+        { label: '30天内到期', value: 'soon' },
+        { label: '已过期', value: 'expired' },
+      ];
+    },
  },
  watch: {
    $route(to, from) {
@@ -2544,7 +2664,9 @@ export default {
        const res = await querySupplierCode(code);
        // 防止响应返回时用户已修改代码
        if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
-        this.archiveForm.supplierCode = res?.data?.data || '';
+        // 后端查不到时 data 为 {}（R 对 null 的空承载兜底），非字符串一律按空处理，避免显示 [object Object]
+        const supplierCode = res?.data?.data;
+        this.archiveForm.supplierCode = typeof supplierCode === 'string' ? supplierCode : '';
      } catch (error) {
        // 忽略查询异常，编码留空
      }
@@ -3516,13 +3638,22 @@ export default {
      return Number.isFinite(rate) ? `${rate.toFixed(2)}%` : '-';
    },
    isBusinessLicenseExpiringSoon(row = {}) {
-      if (row.businessTermType === '长期' || !row.businessEndDate) return false;
-      const endDate = this.$dayjs(row.businessEndDate);
+      return this.isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期');
+    },
+    /** 日期是否在 30 天内到期（含当天）；skip=true 时不提示（如营业执照长期） */
+    isDateExpiringSoon(dateValue, skip = false) {
+      if (skip || !dateValue) return false;
+      const endDate = this.$dayjs(dateValue);
      if (!endDate.isValid()) return false;
      const today = this.$dayjs().startOf('day');
      const expireSoonDate = today.add(30, 'day');
      return !endDate.isAfter(expireSoonDate, 'day');
    },
+    handleExpireChange(expireStatus) {
+      this.query.expireStatus = expireStatus || 'all';
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
    handleBusinessEndDateChange(value) {
      if (value) {
        this.archiveForm.businessTermType = '固定期限';
@@ -4406,7 +4537,9 @@ export default {
    normalizeScore(score) {
      return {
        quantificationId: '',
+        evaluateMode: 'online',
        scoreDate: this.$dayjs().format('YYYY-MM-DD'),
+        nextEvaluateDate: '',
        applyCreditLimit: this.archiveForm.applyCreditLimit || '',
        maxCreditLimit: '',
        maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
@@ -4424,6 +4557,11 @@ export default {
        details: [],
        ...score,
        quantificationId: score.quantificationId ? String(score.quantificationId) : '',
+        evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
+        nextEvaluateDate: score.nextEvaluateDate || '',
+        selfScore: this.normalizeScoreInputValue(score.selfScore),
+        reviewScore: this.normalizeScoreInputValue(score.reviewScore),
+        finalScore: this.normalizeScoreInputValue(score.finalScore),
        applyCreditLimit: this.normalizeOptionalAmount(
          score.applyCreditLimit === undefined
            ? this.archiveForm.applyCreditLimit
@@ -4437,6 +4575,8 @@ export default {
        details: (score.details || []).map(detail => ({
          ...detail,
          scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
+          selfScore: this.normalizeScoreInputValue(detail.selfScore),
+          reviewScore: this.normalizeScoreInputValue(detail.reviewScore),
        })),
      };
    },
@@ -4586,19 +4726,38 @@ export default {
      this.invoiceForm = this.emptyInvoice();
      this.$refs.archiveForm?.clearValidate();
    },
-    // 客商材料不做提交校验，仅在页面上提示未上传项。提交审批前必须完成自评，且评分记录只能有一条。
+    // 仅客商分类含「客户」时强制评分；纯承运商不强制。评分记录至多一条。
    validateScoreForApproval(archive) {
      const scores = archive.scores || [];
      if (scores.length > 1) {
        this.$message.warning('评分记录只能有一条');
        return false;
      }
+      if (!this.requiresCustomerScore(archive.customerType)) {
+        return true;
+      }
      if (scores.length !== 1 || scores[0].selfStatus !== '已完成') {
-        this.$message.warning('提交审批前必须完成自评');
+        this.$message.warning('客户提交审批前必须完成评分自评');
+        return false;
+      }
+      if (!scores[0].nextEvaluateDate) {
+        this.$message.warning('请填写下次评定日期');
        return false;
      }
      return true;
    },
+    /** 客商分类是否包含客户（字典值「客户」或历史值 customer） */
+    requiresCustomerScore(customerType) {
+      const values = Array.isArray(customerType)
+        ? customerType
+        : String(customerType || '')
+            .replace(/，/g, ',')
+            .split(',');
+      return values
+        .map(item => String(item || '').trim())
+        .filter(Boolean)
+        .some(item => item === '客户' || item.toLowerCase() === 'customer');
+    },
    normalizeArchive() {
      // 提交前再次固定所属组织，防止被绕过
      this.applyFixedOwnerDept();
@@ -4889,7 +5048,9 @@ export default {
        const template = this.normalizeScore({
          ...scoreTemplate,
          quantificationId,
+          evaluateMode: this.currentScore.evaluateMode || 'online',
          scoreDate: this.currentScore.scoreDate,
+          nextEvaluateDate: this.currentScore.nextEvaluateDate,
          applyCreditLimit: this.currentScore.applyCreditLimit,
          maxCreditLimit: '',
          creditLevel: '',
@@ -5143,7 +5304,8 @@ export default {
        .replace(/^\./, '')
        .replace(/(\..*)\./g, '$1')
        .replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2');
-      if (prop === 'reviewScore' && normalized !== '') {
+      // 减分项复评得分存正数扣分，允许填 0（不扣分）；不做项目满分截断
+      if (prop === 'reviewScore' && normalized !== '' && !this.isMinusScoreDetail(detail)) {
        const maxScore = this.getScoreItemFullScore(detail);
        if (Number(normalized) > maxScore) {
          detail[prop] = String(maxScore);
@@ -5195,7 +5357,9 @@ export default {
      return this.getScoreDetailCategoryCode(detail) === 'basic';
    },
    getSignedScore(detail, prop) {
-      const score = Number(detail[prop] || 0);
+      if (this.isBlankScore(detail[prop])) return '';
+      const score = Number(detail[prop]);
+      if (!Number.isFinite(score)) return '';
      return this.isMinusScoreDetail(detail) && score > 0 ? -score : score;
    },
    getScoreItemFullScore(detail = {}) {
@@ -5204,7 +5368,12 @@ export default {
      const optionScores = this.parseScoreOptions(detail.optionsJson)
        .map(item => Number(item.score))
        .filter(score => Number.isFinite(score));
-      return optionScores.length ? Math.max(...optionScores) : 0;
+      if (!optionScores.length) return 0;
+      // 减分项选项分常为负（如 -5），项目满分按绝对值取最大可扣分；避免 0 分被误判为高于“最高得分-5”
+      if (this.isMinusScoreDetail(detail)) {
+        return Math.max(...optionScores.map(score => Math.abs(score)));
+      }
+      return Math.max(...optionScores);
    },
    getScoreFullMark(details = []) {
      return details.reduce((sum, item) => {
@@ -5222,6 +5391,7 @@ export default {
      });
    },
    matchCreditStandard(score, scoreRate) {
+      // 闭开区间：≥lower 且 <upper；最高档 upper=100 时包含 100（≥90 A；80≤x<90 B；…；x<50 F）
      const standards = (score.standards || [])
        .filter(item => item && item.creditLevel)
        .sort((a, b) => Number(b.scoreRateLower || 0) - Number(a.scoreRateLower || 0));
@@ -5229,7 +5399,10 @@ export default {
        const lower = Number(standard.scoreRateLower);
        const upper = Number(standard.scoreRateUpper);
        if (!Number.isFinite(lower) || !Number.isFinite(upper)) return false;
-        return scoreRate >= lower && scoreRate <= upper;
+        if (upper >= 100) {
+          return scoreRate >= lower && scoreRate <= upper;
+        }
+        return scoreRate >= lower && scoreRate < upper;
      });
    },
    calculateCreditLimitByStandard(standard, scoreRate) {
@@ -5260,41 +5433,71 @@ export default {
      const basicDetails = this.getScoreCategoryDetailsByList(details, 'basic');
      const plusDetails = this.getScoreCategoryDetailsByList(details, 'plus');
      const minusDetails = this.getScoreCategoryDetailsByList(details, 'minus');
-      const sumScore = (list, prop) => list.reduce((sum, item) => sum + Number(item[prop] || 0), 0);
+      const sumScore = (list, prop) =>
+        list.reduce((sum, item) => {
+          if (this.isBlankScore(item[prop])) return sum;
+          const value = Number(item[prop]);
+          return sum + (Number.isFinite(value) ? value : 0);
+        }, 0);
      const rawPlusSelf = sumScore(plusDetails, 'selfScore');
      const rawPlusReview = sumScore(plusDetails, 'reviewScore');
      const rawMinusSelf = sumScore(minusDetails, 'selfScore');
      const rawMinusReview = sumScore(minusDetails, 'reviewScore');
-      // 暂定：加分/减分合计最高按 15 分计
+      // 暂定：加分/减分合计最高按 15 分计（未超按实际，超 15 按 15/-15）
      const plusSelf = Math.min(rawPlusSelf, HARDCODED_MAX_PLUS_SCORE);
      const plusReview = Math.min(rawPlusReview, HARDCODED_MAX_PLUS_SCORE);
      const minusSelf = Math.min(rawMinusSelf, HARDCODED_MAX_MINUS_SCORE);
      const minusReview = Math.min(rawMinusReview, HARDCODED_MAX_MINUS_SCORE);
-      const selfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
+      const computedSelfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
      const reviewScore = sumScore(basicDetails, 'reviewScore') + plusReview - minusReview;
      const hasReviewScore = details.some(
        item => !this.isBlankScore(item.reviewScore)
      );
+      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计；-1 视为未填
+      const isOffline = String(score.evaluateMode || '') === 'offline';
+      const hasManualSelfScore = isOffline && !this.isBlankScore(score.selfScore);
+      const hasFilledDetail = details.some(item => {
+        if (this.isScoreTypeDetail(item)) {
+          const input = String(item.scoreInput ?? '').trim();
+          return input !== '' && input !== '-' && input !== '.';
+        }
+        return !this.isBlankScore(item.selectedOption);
+      });
+      const manualSelfScore = Number(score.selfScore);
+      const selfScore =
+        hasManualSelfScore && Number.isFinite(manualSelfScore) ? manualSelfScore : computedSelfScore;
      const finalScore = hasReviewScore ? reviewScore : selfScore;
      const fullMark = this.getScoreFullMark(details);
      const scoreRate =
        fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
      const standard = this.matchCreditStandard(score, scoreRate);
      const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
-      score.selfScore = Number(selfScore.toFixed(2));
+      // 线下未手工填写且明细未实际填报时保留空，避免默认写出 -1/0
+      const keepOfflineScoreBlank = isOffline && !hasManualSelfScore && !hasFilledDetail;
+      score.selfScore = keepOfflineScoreBlank ? '' : Number(Number(selfScore).toFixed(2));
      score.reviewScore = Number(reviewScore.toFixed(2));
-      score.finalScore = Number(finalScore.toFixed(2));
-      score.scoreRate = Number(scoreRate.toFixed(2));
+      score.finalScore =
+        keepOfflineScoreBlank && !hasReviewScore ? '' : Number(Number(finalScore).toFixed(2));
+      score.scoreRate = keepOfflineScoreBlank && !hasReviewScore ? '' : Number(scoreRate.toFixed(2));
      if (hasStandards) {
-        score.creditLevel = standard?.creditLevel || '';
-        score.maxCreditLimit = standard
-          ? this.calculateCreditLimitByStandard(standard, scoreRate)
-          : '';
+        score.creditLevel = keepOfflineScoreBlank && !hasReviewScore ? '' : standard?.creditLevel || '';
+        score.maxCreditLimit =
+          keepOfflineScoreBlank && !hasReviewScore
+            ? ''
+            : standard
+              ? this.calculateCreditLimitByStandard(standard, scoreRate)
+              : '';
      }
      return score;
    },
    isBlankScore(value) {
-      return value === undefined || value === null || String(value).trim() === '';
+      return (
+        value === undefined ||
+        value === null ||
+        value === -1 ||
+        value === '-1' ||
+        String(value).trim() === ''
+      );
    },
    hasIncompleteBasicScoreDetail(details = []) {
      return this.getScoreCategoryDetailsByList(details, 'basic').some(item => {
@@ -5411,6 +5614,10 @@ export default {
        this.$message.warning('请选择评定日期');
        return false;
      }
+      if (!this.currentScore.nextEvaluateDate) {
+        this.$message.warning('请选择下次评定日期');
+        return false;
+      }
      if (!this.currentScore.applyCreditLimit) {
        this.$message.warning('请输入拟申请总资金使用额度');
        return false;
@@ -5424,7 +5631,11 @@ export default {
        return false;
      }
      if (!this.currentScore.details || !this.currentScore.details.length) {
-        this.$message.warning('当前评分量化表未配置评分项目');
+        this.$message.warning(
+          this.isOfflineScore
+            ? '请先上传评分表 Excel 解析回填明细'
+            : '当前评分量化表未配置评分项目'
+        );
        return false;
      }
      const invalidScoreInput = this.currentScore.details.find(item => {
@@ -5438,7 +5649,9 @@ export default {
        );
        return false;
      }
+      // 减分项允许填 0（不扣分），且按阶梯累计扣分不做项目满分截断
      const overMaxReviewScore = this.currentScore.details.find(item => {
+        if (this.isMinusScoreDetail(item)) return false;
        if (
          item.reviewScore === undefined ||
          item.reviewScore === null ||
@@ -5633,13 +5846,15 @@ export default {
        });
    },
    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
+      this.query = { expireStatus: this.query.expireStatus || 'all' };
+      this.onLoad(this.page, this.query);
    },
    searchChange(params, done) {
      // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
      // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
+      const expireStatus = this.query.expireStatus || 'all';
      this.query = this.buildQuery(params, true);
+      this.query.expireStatus = expireStatus;
      this.page.currentPage = 1;
      this.onLoad(this.page, this.query);
      done();
@@ -5778,8 +5993,179 @@ export default {
      if (status === 0 || status === '0' || status === -1 || status === '-1') {
        delete values.status;
      }
+      if (!values.expireStatus) {
+        values.expireStatus = this.query.expireStatus || 'all';
+      }
+      if (values.expireStatus === 'all') {
+        delete values.expireStatus;
+      }
      return values;
    },
+    handleEvaluateModeChange(mode) {
+      this.currentScore.evaluateMode = mode === 'offline' ? 'offline' : 'online';
+      if (this.isOfflineScore) {
+        this.expandedScoreCategoryKeys = [];
+        // 切到线下且明细尚未实际填报时清空自评，避免沿用线上合计或 -1 哨兵值
+        const hasFilledDetail = (this.currentScore.details || []).some(item => {
+          if (this.isScoreTypeDetail(item)) {
+            const input = String(item.scoreInput ?? '').trim();
+            return input !== '' && input !== '-' && input !== '.';
+          }
+          return !this.isBlankScore(item.selectedOption);
+        });
+        if (!hasFilledDetail || this.isBlankScore(this.currentScore.selfScore)) {
+          this.currentScore.selfScore = '';
+        }
+        if (!hasFilledDetail || this.isBlankScore(this.currentScore.finalScore)) {
+          this.currentScore.finalScore = '';
+        }
+        if (!hasFilledDetail) {
+          this.currentScore.scoreRate = '';
+          this.currentScore.creditLevel = '';
+          this.currentScore.maxCreditLimit = '';
+        }
+      } else {
+        this.calculateScore(this.currentScore);
+      }
+    },
+    handleOfflineSelfScoreInput(value) {
+      const normalized = String(value || '')
+        .replace(/[^\d.-]/g, '')
+        .replace(/(?!^)-/g, '')
+        .replace(/^\./, '')
+        .replace(/(\..*)\./g, '$1')
+        .replace(/^(-?\d+)(\.\d{0,2})?.*$/, '$1$2');
+      this.currentScore.selfScore = normalized;
+    },
+    recalculateOfflineScore() {
+      if (!this.isOfflineScore) return;
+      if (this.isBlankScore(this.currentScore.selfScore)) {
+        this.currentScore.selfScore = '';
+        const hasReviewScore = (this.currentScore.details || []).some(
+          item => !this.isBlankScore(item.reviewScore)
+        );
+        if (!hasReviewScore) {
+          this.currentScore.finalScore = '';
+        }
+        this.currentScore.scoreRate = '';
+        this.currentScore.creditLevel = '';
+        this.currentScore.maxCreditLimit = '';
+        return;
+      }
+      const selfScore = Number(this.currentScore.selfScore);
+      if (!Number.isFinite(selfScore)) return;
+      this.currentScore.selfScore = Number(selfScore.toFixed(2));
+      const hasReviewScore = (this.currentScore.details || []).some(
+        item => !this.isBlankScore(item.reviewScore)
+      );
+      if (!hasReviewScore) {
+        this.currentScore.finalScore = this.currentScore.selfScore;
+      }
+      const fullMark = this.getScoreFullMark(this.currentScore.details || []);
+      const scoreRate =
+        fullMark > 0
+          ? Math.max(0, Math.min(100, (Number(this.currentScore.finalScore) / fullMark) * 100))
+          : 0;
+      this.currentScore.scoreRate = Number(scoreRate.toFixed(2));
+      const standard = this.matchCreditStandard(this.currentScore, scoreRate);
+      const hasStandards = (this.currentScore.standards || []).some(item => item && item.creditLevel);
+      if (hasStandards) {
+        this.currentScore.creditLevel = standard?.creditLevel || '';
+        this.currentScore.maxCreditLimit = standard
+          ? this.calculateCreditLimitByStandard(standard, scoreRate)
+          : '';
+      }
+    },
+    downloadScoreTemplate() {
+      if (!this.currentScore.quantificationId) {
+        this.$message.warning('请先选择评分量化表');
+        return;
+      }
+      NProgress.start();
+      const loading = ElLoading.service({
+        lock: true,
+        text: '模板下载中',
+        background: 'rgba(255, 255, 255, 0.7)',
+      });
+      downloadScoreExcelTemplate(this.currentScore.quantificationId)
+        .then(res => {
+          downloadXls(
+            res.data,
+            `客商评分明细模板${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
+          );
+        })
+        .finally(() => {
+          loading.close();
+          NProgress.done();
+        });
+    },
+    async uploadScoreExcel(option) {
+      const file = option?.file;
+      if (!file) return;
+      if (!this.currentScore.quantificationId) {
+        this.$message.warning('请先选择评分量化表');
+        return;
+      }
+      const fileName = String(file.name || '').toLowerCase();
+      if (!/\.(xls|xlsx)$/.test(fileName)) {
+        this.$message.error('请上传 .xls,.xlsx 标准格式文件');
+        return;
+      }
+      this.scoreImporting = true;
+      NProgress.start();
+      const loading = ElLoading.service({
+        lock: true,
+        text: '导入中',
+        background: 'rgba(255, 255, 255, 0.7)',
+      });
+      try {
+        const res = await importScoreExcel(this.currentScore.quantificationId, file);
+        if (isExcelResponse(res)) {
+          downloadXls(
+            res.data,
+            `客商评分导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
+          );
+          this.$message.warning('部分数据导入失败，已下载失败明细');
+          return;
+        }
+        const result = isBusinessJson(res?.data) ? res.data : await parseBlobJson(res?.data);
+        if (Number(result?.code) !== 200) {
+          this.$message.error(result?.msg || '导入失败');
+          return;
+        }
+        const imported = result?.data || {};
+        const keepFields = {
+          evaluateMode: 'offline',
+          scoreDate: this.currentScore.scoreDate,
+          nextEvaluateDate: this.currentScore.nextEvaluateDate,
+          applyCreditLimit: this.currentScore.applyCreditLimit,
+          tempApplyCreditLimit: this.currentScore.tempApplyCreditLimit,
+          tempCreditStartDate: this.currentScore.tempCreditStartDate,
+          tempCreditEndDate: this.currentScore.tempCreditEndDate,
+          remark: this.currentScore.remark,
+          attachments: this.scoreAttachmentFiles,
+          quantificationId: this.currentScore.quantificationId,
+        };
+        this.currentScore = this.normalizeScore({
+          ...imported,
+          ...keepFields,
+          standards: imported.standards || this.currentScore.standards || [],
+          details: (imported.details || []).map(detail => ({
+            ...detail,
+            scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
+          })),
+        });
+        this.calculateScore(this.currentScore);
+        this.$message.success('评分表解析成功，请在证明材料中上传评分表原件');
+      } catch (error) {
+        const message = await resolveImportErrorMessage(error);
+        this.$message.error(message);
+      } finally {
+        this.scoreImporting = false;
+        loading.close();
+        NProgress.done();
+      }
+    },
  },
 };
 </script>
@@ -5814,6 +6200,23 @@ export default {
  color: var(--el-color-danger);
 }

+.customer-archive-page__expiry-tabs {
+  margin-bottom: 8px;
+}
+
+.score-offline-tip {
+  margin-left: 12px;
+  color: #909399;
+  font-size: 12px;
+}
+
+.score-offline-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
 // 风险客商悬浮提示：popper 挂在 body 下，需用 :global 约束宽度
 :global(.customer-risk-popper) {
  max-width: 360px;
Author	SHA1	Message	Date
weicw	ad487b1e51	🐛 运输计划调度确认生成不再强制司机与手机号司机与手机号对全部承运类型（承运商/自运/平台）均为选填，仅校验已填内容的格式与长度。	2026-11-07 04:29:43 +08:00
weicw	63722585c0	🔀 合并主干 master 到 dev	2026-11-07 02:16:20 +08:00
weicw	6bb1a91be8	✨ 更新规格和型号输入框的占位符文本	2026-11-06 14:57:30 +08:00
b2894lxlx	d3ba0ce38b	Merge remote-tracking branch 'websoft/dev'	2026-11-06 09:36:51 +08:00
b2894lxlx	f5be5245d6	✨ 角色管理列表接入分页 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-06 09:32:50 +08:00
b2894lxlx	baf54efb7b	🐛 修复评分-1空值、结算单号跳转与小程序用户数据权限组织选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-06 09:32:36 +08:00
weicw	e7ba220b34	✨ 新建运输计划默认运输方式为公路运输	2026-11-06 09:00:00 +08:00
weicw	e79e50bf40	🐛 修复关联运单批次弹窗重新打开时残留上次筛选条件 - 打开弹窗时重置搜索条件与分页，并清空上一次的列表数据 - 重置按钮与打开时的重置共用 resetBatchSearch	2026-11-06 08:31:15 +08:00
weicw	a6b4a7b2d1	✨ 凭证管理关联运单批次弹窗增加项目筛选与项目列 - 搜索表单新增项目下拉筛选，查询参数透传 projectId - 运单批次表格在运单批次号后新增项目列，同一批次跨项目时显示「多个项目」	2026-11-06 08:10:31 +08:00
weicw	2be6a559e7	✨ 运单导入新增与已有运单重复页签	2026-11-06 07:30:04 +08:00
weicw	523a042fa9	✨ 运力管理司机、车辆、船舶的所属组织只允许选择平台公司	2026-11-05 20:20:09 +08:00
weicw	07af103ecb	✨ 新增司机时预填所属组织为广西桂物物流服务集团有限公司	2026-11-05 19:19:40 +08:00
weicw	6e48fa50cf	🐛 修复组织级联回显时递归取整棵树导致栈溢出	2026-11-05 19:19:35 +08:00
weicw	8734c27fd3	🔀 合并主干 master 到 dev	2026-11-05 18:24:26 +08:00
b2894lxlx	7ff2b3fe28	✨ 司机从业资格证改为调用专用识别接口 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 15:09:16 +08:00
b2894lxlx	17d2766f82	Merge pull request '收票登记新增所属合同带出承办部门替代手选结算组织' (#13 ) from feature/20261104-bfi-project-web into master Reviewed-on: #13	2026-11-05 15:04:42 +08:00
刘泉佳	2fd927a90c	fix: 预付结算单与结算调整单分页固定底部，搜索label不再换行	2026-11-05 15:01:28 +08:00
刘泉佳	8057e860de	fix: 批量转结算弹窗居中限高并固定勾选列	2026-11-05 14:47:06 +08:00
刘泉佳	ffc2942d2b	fix: 付款申请结算单号误跳预付结算单过滤-1占位id	2026-11-05 13:30:36 +08:00
刘泉佳	22bbcbb7aa	fix: 应收转结算与开票申请点击结算单号跳转收款结算单	2026-11-05 13:30:36 +08:00
刘泉佳	4dd63fc5fa	feat: 收票登记新增所属合同带出承办部门替代手选结算组织	2026-11-05 12:05:56 +08:00
刘泉佳	c525bffeca	fix: 修复开票申请提交返回列表页未刷新	2026-11-05 11:44:19 +08:00
b2894lxlx	8f3da0e386	✨ 预结算收款方与付款方改为下拉选择 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 23:47:00 +08:00
b2894lxlx	d4ae6d521a	✨ 客商评分双模式与金蝶公司代码改回组织维护 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 23:46:20 +08:00
刘泉佳	b36fa18db5	Merge remote-tracking branch 'origin/master'	2026-11-04 22:19:13 +08:00
刘泉佳	f648285406	fix: 修复客商档案供应商编码查询无结果时显示[object Object]	2026-11-04 22:17:52 +08:00
b2894lxlx	fff0a29947	✨ 业务部门配置支持维护金蝶公司代码 Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 22:15:48 +08:00
b2894lxlx	64b61c9c29	Merge pull request '付款结算 / 收票登记 / 发票认领模块' (#12 ) from feature/20261103-bfi-warehouse-web into master Reviewed-on: #12	2026-11-04 21:22:51 +08:00
weicw	32065b9c54	🔀 合并主干 master 到 dev	2026-11-04 18:24:39 +08:00
weicw	799a87641e	✨ 合同管理搜索表单新增客商筛选，合同名称移到最后，生效类型改为合同状态	2026-11-03 21:16:00 +08:00
weicw	28baa69e8f	🐛 装货管理与运输计划货物信息列统一为仅一种货物时不显示等N种货物	2026-11-03 19:41:25 +08:00
weicw	4ed80268b4	🐛 运单管理货物信息列仅一种货物时不显示等N种货物	2026-11-03 19:37:23 +08:00
weicw	30c59c2acb	🔀 合并主干 master 到 dev	2026-11-03 19:30:03 +08:00
weicw	39560bde79	✨ 过程配置新增装货端/卸货端节点与货量类型校验	2026-11-02 15:22:42 +08:00