✨ 运力管理司机、车辆、船舶的所属组织只允许选择平台公司

Co-authored-by: Cursor <cursoragent@cursor.com>

src/api/transportCapacity/driver.js

@@ -91,3 +91,14 @@ export const recognizeBaiduOcr = (imageUrl, type, side = '') => {
     },
   });
 };
+
+export const recognizeQualificationCertificateOcr = imageUrl => {
+  return request({
+    url: '/blade-transport/baidu-ocr/qualification-certificate',
+    method: 'post',
+    timeout: 60000,
+    params: {
+      imageUrl,
+    },
+  });
+};

src/components/kingdee-invoice-pool-dialog/main.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body 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 :model="query" inline label-width="130px" @submit.prevent>
       <el-form-item label="发票号码">
-        <el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票日期">
         <el-date-picker
@@ -10,16 +10,15 @@
           type="daterange"
           value-format="YYYY-MM-DD"
           format="YYYY-MM-DD"
-          range-separator="-"
+          start-placeholder="开始日期"
-          start-placeholder="请选择"
+          end-placeholder="结束日期"
-          end-placeholder="请选择"
         />
       </el-form-item>
       <el-form-item label="开票单位">
-        <el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="受票单位">
-        <el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票单位（销方）">
         <el-select
@@ -94,9 +93,6 @@
       <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
@@ -105,7 +101,7 @@
       :data="rows"
       :row-key="rowKey"
       border
-      max-height="50vh"
+      height="520"
       :highlight-current-row="!multiple"
       @selection-change="selection => (selected = selection)"
       @row-dblclick="handleRowDblclick"
@@ -122,7 +118,6 @@
           </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" />
@@ -177,8 +172,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="kingdee-pool-dialog__pagination">
+    <div class="kingdee-pool-dialog__pager">
-      <span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
       <el-pagination
         v-model:current-page="page.current"
         v-model:page-size="page.size"
