fix: 附件同步不再自动填充描述，调整附件类型不再重排，回显保持原位置

fix: 修复正式结算单结算明细运输总量未显示计量单位
feat: 应收应付明细新增运单号查询条件
2026-11-06 14:06:01 +08:00 · 2026-11-06 12:22:47 +08:00 · 2026-11-06 12:22:46 +08:00 · 2026-11-06 11:26:24 +08:00 · 2026-11-06 11:15:29 +08:00 · 2026-11-06 11:07:38 +08:00
17 changed files with 301 additions and 438 deletions
@@ -95,5 +95,3 @@ 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 });
@@ -1,4 +1,4 @@
-import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
+import { getDeptTree } from '@/api/system/dept';
 import { ElCascader } from 'element-plus';
 import { h } from 'vue';

@@ -14,10 +14,6 @@ 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
@@ -38,11 +34,6 @@ const ORG_PROPS = ['organizationName', 'deptName'];
 // 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
 const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';

-// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到
-// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、
-// 保存即把原值丢掉。
-const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
-
 export default {
  data() {
    return {
@@ -53,14 +44,6 @@ export default {
      organizationLoading: false,
      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
      enableUnassignedOrgFilter: false,
-      // 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效
-      restrictFormOrgToPlatformCompany: false,
-      // 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取
-      platformCompanyOrgIds: [],
-      // 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项
-      formOrganizationLegacyName: '',
-      // 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重）
-      organizationOptionsPromise: null,
    };
  },
  computed: {
@@ -71,12 +54,9 @@ export default {
        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
        : this.organizationTreeOptions;
    },
-    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。
-    // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
-    // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
-    // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
+    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
    organizationCascaderProps() {
-      const props = {
+      return {
        value: 'id',
        label: 'label',
        children: 'children',
@@ -84,25 +64,15 @@ export default {
        checkStrictly: true,
        expandTrigger: 'click',
      };
-      if (this.restrictFormOrgToPlatformCompany) {
-        props.disabled = data => this.platformCompanyOrgDisabled(data);
-      }
-      return props;
    },
  },
  methods: {
    loadOrganizationOptions() {
-      // 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve
-      if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
+      if (this.organizationLoading) return;
      this.organizationLoading = true;
      const tenantId = this.userInfo?.tenantId;
-      // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
-      const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
-        ? getPlatformCompanySelect().catch(() => null)
-        : Promise.resolve(null);
-      this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
-        .then(([res, platformRes]) => {
-          this.applyPlatformCompanyOptions(platformRes);
+      getDeptTree(tenantId)
+        .then(res => {
          const source = res.data?.data || res.data || [];
          const tree = this.excludeExternalOrganization
            ? this.excludeExternalOrganization(source)
@@ -120,21 +90,7 @@ 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 = []) {
@@ -187,9 +143,7 @@ export default {
      for (const node of tree || []) {
        const path = [...parents, String(node.id)];
        if (String(node.id) === String(target)) return path;
-        // 必须显式传 node.children || []：叶节点的 children 是 undefined，
-        // 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
-        const matched = this.findOrgPath(target, node.children || [], path);
+        const matched = this.findOrgPath(target, node.children, path);
        if (matched) return matched;
      }
      return null;
@@ -198,52 +152,6 @@ 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();
@@ -256,13 +164,7 @@ export default {
      const value = Array.isArray(path)
        ? path.filter(item => item !== undefined && item !== null && item !== '')
        : [];
-      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()
-        : '';
+      return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
    },
    // 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤）
    normalizeOrganizationSearch(params, prop = 'organizationName') {
@@ -208,9 +208,6 @@ 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'],
@@ -23,6 +23,7 @@ export const searchFields = [
  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
  { label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
  { label: '批次号', prop: 'batchNo', type: 'input' },
+  { label: '运单号', prop: 'waybillNo', type: 'input' },
  { label: '车号', prop: 'vehicleNo', type: 'input' },
 ];

@@ -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();
      });
@@ -484,24 +484,20 @@
      </div>
      <el-tabs v-model="previewTab"
        ><el-tab-pane :label="`运单数（${rows.length}）`" name="all" /><el-tab-pane
-          :label="`Excel内重复（${duplicateRows.length}）`"
-          name="duplicate" /><el-tab-pane
-          :label="`与已有运单重复（${historyDuplicateRows.length}）`"
-          name="history" /></el-tabs
+          :label="`疑似重复（${duplicateRows.length}）`"
+          name="duplicate" /></el-tabs
      ><el-table
        :data="previewRows"
        border
        max-height="440"
-        :row-class-name="
-          ({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
-        "
+        :row-class-name="({ row }) => (row._duplicate ? '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 previewColumns"
+          v-for="column in detailColumns"
          :key="column.prop"
          :prop="column.prop"
          :label="column.label"
@@ -587,6 +583,8 @@
                ><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
@@ -718,12 +716,9 @@ const transportTypeOptions = ref([]),
 const rowSelection = ref([]),
  previewTab = ref('all');
 const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
-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 previewRows = computed(() =>
+  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
+);
 const carrierContractsLoaded = ref(false),
  hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
@@ -800,16 +795,6 @@ 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: '运输方式' },
@@ -1202,7 +1187,6 @@ const loadBatchRows = async batchId => {
    batchNo: item.batchNo || form.batchNo,
  }));
  refreshDuplicateFlags();
-  await refreshHistoryDuplicates();
  rowSelection.value = [];
  previewTab.value = 'all';
 };
@@ -1525,8 +1509,6 @@ const fileChange = async (file, list) => {
  if (isValid) {
    // 校验通过，填充表格数据
    rows.value = parsedRows;
-    // 传 rows.value（响应式代理），否则后续写入不触发重新渲染
-    await refreshHistoryDuplicates(rows.value);
  } else {
    // 校验失败，清空数据
    rows.value = [];
@@ -1544,12 +1526,16 @@ 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);
@@ -1558,39 +1544,19 @@ const refreshDuplicateFlags = (list = rows.value) => {
  groups.forEach(group => {
    const duplicated = group.length > 1;
    group.forEach(row => {
-      row._duplicate = duplicated;
+      row._duplicate = duplicated && !row._duplicateConfirmed;
    });
  });
 };

-/** 逐行提交给后端与项目下已有运单比对，命中的行带上已有运单号。比对失败不影响导入。 */
-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 confirmDuplicateRow = row => {
+  row._duplicateConfirmed = true;
+  refreshDuplicateFlags();
+  ElMessage.success('已确认，该行将按正常数据导入');
 };

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

@@ -1805,7 +1771,6 @@ const saveRow = row => {
  row._editing = false;
  delete row._editSnapshot;
  refreshDuplicateFlags();
-  refreshHistoryDuplicates();
 };
 const cancelRow = row => {
  if (row._editSnapshot) Object.assign(row, row._editSnapshot);
@@ -1815,14 +1780,12 @@ 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;
@@ -1886,11 +1849,7 @@ 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}条Excel内重复数据，是否确认导入？`, '提示');
-  const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
-  if (historyCount)
-    await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
+  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
  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"
                />
@@ -8453,6 +8453,7 @@ export default {
      }
      if (!this.isTaskFullMode) {
        requiredFields.push(['cargoName', '货物名称']);
+        requiredFields.push(['model', '型号']);
        requiredFields.push(['quantity', '数量']);
      }
      const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
@@ -389,18 +389,6 @@
              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
@@ -440,10 +428,6 @@
        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"
@@ -710,12 +694,7 @@ const selectedBatches = ref([]),
  batchRows = ref([]),
  batchSelection = ref([]),
  batchCreateRange = ref([]);
-const batchQuery = reactive({
-  batchNo: '',
-  projectId: '',
-  createUser: '',
-  waybillCount: undefined,
-});
+const batchQuery = reactive({ batchNo: '', 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 });
@@ -1044,12 +1023,7 @@ 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);
@@ -1059,7 +1033,6 @@ 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` : '',
@@ -1080,18 +1053,10 @@ const handleWaybillCountInput = value => {
    batchQuery.waybillCount = filtered.replace(/^0+/, '');
  }
 };
-const resetBatchSearch = () => {
-  Object.assign(batchQuery, {
-    batchNo: '',
-    projectId: '',
-    createUser: '',
-    waybillCount: undefined,
-  });
+const resetBatchQuery = () => {
+  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
  batchCreateRange.value = [];
  batchPage.current = 1;
-};
-const resetBatchQuery = () => {
-  resetBatchSearch();
  loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {
@@ -97,7 +97,7 @@
                <el-option
                  v-for="item in contractOptions"
                  :key="item.id"
-                  :label="formatContractOptionLabel(item)"
+                  :label="item.contractName || item.contractNo"
                  :value="item.id"
                />
              </el-select>
@@ -415,7 +415,8 @@
              ><el-input
                v-model="row.description"
                :disabled="readonly"
-                maxlength="200" /></template></el-table-column
+                maxlength="200"
+                placeholder="请输入" /></template></el-table-column
          ><el-table-column label="文件大小" width="120"
            ><template #default="{ row }">{{
              formatAttachmentSize(row)
@@ -732,7 +733,6 @@ import {
  getList as getCustomerArchiveList,
 } from '@/api/vehicle/customer-archive';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
-import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
@@ -1140,7 +1140,6 @@ export default {
    this.initialize();
  },
  methods: {
-    formatContractOptionLabel,
    hasPermission(code) {
      return this.permission?.[code] !== false;
    },
@@ -2086,10 +2085,10 @@ export default {
    mergeAutomaticAttachments(
      files,
      materials,
-      sourceName,
      defaultMaterial = null,
      sourceKey = '',
-      keepUnmatched = false
+      keepUnmatched = false,
+      insertIndex = -1
    ) {
      const existingUrls = new Set(
        (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
@@ -2113,35 +2112,39 @@ export default {
            url,
            link: file.link || url,
            attachmentType: material ? MATERIAL_TYPE_MAP[material.key] : 'other',
-            description: file.description || `自动取自${sourceName}`,
+            description: file.description || '',
            sourceImported: true,
            sourceKey: sourceKey || undefined,
          };
        });
-      if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
+      if (imported.length) {
+        // 回填到被替换附件的原起始位置，避免回显/切换时把用户新传附件顶到前面
+        const attachments = [...this.form.attachments];
+        const insertAt =
+          insertIndex >= 0 ? Math.min(insertIndex, attachments.length) : attachments.length;
+        attachments.splice(insertAt, 0, ...imported);
+        this.form.attachments = attachments;
+      }
      return imported;
    },
-    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
-    removeAutomaticAttachments(sourceKey, sourceName = '') {
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换），返回首个被移除的位置 */
+    removeAutomaticAttachments(sourceKey) {
      const previousUrls = new Set(
        sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
      );
-      this.form.attachments = (this.form.attachments || []).filter(file => {
+      let firstRemovedIndex = -1;
+      this.form.attachments = (this.form.attachments || []).filter((file, index) => {
        const url = this.attachmentFileUrl(file);
-        if (sourceKey && file.sourceKey === sourceKey) return false;
-        if (
-          sourceName &&
-          file.sourceImported &&
-          String(file.description || '').includes(`自动取自${sourceName}`)
-        ) {
-          return false;
-        }
-        if (previousUrls.size && url && previousUrls.has(url)) return false;
-        return true;
+        const keep =
+          !(sourceKey && file.sourceKey === sourceKey) &&
+          !(previousUrls.size && url && previousUrls.has(url));
+        if (!keep && firstRemovedIndex === -1) firstRemovedIndex = index;
+        return keep;
      });
      if (sourceKey === 'settlement') {
        this.linkedSettlementAttachmentUrls = [];
      }
+      return firstRemovedIndex;
    },
    /** 按当前结算单附件整批同步：先清旧关联，再写入新结算单上传的附件 */
    syncSettlementAttachments(settlementRows = []) {
@@ -2156,14 +2159,14 @@ export default {
          .map(file => this.attachmentFileUrl(file))
          .filter(url => url && nextUrlSet.has(url));
      }
-      this.removeAutomaticAttachments('settlement', '结算单');
+      const removedAt = this.removeAutomaticAttachments('settlement');
      const imported = this.mergeAutomaticAttachments(
        settlementFiles,
        settlementMaterials,
-        '结算单',
        null,
        'settlement',
-        true
+        true,
+        removedAt
      );
      this.linkedSettlementAttachmentUrls = imported
        .map(file => this.attachmentFileUrl(file))
@@ -2214,7 +2217,7 @@ export default {
        this.syncSettlementAttachments(settlementRows);
        if (!this.form.contractId) {
          this.firstContractPayment = false;
-          this.removeAutomaticAttachments('contract', '合同');
+          this.removeAutomaticAttachments('contract');
          return;
        }
        const contractResponse = await getContractDetail(this.form.contractId);
@@ -2226,13 +2229,14 @@ export default {
          this.contractSignatureFileAvailable = contractFiles.some(file =>
            Boolean(this.attachmentFileUrl(file))
          );
-          this.removeAutomaticAttachments('contract', '合同');
+          const contractRemovedAt = this.removeAutomaticAttachments('contract');
          this.mergeAutomaticAttachments(
            contractFiles,
            [ATTACHMENT_MATERIALS.contract],
-            '合同',
            ATTACHMENT_MATERIALS.contract,
-            'contract'
+            'contract',
+            false,
+            contractRemovedAt
          );
          return;
        }
@@ -2246,14 +2250,15 @@ export default {
            String(item.id || '') !== String(this.form.id || '') &&
            item.approvalStatus !== 'voided'
        );
-        this.removeAutomaticAttachments('contract', '合同');
+        const contractRemovedAt = this.removeAutomaticAttachments('contract');
        if (this.firstContractPayment) {
          this.mergeAutomaticAttachments(
            this.parse(contract.contractFileJson),
            [ATTACHMENT_MATERIALS.contract],
-            '合同',
            ATTACHMENT_MATERIALS.contract,
-            'contract'
+            'contract',
+            false,
+            contractRemovedAt
          );
        }
      } catch (error) {
@@ -306,7 +306,7 @@
              </el-link>
              <span v-else-if="item.column.money">{{ formatMoney(row[item.column.prop]) }}</span>
              <span v-else-if="item.column.prop === 'transportQuantity'">
-                {{ formatDetailTransportQuantity(row[item.column.prop]) }}
+                {{ formatDetailTransportQuantity(row) }}
              </span>
              <span v-else-if="item.column.prop === 'mileage'">
                {{ formatDetailMileage(row[item.column.prop]) }}
@@ -362,7 +362,6 @@
                v-model="row.type"
                filterable
                placeholder="请选择类型"
-                @change="sortAttachments"
              >
                <el-option
                  v-for="item in attachmentTypeOptions"
@@ -1530,7 +1529,6 @@ export default {
      this.selectedAttachmentRows = [];
      this.invoices = data.invoices || [];
      this.issuedInvoices = data.issuedInvoices || [];
-      this.sortAttachments();
      this.contracts = this.filterContracts(this.allContracts, this.form.projectId);
    },
    async initialize() {
@@ -3172,13 +3170,13 @@ export default {
    formatMoney(value) {
      return `${Number(value || 0).toFixed(2)} RMB`;
    },
-    formatQuantity(value) {
-      if (value === undefined || value === null || value === '') return '-';
+    formatDetailTransportQuantity(row) {
+      const value = row.transportQuantity;
+      if (this.readonly && Number(value) === -1) return '-';
      const quantity = Number(value);
-      return Number.isFinite(quantity) ? quantity.toFixed(2) : '-';
-    },
-    formatDetailTransportQuantity(value) {
-      return this.readonly && Number(value) === -1 ? '-' : this.formatQuantity(value);
+      if (!Number.isFinite(quantity)) return '-';
+      // 与预结算编辑器 formatQuantity 保持一致，拼接计量单位
+      return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
    },
    formatDetailMileage(value) {
      return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);
@@ -3235,7 +3233,6 @@ export default {
        label: item.dictValue,
        value: item.dictValue,
      }));
-      this.sortAttachments();
    },
    resolveAttachmentType(fileName) {
      const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3259,25 +3256,6 @@ export default {
      const typeText = String(item?.label || item?.value || '').trim();
      return typeText === '其他' || typeText === '其他附件';
    },
-    getAttachmentTypeOrder(type) {
-      const normalizedType = String(type || '').trim();
-      const index = this.attachmentTypeOptions.findIndex(
-        item =>
-          String(item.value || '').trim() === normalizedType ||
-          String(item.label || '').trim() === normalizedType
-      );
-      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
-    },
-    sortAttachments() {
-      this.attachments = (this.attachments || [])
-        .map((file, index) => ({ file, index }))
-        .sort((a, b) => {
-          const orderDifference =
-            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
-          return orderDifference || a.index - b.index;
-        })
-        .map(item => item.file);
-    },
    getMissingAttachmentTypes(files = this.attachments) {
      const uploadedTypes = new Set(
        (files || [])
@@ -3307,7 +3285,6 @@ export default {
        size: this.formatAttachmentSize(file.size),
        url: file.url || file.link || '',
      });
-      this.sortAttachments();
    },
    handleAttachmentSelectionChange(rows) {
      this.selectedAttachmentRows = rows || [];
@@ -371,7 +371,6 @@
                  v-model="row.type"
                  filterable
                  placeholder="请选择"
-                  @change="sortAttachments"
                >
                  <el-option
                    v-for="item in attachmentTypeOptions"
@@ -1573,7 +1572,6 @@ export default {
          row => !isApprovalSettlementChange(row.changeContent)
        );
        this.attachments = this.parseAttachments(detail.attachmentsJson);
-        this.sortAttachments();
        this.selectedAttachmentRows = [];
        if (detail.contractId) {
          await this.ensureContractPartyOptions(detail.contractId, {
@@ -3099,7 +3097,6 @@ export default {
          uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
        };
      });
-      this.sortAttachments();
      this.selectedAttachmentRows = [];
    },
    async loadAttachmentTypeOptions() {
@@ -3115,7 +3112,6 @@ export default {
      } catch (error) {
        this.attachmentTypeOptions = [];
      }
-      this.sortAttachments();
    },
    resolveAttachmentType(fileName) {
      const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3143,25 +3139,6 @@ export default {
        typeText === '其它附件'
      );
    },
-    getAttachmentTypeOrder(type) {
-      const normalizedType = String(type || '').trim();
-      const index = this.attachmentTypeOptions.findIndex(
-        item =>
-          String(item.value || '').trim() === normalizedType ||
-          String(item.label || '').trim() === normalizedType
-      );
-      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
-    },
-    sortAttachments() {
-      this.attachments = (this.attachments || [])
-        .map((file, index) => ({ file, index }))
-        .sort((a, b) => {
-          const orderDifference =
-            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
-          return orderDifference || a.index - b.index;
-        })
-        .map(item => item.file);
-    },
    attachmentTypeName(type) {
      const option = this.attachmentTypeOptions.find(
        item => String(item.value) === String(type) || String(item.label) === String(type)
@@ -136,7 +136,7 @@
        <div class="settlement-detail-page__detail-panel-body">
          <el-tabs v-model="detailDialog.activeTab" @tab-change="handleDetailTabChange">
            <el-tab-pane label="费用明细" name="fee">
-              <el-table v-loading="detailDialog.loading" :data="feeRows" border>
+              <el-table v-loading="detailDialog.loading" :data="feeRows" :max-height="detailTableMaxHeight" border>
                <el-table-column type="index" label="序号" width="64" align="center" />
                <el-table-column
                  v-for="column in feeDetailColumns"
@@ -168,7 +168,7 @@
              </el-table>
            </el-tab-pane>
            <el-tab-pane label="变更记录" name="change">
-              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" border>
+              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" :max-height="detailTableMaxHeight" border>
                <el-table-column type="index" label="序号" width="64" align="center" />
                <el-table-column
                  v-for="column in changeRecordColumns"
@@ -1063,11 +1063,11 @@ import { getContractOptions as getSettlementContractOptions } from '@/api/settle
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
-import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
-import { settlementListPath } from '@/utils/settlement-menu';
+import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
+import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
 import {
  contractApprovalStatusOptions,
  contractCategoryOptions,
@@ -1144,8 +1144,6 @@ export default {
        rule: null,
      },
      adjustDialog: { visible: false, loading: false, submitting: false, row: null },
-      // 表头 + 最多 3 行费用 + 横向滚动条，超出后表体上下滚动
-      adjustTableMaxHeight: 40 + 49 * 3 + 16,
      adjustRows: [],
      adjustDynamicFeeColumns: [],
      adjustTextProps: ['specification', 'model', 'billingFactor', 'billingType'],
@@ -1223,18 +1221,28 @@ export default {
    };
  },
  computed: {
+    adjustTableMaxHeight() {
+      // 面板满高 min(60vh,560) 减去头部(49)、底部(58)、内边距(32)；费用行多时表体内部滚动，表头固定
+      if (!this.adjustDialog.visible) return 40 + 49 * 3 + 16;
+      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 138;
+    },
+    detailTableMaxHeight() {
+      // 同上，另减 body 下内边距(16) 和 tabs 头(55)
+      if (!this.detailDialog.visible) return 40 + 49 * 3 + 16;
+      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 178;
+    },
    generateContractName() {
      const contract = this.contractOptions.find(
        item => String(item.id) === String(this.generateQuery.contractId)
      );
-      return formatContractOptionLabel(contract);
+      return contract?.contractName || '';
    },
    updateContractName() {
      const contractId = this.updateFeeForm.contractId;
      const contract = [...this.updateContractOptions, ...this.contractOptions].find(
        item => String(item.id) === String(contractId)
      );
-      return formatContractOptionLabel(contract);
+      return contract?.contractName || '';
    },
    updateBillingPlanName() {
      const billingPlanId = this.updateFeeForm.billingPlanId;
@@ -1921,8 +1929,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);
@@ -1934,6 +1943,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 =
@@ -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="formOrganizationTreeOptions"
+                  :options="organizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -797,8 +797,6 @@ export default {
      driverBox: false,
      // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
      enableUnassignedOrgFilter: true,
-      // 表单「所属组织」只允许选平台公司；搜索栏不受影响
-      restrictFormOrgToPlatformCompany: true,
      vehicleSelectorVisible: false,
      vehicleSelectorLoading: false,
      vehicleSelectorOption,
@@ -923,19 +921,13 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
-    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
-    formOrganizationTreeOptions() {
-      return this.buildFormOrganizationTree();
-    },
    // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveFormOrgPath(this.driverForm.organizationName);
+        return this.resolveOrgPath(this.driverForm.organizationName);
      },
      set(path) {
-        const name = this.resolveOrgName(path);
-        this.driverForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
+        this.driverForm.organizationName = this.resolveOrgName(path);
      },
    },
    isAdmin() {
@@ -973,8 +965,8 @@ export default {
    },
  },
  created() {
-    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
+    this.loadOrganizationOptions();
    this.initRegionOptions();
    this.initQualificationTypeOptions();
  },
@@ -992,7 +984,9 @@ export default {
          'organizationName'
        );
        vehicleColumn.dicData = this.organizationOptions;
-        return this.loadOrganizationOptions();
+        if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
+          this.driverForm.organizationName = this.getCurrentOrganizationName();
+        }
      });
    },
    initQualificationTypeOptions() {
@@ -1022,11 +1016,6 @@ 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(
@@ -1214,16 +1203,8 @@ export default {
      this.submitAttempted = false;
      if (!row?.id) {
        this.driverForm = emptyForm();
-        // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
-        this.driverForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.driverForm.organizationName = this.getCurrentOrganizationName();
        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 => {
@@ -1237,13 +1218,11 @@ 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;
@@ -147,7 +147,7 @@
              <el-form-item label="船舶所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="formOrganizationTreeOptions"
+                  :options="organizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -664,8 +664,6 @@ export default {
      shipForm: emptyForm(),
      uploadHeaders: getUploadHeaders(),
      organizationOptions: [],
-      // 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
-      restrictFormOrgToPlatformCompany: true,
      formRules: {
        organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
        shipName: [
@@ -712,19 +710,13 @@ export default {
  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
-    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
-    formOrganizationTreeOptions() {
-      return this.buildFormOrganizationTree();
-    },
    // 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
    organizationCascaderValue: {
      get() {
-        return this.resolveFormOrgPath(this.shipForm.organizationName);
+        return this.resolveOrgPath(this.shipForm.organizationName);
      },
      set(path) {
-        const name = this.resolveOrgName(path);
-        this.shipForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
+        this.shipForm.organizationName = this.resolveOrgName(path);
      },
    },
    isAdmin() {
@@ -752,8 +744,8 @@ export default {
    },
  },
  created() {
-    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
+    this.loadOrganizationOptions();
  },
  methods: {
    hasPermission(code) {
@@ -764,7 +756,9 @@ export default {
        this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
        const column = this.findColumn(this.option.column, 'organizationName');
        column.dicData = this.organizationOptions;
-        return this.loadOrganizationOptions();
+        if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
+          this.shipForm.organizationName = this.getCurrentOrganizationName();
+        }
      });
    },
    flattenDeptOptions(tree = [], level = 0) {
@@ -790,10 +784,6 @@ 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);
    },
@@ -885,19 +875,12 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.shipForm = emptyForm();
-        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
-        this.shipForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.shipForm.organizationName = this.getCurrentOrganizationName();
        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;
      });
    },
@@ -907,7 +890,6 @@ 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="organizationFormCascaderProps"
+                      :props="formOrgCascaderProps"
                      filterable
                      clearable
                      placeholder="请选择"
@@ -702,8 +702,6 @@ export default {
      // 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
      organizationCascaderPath: [],
      useDepartmentCascaderPath: [],
-      // 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
-      restrictFormOrgToPlatformCompany: true,
      formOrgCascaderProps: {
        value: 'id',
        label: 'label',
@@ -759,17 +757,11 @@ export default {
    },
    // 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
    organizationFormTreeOptions() {
-      return this.cloneOrgTree(this.buildFormOrganizationTree());
+      return this.cloneOrgTree(this.organizationTreeOptions);
    },
    useDepartmentFormTreeOptions() {
      return this.cloneOrgTree(this.organizationTreeOptions);
    },
-    // 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
-    organizationFormCascaderProps() {
-      return this.restrictFormOrgToPlatformCompany
-        ? { ...this.formOrgCascaderProps, disabled: data => this.platformCompanyOrgDisabled(data) }
-        : this.formOrgCascaderProps;
-    },
    // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
    organizationCascaderValue: {
      get() {
@@ -777,9 +769,7 @@ export default {
      },
      set(path) {
        this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
-        const name = this.resolveOrgName(this.organizationCascaderPath);
-        this.vehicleForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
+        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
      },
    },
    // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -820,6 +810,7 @@ export default {
  },
  created() {
    this.initDeptTree();
+    this.loadOrganizationOptions();
  },
  watch: {
    organizationTreeOptions() {
@@ -861,15 +852,17 @@ export default {
      }));
    },
    syncOrgCascaderPaths() {
-      this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
+      this.organizationCascaderPath = this.resolveOrgPath(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();
        }
@@ -901,10 +894,6 @@ 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, '');
    },
@@ -972,18 +961,11 @@ export default {
      this.readonly = readonly;
      if (!row?.id) {
        this.vehicleForm = emptyForm();
-        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
-        this.vehicleForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.vehicleForm.organizationName = this.getCurrentOrganizationName();
        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 => {
@@ -995,7 +977,6 @@ export default {
        if (!this.vehicleForm.useDepartment) {
          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
        }
-        this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
        this.syncOrgCascaderPaths();
        this.splitPlateNo();
        this.syncPlateNo(false);
@@ -1008,7 +989,6 @@ export default {
    },
    resetVehicle() {
      this.vehicleForm = emptyForm();
-      this.formOrganizationLegacyName = '';
      this.organizationCascaderPath = [];
      this.useDepartmentCascaderPath = [];
      this.vehicleCertificateUploads = {};
@@ -1630,16 +1610,6 @@ 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) {
@@ -1671,7 +1641,18 @@ 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%;
  }
@@ -1409,9 +1409,10 @@
              <el-form-item label="自评得分" :required="isOfflineScore">
                <el-input
                  v-if="isOfflineScore"
-                  v-model="currentScore.selfScore"
+                  :model-value="formatScoreValue(currentScore.selfScore)"
                  maxlength="10"
                  :disabled="readonly"
+                  placeholder="请输入自评得分"
                  @input="handleOfflineSelfScoreInput"
                  @blur="recalculateOfflineScore"
                >
@@ -2489,8 +2490,14 @@ 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);
+        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);
@@ -4552,6 +4559,9 @@ export default {
        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
@@ -4565,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),
        })),
      };
    },
@@ -5345,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 = {}) {
@@ -5419,7 +5433,12 @@ 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');
@@ -5434,33 +5453,51 @@ export default {
      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 =
-        isOffline && Number.isFinite(manualSelfScore) && String(score.selfScore ?? '').trim() !== ''
-          ? manualSelfScore
-          : computedSelfScore;
+        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(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(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 => {
@@ -5968,6 +6005,27 @@ export default {
      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) {
@@ -5981,6 +6039,19 @@ export default {
    },
    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));
Author	SHA1	Message	Date
刘泉佳	53aa1f66ef	fix: 附件同步不再自动填充描述，调整附件类型不再重排，回显保持原位置	2026-11-06 14:06:01 +08:00
刘泉佳	7def9869ff	fix: 修复正式结算单结算明细运输总量未显示计量单位	2026-11-06 12:22:47 +08:00
刘泉佳	f767296e4d	feat: 应收应付明细新增运单号查询条件	2026-11-06 12:22:46 +08:00
刘泉佳	b879fd3011	fix: 单据详情面板费用明细与变更记录表体内部滚动，表头固定	2026-11-06 11:26:24 +08:00
刘泉佳	db55c3ef00	fix: 修复应收应付调整费用面板表格行被裁切，费用行多时表体内部滚动	2026-11-06 11:15:29 +08:00
刘泉佳	af4a9b6d60	fix: 应收应付明细与付款申请合同名称仅显示名称，不再拼接合同编号	2026-11-06 11:07:38 +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