fix: 修复发票登记弹窗金蝶同步状态不显示

fix: 收票管理列表金蝶状态增加颜色标签与其他页面一致
fix: 金蝶票据池弹框样式与批量转结算保持一致
2026-11-05 18:05:58 +08:00 · 2026-11-05 16:49:01 +08:00 · 2026-11-05 16:34:04 +08:00
20 changed files with 205 additions and 457 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 });
@@ -91,14 +91,3 @@ 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,
-    },
-  });
-};
@@ -1,8 +1,8 @@
 <template>
-  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
-    <el-form :model="query" inline label-width="130px" @submit.prevent>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
+    <el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
      <el-form-item label="发票号码">
-        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="开票日期">
        <el-date-picker
@@ -10,15 +10,16 @@
          type="daterange"
          value-format="YYYY-MM-DD"
          format="YYYY-MM-DD"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          range-separator="-"
+          start-placeholder="请选择"
+          end-placeholder="请选择"
        />
      </el-form-item>
      <el-form-item label="开票单位">
-        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="受票单位">
-        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="开票单位（销方）">
        <el-select
@@ -93,6 +94,9 @@
      <el-form-item>
        <el-button :disabled="loading" @click="resetQuery">重置</el-button>
        <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+        <el-tooltip content="按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找" placement="top">
+          <el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
+        </el-tooltip>
      </el-form-item>
    </el-form>
    <el-table
@@ -101,7 +105,7 @@
      :data="rows"
      :row-key="rowKey"
      border
-      height="520"
+      max-height="50vh"
      :highlight-current-row="!multiple"
      @selection-change="selection => (selected = selection)"
      @row-dblclick="handleRowDblclick"
@@ -118,6 +122,7 @@
          </el-radio>
        </template>
      </el-table-column>
+      <el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
      <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
@@ -172,8 +177,8 @@
        </template>
      </el-table-column>
    </el-table>
-    <div class="kingdee-pool-dialog__pager">
-      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+    <div class="kingdee-pool-dialog__pagination">
+      <span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
      <el-pagination
        v-model:current-page="page.current"
        v-model:page-size="page.size"
@@ -323,6 +328,9 @@ export default {
      this.page.current = 1;
      this.load();
    },