@@ -328,9 +323,6 @@ 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();
@@ -428,28 +420,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.kingdee-pool-dialog__form {
+.kingdee-pool-dialog__pager {
-  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;
-  padding: 16px 0;
+  margin-top: 12px;
   gap: 16px;
 }
-.kingdee-pool-dialog__pagination-tip {
+.kingdee-pool-dialog__pager-tip {
   color: #909399;
   font-size: 12px;
-  white-space: nowrap;
-}
-.kingdee-pool-dialog__query-tip {
-  margin-left: 8px;
-  color: #909399;
-  cursor: pointer;
 }
 </style>

src/mixins/organization-search.js

@@ -1,4 +1,4 @@
-import { getDeptTree } from '@/api/system/dept';
+import { getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
 import { ElCascader } from 'element-plus';
 import { h } from 'vue';
 
@@ -14,6 +14,10 @@ import { h } from 'vue';
  *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
  *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
  *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
+ *   5. 表单「所属组织」只允许选平台公司的页面（运力管理）在 data 里置
+ *      restrictFormOrgToPlatformCompany: true，表单级联样式改用
+ *      buildFormOrganizationTree(...) 的结果，并在打开表单时把回显的组织名写进
+ *      formOrganizationLegacyName；只影响表单，搜索栏仍是全量组织
  *
  * 说明：
  *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -34,6 +38,11 @@ const ORG_PROPS = ['organizationName', 'deptName'];
 // 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
 const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
 
+// 表单「所属组织」限定只能选平台公司时，存量记录里的旧组织名在组织树里已经找不到
+// （节点被删或改名），用这个 id 补一个只读节点，否则编辑老数据时所属组织显示为空、
+// 保存即把原值丢掉。
+const FORM_LEGACY_ORG_ID = '__LEGACY_ORG__';
+
 export default {
   data() {
     return {
@@ -44,6 +53,14 @@ export default {
       organizationLoading: false,
       // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
       enableUnassignedOrgFilter: false,
+      // 表单「所属组织」是否只允许选平台公司；页面在 data 里覆盖为 true 才生效
+      restrictFormOrgToPlatformCompany: false,
+      // 平台公司部门 id（字符串），loadOrganizationOptions 时一并拉取
+      platformCompanyOrgIds: [],
+      // 表单当前回显的组织名，树里没有同名节点时用它补一个只读选项
+      formOrganizationLegacyName: '',
+      // 进行中的组织数据请求，并发调用共用（不是响应式状态，只做去重）
+      organizationOptionsPromise: null,
     };
   },
   computed: {
@@ -54,9 +71,12 @@ export default {
         ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
         : this.organizationTreeOptions;
     },
-    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
+    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级。
+    // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
+    // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
+    // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
     organizationCascaderProps() {
-      return {
+      const props = {
         value: 'id',
         label: 'label',
         children: 'children',
@@ -64,15 +84,25 @@ export default {
         checkStrictly: true,
         expandTrigger: 'click',
       };
+      if (this.restrictFormOrgToPlatformCompany) {
+        props.disabled = data => this.platformCompanyOrgDisabled(data);
+      }
+      return props;
     },
   },
   methods: {
     loadOrganizationOptions() {
-      if (this.organizationLoading) return;
+      // 并发调用共用同一次请求，返回的 Promise 在数据就绪后才 resolve
+      if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
       this.organizationLoading = true;
       const tenantId = this.userInfo?.tenantId;
-      getDeptTree(tenantId)
+      // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
-        .then(res => {
+      const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
+        ? getPlatformCompanySelect().catch(() => null)
+        : Promise.resolve(null);
+      this.organizationOptionsPromise = Promise.all([getDeptTree(tenantId), platformCompanyRequest])
+        .then(([res, platformRes]) => {
+          this.applyPlatformCompanyOptions(platformRes);
           const source = res.data?.data || res.data || [];
           const tree = this.excludeExternalOrganization
             ? this.excludeExternalOrganization(source)
@@ -90,7 +120,21 @@ export default {
         })
         .finally(() => {
           this.organizationLoading = false;
+          this.organizationOptionsPromise = null;
         });
+      return this.organizationOptionsPromise;
+    },
+    // 组织树与平台公司列表就绪后执行回调；已加载过则立即执行
+    whenOrganizationOptionsReady(callback) {
+      const pending = this.organizationTreeFlatOptions.length
+        ? Promise.resolve()
+        : this.loadOrganizationOptions();
+      return Promise.resolve(pending).then(callback, () => callback());
+    },
+    applyPlatformCompanyOptions(res) {
+      if (!res) return;
+      const list = res.data?.data || res.data || [];
+      this.platformCompanyOrgIds = (Array.isArray(list) ? list : []).map(item => String(item.id));
     },
     // 默认排除「外部组织」节点；页面可覆盖
     excludeExternalOrganization(tree = []) {
@@ -143,7 +187,9 @@ export default {
       for (const node of tree || []) {
         const path = [...parents, String(node.id)];
         if (String(node.id) === String(target)) return path;
-        const matched = this.findOrgPath(target, node.children, path);
+        // 必须显式传 node.children || []：叶节点的 children 是 undefined，
+        // 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
+        const matched = this.findOrgPath(target, node.children || [], path);
         if (matched) return matched;
       }
       return null;
@@ -152,6 +198,52 @@ export default {
     findOrgName(id) {
       return this.findOrgById(id)?.rawLabel || '';
     },
+    // 级联节点的 disabled 判定：只有平台公司可选。页面自建 props 时也复用它
+    platformCompanyOrgDisabled(data) {
+      return !this.platformCompanyOrgIds.includes(String(data?.id ?? ''));
+    },
+    // 组织名对应的节点是否为平台公司；名称在树里不存在时按「不是」处理
+    isPlatformCompanyOrgName(name) {
+      const value = String(name ?? '').trim();
+      if (!value) return false;
+      const node = this.organizationTreeFlatOptions.find(item => item.rawLabel === value);
+      return !!node && this.platformCompanyOrgIds.includes(String(node.id));
+    },
+    // 新增表单的默认组织：只有落在平台公司上才预填，否则留空（不能让用户从默认值
+    // 直接带出一个选不中的组织名）
+    defaultFormOrganizationName(name) {
+      return this.isPlatformCompanyOrgName(name) ? String(name).trim() : '';
+    },
+    // 表单级联的选项树：限定平台公司时，把回显的原组织名补成一个只读节点，
+    // 否则存量记录的组织在树里找不到，编辑时显示为空、保存即丢原值
+    buildFormOrganizationTree(tree = this.organizationTreeOptions) {
+      const source = tree || [];
+      if (!this.restrictFormOrgToPlatformCompany) return source;
+      const name = String(this.formOrganizationLegacyName || '').trim();
+      if (!name) return source;
+      if (this.organizationTreeFlatOptions.some(item => item.rawLabel === name)) return source;
+      return [...source, { id: FORM_LEGACY_ORG_ID, label: name, rawLabel: name }];
+    },
+    // 表单级联回显用的路径：树里有该组织就用真实路径，否则落到原组织兜底节点
+    resolveFormOrgPath(name) {
+      const path = this.resolveOrgPath(name);
+      if (path.length) return path;
+      const value = String(name ?? '').trim();
+      if (!value) return [];
+      return value === String(this.formOrganizationLegacyName || '').trim()
+        ? [FORM_LEGACY_ORG_ID]
+        : [];
+    },
+    // 记录表单当前回显的组织名：能匹配真实节点（或已清空）就不需要兜底节点，
+    // 否则记下来，由 buildFormOrganizationTree 补成只读选项
+    syncFormOrganizationLegacy(name) {
+      const value = String(name ?? '').trim();
+      if (!value || this.organizationTreeFlatOptions.some(item => item.rawLabel === value)) {
+        this.formOrganizationLegacyName = '';
+        return;
+      }
+      this.formOrganizationLegacyName = value;
+    },
     // 组织名称 → 级联路径（表单回显用；部门树异步加载完成后会自动重算）
     resolveOrgPath(name) {
       const value = String(name ?? '').trim();
@@ -164,7 +256,13 @@ export default {
       const value = Array.isArray(path)
         ? path.filter(item => item !== undefined && item !== null && item !== '')
         : [];
-      return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
+      if (!value.length) return '';
+      const node = this.findOrgById(value);
+      if (node) return node.rawLabel || '';
+      // 原组织兜底节点不在扁平表里，直接取它代表的历史名称
+      return String(value[value.length - 1]) === FORM_LEGACY_ORG_ID
+        ? String(this.formOrganizationLegacyName || '').trim()
+        : '';
     },
     // 搜索提交前把级联路径数组就地转成组织名称（后端按名称过滤）
     normalizeOrganizationSearch(params, prop = 'organizationName') {

src/option/business/contract-manage.js

@@ -253,16 +253,18 @@ export const option = createCrudOption([
     label: '客商',
     prop: 'partyName',
     search: true,
-    searchOrder: 11,
+    searchOrder: 14,
-    searchPlaceholder: '请输入',
+    searchPlaceholder: '请输入甲/乙方名称',
     hide: true,
     display: false,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '合同编号',
     prop: 'contractNo',
     search: true,
-    searchOrder: 6,
+    searchOrder: 8,
     searchPlaceholder: '请输入',
     order: 185,
     maxlength: 100,
@@ -287,7 +289,7 @@ export const option = createCrudOption([
     label: '所属项目',
     prop: 'projectName',
     search: true,
-    searchOrder: 8,
+    searchOrder: 11,
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
@@ -334,7 +336,7 @@ export const option = createCrudOption([
     prop: 'contractCategory',
     type: 'select',
     search: true,
-    searchOrder: 9,
+    searchOrder: 12,
     searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
@@ -346,7 +348,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: true,
-    searchOrder: 10,
+    searchOrder: 13,
     searchPlaceholder: '请选择',
     span: 8,
     order: 190,
@@ -359,7 +361,7 @@ export const option = createCrudOption([
     prop: 'effectiveType',
     type: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 6,
     searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
@@ -630,7 +632,7 @@ export const option = createCrudOption([
     prop: 'hcsSyncStatus',
     type: 'select',
     search: true,
-    searchOrder: 6,
+    searchOrder: 7,
     searchPlaceholder: '请选择',
     slot: true,
     dicData: hcsSyncStatusOptions,
@@ -660,7 +662,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,
@@ -672,7 +674,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,

src/option/business/transport-plan.js

@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
   const text = Object.entries(groups)
     .map(([unit, group]) => {
       const quantity = formatGoodsQuantity(group.quantity);
-      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
+      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
     })
     .join('； ');
 

src/option/payment/invoiceReceipt.js

@@ -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, kingdeeStatus: true },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
   { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
   { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/utils/kingdee.js

@@ -14,17 +14,6 @@ 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',

src/views/business/components/transport-plan-page.vue

@@ -3949,9 +3949,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatDispatchQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+          const typeName =
-            group.unit ? ` ${group.unit}` : ''
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          }`;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
         })
         .join('； ');
     },
@@ -7549,12 +7549,13 @@ export default {
       }, {});
 
       const cargoInfo = Object.values(groups)
-        .map(
+        .map(group => {
-          group =>
+          const typeName =
-            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
+            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
-              group.quantity
+          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
-            )}${group.unit ? ` ${group.unit}` : ''}`
+            group.unit ? ` ${group.unit}` : ''
-        )
+          }`;
+        })
         .join('； ');
       return cargoInfo || plan.goodsInfo || '';
     },

src/views/business/components/waybill-manage-page.vue

@@ -5018,9 +5018,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatQuantity(group.quantity);
-          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+          const typeName =
-            group.unit ? ` ${group.unit}` : ''
+            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          }`;
+          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
         })
         .join('； ');
     },

src/views/business/loading-manage.vue

@@ -2545,9 +2545,9 @@ export default {
         Object.values(groups)
           .map(group => {
             const quantity = this.formatGoodsQuantity(group.quantity);
-            return `${group.typeName}等${group.count}种货物 | ${quantity}${
+            const typeName =
-              group.unit ? ` ${group.unit}` : ''
+              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-            }`;
+            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
           })
           .join('； ') || '-'
       );

src/views/business/process-config.vue

@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
   },
 ];
 
+// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
+// 到场没有货量开关，不能拿它顶替货量采集
+const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
+const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
+const CARGO_NODE_KEYS = ['load', 'dispatch'];
+
 export default {
   data() {
     return {
@@ -916,8 +922,24 @@ export default {
         this.$message.warning('备注不能超过500个字符');
         return false;
       }
-      if (!this.enabledNodes.length) {
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
-        this.$message.warning('请至少选择一个过程节点');
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
         return false;
       }
       const transit = this.nodeRows.find(item => item.key === 'transit');

src/views/payment/invoice-receipt.vue

@@ -119,9 +119,6 @@
             <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>
@@ -225,7 +222,6 @@ 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';
@@ -484,7 +480,6 @@ export default {
         ''
       );
     },
-    kingdeePushStatusType,
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

src/views/settlement/components/invoice-receipt-candidates-dialog.vue

@@ -74,7 +74,6 @@
 
 <script>
 import { claimCandidates } from '@/api/payment/invoiceReceipt';
-import { kingdeePushStatusType } from '@/utils/kingdee';
 
 export default {
   name: 'InvoiceReceiptCandidatesDialog',
@@ -153,7 +152,7 @@ export default {
       );
     },
     pushStatusType(value) {
-      return kingdeePushStatusType(value);
+      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
     },
     formatMoney(value) {
       const number = Number(value);

src/views/settlement/formal-settlement.vue

@@ -145,10 +145,10 @@
           <el-descriptions-item label="创建时间">
             {{ invoiceRegisterDialog.row.createTime || '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态">
+          <el-descriptions-item label="金蝶同步状态" :span="2">
             {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
           </el-descriptions-item>
-          <el-descriptions-item label="备注">
+          <el-descriptions-item label="备注" :span="2">
             {{ invoiceRegisterDialog.row.remark || '-' }}
           </el-descriptions-item>
         </el-descriptions>
@@ -847,10 +847,6 @@ 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;

src/views/transportCapacity/driver.vue

@@ -589,7 +589,7 @@
               <el-form-item label="所属组织" prop="organizationName">
                 <el-cascader
                   v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                   :props="organizationCascaderProps"
                   filterable
                   clearable
@@ -689,6 +689,7 @@ import {
   recognitionIDCard,
   recognitionTransportCertificates,
   recognizeBaiduOcr,
+  recognizeQualificationCertificateOcr,
 } from '@/api/transportCapacity/driver';
 import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
 import { getDeptTree } from '@/api/system/dept';
@@ -796,6 +797,8 @@ export default {
       driverBox: false,
       // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
       enableUnassignedOrgFilter: true,
+      // 表单「所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
       vehicleSelectorVisible: false,
       vehicleSelectorLoading: false,
       vehicleSelectorOption,
@@ -920,13 +923,19 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
     // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
     organizationCascaderValue: {
       get() {
-        return this.resolveOrgPath(this.driverForm.organizationName);
+        return this.resolveFormOrgPath(this.driverForm.organizationName);
       },
       set(path) {
-        this.driverForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.driverForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
       },
     },
     isAdmin() {
@@ -964,8 +973,8 @@ export default {
     },
   },
   created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
     this.initDeptTree();
-    this.loadOrganizationOptions();
     this.initRegionOptions();
     this.initQualificationTypeOptions();
   },
@@ -983,9 +992,7 @@ export default {
           'organizationName'
         );
         vehicleColumn.dicData = this.organizationOptions;
-        if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
+        return this.loadOrganizationOptions();
-          this.driverForm.organizationName = this.getCurrentOrganizationName();
-        }
       });
     },
     initQualificationTypeOptions() {
@@ -1015,6 +1022,11 @@ export default {
       });
       return result;
     },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空，
+    // 不能让默认值带出一个在表单里选不中的组织名
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
     getCurrentOrganizationName() {
       const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id;
       const currentDept = this.organizationOptions.find(
@@ -1202,8 +1214,16 @@ export default {
       this.submitAttempted = false;
       if (!row?.id) {
         this.driverForm = emptyForm();
-        this.driverForm.organizationName = this.getCurrentOrganizationName();
+        // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
+        this.driverForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
         this.driverBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return;
+          const name = this.getDefaultOrganizationName();
+          this.driverForm.organizationName = name;
+          this.syncFormOrganizationLegacy(name);
+        });
         return;
       }
       getDetail(row.id).then(res => {
@@ -1217,11 +1237,13 @@ export default {
           postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [],
         };
         this.syncAddressRegionPath();
+        this.syncFormOrganizationLegacy(this.driverForm.organizationName);
         this.driverBox = true;
       });
     },
     resetDriver() {
       this.driverForm = emptyForm();
+      this.formOrganizationLegacyName = '';
       this.drivingLicenseUploads = {};
       this.readonly = false;
       this.submitAttempted = false;
@@ -1322,9 +1344,29 @@ export default {
     },
     handleQualificationUploadSuccess(prop, url) {
       this.setImage(prop, url);
-      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
+      this.recognizeQualificationCertificate(url);
-        this.applyQualificationRecognition(data);
+    },
+    recognizeQualificationCertificate(url) {
+      if (!url) {
+        this.$message.warning('从业资格证图片上传成功，未获取到图片地址，无法自动识别');
+        return;
+      }
+      const loading = ElLoading.service({
+        lock: true,
+        text: '从业资格证识别中',
+        background: 'rgba(255, 255, 255, 0.7)',
       });
+      recognizeQualificationCertificateOcr(url)
+        .then(res => {
+          this.applyQualificationRecognition(res?.data?.data || {});
+          this.$message.success('从业资格证识别完成');
+        })
+        .catch(() => {
+          this.$message.warning('从业资格证图片上传成功，自动识别失败，请手动填写相关信息');
+        })
+        .finally(() => {
+          loading.close();
+        });
     },
     recognizeBaiduOcr(url, type, side, documentName, applyRecognition) {
       if (!url) {
@@ -1614,25 +1656,43 @@ export default {
       return typeof value === 'object' ? value.words || value.value || '' : value || '';
     },
     applyQualificationRecognition(data = {}) {
-      const qualificationType = this.getQualificationType(data);
+      const fields = this.normalizeQualificationOcrFields(data);
-      const qualificationNo = this.getQualificationNo(data);
+      const qualificationType = this.getQualificationOcrValue(fields, [
+        'qualification_category',
+        '从业资格类别',
+        '从业资格类型',
+      ]).replace(/[，,；;]+$/, '');
+      const qualificationNo = this.getQualificationOcrValue(fields, [
+        'certificate_no',
+        '证号',
+        '从业资格证号',
+        '资格证号',
+        '证书编号',
+      ]);
+      const validFrom = this.getQualificationOcrValue(fields, ['valid_from', '有效起始日期']);
+      const validUntil = this.getQualificationOcrValue(fields, ['valid_until', '有效期限', '有效期']);
       const matchedType = this.matchQualificationType(qualificationType);
       if (matchedType) {
         this.driverForm.qualificationType = matchedType;
       } else if (qualificationType && !this.qualificationTypeOptions.length) {
         this.driverForm.qualificationType = qualificationType;
       }
-      if (qualificationNo && !this.driverForm.qualificationNo) {
+      if (qualificationNo) {
         this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
       }
-      const words = this.getBaiduOcrWords(data).join(' ');
+      const startDate = this.normalizeBirthday(validFrom);
-      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
+      if (startDate) {
-      if (/(长期|永久有效)/.test(words)) {
+        this.driverForm.qualificationStartDate = startDate;
+      }
+      if (/(长期|永久)/.test(validUntil)) {
         this.driverForm.qualificationLongTerm = 1;
         this.driverForm.qualificationEndDate = '';
-      } else if (dateList.length) {
+      } else {
-        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
+        const endDate = this.normalizeBirthday(validUntil);
-        this.driverForm.qualificationLongTerm = 0;
+        if (endDate) {
+          this.driverForm.qualificationEndDate = endDate;
+          this.driverForm.qualificationLongTerm = 0;
+        }
       }
       this.$nextTick(() => {
         ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1640,22 +1700,25 @@ export default {
         });
       });
     },
-    getQualificationType(data = {}) {
+    normalizeQualificationOcrFields(result = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
-      if (fieldValue) return String(fieldValue).trim();
+        return result.fields;
-      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);
       }
-      return values.join('').replace(/[，,；;]+$/, '').trim();
+      const keyInfos = result.key_info || result.keyInfo || result.keyInfos || [];
+      if (!Array.isArray(keyInfos)) return {};
+      return Object.fromEntries(
+        keyInfos
+          .filter(item => item && item.key)
+          .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
+          .filter(([, value]) => value)
+      );
+    },
+    getQualificationOcrValue(fields = {}, keys = []) {
+      const normalizedKeys = keys.map(key => String(key).toLowerCase());
+      const entry = Object.entries(fields).find(([key]) =>
+        normalizedKeys.includes(String(key).toLowerCase())
+      );
+      return entry ? String(entry[1] || '').trim() : '';
     },
     matchQualificationType(value = '') {
       const text = String(value || '').replace(/\s/g, '');
@@ -1673,27 +1736,6 @@ export default {
       );
       return matched?.value || '';
     },
-    getQualificationNo(data = {}) {
-      const fieldValue = this.getOcrValue(data, ['从业资格证号', '资格证号', '证书编号']);
-      if (fieldValue) return fieldValue;
-      const words = this.getBaiduOcrWords(data);
-      const labelIndex = words.findIndex(word => /^(?:(?:从业)?资格证号?|证书编号)[:：]?$/.test(word));
-      if (labelIndex >= 0 && words[labelIndex + 1]) {
-        return words[labelIndex + 1];
-      }
-      const certificateLine = words.find(word => /(?:从业)?资格证号?|证书编号/.test(word));
-      const match = certificateLine?.match(/(?:(?:从业)?资格证号?|证书编号)\s*[:：]?\s*([A-Z0-9-]{6,})/i);
-      return match?.[1] || '';
-    },
-    getBaiduOcrWords(data = {}) {
-      const wordsResult = data.words_result || data.wordsResult || {};
-      if (Array.isArray(wordsResult)) {
-        return wordsResult.map(item => item.words || item.value || '').filter(Boolean);
-      }
-      return Object.values(wordsResult)
-        .map(item => (typeof item === 'object' ? item.words || item.value || '' : item || ''))
-        .filter(Boolean);
-    },
     normalizeNation(value = '') {
       const nation = String(value || '').trim();
       if (!nation) return '';

src/views/transportCapacity/ship.vue

@@ -147,7 +147,7 @@
               <el-form-item label="船舶所属组织" prop="organizationName">
                 <el-cascader
                   v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
+                  :options="formOrganizationTreeOptions"
                   :props="organizationCascaderProps"
                   filterable
                   clearable
@@ -664,6 +664,8 @@ export default {
       shipForm: emptyForm(),
       uploadHeaders: getUploadHeaders(),
       organizationOptions: [],
+      // 表单「船舶所属组织」只允许选平台公司；搜索栏不受影响
+      restrictFormOrgToPlatformCompany: true,
       formRules: {
         organizationName: [{ required: true, message: '请选择船舶所属组织', trigger: 'change' }],
         shipName: [
@@ -710,13 +712,19 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
+    // 表单所属组织级联的选项：限定平台公司时多一个原组织兜底节点
+    formOrganizationTreeOptions() {
+      return this.buildFormOrganizationTree();
+    },
     // 船舶所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
     organizationCascaderValue: {
       get() {
-        return this.resolveOrgPath(this.shipForm.organizationName);
+        return this.resolveFormOrgPath(this.shipForm.organizationName);
       },
       set(path) {
-        this.shipForm.organizationName = this.resolveOrgName(path);
+        const name = this.resolveOrgName(path);
+        this.shipForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
       },
     },
     isAdmin() {
@@ -744,8 +752,8 @@ export default {
     },
   },
   created() {
+    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
     this.initDeptTree();
-    this.loadOrganizationOptions();
   },
   methods: {
     hasPermission(code) {
@@ -756,9 +764,7 @@ export default {
         this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
         const column = this.findColumn(this.option.column, 'organizationName');
         column.dicData = this.organizationOptions;
-        if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
+        return this.loadOrganizationOptions();
-          this.shipForm.organizationName = this.getCurrentOrganizationName();
-        }
       });
     },
     flattenDeptOptions(tree = [], level = 0) {
@@ -784,6 +790,10 @@ export default {
       );
       return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
     },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
     validateField(prop) {
       this.$refs.shipForm?.validateField(prop);
     },
@@ -875,12 +885,19 @@ export default {
       this.readonly = readonly;
       if (!row?.id) {
         this.shipForm = emptyForm();
-        this.shipForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.shipForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
         this.shipBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return;
+          this.shipForm.organizationName = this.getDefaultOrganizationName();
+        });
         return;
       }
       getDetail(row.id).then(res => {
         this.shipForm = { ...emptyForm(), ...(res.data.data || {}) };
+        this.syncFormOrganizationLegacy(this.shipForm.organizationName);
         this.shipBox = true;
       });
     },
@@ -890,6 +907,7 @@ export default {
     },
     resetShip() {
       this.shipForm = emptyForm();
+      this.formOrganizationLegacyName = '';
       this.readonly = false;
       this.submitLoading = false;
       this.$refs.shipForm?.clearValidate();

src/views/transportCapacity/vehicle.vue

@@ -347,7 +347,7 @@
                     <el-cascader
                       v-model="organizationCascaderValue"
                       :options="organizationFormTreeOptions"
-                      :props="formOrgCascaderProps"
+                      :props="organizationFormCascaderProps"
                       filterable
                       clearable
                       placeholder="请选择"
@@ -702,6 +702,8 @@ export default {
       // 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
       organizationCascaderPath: [],
       useDepartmentCascaderPath: [],
+      // 表单「所属组织」只允许选平台公司，「使用部门」仍是全量组织
+      restrictFormOrgToPlatformCompany: true,
       formOrgCascaderProps: {
         value: 'id',
         label: 'label',
@@ -757,11 +759,17 @@ export default {
     },
     // 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
     organizationFormTreeOptions() {
-      return this.cloneOrgTree(this.organizationTreeOptions);
+      return this.cloneOrgTree(this.buildFormOrganizationTree());
     },
     useDepartmentFormTreeOptions() {
       return this.cloneOrgTree(this.organizationTreeOptions);
     },
+    // 所属组织级联的可选范围：只放开平台公司；使用部门仍用 formOrgCascaderProps 全量可选
+    organizationFormCascaderProps() {
+      return this.restrictFormOrgToPlatformCompany
+        ? { ...this.formOrgCascaderProps, disabled: data => this.platformCompanyOrgDisabled(data) }
+        : this.formOrgCascaderProps;
+    },
     // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
     organizationCascaderValue: {
       get() {
@@ -769,7 +777,9 @@ export default {
       },
       set(path) {
         this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
-        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
+        const name = this.resolveOrgName(this.organizationCascaderPath);
+        this.vehicleForm.organizationName = name;
+        this.syncFormOrganizationLegacy(name);
       },
     },
     // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -810,7 +820,6 @@ export default {
   },
   created() {
     this.initDeptTree();
-    this.loadOrganizationOptions();
   },
   watch: {
     organizationTreeOptions() {
@@ -852,17 +861,15 @@ export default {
       }));
     },
     syncOrgCascaderPaths() {
-      this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
+      this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
       this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
     },
     initDeptTree() {
+      this.loadOrganizationOptions();
       getDeptTree(this.userInfo.tenantId).then(res => {
         this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
         const column = this.findColumn(this.option.column, 'organizationName');
         column.dicData = this.organizationOptions;
-        if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
-          this.vehicleForm.organizationName = this.getCurrentOrganizationName();
-        }
         if (this.vehicleBox && !this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
@@ -894,6 +901,10 @@ export default {
       );
       return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
     },
+    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
+    getDefaultOrganizationName() {
+      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
+    },
     digitsOnly(value = '') {
       return String(value).replace(/\D/g, '');
     },
@@ -961,11 +972,18 @@ export default {
       this.readonly = readonly;
       if (!row?.id) {
         this.vehicleForm = emptyForm();
-        this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
+        this.vehicleForm.organizationName = '';
+        this.formOrganizationLegacyName = '';
         this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         this.syncOrgCascaderPaths();
         this.syncPlateNo(false);
         this.vehicleBox = true;
+        this.whenOrganizationOptionsReady(() => {
+          if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return;
+          this.vehicleForm.organizationName = this.getDefaultOrganizationName();
+          this.syncOrgCascaderPaths();
+        });
         return;
       }
       getDetail(row.id).then(res => {
@@ -977,6 +995,7 @@ export default {
         if (!this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
+        this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
         this.syncOrgCascaderPaths();
         this.splitPlateNo();
         this.syncPlateNo(false);
@@ -989,6 +1008,7 @@ export default {
     },
     resetVehicle() {
       this.vehicleForm = emptyForm();
+      this.formOrganizationLegacyName = '';
       this.organizationCascaderPath = [];
       this.useDepartmentCascaderPath = [];
       this.vehicleCertificateUploads = {};
@@ -1610,6 +1630,16 @@ export default {
   }
 }
 
+// 列表组织列超长时单行省略
+.org-cell-text {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
 // 编辑弹窗：灰底 + section-card 白卡分组
 .vehicle-form {
   :deep(.el-form-item__label) {
@@ -1641,18 +1671,7 @@ export default {
     flex: 0 0 calc(4em + 24px) !important;
     width: calc(4em + 24px) !important;
   }
-}
 
-.org-cell-text {
-  display: inline-block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  vertical-align: bottom;
-}
-
-.vehicle-form {
   .org-cascader-tooltip {
     width: 100%;
   }