Merge remote-tracking branch 'origin/master' into feature/20261104-汇总文档-web

# Conflicts:
#	src/option/settlement/formalSettlement.js

src/api/business/waybill-manage.js

@@ -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 });

src/api/transportCapacity/driver.js

@@ -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,
-    },
-  });
-};

src/api/vehicle/customer-archive.js

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

src/mixins/organization-search.js

@@ -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 允许选中任意层级，不必选到末级。
+    // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
-    // 限定只能选平台公司时用 disabled 函数只放开平台公司：非平台公司的非末级节点
-    // 在 checkStrictly 下仍可展开（el-cascader 的 expandable 判断），末级节点点击无效，
-    // 两者都选不中。disabled 在节点渲染时求值，平台公司 id 到手后节点会自行重算。
     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.organizationLoading) return;
-      if (this.organizationOptionsPromise) return this.organizationOptionsPromise;
       this.organizationLoading = true;
       const tenantId = this.userInfo?.tenantId;
-      // 平台公司下拉失败不能拖垮组织树，单独兜住，失败时保持上一次的可选范围
+      getDeptTree(tenantId)
-      const platformCompanyRequest = this.restrictFormOrgToPlatformCompany
+        .then(res => {
-        ? 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)
@@ -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，
+        const matched = this.findOrgPath(target, node.children, path);
-        // 传 undefined 会触发默认参数重新拿到整棵树，逐层重复扫描直到爆栈
-        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 '';
+      return value.length ? this.findOrgById(value)?.rawLabel || '' : '';
-      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/base/measurement-unit.js

@@ -38,7 +38,6 @@ export const createOption = () => ({
   delBtn: false,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 320,
   menuFixed: 'right',
   column: [
     {

src/option/business/contract-manage.js

@@ -249,22 +249,11 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
-  {
-    label: '客商',
-    prop: 'partyName',
-    search: true,
-    searchOrder: 14,
-    searchPlaceholder: '请输入甲/乙方名称',
-    hide: true,
-    display: false,
-    addDisplay: false,
-    editDisplay: false,
-  },
   {
     label: '合同编号',
     prop: 'contractNo',
     search: true,
-    searchOrder: 8,
+    searchOrder: 6,
     searchPlaceholder: '请输入',
     order: 185,
     maxlength: 100,
@@ -277,7 +266,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 1,
+    searchOrder: 7,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -289,7 +278,7 @@ export const option = createCrudOption([
     label: '所属项目',
     prop: 'projectName',
     search: true,
-    searchOrder: 11,
+    searchOrder: 8,
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
@@ -336,7 +325,7 @@ export const option = createCrudOption([
     prop: 'contractCategory',
     type: 'select',
     search: true,
-    searchOrder: 12,
+    searchOrder: 9,
     searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
@@ -348,7 +337,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: true,
-    searchOrder: 13,
+    searchOrder: 10,
     searchPlaceholder: '请选择',
     span: 8,
     order: 190,
@@ -357,11 +346,11 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '合同状态',
+    label: '生效类型',
     prop: 'effectiveType',
     type: 'select',
     search: true,
-    searchOrder: 6,
+    searchOrder: 5,
     searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
@@ -632,7 +621,7 @@ export const option = createCrudOption([
     prop: 'hcsSyncStatus',
     type: 'select',
     search: true,
-    searchOrder: 7,
+    searchOrder: 6,
     searchPlaceholder: '请选择',
     slot: true,
     dicData: hcsSyncStatusOptions,
@@ -662,7 +651,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 9,
+    searchOrder: 7,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,
@@ -674,7 +663,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 10,
+    searchOrder: 8,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,

src/option/business/transport-plan.js

@@ -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 `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
-      return `${typeName} | ${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'],

src/option/settlement/formalSettlement.js

@@ -93,24 +93,21 @@ const COLUMN_EXTRA = {
   createTime: { width: 180 },
 };
 
-// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不展示
+const buildTableColumns = () =>
-const buildTableColumns = settlementType =>
+  formalSettlementTableColumns.map(column => {
-  formalSettlementTableColumns
+    const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
-    .filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
+    if (column.money) {
-    .map(column => {
+      extra.formatter = moneyFormatter;
-      const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+      extra.align = 'right';
-      if (column.money) {
+    }
-        extra.formatter = moneyFormatter;
+    // link / status 标记的列统一走单元格插槽
-        extra.align = 'right';
+    if (column.link || column.status) extra.slot = true;
-      }
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
-      // link / status 标记的列统一走单元格插槽
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
-      if (column.link || column.status) extra.slot = true;
+    return { ...column, ...extra };
-      // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+  });
-      if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
-      return { ...column, ...extra };
-    });
 
-export const formalSettlementOption = (settlementType = '') => ({
+export const formalSettlementOption = () => ({
   height: 'auto',
   calcHeight: 32,
   tip: false,
@@ -118,7 +115,7 @@ export const formalSettlementOption = (settlementType = '') => ({
   emptyBtnText: '重置',
   searchShow: true,
   searchIcon: true,
-  searchLabelWidth: 100,
+  searchLabelWidth: 88,
   // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
   searchMenuSpan: 4,
   searchIndex: 4,
@@ -172,7 +169,7 @@ export const formalSettlementOption = (settlementType = '') => ({
       type: 'daterange',
     }),
     // ---------- 表格列（部分兼搜索项） ----------
-    ...buildTableColumns(settlementType),
+    ...buildTableColumns(),
   ],
 });
 

src/option/settlement/preSettlementForm.js

@@ -8,20 +8,8 @@ export const preSettlementFormFields = [
   { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
   { label: '合同编号', prop: 'contractNo', readonly: true },
   { label: '项目名称', prop: 'projectName', readonly: true },
-  {
+  { label: '收款方', prop: 'payeeName', readonly: true },
-    label: '收款方',
+  { label: '付款方', prop: 'payerName', readonly: true },
-    prop: 'payeeName',
-    type: 'select',
-    optionsKey: 'payeeOptions',
-    required: true,
-  },
-  {
-    label: '付款方',
-    prop: 'payerName',
-    type: 'select',
-    optionsKey: 'payerOptions',
-    required: true,
-  },
   { label: '结算类型', prop: 'settlementType', readonly: true },
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
   { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
@@ -36,8 +24,6 @@ export const preSettlementFormFields = [
 
 export const preSettlementFormRules = {
   contractId: [{ required: true, message: '请选择合同名称', trigger: 'change' }],
-  payeeName: [{ required: true, message: '请选择收款方', trigger: 'change' }],
-  payerName: [{ required: true, message: '请选择付款方', trigger: 'change' }],
   exchangeRateDate: [
     {
       validator: (_rule, value, callback, source) => {

src/router/views/index.js

@@ -129,39 +129,7 @@ export default [
         name: '新增编辑结算单',
         meta: {
           keepAlive: false,
-          // 付款结算单表单入口，高亮付款结算单菜单
+          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
-          activeMenu: '/settlement/payment-settlement',
-        },
-        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
-      },
-    ],
-  },
-  {
-    // 收款结算单表单入口：与付款结算单共用表单组件，仅高亮菜单不同
-    path: '/settlement/receipt-settlement/form',
-    component: Layout,
-    children: [
-      {
-        path: '',
-        name: '新增编辑收款结算单',
-        meta: {
-          keepAlive: false,
-          activeMenu: '/settlement/receipt-settlement',
-        },
-        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
-      },
-    ],
-  },
-  {
-    // 付款结算单表单入口：与 settlementListPath('payable') + '/form' 对应
-    path: '/settlement/payment-settlement/form',
-    component: Layout,
-    children: [
-      {
-        path: '',
-        name: '新增编辑付款结算单',
-        meta: {
-          keepAlive: false,
           activeMenu: '/settlement/payment-settlement',
         },
         component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),

src/views/base/airport-master.vue

@@ -60,13 +60,6 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="hasPermission('airport_master_view')"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('airport_master_edit')"
@@ -286,7 +279,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         column: [
           {
             label: '编码',

src/views/base/currency.vue

@@ -68,13 +68,6 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="permission.currency_view"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="permission.currency_edit"
@@ -178,7 +171,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         menuFixed: 'right',
         column: [
           {

src/views/base/customer-type.vue

@@ -36,13 +36,6 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="permission.customer_type_view"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="permission.customer_type_edit"
@@ -109,7 +102,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         column: [
           {
             label: '中文名称',

src/views/base/fee-item.vue

@@ -76,13 +76,6 @@
         </el-input>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="permission.fee_item_view"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="permission.fee_item_edit"
@@ -148,7 +141,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         column: [
           {
             label: '费用类型',

src/views/base/measurement-unit.vue

@@ -46,13 +46,6 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          v-if="hasPermission('measurement_unit_view')"
-          type="primary"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           v-if="hasPermission('measurement_unit_edit')"
           type="primary"

src/views/base/port-terminal.vue

@@ -134,13 +134,6 @@
         </div>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="hasPermission('port_terminal_view')"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('port_terminal_edit')"
@@ -377,7 +370,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         column: [
           {
             label: '编码',

src/views/base/railway-station.vue

@@ -60,13 +60,6 @@
         </el-tag>
       </template>
       <template #menu="{ row, index }">
-        <el-link
-          type="primary"
-          v-if="hasPermission('railway_station_view')"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           type="primary"
           v-if="hasPermission('railway_station_edit')"
@@ -257,7 +250,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 220,
+        menuWidth: 180,
         column: [
           {
             label: '编码',

src/views/business/components/billing-plan-editor.vue

@@ -12,12 +12,12 @@
         <el-descriptions-item label="方案名称">{{
             displayValue(draft.planName)
           }}</el-descriptions-item>
-        <el-descriptions-item label="适用客商">{{
-            displayValue(draft.customerName || partyOptionLabel(draft.partyRowId))
-          }}</el-descriptions-item>
         <el-descriptions-item label="运输方式">{{
             transportModeLabel(draft.transportMode)
           }}</el-descriptions-item>
+        <el-descriptions-item label="默认方案">{{
+            isDefaultPlan(draft) ? '是' : '否'
+          }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ displayValue(draft.remark) }}</el-descriptions-item>
       </el-descriptions>
       <el-form
@@ -37,20 +37,6 @@
             :disabled="readonly" /></el-form-item
           ></el-col>
           <el-col :span="8"
-          ><el-form-item label="适用客商" prop="partyRowId"
-          ><el-select
-            v-model="draft.partyRowId"
-            clearable
-            filterable
-            placeholder="请选择适用客商"
-            @change="handlePartyChange"
-          ><el-option
-            v-for="item in partyOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value" /></el-select></el-form-item
-          ></el-col>
-          <el-col :span="8"
           ><el-form-item label="运输方式" prop="transportMode"
           ><el-select
             v-model="draft.transportMode"
@@ -65,6 +51,16 @@
             :label="item.label"
             :value="item.value" /></el-select></el-form-item
           ></el-col>
+          <el-col :span="8"
+          ><el-form-item
+          ><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox
+          ><el-tooltip content="同一运输方式仅支持配置一个默认计费方案" placement="top">
+            <el-icon class="billing-plan-editor__default-tip"
+            ><InfoFilled
+            /></el-icon> </el-tooltip
+          ></el-form-item
+          ></el-col
+          >
           <el-col :span="24"
           ><el-form-item label="备注"
           ><el-input
@@ -384,7 +380,6 @@ import { InfoFilled } from '@element-plus/icons-vue';
 import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 import { currencyUnit } from '@/utils/currency';
-// InfoFilled 仅用于保底计费重量列头提示
 
 const clone = value => JSON.parse(JSON.stringify(value));
 /** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
@@ -438,7 +433,6 @@ export default {
     index: { type: Number, default: -1 },
     readonly: Boolean,
     settlementCurrency: { type: String, default: 'RMB' },
-    partyOptions: { type: Array, default: () => [] },
   },
   emits: ['update:modelValue', 'save'],
   data() {
@@ -482,7 +476,6 @@ export default {
       cargoRequest: null,
       formRules: {
         planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
-        partyRowId: [{ required: true, message: '请选择适用客商', trigger: 'change' }],
         transportMode: [{ required: true, message: '请选择运输方式', trigger: 'change' }],
       },
     };
@@ -523,24 +516,10 @@ export default {
       handler(value) {
         if (this.modelValue) {
           this.draft = this.normalizePlan(value);
-          this.applyDefaultPartySelection();
           this.loadRuleItems();
         }
       },
     },
-    modelValue(visible) {
-      if (visible) {
-        this.$nextTick(() => this.applyDefaultPartySelection());
-      }
-    },
-    partyOptions: {
-      deep: true,
-      handler() {
-        if (this.modelValue) {
-          this.applyDefaultPartySelection();
-        }
-      },
-    },
   },
   methods: {
     displayValue(value) {
@@ -560,62 +539,27 @@ export default {
       );
       return this.displayValue(option?.label || this.draft.transportModeLabel || value);
     },
+    isDefaultPlan(plan) {
+      return (
+        plan?.defaultPlan === true ||
+        plan?.defaultPlan === 1 ||
+        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
+      );
+    },
     normalizePlan(value = {}) {
       const plan = {
         planName: '',
-        partyRowId: '',
-        partyRole: '',
-        customerId: '',
-        customerName: '',
         transportMode: '',
         transportModeLabel: '',
+        defaultPlan: false,
         remark: '',
         ...clone(value || {}),
       };
-      // 一个客商对应一个方案，不再维护默认方案字段
-      delete plan.defaultPlan;
       plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
         this.normalizeRule(rule)
       );
       return plan;
     },
-    partyOptionLabel(partyRowId) {
-      const matched = (this.partyOptions || []).find(
-        item => String(item.value) === String(partyRowId)
-      );
-      return matched?.label || '';
-    },
-    /**
-     * 仅一个可选客商时默认选中（客户合同仅一个甲方的常见场景）
-     */
-    applyDefaultPartySelection() {
-      if (this.readonly) {
-        return;
-      }
-      const options = this.partyOptions || [];
-      if (options.length !== 1) {
-        return;
-      }
-      const current = String(this.draft.partyRowId || '');
-      const only = options[0];
-      const onlyValue = String(only?.value || only?.partyRowId || '');
-      if (!onlyValue) {
-        return;
-      }
-      if (current && current === onlyValue) {
-        return;
-      }
-      this.handlePartyChange(only.value || only.partyRowId);
-    },
-    handlePartyChange(partyRowId) {
-      const matched = (this.partyOptions || []).find(
-        item => String(item.value) === String(partyRowId)
-      );
-      this.draft.partyRowId = matched?.partyRowId || matched?.value || '';
-      this.draft.partyRole = matched?.partyRole || '';
-      this.draft.customerId = matched?.customerId || '';
-      this.draft.customerName = matched?.customerName || '';
-    },
     normalizeRule(rule = {}) {
       const next = { ...defaultRule(), ...clone(rule) };
       if (next.billingType === '阶梯单价' && next.minimumBillingWeight === '') {
@@ -1088,11 +1032,6 @@ export default {
       this.$refs.formRef.validate(valid => {
         if (!valid || !this.validateRules()) return;
         const plan = clone(this.draft);
-        this.handlePartyChange(plan.partyRowId);
-        plan.partyRowId = this.draft.partyRowId;
-        plan.partyRole = this.draft.partyRole;
-        plan.customerId = this.draft.customerId;
-        plan.customerName = this.draft.customerName;
         const transportMode = this.transportModeOptions.find(
           item => String(item.value) === String(plan.transportMode)
         );

src/views/business/components/master-order-dispatch.vue

@@ -195,7 +195,7 @@
           <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form carrier-form">
             <el-row :gutter="16">
               <template v-if="isRoad(route)">
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"
                   ><el-form-item label="司机" :required="route.carrierType !== '承运商'"
                     ><el-autocomplete
@@ -255,7 +255,7 @@
                 ></el-col>
               </template>
               <template v-else>
-                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? carrierSelectedValue(route) : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船班号/船次号/班次号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="船长"><el-input v-model="route.captainName" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="联系电话"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
@@ -920,8 +920,6 @@ export default {
       route.carrierName = '';
       route.carrierId = '';
       route.carrierContractId = '';
-      route.carrierPartyId = '';
-      route.carrierPartyRole = '';
       this.clearRouteDriverVehicleFields(route);
       if (value === '承运商') {
         route.trailerVehicleNo = '';
@@ -932,18 +930,15 @@ export default {
         if (value === '自运') this.applySelfOperatedCarrierDefaults(route);
       });
     },
-    handleCarrierContractChange(route, selectedValue) {
+    handleCarrierContractChange(route, contractId) {
       const contract = this.carrierOptions.find(
         item =>
-          this.carrierOptionValue(item) === String(selectedValue || '') ||
           [item.contractId, item.carrierName, item.id].some(
-            value => String(value || '') === String(selectedValue || '')
+            value => String(value || '') === String(contractId || '')
           )
       );
       route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
-      route.carrierPartyId = route.carrierType !== '自运' ? contract?.carrierPartyId || '' : '';
+      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
-      route.carrierPartyRole = route.carrierType !== '自运' ? contract?.carrierPartyRole || '' : '';
-      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || contract?.customerId || '' : '';
       route.carrierName = contract?.carrierName || '';
       this.clearRouteDriverVehicleFields(route);
     },
@@ -959,23 +954,15 @@ export default {
       this.driverOptions = [];
     },
     carrierOptionValue(item = {}) {
-      return [item.contractId || item.id || '', item.carrierPartyId || '', item.carrierName || ''].join(
+      return item.contractId || item.id || item.value || item.carrierName || '';
-        '__'
-      );
-    },
-    carrierSelectedValue(route = {}) {
-      return this.carrierOptionValue({
-        contractId: route.carrierContractId,
-        carrierPartyId: route.carrierPartyId,
-        carrierName: route.carrierName,
-      });
     },
     carrierOptionLabel(item) {
-      const roleLabel = item.carrierPartyRole === 'C' ? '丙方' : item.carrierPartyRole === 'B' ? '乙方' : '';
+      const duplicateCount = this.carrierOptions.filter(option => option.carrierName === item.carrierName).length;
-      const nameWithRole =
+      if (duplicateCount <= 1) {
-        roleLabel && item.carrierName ? `${item.carrierName}（${roleLabel}）` : item.carrierName;
+        return item.carrierName;
+      }
       const contractLabel = formatContractOptionLabel(item);
-      return contractLabel ? `${nameWithRole} - ${contractLabel}` : nameWithRole;
+      return contractLabel ? `${item.carrierName}（${contractLabel}）` : item.carrierName;
     },
     driverOptionLabel(item) { return item.driverName || item.name || ''; },
     driverOptionKey(item) { return item.id || item.driverId || this.driverOptionLabel(item) || item.mobile; },
@@ -996,22 +983,19 @@ export default {
             ...item,
             contractId: item.contractId || item.carrierContractId || item.id || '',
             carrierName:
-              item.carrierName ||
               item.partyB ||
               item.partyBName ||
               item.contractPartyB ||
               item.customerContractPartyB ||
+              item.carrierName ||
               '',
             carrierId:
-              item.customerId ||
               item.partyBId ||
               item.partyBUserId ||
               item.contractPartyBId ||
               item.customerContractPartyBId ||
               item.carrierId ||
               '',
-            carrierPartyId: item.carrierPartyId || '',
-            carrierPartyRole: item.carrierPartyRole || '',
           }))
           .filter(item => item.carrierName);
       } finally {
@@ -1153,7 +1137,7 @@ export default {
         id: `${route.segmentNo}-${item.cargoName}-${Date.now()}-${Math.random()}`,
         batchNo,
         segmentNo: route.segmentNo, relationNo: route.segmentNo, documentType: route.documentType, transportType: route.transportType, carrierType: route.carrierType,
-        carrierContractId: route.carrierContractId, carrierPartyId: route.carrierPartyId, carrierPartyRole: route.carrierPartyRole, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
+        carrierContractId: route.carrierContractId, carrierName: route.carrierName, driverName: route.driverName, driverPhone: route.driverPhone, vehicleNo: route.vehicleNo, captainName: route.captainName, cabinNo: route.cabinNo, containerNo: route.containerNo, trailerVehicleNo: route.trailerVehicleNo, escortName: route.escortName, escortPhone: route.escortPhone, mileage: this.normalizeMileage(route.mileage), unitPrice: this.freightItemsForGoods(route, item).unitPrice || '', priceUnit: this.freightItemsForGoods(route, item).priceUnit || '', currency: route.currency || 'RMB', freightAmount: this.freightAmount(this.freightItemsForGoods(route, item)), freightTotal: this.freightTotal(route), otherFeeTotal: route.otherFeeTotal || '', freightJson: this.buildFreightJson(route), routeRemark: route.remark,
         departureName: route.departureName, departureAddress: route.departureAddress, departureContact: route.departureContact, departurePhone: route.departurePhone,
         arrivalName: route.arrivalName, arrivalAddress: route.arrivalAddress, arrivalContact: route.arrivalContact, arrivalPhone: route.arrivalPhone,
         estimatedStartTime: route.estimatedStartTime, estimatedEndTime: route.estimatedEndTime,

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

src/views/business/components/waybill-import-dialog.vue

@@ -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}）`"
+          :label="`疑似重复（${duplicateRows.length}）`"
-          name="duplicate" /><el-tab-pane
+          name="duplicate" /></el-tabs
-          :label="`与已有运单重复（${historyDuplicateRows.length}）`"
-          name="history" /></el-tabs
       ><el-table
         :data="previewRows"
         border
         max-height="440"
-        :row-class-name="
+        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
-          ({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
-        "
         @selection-change="rowSelection = $event"
         ><el-table-column type="selection" width="55" /><el-table-column
           type="index"
           label="序号"
           width="65"
         /><el-table-column
-          v-for="column in 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(() =>
-const previewRows = computed(() => {
+  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
-  if (previewTab.value === 'duplicate') return duplicateRows.value;
+);
-  if (previewTab.value === 'history') return historyDuplicateRows.value;
-  return rows.value;
-});
 const carrierContractsLoaded = ref(false),
   hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
@@ -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 confirmDuplicateRow = row => {
-const refreshHistoryDuplicates = async (list = rows.value) => {
+  row._duplicateConfirmed = true;
-  if (!list.length || !form.projectId) {
+  refreshDuplicateFlags();
-    list.forEach(row => {
+  ElMessage.success('已确认，该行将按正常数据导入');
-      row._historyWaybillNo = '';
-    });
-    return;
-  }
-  let duplicates = [];
-  try {
-    const res = await api.checkImportDuplicates(buildImportPayload(form.status, list));
-    const data = res?.data?.data ?? res?.data ?? res;
-    duplicates = Array.isArray(data) ? data : [];
-  } catch (error) {
-    console.error('与已有运单重复校验失败:', error);
-    duplicates = [];
-  }
-  const numbersByRow = new Map(
-    duplicates.map(item => [item.rowIndex, (item.waybillNos || []).filter(Boolean)])
-  );
-  list.forEach((row, index) => {
-    row._historyWaybillNo = (numbersByRow.get(index) || []).join('、');
-  });
 };
 
 const stripInternalRowFields = row => {
-  const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, _historyWaybillNo, ...data } =
+  const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
-    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)
+  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
-    await ElMessageBox.confirm(`当前导入有${count}条Excel内重复数据，是否确认导入？`, '提示');
-  const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
-  if (historyCount)
-    await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
   if (form.importType === 'settlement' && form.status === 'completed')
     await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');
 

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

@@ -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"
                 />
@@ -4650,14 +4650,9 @@ export default {
     },
     taskCarrierValue: {
       get() {
-        if (this.form.carrierType === '自运') {
+        return this.form.carrierType === '自运'
-          return this.form.carrierName || '';
+          ? this.form.carrierName || ''
-        }
+          : this.form.carrierContractId || this.form.carrierName || '';
-        return this.taskCarrierOptionValue({
-          carrierContractId: this.form.carrierContractId,
-          carrierPartyId: this.form.carrierPartyId,
-          carrierName: this.form.carrierName,
-        });
       },
       set(value) {
         this.handleTaskCarrierChange(value);
@@ -5018,9 +5013,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatQuantity(group.quantity);
-          const typeName =
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+            group.unit ? ` ${group.unit}` : ''
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          }`;
         })
         .join('； ');
     },
@@ -7295,8 +7290,6 @@ export default {
         this.form.carrierName = '';
         this.form.carrierId = '';
         this.form.carrierContractId = '';
-        this.form.carrierPartyId = '';
-        this.form.carrierPartyRole = '';
         this.hasProjectProcessConfig = false;
         this.waybillProcessConfigRows = [];
         return;
@@ -7311,8 +7304,6 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
-      this.form.carrierPartyId = '';
-      this.form.carrierPartyRole = '';
       this.loadProjectProcessConfigState();
       this.loadTaskCarrierOptions(project);
       if (this.contractSelectEnabled) {
@@ -7769,8 +7760,6 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
-      this.form.carrierPartyId = '';
-      this.form.carrierPartyRole = '';
       this.form.driverId = '';
       this.form.driverName = '';
       this.form.driverPhone = '';
@@ -7825,9 +7814,7 @@ export default {
     },
     taskCarrierOptionValue(item = {}) {
       if (this.form.carrierType !== '自运') {
-        if (item.value) return item.value;
+        return item.carrierContractId || item.value || item.id || '';
-        return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
-          .join('__');
       }
       return (
         item.carrierName ||
@@ -7865,76 +7852,55 @@ export default {
       names.forEach(append);
       return options;
     },
-    parseContractPartyRows(partyJson, fallbackName = '', partyRole = 'B') {
-      const rows = this.parseJsonArray(partyJson)
-        .map(item => ({
-          id: item.id || '',
-          customerId: item.customerId || '',
-          customerName: String(item.customerName || '').trim(),
-          creditCode: item.creditCode || '',
-          partyRole,
-        }))
-        .filter(item => item.customerName);
-      if (rows.length) return rows;
-      return String(fallbackName || '')
-        .split(/[、,，]/)
-        .map(name => name.trim())
-        .filter(Boolean)
-        .map(name => ({
-          id: '',
-          customerId: '',
-          customerName: name,
-          creditCode: '',
-          partyRole,
-        }));
-    },
     getWaybillCarrierContractOptions(contracts = []) {
-      const options = [];
+      const carrierNameCounts = contracts.reduce((counts, contract) => {
-      contracts.forEach(contract => {
+        const carrierName = String(
-        if (!contract?.id) return;
+          contract.partyB ||
-        const parties = [
+          contract.partyBName ||
-          ...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
+          contract.contractPartyB ||
-          ...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
+          contract.customerContractPartyB ||
-        ];
+          contract.secondParty ||
-        if (!parties.length) {
+          contract.secondPartyName ||
-          const fallbackName = String(
+          ''
+        ).trim();
+        if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
+        return counts;
+      }, {});
+      return contracts
+        .map(contract => {
+          const carrierName = String(
             contract.partyB ||
-              contract.partyBName ||
+            contract.partyBName ||
-              contract.contractPartyB ||
+            contract.contractPartyB ||
-              contract.customerContractPartyB ||
+            contract.customerContractPartyB ||
-              contract.secondParty ||
+            contract.secondParty ||
-              contract.secondPartyName ||
+            contract.secondPartyName ||
-              ''
+            ''
           ).trim();
-          if (fallbackName) {
+          if (!carrierName || !contract.id) return null;
-            parties.push({
+          const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
-              id: '',
+          return {
-              customerId: '',
-              customerName: fallbackName,
-              creditCode: '',
-              partyRole: 'B',
-            });
-          }
-        }
-        const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
-        parties.forEach(party => {
-          const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
-          const optionValue = [contract.id, party.id || '', party.customerName].join('__');
-          options.push({
             id: contract.id,
-            carrierId: party.customerId || '',
+            carrierId:
-            value: optionValue,
+              contract.partyBId ||
-            label: `${party.customerName}（${roleLabel}） - ${contractIdentifier}`,
+              contract.partyBUserId ||
-            carrierName: party.customerName,
+              contract.contractPartyBId ||
-            fullName: party.customerName,
+              contract.customerContractPartyBId ||
+              contract.secondPartyId ||
+              contract.secondPartyUserId ||
+              contract.carrierId ||
+              '',
+            value: contract.id,
+            label:
+              carrierNameCounts[carrierName] > 1
+                ? `${carrierName}（${contractIdentifier}）`
+                : carrierName,
+            carrierName,
+            fullName: carrierName,
             carrierContractId: contract.id,
-            carrierPartyId: party.id || '',
+          };
-            carrierPartyRole: party.partyRole,
+        })
-            creditCode: party.creditCode || '',
+        .filter(Boolean);
-          });
-        });
-      });
-      return options;
     },
     resetWaybillCarrierContractState() {
       this.waybillCarrierContractRequestId += 1;
@@ -7964,8 +7930,6 @@ export default {
             this.form.carrierName = '';
             this.form.carrierId = '';
             this.form.carrierContractId = '';
-            this.form.carrierPartyId = '';
-            this.form.carrierPartyRole = '';
           }
           return options;
         })
@@ -8056,14 +8020,10 @@ export default {
       );
       if (this.form.carrierType !== '自运') {
         this.form.carrierContractId = carrier?.carrierContractId || '';
-        this.form.carrierPartyId = carrier?.carrierPartyId || '';
-        this.form.carrierPartyRole = carrier?.carrierPartyRole || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || '';
       } else {
         this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
-        this.form.carrierPartyId = '';
-        this.form.carrierPartyRole = '';
         this.form.carrierName = value || '';
       }
       // 承运商变更后清空司机/车辆，避免跨组织脏数据
@@ -8453,6 +8413,7 @@ export default {
       }
       if (!this.isTaskFullMode) {
         requiredFields.push(['cargoName', '货物名称']);
+        requiredFields.push(['model', '型号']);
         requiredFields.push(['quantity', '数量']);
       }
       const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));

src/views/business/contract-manage-change.vue

@@ -299,27 +299,25 @@
           ><el-radio label="system">系统生成</el-radio
           ><el-radio label="manual">账单导入生成</el-radio></el-radio-group
         >
-        <el-table :data="plans" border class="change-table">
+        <el-table :data="plans" border class="change-table"
-          <el-table-column type="index" label="序号" width="70" />
+          ><el-table-column type="index" label="序号" width="70" /><el-table-column
-          <el-table-column prop="planName" label="方案名称" min-width="180" />
+            prop="planName"
-          <el-table-column label="适用客商" min-width="180">
+            label="方案名称"
-            <template #default="{ row }">
+            min-width="220"
-              {{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
+          /><el-table-column label="默认方案" min-width="120"
-            </template>
+            ><template #default="{ row }">{{
-          </el-table-column>
+              row.defaultPlan ? '是' : '否'
-          <el-table-column prop="remark" label="备注" min-width="200" />
+            }}</template></el-table-column
-          <el-table-column v-if="!pageReadonly" label="操作" width="180">
+          ><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
-            <template #default="{ row, $index }">
+            v-if="!pageReadonly"
-              <el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
+            label="操作"
-              <el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
+            width="180"
-            </template>
+            ><template #default="{ row, $index }"
-          </el-table-column>
+              ><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
-          <el-table-column v-else label="操作" width="100">
+              ><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
-            <template #default="{ row, $index }">
+            ></el-table-column
-              <el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
+          ></el-table
-            </template>
+        >
-          </el-table-column>
-        </el-table>
       </section>
 
       <section class="change-section">
@@ -493,9 +491,7 @@
         v-model="planDialogVisible"
         :value="planEditor"
         :index="planEditorIndex"
-        :readonly="pageReadonly"
         :settlement-currency="form.settlementCurrency"
-        :party-options="billingPartyOptions"
         @save="savePlan"
       />
 
@@ -634,45 +630,6 @@ const normalizeCustomPeriods = (periods = []) =>
     endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
   }));
 
-const createPartyRow = (row = {}) => ({
-  id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
-  customerId: row.customerId || '',
-  customerName: row.customerName || '',
-  creditCode: row.creditCode || row.unifiedCreditCode || '',
-  contactId: row.contactId || '',
-  contactName: row.contactName || '',
-  contactPhone: row.contactPhone || '',
-});
-
-const partyRoleLabel = role => {
-  if (role === 'A') return '甲方';
-  if (role === 'B') return '乙方';
-  if (role === 'C') return '丙方';
-  return role || '';
-};
-
-const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
-  const rows = (() => {
-    if (Array.isArray(partyJson)) return partyJson;
-    if (!partyJson) return [];
-    try {
-      const data = JSON.parse(partyJson);
-      return Array.isArray(data) ? data : [];
-    } catch (error) {
-      return [];
-    }
-  })().map(item => createPartyRow(item));
-  if (rows.length) return rows;
-  if (fallbackName) {
-    return String(fallbackName)
-      .split(/[、,]/)
-      .map(name => name.trim())
-      .filter(Boolean)
-      .map(name => createPartyRow({ customerName: name }));
-  }
-  return requireOne ? [createPartyRow()] : [];
-};
-
 export default {
   components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
   data() {
@@ -680,9 +637,6 @@ export default {
       form: {},
       period: [],
       plans: [],
-      partyARows: [],
-      partyBRows: [],
-      partyCRows: [],
       attachments: [],
       contractFiles: [],
       contractFileRows: [],
@@ -721,7 +675,7 @@ export default {
       settlementModeDictOptions: [],
       contractFormatDictOptions: [],
       planDialogVisible: false,
-      planEditor: { planName: '', remark: '', rules: [] },
+      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
       planEditorIndex: -1,
       billingElements: [
         '按重量',
@@ -802,29 +756,6 @@ export default {
     isSettlementRuleChange() {
       return this.form.changeType === '结算规则变更';
     },
-    /**
-     * 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
-     */
-    billingPartyOptions() {
-      const category = String(this.form.contractCategory || '').trim();
-      const allowedRoles =
-        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
-      return [
-        ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
-        ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
-        ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
-      ]
-        .filter(row => allowedRoles.includes(row.partyRole))
-        .filter(row => row.customerName || row.customerId)
-        .map(row => ({
-          value: row.id,
-          label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
-          partyRole: row.partyRole,
-          partyRowId: row.id,
-          customerId: row.customerId,
-          customerName: row.customerName,
-        }));
-    },
     changeAttachmentLocationOptions() {
       if (this.isSettlementRuleChange) {
         return ['变更材料'];
@@ -959,9 +890,6 @@ export default {
       };
       this.changeMaterials = this.parse(data.changeAttachmentsJson);
       this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
-      this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
-      this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
-      this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
       this.plans = this.parse(data.billingPlanJson);
       this.attachments = this.mergeChangeAttachments(
         this.parse(data.attachmentsJson),
@@ -1120,32 +1048,10 @@ export default {
         .replace(/\D/g, '')
         .replace(/^0+/, '');
     },
-    addPlan() {
+    addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
-      this.planEditorIndex = -1;
+    editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
-      this.planEditor = {
+    toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
-        planName: `计费方案${this.plans.length + 1}`,
+    savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
-        remark: '',
-        rules: [{}],
-      };
-      this.planDialogVisible = true;
-    },
-    editPlan(row, index) {
-      this.planEditorIndex = index;
-      this.planEditor = JSON.parse(JSON.stringify(row));
-      this.planDialogVisible = true;
-    },
-    billingPlanCustomerLabel(row) {
-      const matched = this.billingPartyOptions.find(
-        item => String(item.partyRowId) === String(row.partyRowId)
-      );
-      return matched?.label || row.customerName || '';
-    },
-    savePlan(value, index) {
-      const nextPlan = { ...value };
-      delete nextPlan.defaultPlan;
-      if (index < 0) this.plans.push(nextPlan);
-      else this.plans.splice(index, 1, nextPlan);
-    },
     handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
     handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
     attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },

src/views/business/contract-manage.vue

@@ -1707,21 +1707,12 @@ export default {
         { role: 'C', label: '丙方', rows: this.partyCRows },
       ];
     },
-    /**
-     * 计费方案适用客商：
-     * - 客户合同：仅甲方（仅 1 个甲方时编辑器自动选中）
-     * - 承运商合同：仅乙方、丙方（应付明细按这些方案生成）
-     */
     billingPartyOptions() {
-      const category = String(this.form.contractCategory || '').trim();
-      const allowedRoles =
-        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
       return [
         ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
         ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
         ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
       ]
-        .filter(row => allowedRoles.includes(row.partyRole))
         .filter(row => row.customerName || row.customerId)
         .map(row => ({
           value: row.id,
@@ -2353,6 +2344,7 @@ export default {
       if (!this.validatePartyRows(true)) return false;
       return (
         this.validateBillingPlanBindings() &&
+        this.validateBillingPlanDefault() &&
         this.validateSettlementRules() &&
         this.validatePaymentRatios()
       );
@@ -2948,17 +2940,10 @@ export default {
     validateBillingPlanBindings() {
       if (!this.billingPlanRows.length) return true;
       const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
-      const category = String(this.form.contractCategory || '').trim();
-      const roleHint =
-        category === '承运商合同'
-          ? '请选择乙方或丙方客商'
-          : category === '客户合同'
-            ? '请选择甲方客商'
-            : '请选择适用客商';
       for (let index = 0; index < this.billingPlanRows.length; index += 1) {
         const plan = this.billingPlanRows[index];
         if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
-          this.$message.warning(`计费方案第${index + 1}个${roleHint}`);
+          this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
           return false;
         }
       }
@@ -3084,7 +3069,7 @@ export default {
           const message =
             error?.response?.data?.msg ||
             error?.message ||
-            '业务部门配置中未维护该平台公司与业务部门的合同编码前缀，无法自动生成，请先在业务部门配置中维护或手动输入合同编号';
+            '部门合同前缀未配置，无法自动生成，请手动输入合同编号';
           this.$message.warning(message);
         });
     },
@@ -3213,13 +3198,21 @@ export default {
     openBillingPlan(row = {}, index = -1) {
       this.billingPlanIndex = index;
       this.billingPlanForm =
-        index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
+        index < 0
+          ? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
+          : clone(row);
       this.billingPlanBox = true;
       this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
     },
     saveBillingPlan(plan, index) {
       const nextPlan = clone(plan);
-      delete nextPlan.defaultPlan;
+      if (this.isDefaultBillingPlan(nextPlan)) {
+        this.billingPlanRows.forEach((item, itemIndex) => {
+          if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
+            item.defaultPlan = false;
+          }
+        });
+      }
       if (index < 0) this.billingPlanRows.push(nextPlan);
       else this.billingPlanRows.splice(index, 1, nextPlan);
       this.billingPlanBox = false;
@@ -3229,6 +3222,31 @@ export default {
         this.billingPlanRows.splice(index, 1);
       });
     },
+    isDefaultBillingPlan(plan) {
+      return (
+        plan?.defaultPlan === true ||
+        plan?.defaultPlan === 1 ||
+        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
+      );
+    },
+    validateBillingPlanDefault() {
+      if (!this.billingPlanRows.length) return true;
+      const defaultCountByTransportMode = this.billingPlanRows.reduce((result, plan) => {
+        const transportMode = plan.transportMode || '';
+        result[transportMode] =
+          (result[transportMode] || 0) + Number(this.isDefaultBillingPlan(plan));
+        return result;
+      }, {});
+      const invalidTransportMode = Object.entries(defaultCountByTransportMode).find(
+        ([, count]) => count > 1
+      );
+      if (invalidTransportMode) {
+        const [transportMode, count] = invalidTransportMode;
+        this.$message.warning(`运输方式“${transportMode}”仅支持配置一个默认计费方案`);
+        return false;
+      }
+      return true;
+    },
     isFixedCycleSettlementType(value) {
       return value === '按固定天数周期' || value === '固定天数周期结算';
     },
@@ -3562,7 +3580,8 @@ export default {
       return list
         .map(item => {
           if (!item || typeof item !== 'object') return String(item ?? '');
-          return item.planName || item.name || '未命名方案';
+          const name = item.planName || item.name || '未命名方案';
+          return item.defaultPlan ? `${name}（默认）` : name;
         })
         .filter(Boolean)
         .join('、');

src/views/business/loading-manage.vue

@@ -1448,7 +1448,7 @@
                   <el-select
                     :model-value="
                       dialogForm.carrierType === '承运商'
-                        ? taskCarrierSelectedValue
+                        ? dialogForm.carrierContractId
                         : dialogForm.carrierName
                     "
                     clearable
@@ -1465,7 +1465,7 @@
                   >
                     <el-option
                       v-for="item in taskCarrierOptions"
-                      :key="carrierOptionValue(item)"
+                      :key="item.id || item.carrierName"
                       :label="
                         dialogForm.carrierType === '承运商'
                           ? formatTaskCarrierContractLabel(item)
@@ -1473,7 +1473,7 @@
                       "
                       :value="
                         dialogForm.carrierType === '承运商'
-                          ? carrierOptionValue(item)
+                          ? item.id
                           : item.carrierName || item.partyB
                       "
                     />
@@ -1953,8 +1953,6 @@ const createDialogForm = () => ({
   carrierType: '承运商',
   carrierName: '',
   carrierContractId: '',
-  carrierPartyId: '',
-  carrierPartyRole: '',
   escortName: '',
   escortPhone: '',
   departureAddress: '',
@@ -2258,13 +2256,6 @@ export default {
       if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
       return '请选择';
     },
-    taskCarrierSelectedValue() {
-      return this.carrierOptionValue({
-        id: this.dialogForm.carrierContractId,
-        carrierPartyId: this.dialogForm.carrierPartyId,
-        carrierName: this.dialogForm.carrierName,
-      });
-    },
     detailStatusType() {
       const typeMap = {
         pending: 'success',
@@ -2400,23 +2391,11 @@ export default {
     driverOptionText,
     formatTaskCarrierContractLabel(item = {}) {
       const carrierName = item.carrierName || item.partyB || '';
-      const roleLabel =
-        item.carrierPartyRole === 'C' || item.carrierPartyRole === '丙'
-          ? '丙方'
-          : item.carrierPartyRole === 'B' || item.carrierPartyRole === '乙'
-            ? '乙方'
-            : '';
       const contractLabel = formatContractOptionLabel(item);
-      const nameWithRole = roleLabel && carrierName ? `${carrierName}（${roleLabel}）` : carrierName;
+      if (carrierName && contractLabel) {
-      if (nameWithRole && contractLabel) {
+        return `${carrierName}（${contractLabel}）`;
-        return `${nameWithRole} - ${contractLabel}`;
       }
-      return nameWithRole || contractLabel;
+      return carrierName || contractLabel;
-    },
-    carrierOptionValue(item = {}) {
-      return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
-        '__'
-      );
     },
     syncStandaloneTagTitle() {
       if (!this.isStandalonePage) return;
@@ -2545,9 +2524,9 @@ export default {
         Object.values(groups)
           .map(group => {
             const quantity = this.formatGoodsQuantity(group.quantity);
-            const typeName =
+            return `${group.typeName}等${group.count}种货物 | ${quantity}${
-              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+              group.unit ? ` ${group.unit}` : ''
-            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+            }`;
           })
           .join('； ') || '-'
       );
@@ -4576,8 +4555,6 @@ export default {
     },
     handleCarrierTypeChange() {
       this.dialogForm.carrierContractId = '';
-      this.dialogForm.carrierPartyId = '';
-      this.dialogForm.carrierPartyRole = '';
       this.dialogForm.carrierName = '';
       this.dialogForm.carrierId = '';
       this.clearDialogDriverVehicleFields();
@@ -4588,25 +4565,17 @@ export default {
       }
       if (this.dialogForm.carrierType === '自运') {
         this.dialogForm.carrierContractId = '';
-        this.dialogForm.carrierPartyId = '';
-        this.dialogForm.carrierPartyRole = '';
       }
       this.loadTaskCarrierOptions();
     },
-    handleTaskCarrierChange(selectedValue) {
+    handleTaskCarrierChange(contractId) {
-      const contract = this.taskCarrierOptions.find(
+      const contract = this.taskCarrierOptions.find(item =>
-        item =>
+        [item.id, item.carrierName, item.partyB].some(
-          this.carrierOptionValue(item) === String(selectedValue || '') ||
+          value => String(value || '') === String(contractId || '')
-          [item.id, item.carrierName, item.partyB].some(
+        )
-            value => String(value || '') === String(selectedValue || '')
-          )
       );
       this.dialogForm.carrierContractId =
         this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
-      this.dialogForm.carrierPartyId =
-        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyId || '' : '';
-      this.dialogForm.carrierPartyRole =
-        this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyRole || '' : '';
       this.dialogForm.carrierName = contract?.carrierName || '';
       this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
       this.clearDialogDriverVehicleFields();
@@ -4789,45 +4758,30 @@ export default {
             .map(item => ({
               ...item,
               carrierName:
-                item.carrierName ||
                 item.partyB ||
                 item.partyBName ||
                 item.contractPartyB ||
                 item.customerContractPartyB ||
+                item.carrierName ||
                 '',
               carrierId:
-                item.customerId ||
                 item.partyBId ||
                 item.partyBUserId ||
                 item.contractPartyBId ||
                 item.customerContractPartyBId ||
                 item.carrierId ||
                 '',
-              carrierPartyId: item.carrierPartyId || '',
-              carrierPartyRole: item.carrierPartyRole || '',
             }))
             .filter(item => item.carrierName);
           const current =
-            this.taskCarrierOptions.find(
+            contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
-              item =>
-                this.carrierOptionValue(item) === this.taskCarrierSelectedValue ||
-                (String(item.id) === String(this.dialogForm.carrierContractId) &&
-                  (!this.dialogForm.carrierPartyId ||
-                    String(item.carrierPartyId) === String(this.dialogForm.carrierPartyId)) &&
-                  (!this.dialogForm.carrierName ||
-                    item.carrierName === this.dialogForm.carrierName))
-            ) ||
             this.taskCarrierOptions.find(item => item.carrierName === this.dialogForm.carrierName);
           if (current) {
             this.dialogForm.carrierContractId = current.id;
-            this.dialogForm.carrierPartyId = current.carrierPartyId || '';
-            this.dialogForm.carrierPartyRole = current.carrierPartyRole || '';
             this.dialogForm.carrierName = current.carrierName;
             this.dialogForm.carrierId = current.carrierId || '';
           } else {
             this.dialogForm.carrierContractId = '';
-            this.dialogForm.carrierPartyId = '';
-            this.dialogForm.carrierPartyRole = '';
             this.dialogForm.carrierName = '';
             this.dialogForm.carrierId = '';
           }
@@ -4838,22 +4792,19 @@ export default {
             .map(item => ({
               ...item,
               carrierName:
-                item.carrierName ||
                 item.partyB ||
                 item.partyBName ||
                 item.contractPartyB ||
                 item.customerContractPartyB ||
+                item.carrierName ||
                 '',
               carrierId:
-                item.customerId ||
                 item.partyBId ||
                 item.partyBUserId ||
                 item.contractPartyBId ||
                 item.customerContractPartyBId ||
                 item.carrierId ||
                 '',
-              carrierPartyId: item.carrierPartyId || '',
-              carrierPartyRole: item.carrierPartyRole || '',
             }))
             .filter(item => item.carrierName);
           const current = this.taskCarrierOptions.find(

src/views/business/process-config.vue

@@ -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 (!this.enabledNodes.length) {
-      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('请至少选择一个过程节点');
-        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/business/project-apply.vue

@@ -761,96 +761,6 @@
           />
         </div>
 
-        <template v-if="showProjectContractSection">
-          <div class="dialog-section-title project-apply-form__table-title">项目合同</div>
-          <el-table
-            v-loading="projectContractLoading"
-            :data="projectContractRows"
-            border
-            class="project-apply-form__table"
-          >
-            <el-table-column type="index" label="序号" width="80" align="center" />
-            <el-table-column
-              prop="contractCategory"
-              label="合同类型"
-              min-width="120"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="contractNo"
-              label="合同编号"
-              min-width="140"
-              align="center"
-              show-overflow-tooltip
-            >
-              <template #default="{ row }">
-                <el-link
-                  v-if="row.id && row.contractNo"
-                  type="primary"
-                  @click.stop="openProjectContractDetail(row)"
-                >
-                  {{ row.contractNo }}
-                </el-link>
-                <span v-else>{{ row.contractNo || '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="contractName"
-              label="合同名称"
-              min-width="160"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="partyA"
-              label="甲方"
-              min-width="140"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="partyB"
-              label="乙方"
-              min-width="140"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="partyC"
-              label="丙方"
-              min-width="140"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="startDate"
-              label="开始日期"
-              min-width="120"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="endDate"
-              label="结束日期"
-              min-width="120"
-              align="center"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="contractAmount"
-              label="合同金额"
-              min-width="120"
-              align="center"
-              show-overflow-tooltip
-            >
-              <template #default="{ row }">
-                {{ formatAmount(row.contractAmount) }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-
         <div
           v-if="!isChangeDialog && !isNewProjectDialog"
           class="dialog-section-title project-apply-form__table-title"
@@ -1080,7 +990,6 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
-import { getList as getContractManageList } from '@/api/business/contract-manage';
 import {
   getRisk,
   loadHcsImmediateEnabled,
@@ -1479,8 +1388,6 @@ export default {
         'zip',
       ],
       changeRows: [],
-      projectContractRows: [],
-      projectContractLoading: false,
       changeRecordDetailVisible: false,
       changeRecordDetail: null,
       changeRecordDetailRows: [],
@@ -1557,9 +1464,6 @@ export default {
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
-    showProjectContractSection() {
-      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
-    },
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
@@ -2208,8 +2112,6 @@ export default {
       this.attachmentRows = [];
       this.selectedAttachmentRows = [];
       this.changeRows = [];
-      this.projectContractRows = [];
-      this.projectContractLoading = false;
       this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
@@ -2258,40 +2160,6 @@ export default {
       this.syncSelectedCustomerOptions();
       this.ensureCurrentPlatformOption();
       this.ensureCurrentBusinessDeptOption();
-      this.loadProjectContracts(row?.id);
-    },
-    loadProjectContracts(projectId) {
-      if (!this.showProjectContractSection || !projectId) {
-        this.projectContractRows = [];
-        this.projectContractLoading = false;
-        return;
-      }
-      this.projectContractLoading = true;
-      getContractManageList(1, 1000, { projectId })
-        .then(res => {
-          const data = res.data?.data;
-          const records = Array.isArray(data) ? data : data?.records || [];
-          this.projectContractRows = records.filter(
-            item => String(item.projectId) === String(projectId)
-          );
-        })
-        .catch(() => {
-          this.projectContractRows = [];
-          this.$message.error('项目合同加载失败');
-        })
-        .finally(() => {
-          this.projectContractLoading = false;
-        });
-    },
-    openProjectContractDetail(row) {
-      if (!row?.id) {
-        this.$message.warning('合同信息不完整，无法跳转');
-        return;
-      }
-      this.$router.push({
-        path: '/business/contract-manage/detail',
-        query: { id: row.id, name: '合同详情' },
-      });
     },
     fillDefaultUsers() {
       const userId = this.userInfo?.userId || this.userInfo?.id || '';

src/views/business/voucher-manage.vue

@@ -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({
+const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
-  batchNo: '',
-  projectId: '',
-  createUser: '',
-  waybillCount: undefined,
-});
 const batchPage = reactive({ current: 1, size: 10, total: 0 });
 const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
 const progressPage = reactive({ current: 1, size: 10, total: 0 });
@@ -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 = () => {
+const resetBatchQuery = () => {
-  Object.assign(batchQuery, {
+  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
-    batchNo: '',
-    projectId: '',
-    createUser: '',
-    waybillCount: undefined,
-  });
   batchCreateRange.value = [];
   batchPage.current = 1;
-};
-const resetBatchQuery = () => {
-  resetBatchSearch();
   loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {

src/views/payment/invoice-application-form.vue

@@ -494,9 +494,6 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
-// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
-const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
-
 let localId = 0;
 const emptyLine = () => ({
   localId: ++localId,
@@ -1230,7 +1227,6 @@ export default {
         mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
-      sessionStorage.setItem(invoiceApplicationListRefreshKey, '1');
       this.goBack();
     },
     async syncReferenceData() {

src/views/payment/invoice-application.vue

@@ -250,11 +250,6 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { kingdeeStatusType } from '@/utils/kingdee';
-import { settlementListPath } from '@/utils/settlement-menu';
-
-// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
-const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
-const invoiceApplicationListRoute = '/payment/invoice-application';
 
 const emptyQuery = () => ({
   applicationNo: '',
@@ -313,28 +308,7 @@ export default {
         this.mkEnabled = false;
       });
   },
-  activated() {
-    this.consumeListRefreshFlag();
-  },
-  watch: {
-    $route(to, from) {
-      if (
-        to.path === invoiceApplicationListRoute &&
-        from?.path?.includes('/invoice-application/form')
-      ) {
-        this.consumeListRefreshFlag();
-      }
-    },
-  },
   methods: {
-    /** 表单提交成功后带标记返回时，重新拉取列表 */
-    consumeListRefreshFlag() {
-      if (!sessionStorage.getItem(invoiceApplicationListRefreshKey)) {
-        return;
-      }
-      sessionStorage.removeItem(invoiceApplicationListRefreshKey);
-      this.loadTable();
-    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -398,18 +372,12 @@ export default {
           item => String(item.formalSettlementNo || '').trim() === normalizedNo
         );
         if (!row?.id) {
-          this.$message.warning('未找到对应的结算单');
+          this.$message.warning('未找到对应的付款结算单');
           return;
         }
-        // 开票申请关联的多为收款结算单，按单据类型路由到对应表单入口，避免误落付款结算单
         this.$router.push({
-          path: settlementListPath(row.settlementType) + '/form',
+          path: '/settlement/formal-settlement/form',
-          query: {
+          query: { mode: 'view', id: row.id, name: '查看正式结算' },
-            mode: 'view',
-            id: row.id,
-            settlementType: row.settlementType,
-            name: '查看正式结算',
-          },
         });
       } catch (error) {
         this.$message.error('正式结算单详情加载失败');

src/views/payment/invoice-receipt-form.vue

@@ -100,28 +100,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="所属合同" prop="contractNo">
+            <el-form-item label="结算组织" prop="deptId">
-              <el-tooltip
+              <el-cascader
-                :content="form.contractName"
+                v-if="!readonly"
-                :disabled="!form.contractName"
+                :model-value="deptCascaderValue"
-                placement="top"
+                :options="deptTreeOptions"
-                :show-after="200"
+                :props="deptCascaderProps"
-              >
+                placeholder="请选择结算组织（合同承办部门）"
-                <div class="receipt-form-page__overflow-trigger">
+                filterable
-                  <el-input :model-value="form.contractNo" readonly placeholder="请选择承运商合同">
+                clearable
-                    <template v-if="!readonly" #append>
+                @change="handleDeptChange"
-                      <el-tooltip content="选择承运商合同" placement="top">
+              />
-                        <el-button :icon="Search" @click="openContractDialog" />
+              <el-input v-else :model-value="form.deptName" disabled />
-                      </el-tooltip>
-                    </template>
-                  </el-input>
-                </div>
-              </el-tooltip>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="承办部门">
-              <el-input :model-value="form.deptName" disabled placeholder="从所属合同带出" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -224,48 +214,6 @@
       :query-api="apiQueryInvoicePool"
       @confirm="handleInvoicePicked"
     />
-
-    <el-dialog v-model="contractDialog.visible" title="选择承运商合同" width="920px" append-to-body>
-      <el-form :model="contractDialog.query" label-position="right" label-width="auto" inline @submit.prevent>
-        <el-form-item label="合同编号">
-          <el-input
-            v-model="contractDialog.query.contractNo"
-            clearable
-            placeholder="请输入"
-            @keyup.enter="searchContracts"
-          />
-        </el-form-item>
-        <el-form-item label="合同名称">
-          <el-input
-            v-model="contractDialog.query.contractName"
-            clearable
-            placeholder="请输入"
-            @keyup.enter="searchContracts"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" :icon="Search" @click="searchContracts">查询</el-button>
-          <el-button @click="resetContractQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="contractDialog.loading" :data="contractDialog.rows" border>
-        <el-table-column prop="contractNo" label="合同编号" min-width="180" show-overflow-tooltip />
-        <el-table-column prop="contractName" label="合同名称" min-width="200" show-overflow-tooltip />
-        <el-table-column prop="organizationName" label="承办部门" min-width="160" show-overflow-tooltip />
-        <el-table-column label="操作" width="80" align="center">
-          <template #default="{ row }">
-            <el-button type="primary" link @click="pickContract(row)">选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        v-model:current-page="contractDialog.page.current"
-        v-model:page-size="contractDialog.page.size"
-        :total="contractDialog.page.total"
-        layout="total, prev, pager, next"
-        @current-change="loadContracts"
-      />
-    </el-dialog>
   </basic-container>
 </template>
 
@@ -273,7 +221,7 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
-import { getList as getContractList } from '@/api/business/contract-manage';
+import { getDeptTree } from '@/api/system/dept';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
@@ -299,8 +247,6 @@ const emptyForm = () => ({
   customerEmails: [],
   departmentEmails: [],
   projectName: '',
-  contractNo: '',
-  contractName: '',
   deptId: null,
   deptName: '',
   payerName: '',
@@ -323,19 +269,16 @@ export default {
       customerEmailOptions: [],
       departmentEmailOptions: [],
       invoiceItems: [],
-      contractDialog: {
+      deptTreeOptions: [],
-        visible: false,
+      deptMap: new Map(),
-        loading: false,
+      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
-        rows: [],
+      deptCascaderProps: { checkStrictly: true, emitPath: true },
-        page: { current: 1, size: 10, total: 0 },
-        query: { contractNo: '', contractName: '' },
-      },
       invoiceDialog: {
         visible: false,
       },
       rules: {
         invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
-        contractNo: [{ required: true, validator: this.validateContract, trigger: 'change' }],
+        deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }],
         customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
         departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
       },
@@ -356,6 +299,12 @@ export default {
       const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
       return this.hasPermission(code);
     },
+    deptCascaderValue() {
+      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
+        return [];
+      }
+      return [String(this.form.deptId)];
+    },
   },
   created() {
     this.initialize();
@@ -390,6 +339,7 @@ export default {
         .filter(Boolean);
     },
     async initialize() {
+      this.loadDepartments();
       if (this.isPublicViewPage) {
         await this.loadPublicDetail();
         return;
@@ -430,9 +380,9 @@ export default {
       }
       callback();
     },
-    validateContract(rule, value, callback) {
+    validateDept(rule, value, callback) {
-      if (!this.form.contractNo) {
+      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        callback(new Error('请选择所属合同'));
+        callback(new Error('请选择结算组织'));
         return;
       }
       callback();
@@ -504,43 +454,47 @@ export default {
         this.invoiceItems = [];
       }
     },
-    // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
+    loadDepartments() {
-    openContractDialog() {
+      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
-      this.contractDialog.visible = true;
+      getDeptTree(this.userInfo?.tenantId)
-      this.searchContracts();
+        .then(response => {
+          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
+          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
+          this.deptMap = new Map();
+          this.flattenDepartments(rows).forEach(item =>
+            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
+          );
+        })
+        .catch(() => {});
     },
-    searchContracts() {
+    excludeExternalOrganization(list = []) {
-      this.contractDialog.page.current = 1;
+      return list.reduce((result, item) => {
-      this.loadContracts();
+        const deptName = item.title || item.deptName || item.name;
-    },
+        if (String(deptName || '').trim() === '外部组织') return result;
-    resetContractQuery() {
+        result.push({
-      this.contractDialog.query = { contractNo: '', contractName: '' };
+          ...item,
-      this.searchContracts();
+          children: item.children?.length
-    },
+            ? this.excludeExternalOrganization(item.children)
-    async loadContracts() {
+            : item.children,
-      this.contractDialog.loading = true;
-      try {
-        const res = await getContractList(this.contractDialog.page.current, this.contractDialog.page.size, {
-          ...this.contractDialog.query,
-          contractCategory: '承运商合同',
-          approvalStatuses: 'approved,change_approved',
         });
-        const data = this.unwrapData(res) || {};
+        return result;
-        this.contractDialog.rows = data.records || [];
+      }, []);
-        this.contractDialog.page.total = Number(data.total || 0);
-      } finally {
-        this.contractDialog.loading = false;
-      }
     },
-    pickContract(row) {
+    toDeptCascaderOptions(list = []) {
-      if (!row) return;
+      return list.map(item => ({
-      Object.assign(this.form, {
+        label: item.title || item.deptName || item.name,
-        contractNo: row.contractNo,
+        value: item.id == null || item.id === '' ? '' : String(item.id),
-        contractName: row.contractName,
+        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
-        deptName: row.organizationName,
+      }));
-      });
+    },
-      this.contractDialog.visible = false;
+    flattenDepartments(rows) {
-      this.$refs.formRef?.validateField('contractNo').catch(() => {});
+      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
+    },
+    handleDeptChange(value) {
+      const deptId = Array.isArray(value) ? value.at(-1) : value;
+      this.form.deptId = deptId || null;
+      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
+      this.$refs.formRef?.validateField('deptId').catch(() => {});
     },
     openSettlementDetail(row) {
       const id = row.formalSettlementId || row.settlementId || row.id;
@@ -573,8 +527,9 @@ export default {
         departmentEmails: this.form.departmentEmails.join(';'),
         attachmentsJson: JSON.stringify(this.form.attachments || []),
         remark: this.form.remark,
-        // 所属合同仅传编号，合同名称/承办部门由后端按编号带出（结算组织=合同承办部门）
+        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
-        contractNo: this.form.contractNo,
+        deptId: this.form.deptId,
+        deptName: this.form.deptName,
       };
     },
     async saveDraft() {

src/views/payment/payment-application-form.vue

@@ -1296,11 +1296,9 @@ export default {
       this.form = {
         ...emptyForm(),
         ...data,
-        // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
-        preSettlementId: this.isValidReferenceId(data.preSettlementId) ? data.preSettlementId : null,
         preSettlementIds: data.preSettlementIds?.length
           ? data.preSettlementIds
-          : this.isValidReferenceId(data.preSettlementId)
+          : data.preSettlementId
           ? [data.preSettlementId]
           : [],
         attachments: this.parse(data.attachmentsJson),
@@ -1346,13 +1344,9 @@ export default {
         this.form = {
           ...emptyForm(),
           ...data,
-          // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
-          preSettlementId: this.isValidReferenceId(data.preSettlementId)
-            ? data.preSettlementId
-            : null,
           preSettlementIds: data.preSettlementIds?.length
             ? data.preSettlementIds
-            : this.isValidReferenceId(data.preSettlementId)
+            : data.preSettlementId
             ? [data.preSettlementId]
             : [],
           attachments: this.parse(data.attachmentsJson),
@@ -1593,22 +1587,17 @@ export default {
       });
     },
     clearFormalReferenceWhenPreOnly() {
-      // 纯预付引用才收敛为预付；-1 占位 id 不得充当预付关联
       const progressAdvance = this.form.paymentType === 'progress_advance';
       const onlyPre =
         progressAdvance ||
         (this.referenceRows.length > 0 &&
           this.referenceRows.every(item => item.referenceType === 'pre'));
       if (!onlyPre) return;
-      if (!this.isValidReferenceId(this.form.preSettlementId)) {
+      if (!this.form.preSettlementId) {
         const preId =
-          this.referenceRows.find(
+          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
-            item => item.referenceType === 'pre' && this.isValidReferenceId(item.id)
+          (progressAdvance ? this.form.settlementId : null);
-          )?.id ||
+        if (preId) {
-          (progressAdvance && this.isValidReferenceId(this.form.settlementId)
-            ? this.form.settlementId
-            : null);
-        if (this.isValidReferenceId(preId)) {
           this.form.preSettlementId = preId;
           this.form.preSettlementIds = [preId];
         }
@@ -1619,16 +1608,13 @@ export default {
     },
     restoreReferenceRows(data, fallbackRow) {
       const relations = Array.isArray(data?.settlements) ? data.settlements : [];
-      // 行级预付/正式类型以过滤占位 id 后的关联为准，决定点击结算单号的跳转目标
       const rows = relations
         .map(item => {
-          // 后端用 -1 占位空 id，必须先过滤再判预付，否则正式结算行会被误标为预付
+          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
-          const preId = this.isValidReferenceId(item.preSettlementId) ? item.preSettlementId : null;
-          const isPre = Boolean(preId || item.preSettlementNo);
           const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
           if (!settlementNo) return null;
           return {
-            id: isPre ? preId || item.formalSettlementId : item.formalSettlementId,
+            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
             settlementNo,
             referenceType: isPre ? 'pre' : 'formal',
             settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
@@ -1656,10 +1642,9 @@ export default {
     },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
-      // 后端以 -1 占位空预付 id，必须先校验否则正式结算行会被误判为预付
       const isPre = Boolean(
         row.preSettlementNo ||
-          this.isValidReferenceId(row.preSettlementId) ||
+          row.preSettlementId ||
           row.referenceType === 'pre' ||
           row.paymentType === 'progress_advance'
       );
@@ -2785,26 +2770,23 @@ export default {
     },
     async openSettlementDetail(row = {}) {
       const settlementNo = String(row.settlementNo || '').trim();
-      // 行上 referenceType 优先；发票行等只带单号的，按单号回查引用行；都缺省才回落表单级推断
-      const matchedReference = this.referenceRows.find(
-        item => String(item.settlementNo || '').trim() === settlementNo
-      );
-      const referenceType = row.referenceType || matchedReference?.referenceType;
       const isPre =
-        referenceType === 'pre' ||
+        row.referenceType === 'pre' ||
-        (!referenceType &&
+        this.form.paymentType === 'progress_advance' ||
-          (this.form.paymentType === 'progress_advance' ||
+        Boolean(this.form.preSettlementId || this.form.preSettlementNo);
-            Boolean(
-              this.isValidReferenceId(this.form.preSettlementId) || this.form.preSettlementNo
-            )));
       let id =
         row.id ||
         row.preSettlementId ||
         row.settlementId ||
-        matchedReference?.id ||
         (isPre
           ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
           : this.form.settlementId || this.form.settlementIds?.[0]);
+      if (!id && settlementNo) {
+        const matched = this.referenceRows.find(
+          item => String(item.settlementNo || '').trim() === settlementNo
+        );
+        id = matched?.id;
+      }
       if (!id && settlementNo) {
         try {
           const listApi = isPre ? preApi.getList : formalApi.getList;

src/views/settlement/components/formal-settlement-editor.vue

@@ -494,12 +494,7 @@
               <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="是否已指定应付" min-width="130" align="center">
-            v-if="form.settlementType !== 'receivable'"
-            label="是否已指定应付"
-            min-width="130"
-            align="center"
-          >
             <template #default="{ row }">
               <el-tooltip
                 :disabled="row.kingdeePushStatus !== 'failed'"

src/views/settlement/components/pre-settlement-editor.vue

@@ -989,7 +989,6 @@ import {
   save,
   submit,
 } from '@/api/settlement/preSettlement';
-import { getDetail as getContractDetail } from '@/api/business/contract-manage';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import {
   resolveReceivablePayableDetailId,
@@ -1073,8 +1072,6 @@ export default {
       changeTableColumns: changeRecordColumns,
       candidateColumns: candidateDetailColumns,
       contractOptions: [],
-      payerOptions: [],
-      payeeOptions: [],
       contractCategoryOptions,
       signTypeOptions,
       effectiveTypeOptions,
@@ -1394,34 +1391,18 @@ export default {
       const first = rows[0];
       const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
       const contractId = first.contractId || '';
-      let contractPartyA = '';
+      let contractPartyA = first.payerName || '';
-      let contractPartyB = '';
+      let contractPartyB = first.payeeName || '';
-      let contractPartyAJson = '';
+      if (contractId && (!contractPartyA || !contractPartyB)) {
-      let contractPartyBJson = '';
-      if (contractId) {
         try {
-          const contractDetail = await this.fetchContractPartyDetail(contractId);
+          const { data } = await getContractOptions(first.contractNo || '');
-          if (contractDetail) {
+          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
-            contractPartyA = contractDetail.partyA || '';
+          contractPartyA = contractPartyA || matched?.partyA || '';
-            contractPartyB = contractDetail.partyB || '';
+          contractPartyB = contractPartyB || matched?.partyB || '';
-            contractPartyAJson = contractDetail.partyAJson || '';
-            contractPartyBJson = contractDetail.partyBJson || '';
-          }
         } catch (error) {
           contractPartyA = '';
           contractPartyB = '';
         }
-        if (!contractPartyA && !contractPartyB) {
-          try {
-            const { data } = await getContractOptions(first.contractNo || '');
-            const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
-            contractPartyA = matched?.partyA || '';
-            contractPartyB = matched?.partyB || '';
-          } catch (error) {
-            contractPartyA = first.payerName || '';
-            contractPartyB = first.payeeName || '';
-          }
-        }
       }
       if (!this.contractOptions.some(item => String(item.id) === String(contractId))) {
         this.contractOptions.push({
@@ -1435,8 +1416,6 @@ export default {
           settlementType,
           partyA: contractPartyA,
           partyB: contractPartyB,
-          partyAJson: contractPartyAJson,
-          partyBJson: contractPartyBJson,
         });
       }
       this.handleContractChange(contractId);
@@ -1448,12 +1427,12 @@ export default {
         projectName: first.projectName || this.form.projectName,
         deptId: first.deptId || this.form.deptId,
         deptName: first.deptName || this.form.deptName,
+        payerName: this.form.payerName || contractPartyA,
+        payeeName: this.form.payeeName || contractPartyB,
         settlementType,
         currency: first.currency || 'RMB',
         localCurrency: first.localCurrency || 'RMB',
       });
-      // 明细带入的收付方若为单值且在选项中，优先保留；多方拼接值由下拉默认首项承接
-      this.applyPartySelection(first.payerName, first.payeeName);
       this.details = rows.map(row => this.normalizeSourceDetail(row));
       this.detailPage.current = 1;
       this.loading = true;
@@ -1537,8 +1516,6 @@ export default {
       this.billingRuleDialog.visible = false;
       this.billingRuleDialog.rule = null;
       this.contractOptions = [];
-      this.payerOptions = [];
-      this.payeeOptions = [];
       this.contractDialog.visible = false;
       this.contractDialog.expanded = false;
       this.contractDialog.rows = [];
@@ -1575,20 +1552,21 @@ export default {
         this.attachments = this.parseAttachments(detail.attachmentsJson);
         this.sortAttachments();
         this.selectedAttachmentRows = [];
-        if (detail.contractId) {
+        if (
-          await this.ensureContractPartyOptions(detail.contractId, {
+          detail.contractId &&
+          !this.contractOptions.some(item => item.id === detail.contractId)
+        ) {
+          this.contractOptions.push({
+            id: detail.contractId,
             contractNo: detail.contractNo,
             contractName: detail.contractName,
             projectId: detail.projectId,
             projectName: detail.projectName,
             deptId: detail.deptId,
             deptName: detail.deptName,
-            settlementType: detail.settlementType,
+            partyA: detail.payerName,
+            partyB: detail.payeeName,
           });
-          this.applyPartySelection(detail.payerName, detail.payeeName);
-        } else {
-          this.payerOptions = [];
-          this.payeeOptions = [];
         }
         if (this.publicMode && detail.detailFees) {
           Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
@@ -1662,8 +1640,6 @@ export default {
         deptName: row.deptName || row.organizationName,
         partyA: row.partyA || row.payerName,
         partyB: row.partyB || row.payeeName,
-        partyAJson: row.partyAJson || '',
-        partyBJson: row.partyBJson || '',
         settlementType:
           row.settlementType || (row.contractCategory === '客户合同' ? 'receivable' : 'payable'),
       };
@@ -1673,7 +1649,7 @@ export default {
       this.handleContractChange(contract.id);
       this.contractDialog.visible = false;
       this.contractDialog.current = null;
-      this.$refs.formRef?.clearValidate(['contractId', 'payerName', 'payeeName']);
+      this.$refs.formRef?.clearValidate('contractId');
     },
     contractCategoryName(value) {
       return (
@@ -1738,8 +1714,6 @@ export default {
         this.form.deptName = '';
         this.form.payerName = '';
         this.form.payeeName = '';
-        this.payerOptions = [];
-        this.payeeOptions = [];
         this.summaryFees = [];
         this.projectAdvanceWriteOffs = [];
         return;
@@ -1752,8 +1726,9 @@ export default {
       this.form.deptId = contract.deptId;
       this.form.deptName = contract.deptName;
       this.form.settlementType = contract.settlementType || 'payable';
-      this.syncPartyOptionsFromContract(contract);
+      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
-      this.applyPartySelection('', '');
+      if (contract.partyA) this.form.payerName = contract.partyA;
+      if (contract.partyB) this.form.payeeName = contract.partyB;
       this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
       this.projectAdvanceWriteOffs = [];
@@ -1762,152 +1737,6 @@ export default {
         this.fetchBfiExchangeRate();
       }
     },
-    parsePartyNames(partyJson, fallbackName) {
-      try {
-        const parsed = partyJson ? JSON.parse(partyJson) : [];
-        if (Array.isArray(parsed) && parsed.length) {
-          const names = parsed
-            .map(item => String(item?.customerName || '').trim())
-            .filter(Boolean);
-          if (names.length) return [...new Set(names)];
-        }
-      } catch (error) {
-        // JSON 解析失败时回退到名称拆分
-      }
-      return [
-        ...new Set(
-          String(fallbackName || '')
-            .split(/[、,，]/)
-            .map(name => name.trim())
-            .filter(Boolean)
-        ),
-      ];
-    },
-    buildPartySelectOptions(names) {
-      return (names || []).map(name => ({ dictKey: name, dictValue: name }));
-    },
-    resolveContractPartyNames(contract) {
-      const settlementType = contract?.settlementType || this.form.settlementType || 'payable';
-      const partyANames = this.parsePartyNames(contract?.partyAJson, contract?.partyA);
-      const partyBNames = this.parsePartyNames(contract?.partyBJson, contract?.partyB);
-      if (settlementType === 'receivable') {
-        return { payerNames: partyBNames, payeeNames: partyANames };
-      }
-      return { payerNames: partyANames, payeeNames: partyBNames };
-    },
-    syncPartyOptionsFromContract(contract) {
-      const { payerNames, payeeNames } = this.resolveContractPartyNames(contract || {});
-      this.payerOptions = this.buildPartySelectOptions(payerNames);
-      this.payeeOptions = this.buildPartySelectOptions(payeeNames);
-    },
-    isJoinedPartyName(value) {
-      return /[、,，]/.test(String(value || ''));
-    },
-    pickPartyValue(names, currentValue) {
-      const options = Array.isArray(names) ? names : [];
-      const current = String(currentValue || '').trim();
-      if (!options.length) {
-        // 无线上选项时（如公开查看拉不到合同），保留已有单值，丢弃多方拼接脏值
-        return this.isJoinedPartyName(current) ? '' : current;
-      }
-      if (current && !this.isJoinedPartyName(current) && options.includes(current)) {
-        return current;
-      }
-      return options[0] || '';
-    },
-    applyPartySelection(payerName, payeeName) {
-      const payerNames = this.payerOptions.map(item => item.dictKey);
-      const payeeNames = this.payeeOptions.map(item => item.dictKey);
-      this.form.payerName = this.pickPartyValue(payerNames, payerName);
-      this.form.payeeName = this.pickPartyValue(payeeNames, payeeName);
-      // 编辑历史单值不在合同多方中时，仍保留展示，避免下拉空白
-      if (
-        this.form.payerName &&
-        !this.payerOptions.some(item => item.dictKey === this.form.payerName)
-      ) {
-        this.payerOptions = [
-          ...this.payerOptions,
-          { dictKey: this.form.payerName, dictValue: this.form.payerName },
-        ];
-      }
-      if (
-        this.form.payeeName &&
-        !this.payeeOptions.some(item => item.dictKey === this.form.payeeName)
-      ) {
-        this.payeeOptions = [
-          ...this.payeeOptions,
-          { dictKey: this.form.payeeName, dictValue: this.form.payeeName },
-        ];
-      }
-    },
-    async fetchContractPartyDetail(contractId) {
-      if (!contractId) return null;
-      const { data } = await getContractDetail(contractId);
-      return data?.data || null;
-    },
-    async ensureContractPartyOptions(contractId, fallback = {}) {
-      if (!contractId) {
-        this.payerOptions = [];
-        this.payeeOptions = [];
-        return null;
-      }
-      let contract = this.contractOptions.find(item => String(item.id) === String(contractId));
-      const needDetail =
-        !contract ||
-        !(contract.partyAJson || contract.partyBJson) ||
-        this.isJoinedPartyName(contract.partyA) ||
-        this.isJoinedPartyName(contract.partyB) ||
-        (!contract.partyA && !contract.partyB);
-      if (needDetail) {
-        try {
-          const detail = await this.fetchContractPartyDetail(contractId);
-          if (detail) {
-            contract = {
-              ...(contract || {}),
-              id: contractId,
-              contractNo: detail.contractNo || fallback.contractNo || contract?.contractNo,
-              contractName: detail.contractName || fallback.contractName || contract?.contractName,
-              projectId: detail.projectId || fallback.projectId || contract?.projectId,
-              projectName: detail.projectName || fallback.projectName || contract?.projectName,
-              deptId:
-                detail.organizationId ||
-                detail.deptId ||
-                fallback.deptId ||
-                contract?.deptId,
-              deptName:
-                detail.organizationName ||
-                detail.deptName ||
-                fallback.deptName ||
-                contract?.deptName,
-              partyA: detail.partyA || contract?.partyA || '',
-              partyB: detail.partyB || contract?.partyB || '',
-              partyAJson: detail.partyAJson || contract?.partyAJson || '',
-              partyBJson: detail.partyBJson || contract?.partyBJson || '',
-              settlementType:
-                fallback.settlementType ||
-                contract?.settlementType ||
-                (detail.contractCategory === '客户合同' ? 'receivable' : 'payable'),
-              settlementCurrency: detail.settlementCurrency || contract?.settlementCurrency,
-            };
-          }
-        } catch (error) {
-          // 合同详情失败时仍用现有快照拆分多方名称
-        }
-      }
-      if (!contract) {
-        contract = {
-          id: contractId,
-          ...fallback,
-          partyA: fallback.partyA || '',
-          partyB: fallback.partyB || '',
-        };
-      }
-      const index = this.contractOptions.findIndex(item => String(item.id) === String(contractId));
-      if (index >= 0) this.contractOptions.splice(index, 1, contract);
-      else this.contractOptions.push(contract);
-      this.syncPartyOptionsFromContract(contract);
-      return contract;
-    },
     async saveDraft(shouldSubmit) {
       await this.$refs.formRef?.validate();
       if (shouldSubmit && !this.details.length) {

src/views/settlement/components/settlement-import-page.vue

@@ -89,26 +89,26 @@
           <el-col :span="8">
             <el-form-item label="承运商合同" prop="carrierContractId">
               <el-select
-                v-model="form.carrierOptionValue"
+                v-model="form.carrierContractId"
                 filterable
                 clearable
                 :disabled="readonly || !form.projectId"
                 style="width: 100%"
-                :placeholder="form.projectId ? '请选择承运商合同客商' : '请先选择项目'"
+                :placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
                 @change="onCarrierContractChange"
               >
                 <el-option
-                  v-for="item in filteredCarrierContractOptions"
+                  v-for="item in filteredCarrierContracts"
-                  :key="item.optionValue"
+                  :key="item.id"
-                  :label="item.optionLabel"
+                  :label="formatContractLabel(item)"
-                  :value="item.optionValue"
+                  :value="item.id"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="承运商">
-              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同客商后自动填充" />
+              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -403,9 +403,6 @@ const createDefaultForm = () => ({
   customerName: '',
   carrierContractId: '',
   carrierContractName: '',
-  carrierOptionValue: '',
-  carrierPartyId: '',
-  carrierPartyRole: '',
   carrierName: '',
   waybillMode: 'new',
   remark: '',
@@ -445,62 +442,6 @@ const filteredCustomerContracts = computed(() => customerContracts.value);
 
 const filteredCarrierContracts = computed(() => carrierContracts.value);
 
-const parsePartyRows = (partyJson, fallbackName = '', partyRole = 'B') => {
-  let rows = [];
-  try {
-    const parsed = partyJson ? JSON.parse(partyJson) : [];
-    if (Array.isArray(parsed)) {
-      rows = parsed
-        .map(item => ({
-          id: item.id || '',
-          customerId: item.customerId || '',
-          customerName: String(item.customerName || '').trim(),
-          partyRole,
-        }))
-        .filter(item => item.customerName);
-    }
-  } catch (error) {
-    rows = [];
-  }
-  if (rows.length) return rows;
-  return String(fallbackName || '')
-    .split(/[、,，]/)
-    .map(name => name.trim())
-    .filter(Boolean)
-    .map(name => ({ id: '', customerId: '', customerName: name, partyRole }));
-};
-
-const filteredCarrierContractOptions = computed(() => {
-  const options = [];
-  filteredCarrierContracts.value.forEach(contract => {
-    const parties = [
-      ...parsePartyRows(contract.partyBJson, contract.partyB, 'B'),
-      ...parsePartyRows(contract.partyCJson, contract.partyC, 'C'),
-    ];
-    if (!parties.length && contract.carrierName) {
-      parties.push({
-        id: '',
-        customerId: '',
-        customerName: contract.carrierName,
-        partyRole: 'B',
-      });
-    }
-    parties.forEach(party => {
-      const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
-      const optionValue = [contract.id, party.id || '', party.customerName].join('__');
-      options.push({
-        ...contract,
-        optionValue,
-        optionLabel: `${party.customerName}（${roleLabel}） - ${formatContractLabel(contract)}`,
-        carrierPartyId: party.id || '',
-        carrierPartyRole: party.partyRole,
-        carrierName: party.customerName,
-      });
-    });
-  });
-  return options;
-});
-
 const extractRecords = response => {
   const data = response?.data || response;
   if (Array.isArray(data)) return data;
@@ -767,10 +708,6 @@ const normalizeContract = item => {
     projectId: normalized.projectId,
     partyA: normalized.partyA || '',
     partyB: normalized.partyB || '',
-    partyC: normalized.partyC || '',
-    partyAJson: normalized.partyAJson || '',
-    partyBJson: normalized.partyBJson || '',
-    partyCJson: normalized.partyCJson || '',
     customerName: normalized.customerName || normalized.partyA || '',
     carrierName: normalized.carrierName || normalized.partyB || '',
   };
@@ -1035,9 +972,10 @@ const autoSelectSingleContracts = () => {
     form.customerContractId = customers[0].id;
     onCustomerContractChange(customers[0].id);
   }
-  const carriers = filteredCarrierContractOptions.value;
+  const carriers = filteredCarrierContracts.value;
   if (carriers.length === 1 && !form.carrierContractId) {
-    onCarrierContractChange(carriers[0].optionValue);
+    form.carrierContractId = carriers[0].id;
+    onCarrierContractChange(carriers[0].id);
   }
 };
 
@@ -1049,9 +987,6 @@ const onProjectChange = async id => {
   form.customerName = '';
   form.carrierContractId = '';
   form.carrierContractName = '';
-  form.carrierOptionValue = '';
-  form.carrierPartyId = '';
-  form.carrierPartyRole = '';
   form.carrierName = '';
   customerContracts.value = [];
   carrierContracts.value = [];
@@ -1070,15 +1005,9 @@ const onCustomerContractChange = id => {
   form.customerName = item?.customerName || item?.partyA || '';
 };
 
-const onCarrierContractChange = optionValue => {
+const onCarrierContractChange = id => {
-  const item = filteredCarrierContractOptions.value.find(
+  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
-    row => String(row.optionValue) === String(optionValue)
-  );
-  form.carrierOptionValue = item?.optionValue || '';
-  form.carrierContractId = item?.id || '';
   form.carrierContractName = item?.contractName || '';
-  form.carrierPartyId = item?.carrierPartyId || '';
-  form.carrierPartyRole = item?.carrierPartyRole || '';
   form.carrierName = item?.carrierName || item?.partyB || '';
 };
 

src/views/settlement/formal-settlement.vue

@@ -255,6 +255,7 @@ export default {
   },
   data() {
     return {
+      option: formalSettlementOption(),
       query: {},
       activeSettlementType: 'payable',
       rows: [],
@@ -288,10 +289,6 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
-    // 列随结算类型切换重建：收款结算单不展示「已指定应付」
-    option() {
-      return formalSettlementOption(this.activeSettlementType);
-    },
     isAdmin() {
       return isAdministrator(this.userInfo);
     },
@@ -436,9 +433,8 @@ export default {
       (handlers[type] || (() => {}))();
     },
     openCreate() {
-      // 按列表锁定的结算类型路由到对应表单入口，保证菜单高亮与关闭回落列表正确
       this.$router.push({
-        path: settlementListPath(this.activeSettlementType) + '/form',
+        path: '/settlement/formal-settlement/form',
         query: {
           mode: 'add',
           name: `新增${this.billLabel}`,
@@ -449,9 +445,8 @@ export default {
     },
     openEdit(row) {
       const settlementType = row.settlementType || this.activeSettlementType;
-      // 行类型可能与列表锁定类型不同，按行类型路由
       this.$router.push({
-        path: settlementListPath(settlementType) + '/form',
+        path: '/settlement/formal-settlement/form',
         query: {
           mode: 'edit',
           id: row.id,

src/views/settlement/pre-settlement.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container class="pre-settlement-page">
     <section v-show="searchVisible" class="pre-settlement-page__search">
-      <el-form :model="query" label-position="right" label-width="100px" @submit.prevent>
+      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="pre-settlement-page__search-grid">
           <template v-for="field in visibleSearchFields" :key="field.prop">
             <el-form-item :label="field.label">
@@ -108,7 +108,6 @@
         :data="rows"
         :size="tableSize"
         border
-        height="100%"
         class="pre-settlement-page__table"
         @selection-change="handleSelectionChange"
       >
@@ -769,27 +768,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单 avue 高度自适应对齐）
-// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
-$pre_page_height: calc(100vh - 114px);
-
 .pre-settlement-page {
-  height: $pre_page_height;
-
-  :deep(.basic-container__card) {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  :deep(.el-card__body) {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-  }
-
   &__search {
-    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -821,10 +801,6 @@ $pre_page_height: calc(100vh - 114px);
   }
 
   &__table-panel {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    min-height: 0;
     margin-top: 8px;
   }
 
@@ -847,14 +823,8 @@ $pre_page_height: calc(100vh - 114px);
     justify-content: center;
   }
 
-  &__table {
-    flex: 1;
-    min-height: 0;
-  }
-
   &__pagination {
     display: flex;
-    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }

src/views/settlement/receivable-payable-detail.vue

@@ -507,13 +507,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog v-model="transferDialog.visible" title="批量转结算" width="86%" append-to-body>
-      v-model="transferDialog.visible"
-      title="批量转结算"
-      width="72%"
-      append-to-body
-      align-center
-    >
       <div class="settlement-detail-page__transfer-form">
         <el-form :model="transferQuery" inline label-position="right" label-width="120px">
           <el-form-item label="转结算类型">
@@ -554,10 +548,9 @@
         :data="transferRows"
         row-key="id"
         border
-        max-height="50vh"
         @selection-change="transferSelectionChange"
       >
-        <el-table-column type="selection" width="52" align="center" reserve-selection fixed />
+        <el-table-column type="selection" width="52" align="center" reserve-selection />
         <el-table-column
           type="index"
           label="序号"
@@ -1067,7 +1060,6 @@ import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
-import { settlementListPath } from '@/utils/settlement-menu';
 import {
   contractApprovalStatusOptions,
   contractCategoryOptions,
@@ -2667,11 +2659,10 @@ export default {
         });
         const isPreSettlement = settlementBillType === 'pre';
         this.transferDialog.visible = false;
-        // 按结算类型路由到对应表单入口，保证收款/付款菜单各自高亮正确
         await this.$router.push({
           path: isPreSettlement
             ? '/settlement/pre-settlement/form'
-            : settlementListPath(this.settlementType) + '/form',
+            : '/settlement/formal-settlement/form',
           query: {
             mode: 'add',
             transferToken,
@@ -2913,33 +2904,10 @@ export default {
     buildRequestParams(params = {}) {
       return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
     },
-    syncBillingPlanOptions(contractId, counterpartyName = '') {
+    syncBillingPlanOptions(contractId) {
       const contracts = [...this.updateContractOptions, ...this.contractOptions];
       const contract = contracts.find(item => String(item.id) === String(contractId));
-      let plans = this.parseJson(contract?.billingPlanJson);
+      const plans = this.parseJson(contract?.billingPlanJson);
-      const targetName = String(
-        counterpartyName ||
-          this.updateFeeForm?.counterpartyName ||
-          this.generateQuery?.counterpartyName ||
-          this.currentDetail?.counterpartyName ||
-          this.currentDetail?.carrierName ||
-          this.currentDetail?.customerName ||
-          ''
-      ).trim();
-      if (targetName) {
-        const matched = plans.filter(
-          item =>
-            String(item.customerName || '').trim() === targetName ||
-            String(item.partyRowId || '') ===
-              String(this.updateFeeForm?.carrierPartyId || this.generateQuery?.carrierPartyId || '')
-        );
-        const hasBinding = plans.some(
-          item => item.customerName || item.customerId || item.partyRowId
-        );
-        if (matched.length || hasBinding) {
-          plans = matched;
-        }
-      }
       this.billingPlanOptions = plans.map((item, index) => ({
         id:
           item.id ||
@@ -2948,16 +2916,11 @@ export default {
           item.planName ||
           item.billingPlanName ||
           `plan-${index}`,
-        name: [
+        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
-          item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
-          item.customerName ? `（${item.customerName}）` : '',
-        ].join(''),
         defaultPlan:
           item.defaultPlan === true ||
           item.defaultPlan === 1 ||
           ['true', '1'].includes(String(item.defaultPlan).toLowerCase()),
-        customerName: item.customerName || '',
-        partyRowId: item.partyRowId || '',
       }));
       return this.billingPlanOptions;
     },

src/views/settlement/settlement-adjustment.vue

@@ -69,8 +69,6 @@
         :data="rows"
         :size="tableSize"
         border
-        height="100%"
-        class="settlement-adjustment-page__table"
         @selection-change="selection = $event"
       >
         <el-table-column type="selection" width="52" fixed="left" align="center" /><el-table-column
@@ -391,27 +389,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
-// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单对齐）
-// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
-$adjustment_page_height: calc(100vh - 114px);
-
 .settlement-adjustment-page {
-  height: $adjustment_page_height;
-
-  :deep(.basic-container__card) {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  :deep(.el-card__body) {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-  }
-
   &__search {
-    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -438,10 +417,6 @@ $adjustment_page_height: calc(100vh - 114px);
     margin-bottom: 8px;
   }
   &__table-panel {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    min-height: 0;
     margin-top: 8px;
   }
   &__toolbar {
@@ -456,13 +431,8 @@ $adjustment_page_height: calc(100vh - 114px);
     justify-content: center;
     gap: 8px;
   }
-  &__table {
-    flex: 1;
-    min-height: 0;
-  }
   &__pagination {
     display: flex;
-    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }

src/views/system/business-dept-config.vue

@@ -20,13 +20,6 @@
       @on-load="onLoad"
     >
       <template #menu="{ row, index }">
-        <el-link
-          v-if="permission.business_dept_config_view"
-          type="primary"
-          @click="$refs.crud.rowView(row, index)"
-        >
-          查看
-        </el-link>
         <el-link
           v-if="permission.business_dept_config_edit"
           type="primary"
@@ -124,7 +117,7 @@ export default {
         editBtn: false,
         delBtn: false,
         viewBtn: false,
-        menuWidth: 220,
+        menuWidth: 140,
         dialogWidth: 900,
         dialogClickModal: false,
         labelPosition: 'right',
@@ -195,8 +188,7 @@ export default {
             formslot: true,
             addDisplay: true,
             editDisplay: true,
-            // 列表展示，维护入口在组织管理的平台公司
+            hide: true,
-            hide: false,
           },
           {
             label: '初始流水号',
@@ -207,7 +199,6 @@ export default {
             minRows: 1,
             maxRows: 999,
             controls: false,
-            clearable: true,
             slot: true,
             placeholder: '如果系统已有相同流水号，则跳过这个流水号',
           },
@@ -261,14 +252,6 @@ export default {
       };
     },
   },
-  watch: {
-    // Avue number 清空后可能回写成 -1，统一清成空，避免未填却落库 -1
-    'form.initialSerial'(value) {
-      if (value === -1 || value === '-1') {
-        this.form.initialSerial = undefined;
-      }
-    },
-  },
   created() {
     this.loadSelectOptions();
   },
@@ -293,26 +276,14 @@ export default {
       }));
     },
     formatSerial(value) {
-      // Avue number 空值常落成 -1，历史脏数据也按空展示
+      if (value === null || value === undefined || value === '') return '-';
-      if (value === null || value === undefined || value === '' || value === -1 || value === '-1') {
-        return '';
-      }
       const number = Number(value);
-      if (!Number.isInteger(number) || number < 1) return '';
+      if (!Number.isInteger(number) || number < 1) return String(value);
       return String(number).padStart(3, '0');
     },
-    /** 初始流水号空值归一：未填 / -1 都按空处理，禁止自动落库 -1 */
-    normalizeInitialSerial(value) {
-      if (value === '' || value === undefined || value === null || value === -1 || value === '-1') {
-        return null;
-      }
-      const number = Number(value);
-      return Number.isFinite(number) ? number : null;
-    },
     handlePlatformCompanyChange(value) {
       const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
       this.form.platformCompanyName = matched ? matched.label : '';
-      // 只读回填组织中平台公司的金蝶公司代码
       this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
     },
     handleBusinessDeptChange(value) {
@@ -320,63 +291,47 @@ export default {
       this.form.businessDeptName = matched ? matched.label : '';
     },
     beforeOpen(done, type) {
-      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+      this.loadSelectOptions();
-        ([platformRes, businessRes]) => {
-          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
-          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
-          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
-          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
-          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
-          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
-        }
-      );
       if (['edit', 'view'].includes(type) && this.form.id) {
-        Promise.all([loadOptions, getDetail(this.form.id)]).then(([, detailRes]) => {
+        getDetail(this.form.id).then(res => {
-          const detail = detailRes.data?.data || {};
+          const detail = res.data?.data || {};
-          const platformCompanyId = detail.platformCompanyId ? String(detail.platformCompanyId) : '';
-          const platformMatched = this.platformCompanyOptions.find(
-            item => String(item.value) === platformCompanyId
-          );
           this.form = {
             ...detail,
-            platformCompanyId,
+            platformCompanyId: detail.platformCompanyId ? String(detail.platformCompanyId) : '',
             businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
-            // 展示以组织当前配置为准，避免配置表镜像滞后
-            kingdeeCompanyCode: platformMatched?.kingdeeDeptCode || detail.kingdeeCompanyCode || '',
-            // 历史 -1 / 无效值在表单中显示为空，避免 Avue number 回显 -1
-            initialSerial: this.normalizeInitialSerial(detail.initialSerial) ?? undefined,
           };
           done();
         });
         return;
       }
-      loadOptions.finally(() => {
+      if (type === 'add') {
-        if (type === 'add') {
+        this.form = {
-          this.form = {
+          platformCompanyId: '',
-            platformCompanyId: '',
+          platformCompanyName: '',
-            platformCompanyName: '',
+          businessDeptId: '',
-            businessDeptId: '',
+          businessDeptName: '',
-            businessDeptName: '',
+          contractCodePrefix: '',
-            contractCodePrefix: '',
+          initialSerial: undefined,
-            initialSerial: undefined,
+          kingdeeCompanyCode: '',
-            kingdeeCompanyCode: '',
+          kingdeeDeptCode: '',
-            kingdeeDeptCode: '',
+          remark: '',
-            remark: '',
+        };
-          };
+      }
-        }
+      done();
-        done();
-      });
     },
     normalizeSubmitRow(row) {
+      const initialSerial =
+        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
+          ? null
+          : Number(row.initialSerial);
       return {
         ...row,
         platformCompanyId: row.platformCompanyId || null,
         businessDeptId: row.businessDeptId || null,
         contractCodePrefix: String(row.contractCodePrefix || '').trim(),
-        // 金蝶公司代码由后端按平台公司组织配置覆盖，前端仅展示
         kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
         remark: String(row.remark || '').trim(),
-        initialSerial: this.normalizeInitialSerial(row.initialSerial),
+        initialSerial: Number.isFinite(initialSerial) ? initialSerial : null,
       };
     },
     rowSave(row, done, loading) {

src/views/system/dept.vue

@@ -203,6 +203,7 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';
 
+const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
  * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -322,7 +323,7 @@ export default {
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
+                  // 组织编码非必填，为空直接通过
                   if (!deptCode) {
                     callback();
                     return;
@@ -331,6 +332,34 @@ export default {
                     callback(new Error('组织编码不能超过30个字符'));
                     return;
                   }
+                  const parentId = this.normalizeParentId(this.form?.parentId);
+                  // 顶级组织不选择上级时，编码不依赖上级编码
+                  if (!parentId) {
+                    callback();
+                    return;
+                  }
+                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
+                    this.loadParentDeptCode(parentId);
+                    callback(new Error('正在加载上级组织编码，请稍后重试'));
+                    return;
+                  }
+                  if (!this.parentDeptCode) {
+                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
+                    return;
+                  }
+                  // 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
+                  let expectedPrefix = this.parentDeptCode;
+                  const category = Number(this.form?.deptCategory);
+                  if (category === 2) {
+                    expectedPrefix = 'GWWL';
+                  } else if (category === 3 && this.form?.belongCompanyCode) {
+                    expectedPrefix = String(this.form.belongCompanyCode).trim();
+                  }
+                  const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
+                  if (!pattern.test(deptCode)) {
+                    callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
+                    return;
+                  }
                   callback();
                 },
                 trigger: 'blur',
@@ -402,6 +431,7 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
+            value: 0,
             width: 120,
             order: 36,
             search: true,
@@ -411,25 +441,20 @@ export default {
             change: ({ value }) => this.handlePlatformCompanyChange(value),
             rules: [
               {
-                validator: (rule, value, callback) => {
+                required: true,
-                  if (value === undefined || value === null || value === '') {
+                message: '请选择是否平台公司',
-                    callback(new Error('请选择是否平台公司'));
-                    return;
-                  }
-                  callback();
-                },
                 trigger: 'change',
               },
             ],
           },
           {
-            label: '金蝶公司代码',
+            label: '金蝶部门代码',
             prop: 'kingdeeDeptCode',
             minWidth: 140,
             order: 35,
             maxlength: 64,
             showWordLimit: true,
-            // 仅平台公司维护/展示金蝶公司代码；非平台公司列表留空
+            // 仅平台公司维护/展示金蝶组织代码；非平台公司列表留空
             addDisplay: false,
             editDisplay: false,
             viewDisplay: false,
@@ -444,7 +469,7 @@ export default {
                     return;
                   }
                   if (code.length > 64) {
-                    callback(new Error('金蝶公司代码不能超过64个字符'));
+                    callback(new Error('金蝶部门代码不能超过64个字符'));
                     return;
                   }
                   callback();
@@ -462,6 +487,7 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
+            value: 0,
             width: 120,
             order: 34,
             search: true,
@@ -470,14 +496,8 @@ export default {
             formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
             rules: [
               {
-                validator: (rule, value, callback) => {
+                required: true,
-                  // 不能用 required:true：值为 0（否）时会被当成空
+                message: '请选择是否业务部门',
-                  if (value === undefined || value === null || value === '') {
-                    callback(new Error('请选择是否业务部门'));
-                    return;
-                  }
-                  callback();
-                },
                 trigger: 'change',
               },
             ],
@@ -968,7 +988,6 @@ export default {
     /**
      * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
      * 排序为空时由后端默认填充 1。
-     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
      */
     prepareDeptSubmitRow(row) {
       const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -976,8 +995,6 @@ export default {
         return false;
       }
       row.deptCategory = category;
-      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
-      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
       if (row.status === '' || row.status === null || row.status === undefined) {
         delete row.status;
       } else {
@@ -990,24 +1007,6 @@ export default {
       }
       return true;
     },
-    normalizeYesNoFlag(value) {
-      return Number(value) === 1 ? 1 : 0;
-    },
-    handlePlatformCompanyChange(value) {
-      const isPlatform = Number(value) === 1;
-      this.syncKingdeeCompanyCodeDisplay(isPlatform);
-      if (!isPlatform && this.form) {
-        this.form.kingdeeDeptCode = '';
-      }
-    },
-    syncKingdeeCompanyCodeDisplay(isPlatformCompany) {
-      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
-      if (!column) return;
-      const visible = Number(isPlatformCompany) === 1;
-      column.addDisplay = visible;
-      column.editDisplay = visible;
-      column.viewDisplay = visible;
-    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1164,6 +1163,21 @@ export default {
         row.parentId = 0;
       }
     },
+    handlePlatformCompanyChange(value) {
+      const isPlatform = Number(value) === 1;
+      this.syncKingdeeDeptCodeDisplay(isPlatform);
+      if (!isPlatform && this.form) {
+        this.form.kingdeeDeptCode = '';
+      }
+    },
+    syncKingdeeDeptCodeDisplay(isPlatformCompany) {
+      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
+      if (!column) return;
+      const visible = Number(isPlatformCompany) === 1;
+      column.addDisplay = visible;
+      column.editDisplay = visible;
+      column.viewDisplay = visible;
+    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -1308,7 +1322,7 @@ export default {
     rowSave(row, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 金蝶公司代码仅平台公司维护
+      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
       row.kingdeeDeptCode =
         Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
@@ -1356,7 +1370,7 @@ export default {
     rowUpdate(row, index, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 金蝶公司代码仅平台公司维护
+      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
       row.kingdeeDeptCode =
         Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
@@ -1465,42 +1479,34 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
+        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
-        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
+          this.form.isPlatformCompany = 0;
-        this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
+        }
+        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
+          this.form.isBusinessDept = 0;
+        }
+        this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
-        done();
-        return;
       }
       if (type === 'edit') {
         this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
       }
       if (['edit', 'view'].includes(type)) {
-        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
+        getDept(this.form.id).then(res => {
-        getDept(this.form.id)
+          this.form = Object.assign(res.data.data, {
-          .then(res => {
+            hasChildren: this.form.hasChildren,
-            const detail = res.data.data || {};
-            Object.assign(this.form, detail, {
-              hasChildren: this.form.hasChildren,
-              isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
-              isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
-            });
-            if (this.form.parentId === '0') {
-              this.form.parentId = '';
-            }
-            this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
-            this.loadParentDeptCode(this.form.parentId);
-            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
-              const splitResult = func.split(this.form.leaderId);
-              this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-            }
-            done();
-          })
-          .catch(() => {
-            done();
           });
-        return;
+          if (this.form.parentId === '0') {
+            this.form.parentId = '';
+          }
+          this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
+          this.loadParentDeptCode(this.form.parentId);
+          if (this.form.hasOwnProperty('leaderId')) {
+            const splitResult = func.split(this.form.leaderId);
+            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
+          }
+        });
       }
       done();
     },

src/views/system/user.vue

@@ -172,21 +172,6 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                  <el-form-item label="数据管理权限" prop="dataScopeDeptIds">
-                    <el-cascader
-                      v-model="dataScopeCascaderValue"
-                      :options="permissionDeptTree"
-                      :props="deptCascaderProps"
-                      :disabled="isUserViewMode"
-                      clearable
-                      filterable
-                      collapse-tags
-                      collapse-tags-tooltip
-                      placeholder="请选择数据管理组织（可多选）"
-                    />
-                  </el-form-item>
-                </el-col>
                 <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
@@ -607,26 +592,6 @@ export default {
         this.$refs.userFormRef?.validateField('deptId');
       },
     },
-    // 数据管理权限多选级联：form.dataScopeDeptIds 为 id 数组
-    dataScopeCascaderValue: {
-      get() {
-        const ids = Array.isArray(this.form.dataScopeDeptIds)
-          ? this.form.dataScopeDeptIds
-          : this.form.dataScopeDeptIds
-            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
-            : [];
-        return ids
-          .filter(item => item !== undefined && item !== null && item !== '')
-          .map(item => (typeof item === 'number' ? item : String(item)));
-      },
-      set(value) {
-        this.form.dataScopeDeptIds = Array.isArray(value)
-          ? value.filter(item => item !== undefined && item !== null && item !== '')
-          : value
-            ? [value]
-            : [];
-      },
-    },
     isUserViewMode() {
       return this.userDialogMode === 'view';
     },
@@ -1069,7 +1034,6 @@ export default {
           sex: undefined,
           postId: '',
           deptId: [],
-          dataScopeDeptIds: [],
           code: '',
           personCategory: 1,
           remark: '',
@@ -1082,13 +1046,9 @@ export default {
       getUser(row.id).then(res => {
         const user = res.data.data;
         const deptIds = func.split(user.deptId || '');
-        const dataScopeDeptIds = Array.isArray(user.dataScopeDeptIds)
-          ? user.dataScopeDeptIds.map(item => String(item))
-          : [];
         this.form = {
           ...user,
           deptId: Array.isArray(deptIds) ? deptIds : [],
-          dataScopeDeptIds,
           postId: func.split(user.postId || '')[0] || '',
           roleId: func.join(user.roleId || ''),
           personCategory: user.personCategory || 1,
@@ -1104,13 +1064,9 @@ export default {
     submitUserForm() {
       this.$refs.userFormRef.validate(valid => {
         if (!valid) return;
-        const dataScopeDeptIds = Array.isArray(this.form.dataScopeDeptIds)
-          ? this.form.dataScopeDeptIds.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
         const row = {
           ...this.form,
           deptId: func.join(this.form.deptId),
-          dataScopeDeptIds,
           postId: func.join(this.form.postId),
           roleId: func.join(this.form.roleId),
           leaderId: func.join(this.form.leaderId),

src/views/transportCapacity/driver.vue

@@ -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 = this.resolveOrgName(path);
-        this.driverForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
       },
     },
     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.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 => {
@@ -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);
+      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
-    },
+        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) {
@@ -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.getQualificationType(data);
-      const qualificationType = this.getQualificationOcrValue(fields, [
+      const qualificationNo = this.getQualificationNo(data);
-        '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) {
+      if (qualificationNo && !this.driverForm.qualificationNo) {
         this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
       }
-      const startDate = this.normalizeBirthday(validFrom);
+      const words = this.getBaiduOcrWords(data).join(' ');
-      if (startDate) {
+      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
-        this.driverForm.qualificationStartDate = startDate;
+      if (/(长期|永久有效)/.test(words)) {
-      }
-      if (/(长期|永久)/.test(validUntil)) {
         this.driverForm.qualificationLongTerm = 1;
         this.driverForm.qualificationEndDate = '';
-      } else {
+      } else if (dateList.length) {
-        const endDate = this.normalizeBirthday(validUntil);
+        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
-        if (endDate) {
+        this.driverForm.qualificationLongTerm = 0;
-          this.driverForm.qualificationEndDate = endDate;
-          this.driverForm.qualificationLongTerm = 0;
-        }
       }
       this.$nextTick(() => {
         ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1700,25 +1640,22 @@ export default {
         });
       });
     },
-    normalizeQualificationOcrFields(result = {}) {
+    getQualificationType(data = {}) {
-      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+      const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
-        return result.fields;
+      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 || [];
+      return values.join('').replace(/[，,；;]+$/, '').trim();
-      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, '');
@@ -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 '';

src/views/transportCapacity/ship.vue

@@ -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 = this.resolveOrgName(path);
-        this.shipForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
       },
     },
     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.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;
       });
     },
@@ -907,7 +890,6 @@ 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="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 = this.resolveOrgName(this.organizationCascaderPath);
-        this.vehicleForm.organizationName = name;
-        this.syncFormOrganizationLegacy(name);
       },
     },
     // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -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.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 => {
@@ -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%;
   }

src/views/vehicle/credit-score-quantification.vue

@@ -1012,9 +1012,7 @@ export default {
         this.$message.warning('得分率下限必须小于上限');
         return;
       }
-      // F 级无授信允许额度上下限均为 0；其余等级仍要求下限严格小于上限
       if (
-        !this.isZeroCreditLimitRange(this.standardForm) &&
         Number(this.standardForm.creditLimitLower) >= Number(this.standardForm.creditLimitUpper)
       ) {
         this.$message.warning('授信额度下限必须小于上限');
@@ -1035,7 +1033,7 @@ export default {
         this.$message.warning('评估标准中的得分率区间不能重叠');
         return;
       }
-      if (this.hasCreditLimitOverlap(nextStandards)) {
+      if (this.hasRangeOverlap(nextStandards, 'creditLimitLower', 'creditLimitUpper')) {
         this.$message.warning('评估标准中的授信额度区间不能重叠');
         return;
       }
@@ -1085,17 +1083,6 @@ export default {
         return next && range.upper > next.lower;
       });
     },
-    /** F 级无授信：额度上下限均为 0 */
-    isZeroCreditLimitRange(standard = {}) {
-      return (
-        Number(standard.creditLimitLower) === 0 && Number(standard.creditLimitUpper) === 0
-      );
-    },
-    /** 授信额度区间重叠校验：跳过 0~0 无授信区间，避免与 E 级 0~500 冲突 */
-    hasCreditLimitOverlap(list = []) {
-      const ranges = list.filter(item => !this.isZeroCreditLimitRange(item));
-      return this.hasRangeOverlap(ranges, 'creditLimitLower', 'creditLimitUpper');
-    },
     validateConfig() {
       if (!this.configForm.name || !this.configForm.name.trim()) {
         this.$message.warning('请输入评定表名称');
@@ -1232,10 +1219,7 @@ export default {
           this.$message.warning(`${standard.creditLevel}信用等级得分率下限必须小于上限`);
           return false;
         }
-        if (
+        if (Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)) {
-          !this.isZeroCreditLimitRange(standard) &&
-          Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)
-        ) {
           this.$message.warning(`${standard.creditLevel}信用等级授信额度下限必须小于上限`);
           return false;
         }
@@ -1250,7 +1234,7 @@ export default {
         this.$message.warning('评估标准中的得分率区间不能重叠');
         return false;
       }
-      if (this.hasCreditLimitOverlap(standards)) {
+      if (this.hasRangeOverlap(standards, 'creditLimitLower', 'creditLimitUpper')) {
         this.$message.warning('评估标准中的授信额度区间不能重叠');
         return false;
       }

src/views/vehicle/customer-archive.vue

@@ -42,21 +42,6 @@
           >批量删除
         </el-button>
       </template>
-      <template #header>
-        <el-tabs
-          v-model="query.expireStatus"
-          type="card"
-          class="customer-archive-page__expiry-tabs"
-          @tab-change="handleExpireChange"
-        >
-          <el-tab-pane
-            v-for="item in expiryTagOptions"
-            :key="item.value"
-            :label="item.label"
-            :name="item.value"
-          />
-        </el-tabs>
-      </template>
       <template #customerCode="{ row }">
         <el-button type="primary" link @click="viewArchive(row)">
           {{ row.customerCode }}
@@ -99,15 +84,10 @@
         </el-tag>
       </template>
       <template #businessEndDate="{ row }">
-        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期') }">
+        <span :class="{ 'business-license-expiring': isBusinessLicenseExpiringSoon(row) }">
           {{ formatBusinessLicenseValidPeriod(row) }}
         </span>
       </template>
-      <template #nextEvaluateDate="{ row }">
-        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.nextEvaluateDate) }">
-          {{ row.nextEvaluateDate || '-' }}
-        </span>
-      </template>
       <template #fundUseRate="{ row }">
         {{ formatFundUseRate(row) }}
       </template>
@@ -1321,19 +1301,6 @@
           class="score-detail-form"
         >
           <el-row :gutter="42">
-            <el-col :span="12">
-              <el-form-item label="评分方式" required>
-                <el-radio-group
-                  v-model="currentScore.evaluateMode"
-                  :disabled="readonly"
-                  @change="handleEvaluateModeChange"
-                >
-                  <el-radio value="online">线上评估</el-radio>
-                  <el-radio value="offline">线下评估</el-radio>
-                </el-radio-group>
-                <span v-if="isOfflineScore" class="score-offline-tip">线下请上传评分表 Excel</span>
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <el-form-item label="评定日期" required>
                 <el-date-picker
@@ -1344,12 +1311,59 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="下次评定日期" required>
+              <el-form-item label="拟申请总资金使用额度" required>
+                <el-input
+                  v-model="currentScore.applyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最终得分">
+                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最大资金使用额度">
+                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="信用等级">
+                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="临时申请额度">
+                <el-input
+                  v-model="currentScore.tempApplyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="临时申请额度有效期起">
                 <el-date-picker
-                  v-model="currentScore.nextEvaluateDate"
+                  v-model="currentScore.tempCreditStartDate"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="临时申请额度有效期止">
+                <el-date-picker
+                  v-model="currentScore.tempCreditEndDate"
                   type="date"
                   value-format="YYYY-MM-DD"
-                  placeholder="请选择"
                 />
               </el-form-item>
             </el-col>
@@ -1372,108 +1386,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="isOfflineScore" :span="12">
-              <el-form-item label="评分表">
-                <div class="score-offline-actions">
-                  <el-button
-                    type="primary"
-                    plain
-                    :disabled="!currentScore.quantificationId || readonly"
-                    @click="downloadScoreTemplate"
-                  >
-                    下载模板
-                  </el-button>
-                  <el-upload
-                    :show-file-list="false"
-                    :disabled="!currentScore.quantificationId || readonly || scoreImporting"
-                    accept=".xls,.xlsx"
-                    :http-request="uploadScoreExcel"
-                  >
-                    <el-button
-                      type="primary"
-                      :loading="scoreImporting"
-                      :disabled="!currentScore.quantificationId || readonly"
-                    >
-                      上传 Excel
-                    </el-button>
-                  </el-upload>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="信用等级">
-                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="自评得分" :required="isOfflineScore">
-                <el-input
-                  v-if="isOfflineScore"
-                  v-model="currentScore.selfScore"
-                  maxlength="10"
-                  :disabled="readonly"
-                  @input="handleOfflineSelfScoreInput"
-                  @blur="recalculateOfflineScore"
-                >
-                  <template #suffix>分</template>
-                </el-input>
-                <el-input v-else :model-value="formatScoreValue(currentScore.selfScore)" disabled>
-                  <template #suffix>分</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最终得分">
-                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="拟申请总资金使用额度" required>
-                <el-input
-                  v-model="currentScore.applyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最大资金使用额度">
-                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度">
-                <el-input
-                  v-model="currentScore.tempApplyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度有效期起">
-                <el-date-picker
-                  v-model="currentScore.tempCreditStartDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度有效期止">
-                <el-date-picker
-                  v-model="currentScore.tempCreditEndDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="currentScore.remark" maxlength="200" :rows="2" type="textarea" />
@@ -1483,7 +1395,7 @@
         </el-form>
 
         <el-table
-          v-if="!isOfflineScore && currentScore.quantificationId"
+          v-if="currentScore.quantificationId"
           ref="scoreCategoryTable"
           :data="scoreCategoryRows"
           border
@@ -1705,8 +1617,6 @@ import {
   changeStatus,
   remove,
   getScoreTemplate,
-  downloadScoreExcelTemplate,
-  importScoreExcel,
   recognizeBusinessLicenseOcr,
   queryKingdeeBank,
   queryKingdeeBankByNumber,
@@ -1727,12 +1637,6 @@ import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
-import {
-  isExcelResponse,
-  isBusinessJson,
-  parseBlobJson,
-  resolveImportErrorMessage,
-} from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
 import { normalizeSearchRangeParams } from '@/utils/search-range';
@@ -1819,10 +1723,9 @@ export default {
     };
     return {
       form: {},
-      query: { expireStatus: 'all' },
+      query: {},
       deptSearchInitialized: false,
       loading: true,
-      scoreImporting: false,
       data: [],
       archiveNameRisky: false,
       archiveNameRiskTip: '',
@@ -2166,12 +2069,6 @@ export default {
             slot: true,
             minWidth: 140,
           },
-          {
-            label: '下次评定日期',
-            prop: 'nextEvaluateDate',
-            slot: true,
-            minWidth: 130,
-          },
           {
             label: '资金使用情况',
             prop: 'fundUseRate',
@@ -2491,7 +2388,7 @@ export default {
         const details = this.getScoreCategoryDetails(category.categoryCode);
         let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
         let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
-        // 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
+        // 暂定：加分/减分合计最高按 15 分计
         if (category.categoryCode === 'plus') {
           selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
           reviewScore = Math.min(reviewScore, HARDCODED_MAX_PLUS_SCORE);
@@ -2509,16 +2406,6 @@ export default {
       });
       return rows;
     },
-    isOfflineScore() {
-      return String(this.currentScore?.evaluateMode || 'online') === 'offline';
-    },
-    expiryTagOptions() {
-      return [
-        { label: '全部', value: 'all' },
-        { label: '30天内到期', value: 'soon' },
-        { label: '已过期', value: 'expired' },
-      ];
-    },
   },
   watch: {
     $route(to, from) {
@@ -2657,9 +2544,7 @@ export default {
         const res = await querySupplierCode(code);
         // 防止响应返回时用户已修改代码
         if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
-        // 后端查不到时 data 为 {}（R 对 null 的空承载兜底），非字符串一律按空处理，避免显示 [object Object]
+        this.archiveForm.supplierCode = res?.data?.data || '';
-        const supplierCode = res?.data?.data;
-        this.archiveForm.supplierCode = typeof supplierCode === 'string' ? supplierCode : '';
       } catch (error) {
         // 忽略查询异常，编码留空
       }
@@ -3631,22 +3516,13 @@ export default {
       return Number.isFinite(rate) ? `${rate.toFixed(2)}%` : '-';
     },
     isBusinessLicenseExpiringSoon(row = {}) {
-      return this.isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期');
+      if (row.businessTermType === '长期' || !row.businessEndDate) return false;
-    },
+      const endDate = this.$dayjs(row.businessEndDate);
-    /** 日期是否在 30 天内到期（含当天）；skip=true 时不提示（如营业执照长期） */
-    isDateExpiringSoon(dateValue, skip = false) {
-      if (skip || !dateValue) return false;
-      const endDate = this.$dayjs(dateValue);
       if (!endDate.isValid()) return false;
       const today = this.$dayjs().startOf('day');
       const expireSoonDate = today.add(30, 'day');
       return !endDate.isAfter(expireSoonDate, 'day');
     },
-    handleExpireChange(expireStatus) {
-      this.query.expireStatus = expireStatus || 'all';
-      this.page.currentPage = 1;
-      this.onLoad(this.page, this.query);
-    },
     handleBusinessEndDateChange(value) {
       if (value) {
         this.archiveForm.businessTermType = '固定期限';
@@ -4530,9 +4406,7 @@ export default {
     normalizeScore(score) {
       return {
         quantificationId: '',
-        evaluateMode: 'online',
         scoreDate: this.$dayjs().format('YYYY-MM-DD'),
-        nextEvaluateDate: '',
         applyCreditLimit: this.archiveForm.applyCreditLimit || '',
         maxCreditLimit: '',
         maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
@@ -4550,8 +4424,6 @@ export default {
         details: [],
         ...score,
         quantificationId: score.quantificationId ? String(score.quantificationId) : '',
-        evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
-        nextEvaluateDate: score.nextEvaluateDate || '',
         applyCreditLimit: this.normalizeOptionalAmount(
           score.applyCreditLimit === undefined
             ? this.archiveForm.applyCreditLimit
@@ -4714,38 +4586,19 @@ export default {
       this.invoiceForm = this.emptyInvoice();
       this.$refs.archiveForm?.clearValidate();
     },
-    // 仅客商分类含「客户」时强制评分；纯承运商不强制。评分记录至多一条。
+    // 客商材料不做提交校验，仅在页面上提示未上传项。提交审批前必须完成自评，且评分记录只能有一条。
     validateScoreForApproval(archive) {
       const scores = archive.scores || [];
       if (scores.length > 1) {
         this.$message.warning('评分记录只能有一条');
         return false;
       }
-      if (!this.requiresCustomerScore(archive.customerType)) {
-        return true;
-      }
       if (scores.length !== 1 || scores[0].selfStatus !== '已完成') {
-        this.$message.warning('客户提交审批前必须完成评分自评');
+        this.$message.warning('提交审批前必须完成自评');
-        return false;
-      }
-      if (!scores[0].nextEvaluateDate) {
-        this.$message.warning('请填写下次评定日期');
         return false;
       }
       return true;
     },
-    /** 客商分类是否包含客户（字典值「客户」或历史值 customer） */
-    requiresCustomerScore(customerType) {
-      const values = Array.isArray(customerType)
-        ? customerType
-        : String(customerType || '')
-            .replace(/，/g, ',')
-            .split(',');
-      return values
-        .map(item => String(item || '').trim())
-        .filter(Boolean)
-        .some(item => item === '客户' || item.toLowerCase() === 'customer');
-    },
     normalizeArchive() {
       // 提交前再次固定所属组织，防止被绕过
       this.applyFixedOwnerDept();
@@ -5036,9 +4889,7 @@ export default {
         const template = this.normalizeScore({
           ...scoreTemplate,
           quantificationId,
-          evaluateMode: this.currentScore.evaluateMode || 'online',
           scoreDate: this.currentScore.scoreDate,
-          nextEvaluateDate: this.currentScore.nextEvaluateDate,
           applyCreditLimit: this.currentScore.applyCreditLimit,
           maxCreditLimit: '',
           creditLevel: '',
@@ -5292,8 +5143,7 @@ export default {
         .replace(/^\./, '')
         .replace(/(\..*)\./g, '$1')
         .replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2');
-      // 减分项复评得分存正数扣分，允许填 0（不扣分）；不做项目满分截断
+      if (prop === 'reviewScore' && normalized !== '') {
-      if (prop === 'reviewScore' && normalized !== '' && !this.isMinusScoreDetail(detail)) {
         const maxScore = this.getScoreItemFullScore(detail);
         if (Number(normalized) > maxScore) {
           detail[prop] = String(maxScore);
@@ -5354,12 +5204,7 @@ export default {
       const optionScores = this.parseScoreOptions(detail.optionsJson)
         .map(item => Number(item.score))
         .filter(score => Number.isFinite(score));
-      if (!optionScores.length) return 0;
+      return optionScores.length ? Math.max(...optionScores) : 0;
-      // 减分项选项分常为负（如 -5），项目满分按绝对值取最大可扣分；避免 0 分被误判为高于“最高得分-5”
-      if (this.isMinusScoreDetail(detail)) {
-        return Math.max(...optionScores.map(score => Math.abs(score)));
-      }
-      return Math.max(...optionScores);
     },
     getScoreFullMark(details = []) {
       return details.reduce((sum, item) => {
@@ -5377,7 +5222,6 @@ export default {
       });
     },
     matchCreditStandard(score, scoreRate) {
-      // 闭开区间：≥lower 且 <upper；最高档 upper=100 时包含 100（≥90 A；80≤x<90 B；…；x<50 F）
       const standards = (score.standards || [])
         .filter(item => item && item.creditLevel)
         .sort((a, b) => Number(b.scoreRateLower || 0) - Number(a.scoreRateLower || 0));
@@ -5385,10 +5229,7 @@ export default {
         const lower = Number(standard.scoreRateLower);
         const upper = Number(standard.scoreRateUpper);
         if (!Number.isFinite(lower) || !Number.isFinite(upper)) return false;
-        if (upper >= 100) {
+        return scoreRate >= lower && scoreRate <= upper;
-          return scoreRate >= lower && scoreRate <= upper;
-        }
-        return scoreRate >= lower && scoreRate < upper;
       });
     },
     calculateCreditLimitByStandard(standard, scoreRate) {
@@ -5424,32 +5265,25 @@ export default {
       const rawPlusReview = sumScore(plusDetails, 'reviewScore');
       const rawMinusSelf = sumScore(minusDetails, 'selfScore');
       const rawMinusReview = sumScore(minusDetails, 'reviewScore');
-      // 暂定：加分/减分合计最高按 15 分计（未超按实际，超 15 按 15/-15）
+      // 暂定：加分/减分合计最高按 15 分计
       const plusSelf = Math.min(rawPlusSelf, HARDCODED_MAX_PLUS_SCORE);
       const plusReview = Math.min(rawPlusReview, HARDCODED_MAX_PLUS_SCORE);
       const minusSelf = Math.min(rawMinusSelf, HARDCODED_MAX_MINUS_SCORE);
       const minusReview = Math.min(rawMinusReview, HARDCODED_MAX_MINUS_SCORE);
-      const computedSelfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
+      const selfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
       const reviewScore = sumScore(basicDetails, 'reviewScore') + plusReview - minusReview;
       const hasReviewScore = details.some(
         item => !this.isBlankScore(item.reviewScore)
       );
-      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计
-      const isOffline = String(score.evaluateMode || '') === 'offline';
-      const manualSelfScore = Number(score.selfScore);
-      const selfScore =
-        isOffline && Number.isFinite(manualSelfScore) && String(score.selfScore ?? '').trim() !== ''
-          ? manualSelfScore
-          : computedSelfScore;
       const finalScore = hasReviewScore ? reviewScore : selfScore;
       const fullMark = this.getScoreFullMark(details);
       const scoreRate =
         fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
       const standard = this.matchCreditStandard(score, scoreRate);
       const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
-      score.selfScore = Number(Number(selfScore).toFixed(2));
+      score.selfScore = Number(selfScore.toFixed(2));
       score.reviewScore = Number(reviewScore.toFixed(2));
-      score.finalScore = Number(Number(finalScore).toFixed(2));
+      score.finalScore = Number(finalScore.toFixed(2));
       score.scoreRate = Number(scoreRate.toFixed(2));
       if (hasStandards) {
         score.creditLevel = standard?.creditLevel || '';
@@ -5577,10 +5411,6 @@ export default {
         this.$message.warning('请选择评定日期');
         return false;
       }
-      if (!this.currentScore.nextEvaluateDate) {
-        this.$message.warning('请选择下次评定日期');
-        return false;
-      }
       if (!this.currentScore.applyCreditLimit) {
         this.$message.warning('请输入拟申请总资金使用额度');
         return false;
@@ -5594,11 +5424,7 @@ export default {
         return false;
       }
       if (!this.currentScore.details || !this.currentScore.details.length) {
-        this.$message.warning(
+        this.$message.warning('当前评分量化表未配置评分项目');
-          this.isOfflineScore
-            ? '请先上传评分表 Excel 解析回填明细'
-            : '当前评分量化表未配置评分项目'
-        );
         return false;
       }
       const invalidScoreInput = this.currentScore.details.find(item => {
@@ -5612,9 +5438,7 @@ export default {
         );
         return false;
       }
-      // 减分项允许填 0（不扣分），且按阶梯累计扣分不做项目满分截断
       const overMaxReviewScore = this.currentScore.details.find(item => {
-        if (this.isMinusScoreDetail(item)) return false;
         if (
           item.reviewScore === undefined ||
           item.reviewScore === null ||
@@ -5809,15 +5633,13 @@ export default {
         });
     },
     searchReset() {
-      this.query = { expireStatus: this.query.expireStatus || 'all' };
+      this.query = {};
-      this.onLoad(this.page, this.query);
+      this.onLoad(this.page);
     },
     searchChange(params, done) {
       // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
       // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
-      const expireStatus = this.query.expireStatus || 'all';
       this.query = this.buildQuery(params, true);
-      this.query.expireStatus = expireStatus;
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
       done();
@@ -5956,145 +5778,8 @@ export default {
       if (status === 0 || status === '0' || status === -1 || status === '-1') {
         delete values.status;
       }
-      if (!values.expireStatus) {
-        values.expireStatus = this.query.expireStatus || 'all';
-      }
-      if (values.expireStatus === 'all') {
-        delete values.expireStatus;
-      }
       return values;
     },
-    handleEvaluateModeChange(mode) {
-      this.currentScore.evaluateMode = mode === 'offline' ? 'offline' : 'online';
-      if (this.isOfflineScore) {
-        this.expandedScoreCategoryKeys = [];
-      }
-    },
-    handleOfflineSelfScoreInput(value) {
-      const normalized = String(value || '')
-        .replace(/[^\d.-]/g, '')
-        .replace(/(?!^)-/g, '')
-        .replace(/^\./, '')
-        .replace(/(\..*)\./g, '$1')
-        .replace(/^(-?\d+)(\.\d{0,2})?.*$/, '$1$2');
-      this.currentScore.selfScore = normalized;
-    },
-    recalculateOfflineScore() {
-      if (!this.isOfflineScore) return;
-      const selfScore = Number(this.currentScore.selfScore);
-      if (!Number.isFinite(selfScore)) return;
-      this.currentScore.selfScore = Number(selfScore.toFixed(2));
-      const hasReviewScore = (this.currentScore.details || []).some(
-        item => !this.isBlankScore(item.reviewScore)
-      );
-      if (!hasReviewScore) {
-        this.currentScore.finalScore = this.currentScore.selfScore;
-      }
-      const fullMark = this.getScoreFullMark(this.currentScore.details || []);
-      const scoreRate =
-        fullMark > 0
-          ? Math.max(0, Math.min(100, (Number(this.currentScore.finalScore) / fullMark) * 100))
-          : 0;
-      this.currentScore.scoreRate = Number(scoreRate.toFixed(2));
-      const standard = this.matchCreditStandard(this.currentScore, scoreRate);
-      const hasStandards = (this.currentScore.standards || []).some(item => item && item.creditLevel);
-      if (hasStandards) {
-        this.currentScore.creditLevel = standard?.creditLevel || '';
-        this.currentScore.maxCreditLimit = standard
-          ? this.calculateCreditLimitByStandard(standard, scoreRate)
-          : '';
-      }
-    },
-    downloadScoreTemplate() {
-      if (!this.currentScore.quantificationId) {
-        this.$message.warning('请先选择评分量化表');
-        return;
-      }
-      NProgress.start();
-      const loading = ElLoading.service({
-        lock: true,
-        text: '模板下载中',
-        background: 'rgba(255, 255, 255, 0.7)',
-      });
-      downloadScoreExcelTemplate(this.currentScore.quantificationId)
-        .then(res => {
-          downloadXls(
-            res.data,
-            `客商评分明细模板${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-          );
-        })
-        .finally(() => {
-          loading.close();
-          NProgress.done();
-        });
-    },
-    async uploadScoreExcel(option) {
-      const file = option?.file;
-      if (!file) return;
-      if (!this.currentScore.quantificationId) {
-        this.$message.warning('请先选择评分量化表');
-        return;
-      }
-      const fileName = String(file.name || '').toLowerCase();
-      if (!/\.(xls|xlsx)$/.test(fileName)) {
-        this.$message.error('请上传 .xls,.xlsx 标准格式文件');
-        return;
-      }
-      this.scoreImporting = true;
-      NProgress.start();
-      const loading = ElLoading.service({
-        lock: true,
-        text: '导入中',
-        background: 'rgba(255, 255, 255, 0.7)',
-      });
-      try {
-        const res = await importScoreExcel(this.currentScore.quantificationId, file);
-        if (isExcelResponse(res)) {
-          downloadXls(
-            res.data,
-            `客商评分导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-          );
-          this.$message.warning('部分数据导入失败，已下载失败明细');
-          return;
-        }
-        const result = isBusinessJson(res?.data) ? res.data : await parseBlobJson(res?.data);
-        if (Number(result?.code) !== 200) {
-          this.$message.error(result?.msg || '导入失败');
-          return;
-        }
-        const imported = result?.data || {};
-        const keepFields = {
-          evaluateMode: 'offline',
-          scoreDate: this.currentScore.scoreDate,
-          nextEvaluateDate: this.currentScore.nextEvaluateDate,
-          applyCreditLimit: this.currentScore.applyCreditLimit,
-          tempApplyCreditLimit: this.currentScore.tempApplyCreditLimit,
-          tempCreditStartDate: this.currentScore.tempCreditStartDate,
-          tempCreditEndDate: this.currentScore.tempCreditEndDate,
-          remark: this.currentScore.remark,
-          attachments: this.scoreAttachmentFiles,
-          quantificationId: this.currentScore.quantificationId,
-        };
-        this.currentScore = this.normalizeScore({
-          ...imported,
-          ...keepFields,
-          standards: imported.standards || this.currentScore.standards || [],
-          details: (imported.details || []).map(detail => ({
-            ...detail,
-            scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
-          })),
-        });
-        this.calculateScore(this.currentScore);
-        this.$message.success('评分表解析成功，请在证明材料中上传评分表原件');
-      } catch (error) {
-        const message = await resolveImportErrorMessage(error);
-        this.$message.error(message);
-      } finally {
-        this.scoreImporting = false;
-        loading.close();
-        NProgress.done();
-      }
-    },
   },
 };
 </script>
@@ -6129,23 +5814,6 @@ export default {
   color: var(--el-color-danger);
 }
 
-.customer-archive-page__expiry-tabs {
-  margin-bottom: 8px;
-}
-
-.score-offline-tip {
-  margin-left: 12px;
-  color: #909399;
-  font-size: 12px;
-}
-
-.score-offline-actions {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-
 // 风险客商悬浮提示：popper 挂在 body 下，需用 :global 约束宽度
 :global(.customer-risk-popper) {
   max-width: 360px;