+    indexMethod(index) {
+      return (this.page.current - 1) * this.page.size + index + 1;
+    },
    resetQuery() {
      this.query = this.emptyQuery();
      this.handleQuery();
@@ -420,15 +428,28 @@ export default {
 </script>

 <style lang="scss" scoped>
-.kingdee-pool-dialog__pager {
+.kingdee-pool-dialog__form {
+  margin-bottom: 16px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+.kingdee-pool-dialog__pagination {
  display: flex;
  align-items: center;
  justify-content: space-between;
-  margin-top: 12px;
+  padding: 16px 0;
  gap: 16px;
 }
-.kingdee-pool-dialog__pager-tip {
+.kingdee-pool-dialog__pagination-tip {
  color: #909399;
  font-size: 12px;
+  white-space: nowrap;
+}
+.kingdee-pool-dialog__query-tip {
+  margin-left: 8px;
+  color: #909399;
+  cursor: pointer;
 }
 </style>
@@ -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') {
@@ -253,18 +253,16 @@ export const option = createCrudOption([
    label: '客商',
    prop: 'partyName',
    search: true,
-    searchOrder: 14,
-    searchPlaceholder: '请输入甲/乙方名称',
+    searchOrder: 11,
+    searchPlaceholder: '请输入',
    hide: true,
    display: false,
-    addDisplay: false,
-    editDisplay: false,
  },
  {
    label: '合同编号',
    prop: 'contractNo',
    search: true,
-    searchOrder: 8,
+    searchOrder: 6,
    searchPlaceholder: '请输入',
    order: 185,
    maxlength: 100,
@@ -289,7 +287,7 @@ export const option = createCrudOption([
    label: '所属项目',
    prop: 'projectName',
    search: true,
-    searchOrder: 11,
+    searchOrder: 8,
    searchType: 'select',
    searchPlaceholder: '请选择',
    formslot: true,
@@ -336,7 +334,7 @@ export const option = createCrudOption([
    prop: 'contractCategory',
    type: 'select',
    search: true,
-    searchOrder: 12,
+    searchOrder: 9,
    searchPlaceholder: '请选择',
    order: 170,
    dicData: contractCategoryOptions,
@@ -348,7 +346,7 @@ export const option = createCrudOption([
    prop: 'signType',
    type: 'select',
    search: true,
-    searchOrder: 13,
+    searchOrder: 10,
    searchPlaceholder: '请选择',
    span: 8,
    order: 190,
@@ -361,7 +359,7 @@ export const option = createCrudOption([
    prop: 'effectiveType',
    type: 'select',
    search: true,
-    searchOrder: 6,
+    searchOrder: 5,
    searchPlaceholder: '请选择',
    dicData: effectiveTypeOptions,
    hide: true,
@@ -632,7 +630,7 @@ export const option = createCrudOption([
    prop: 'hcsSyncStatus',
    type: 'select',
    search: true,
-    searchOrder: 7,
+    searchOrder: 6,
    searchPlaceholder: '请选择',
    slot: true,
    dicData: hcsSyncStatusOptions,
@@ -662,7 +660,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 9,
+    searchOrder: 7,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -674,7 +672,7 @@ export const option = createCrudOption([
    type: 'select',
    search: true,
    searchPlaceholder: '请选择',
-    searchOrder: 10,
+    searchOrder: 8,
    dicData: yesNoOptions,
    hide: true,
    addDisplay: false,
@@ -124,8 +124,7 @@ const formatGoodsInfo = row => {
  const text = Object.entries(groups)
    .map(([unit, group]) => {
      const quantity = formatGoodsQuantity(group.quantity);
-      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
+      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
    })
    .join('； ');

@@ -208,9 +207,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'],
@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
  { prop: 'createUserName', label: '创建人', minWidth: 110 },
  { prop: 'createTime', label: '创建时间', minWidth: 170 },
  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
@@ -14,6 +14,17 @@ export const KINGDEE_STATUS_TAG_TYPES = {
 /** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
 export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';

+/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */
+export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
+  unsynced: 'info',
+  pushed: 'warning',
+  assigned: 'success',
+  failed: 'danger',
+};
+
+/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info';
+
 /** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
 export const KINGDEE_WRITEOFF_TAG_TYPES = {
  writtenoff: 'success',
@@ -3949,9 +3949,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatDispatchQuantity(group.quantity);
-          const typeName =
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
        })
        .join('； ');
    },
@@ -7549,13 +7549,12 @@ export default {
      }, {});

      const cargoInfo = Object.values(groups)
-        .map(group => {
-          const typeName =
-            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
-          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
-        })
+        .map(
+          group =>
+            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
+              group.quantity
+            )}${group.unit ? ` ${group.unit}` : ''}`
+        )
        .join('； ');
      return cargoInfo || plan.goodsInfo || '';
    },
@@ -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"
                />
@@ -5018,9 +5018,9 @@ export default {
      return Object.values(groups)
        .map(group => {
          const quantity = this.formatQuantity(group.quantity);
-          const typeName =
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
        })
        .join('； ');
    },
@@ -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]));
@@ -2545,9 +2545,9 @@ export default {
        Object.values(groups)
          .map(group => {
            const quantity = this.formatGoodsQuantity(group.quantity);
-            const typeName =
-              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+            return `${group.typeName}等${group.count}种货物 | ${quantity}${
+              group.unit ? ` ${group.unit}` : ''
+            }`;
          })
          .join('； ') || '-'
      );
@@ -489,12 +489,6 @@ 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 {
@@ -922,24 +916,8 @@ export default {
        this.$message.warning('备注不能超过500个字符');
        return false;
      }
-      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('发货或装货至少勾选一个货量类型');
+      if (!this.enabledNodes.length) {
+        this.$message.warning('请至少选择一个过程节点');
        return false;
      }
      const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -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) => {
@@ -119,6 +119,9 @@
            <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
              {{ displayValue(row[column.prop]) }}
            </el-tag>
+            <el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
+              {{ displayValue(row[column.prop]) }}
+            </el-tag>
            <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
            <span v-else>{{ displayValue(row[column.prop]) }}</span>
          </template>
@@ -222,6 +225,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeePushStatusType } from '@/utils/kingdee';

 // 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
 const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
@@ -480,6 +484,7 @@ export default {
        ''
      );
    },
+    kingdeePushStatusType,
    displayValue(value) {
      return value === null || value === undefined || value === '' ? '-' : value;
    },
@@ -74,6 +74,7 @@

 <script>
 import { claimCandidates } from '@/api/payment/invoiceReceipt';
+import { kingdeePushStatusType } from '@/utils/kingdee';

 export default {
  name: 'InvoiceReceiptCandidatesDialog',
@@ -152,7 +153,7 @@ export default {
      );
    },
    pushStatusType(value) {
-      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
+      return kingdeePushStatusType(value);
    },
    formatMoney(value) {
      const number = Number(value);
@@ -145,10 +145,10 @@
          <el-descriptions-item label="创建时间">
            {{ invoiceRegisterDialog.row.createTime || '-' }}
          </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态" :span="2">
+          <el-descriptions-item label="金蝶同步状态">
            {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
          </el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">
+          <el-descriptions-item label="备注">
            {{ invoiceRegisterDialog.row.remark || '-' }}
          </el-descriptions-item>
        </el-descriptions>
@@ -847,6 +847,10 @@ export default {
    settlementTypeName(value) {
      return { payable: '付款', receivable: '收款' }[value] || '-';
    },
+    // 模板无法直接访问 script 顶部 import，包装成实例方法（与 formal-settlement-table-panel 同模式）
+    kingdeeSyncName(value) {
+      return kingdeeSyncName(value);
+    },
    unwrapData(response) {
      const body = response?.data || response || {};
      return body?.data || body;
@@ -589,7 +589,7 @@
              <el-form-item label="所属组织" prop="organizationName">
                <el-cascader
                  v-model="organizationCascaderValue"
-                  :options="formOrganizationTreeOptions"
+                  :options="organizationTreeOptions"
                  :props="organizationCascaderProps"
                  filterable
                  clearable
@@ -689,7 +689,6 @@ import {
  recognitionIDCard,
  recognitionTransportCertificates,
  recognizeBaiduOcr,
-  recognizeQualificationCertificateOcr,
 } from '@/api/transportCapacity/driver';
 import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
 import { getDeptTree } from '@/api/system/dept';
@@ -797,8 +796,6 @@ export default {
      driverBox: false,
      // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
      enableUnassignedOrgFilter: true,
-      // 表单「所属组织」只允许选平台公司；搜索栏不受影响
-      restrictFormOrgToPlatformCompany: true,
      vehicleSelectorVisible: false,
      vehicleSelectorLoading: false,
      vehicleSelectorOption,
@@ -923,19 +920,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 +964,8 @@ export default {
    },
  },
  created() {
-    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
    this.initDeptTree();
+    this.loadOrganizationOptions();
    this.initRegionOptions();
    this.initQualificationTypeOptions();
  },
@@ -992,7 +983,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 +1015,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 +1202,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 +1217,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;
@@ -1344,29 +1322,9 @@ export default {
    },
    handleQualificationUploadSuccess(prop, url) {
      this.setImage(prop, url);
-      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)',
+      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
+        this.applyQualificationRecognition(data);
      });
-      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) {
@@ -1656,43 +1614,25 @@ export default {
      return typeof value === 'object' ? value.words || value.value || '' : value || '';
    },
    applyQualificationRecognition(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 qualificationType = this.getQualificationType(data);
+      const qualificationNo = this.getQualificationNo(data);
      const matchedType = this.matchQualificationType(qualificationType);
      if (matchedType) {
        this.driverForm.qualificationType = matchedType;
      } else if (qualificationType && !this.qualificationTypeOptions.length) {
        this.driverForm.qualificationType = qualificationType;
      }
-      if (qualificationNo) {
+      if (qualificationNo && !this.driverForm.qualificationNo) {
        this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
      }
-      const startDate = this.normalizeBirthday(validFrom);
-      if (startDate) {
-        this.driverForm.qualificationStartDate = startDate;
-      }
-      if (/(长期|永久)/.test(validUntil)) {
+      const words = this.getBaiduOcrWords(data).join(' ');
+      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
+      if (/(长期|永久有效)/.test(words)) {
        this.driverForm.qualificationLongTerm = 1;
        this.driverForm.qualificationEndDate = '';
-      } else {
-        const endDate = this.normalizeBirthday(validUntil);
-        if (endDate) {
-          this.driverForm.qualificationEndDate = endDate;
-          this.driverForm.qualificationLongTerm = 0;
-        }
+      } else if (dateList.length) {
+        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
+        this.driverForm.qualificationLongTerm = 0;
      }
      this.$nextTick(() => {
        ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1700,25 +1640,22 @@ export default {
        });
      });
    },
-    normalizeQualificationOcrFields(result = {}) {
-      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
-        return result.fields;
+    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);
      }
-      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() : '';
+      return values.join('').replace(/[，,；;]+$/, '').trim();
    },
    matchQualificationType(value = '') {
      const text = String(value || '').replace(/\s/g, '');
@@ -1736,6 +1673,27 @@ 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="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%;
  }
Author	SHA1	Message	Date
刘泉佳	79e903bcd8	fix: 修复发票登记弹窗金蝶同步状态不显示	2026-11-05 18:05:58 +08:00
刘泉佳	119d71b4f5	fix: 收票管理列表金蝶状态增加颜色标签与其他页面一致	2026-11-05 16:49:01 +08:00
刘泉佳	d57d3f86da	fix: 金蝶票据池弹框样式与批量转结算保持一致	2026-11-05 16:34:04 +08:00