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/payment/paymentApplication.js

@@ -34,15 +34,6 @@ export const syncKingdeeBatch = ids =>
 // 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
 export const syncKingdeeResult = () =>
   request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
-// 付款记录付款凭证下载（后端代理 A801-2 流式回源），耗时较普通接口长，放宽到 120s
-export const downloadRecordVoucher = recordId =>
-  request({
-    url: `${baseUrl}/record/download-voucher`,
-    method: 'get',
-    params: { recordId },
-    responseType: 'blob',
-    timeout: 120000,
-  });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },

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/components/kingdee-invoice-pool-dialog/main.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
-    <el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
+    <el-form :model="query" inline label-width="130px" @submit.prevent>
       <el-form-item label="发票号码">
-        <el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票日期">
         <el-date-picker
@@ -10,16 +10,15 @@
           type="daterange"
           value-format="YYYY-MM-DD"
           format="YYYY-MM-DD"
-          range-separator="-"
-          start-placeholder="请选择"
-          end-placeholder="请选择"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
         />
       </el-form-item>
       <el-form-item label="开票单位">
-        <el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="受票单位">
-        <el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
+        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票单位（销方）">
         <el-select
@@ -94,9 +93,6 @@
       <el-form-item>
         <el-button :disabled="loading" @click="resetQuery">重置</el-button>
         <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
-        <el-tooltip content="按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找" placement="top">
-          <el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
-        </el-tooltip>
       </el-form-item>
     </el-form>
     <el-table
@@ -105,7 +101,7 @@
       :data="rows"
       :row-key="rowKey"
       border
-      max-height="50vh"
+      height="520"
       :highlight-current-row="!multiple"
       @selection-change="selection => (selected = selection)"
       @row-dblclick="handleRowDblclick"
@@ -122,7 +118,6 @@
           </el-radio>
         </template>
       </el-table-column>
-      <el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
       <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
       <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
       <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
@@ -177,8 +172,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="kingdee-pool-dialog__pagination">
-      <span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+    <div class="kingdee-pool-dialog__pager">
+      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
       <el-pagination
         v-model:current-page="page.current"
         v-model:page-size="page.size"
@@ -328,9 +323,6 @@ export default {
       this.page.current = 1;
       this.load();
     },
-    indexMethod(index) {
-      return (this.page.current - 1) * this.page.size + index + 1;
-    },
     resetQuery() {
       this.query = this.emptyQuery();
       this.handleQuery();
@@ -428,28 +420,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.kingdee-pool-dialog__form {
-  margin-bottom: 16px;
-  padding: 12px 12px 4px;
-  background: #fff;
-  border-radius: 6px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-}
-.kingdee-pool-dialog__pagination {
+.kingdee-pool-dialog__pager {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 16px 0;
+  margin-top: 12px;
   gap: 16px;
 }
-.kingdee-pool-dialog__pagination-tip {
+.kingdee-pool-dialog__pager-tip {
   color: #909399;
   font-size: 12px;
-  white-space: nowrap;
-}
-.kingdee-pool-dialog__query-tip {
-  margin-left: 8px;
-  color: #909399;
-  cursor: pointer;
 }
 </style>

src/mixins/organization-search.js

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

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/project-change.js

@@ -7,8 +7,7 @@ import {
 
 export const changeTypeOptions = [
   { label: '项目变更', value: '项目变更' },
-  { label: '项目备案流程（本部流程）', value: '项目备案流程（本部流程）' },
-  { label: '项目备案流程（运输部流程）', value: '项目备案流程（运输部流程）' },
+  { label: '项目备案调整', value: '项目备案调整' },
 ];
 
 export const config = {

src/option/business/temporary-credit-limit.js

@@ -85,6 +85,13 @@ export const config = {
       status: ['draft', 'withdrawn', 'rejected'],
       permission: 'temporary_credit_limit_submit',
     },
+    {
+      action: 'flow',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'temporary_credit_limit_view',
+    },
     {
       action: 'withdraw',
       label: '撤回',
@@ -92,14 +99,6 @@ export const config = {
       status: ['reviewing'],
       permission: 'temporary_credit_limit_withdraw',
     },
-    {
-      action: 'mkAudit',
-      label: '流程',
-      statusProp: 'approvalStatus',
-      status: ['reviewing'],
-      permission: 'temporary_credit_limit_approve',
-      mkOnly: true,
-    },
     {
       action: 'approve',
       label: '审批通过',
@@ -107,7 +106,6 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing'],
       permission: 'temporary_credit_limit_approve',
-      localOnly: true,
     },
     {
       action: 'reject',
@@ -116,7 +114,6 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing'],
       permission: 'temporary_credit_limit_reject',
-      localOnly: true,
     },
   ],
 };

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 `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
+      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
     })
     .join('； ');
 
@@ -208,9 +207,6 @@ export const config = {
   transportPlanImportTitle: '导入运输计划',
   transportPlanTemplateUrl: '/blade-transport/transport-plan/export-template',
   attachmentTitle: '附件',
-  defaultForm: {
-    transportType: 'road',
-  },
   searchRangeMap: {
     planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
     createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],

src/option/payment/invoiceReceipt.js

@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
   { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
   { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
   { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/paymentApplication.js

@@ -1,11 +1,14 @@
 /**
  * 付款申请列表（avue-crud）配置
  * ------------------------------------------------------------------
- * 列表页与其它模块统一使用 avue-crud，头部按钮（刷新 / 列显隐 / 表格卡片切换）
- * 由 avue-crud 自带，不做二次封装。
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
+ * 表格卡片切换）由 avue-crud 自带，不做二次封装。
  *
- * 搜索栏与应收/应付明细等页面统一为页面级手写搜索区（见 payment-application.vue），
- * 此处只保留表格列配置。
+ * 搜索项与表格列 label 不一致的（如表格列「收款方」/ 搜索项「客户名称」），
+ * 单独定义一个 hide 的搜索列，并用 searchProp 映射到后端字段。
+ *
+ * ⚠️ avue 的 searchOrder 为降序排序，值越大越靠前（见 header-search2.js：
+ * `list.sort((a, b) => (b.searchOrder || 0) - (a.searchOrder || 0))`）。
  */
 
 const textFormatter = (row, value) =>
@@ -13,10 +16,46 @@ const textFormatter = (row, value) =>
 
 const moneyFormatter = (row, value) => Number(value || 0).toFixed(2);
 
-export const paymentApplicationOption = () => ({
+// 仅用于搜索、不在表格中出现的列
+const searchOnlyColumn = ({ label, prop, searchOrder, searchProp, dicData }) => {
+  const column = {
+    label,
+    prop,
+    search: true,
+    searchOrder,
+    searchPlaceholder: '请输入',
+    hide: true,
+    showColumn: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  };
+  if (searchProp) column.searchProp = searchProp;
+  if (dicData) {
+    column.type = 'select';
+    column.searchPlaceholder = '请选择';
+    column.dicData = dicData;
+  }
+  return column;
+};
+
+export const paymentApplicationOption = ({
+  paymentTypeOptions = [],
+  approvalStatusOptions = [],
+  kingdeeStatusOptions = [],
+} = {}) => ({
   height: 'auto',
   calcHeight: 32,
   tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 88,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
   border: true,
   index: true,
   indexLabel: '序号',
@@ -34,11 +73,84 @@ export const paymentApplicationOption = () => ({
   menuFixed: 'right',
   dialogClickModal: false,
   column: [
+    // ---------- 搜索项（前 4 项默认展示，其余折叠；searchOrder 越大越靠前） ----------
+    {
+      label: '单据号',
+      prop: 'paymentNo',
+      slot: true,
+      search: true,
+      searchSpan: 5,
+      searchOrder: 9,
+      searchPlaceholder: '请输入',
+      minWidth: 150,
+    },
+    {
+      label: '日期',
+      prop: 'applyDateRange',
+      type: 'daterange',
+      searchType: 'daterange',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 8,
+      hide: true,
+      showColumn: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '客户名称',
+        prop: 'payeeNameSearch',
+        searchOrder: 7,
+        searchProp: 'payeeName',
+      }),
+      searchSpan: 5,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '项目名称',
+        prop: 'projectNameSearch',
+        searchOrder: 6,
+        searchProp: 'projectName',
+      }),
+      searchSpan: 5,
+    },
+    searchOnlyColumn({
+      label: '关联结算单',
+      prop: 'settlementNo',
+      searchOrder: 4,
+    }),
+    searchOnlyColumn({
+      label: '付款类型',
+      prop: 'paymentType',
+      searchOrder: 3,
+      dicData: paymentTypeOptions,
+    }),
+    searchOnlyColumn({
+      label: '审核状态',
+      prop: 'approvalStatus',
+      searchOrder: 2,
+      dicData: approvalStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '金蝶单据状态',
+      prop: 'kingdeeStatus',
+      searchOrder: 1,
+      dicData: kingdeeStatusOptions,
+    }),
     // ---------- 表格列 ----------
-    { label: '单据号', prop: 'paymentNo', slot: true, minWidth: 150 },
     { label: '付款类型', prop: 'paymentTypeName', minWidth: 110, formatter: textFormatter },
     { label: '所属项目', prop: 'projectName', minWidth: 140, formatter: textFormatter },
-    { label: '所属组织', prop: 'deptName', minWidth: 120, formatter: textFormatter },
+    {
+      label: '所属组织',
+      prop: 'deptName',
+      search: true,
+      searchOrder: 5,
+      searchslot: true,
+      minWidth: 120,
+      formatter: textFormatter,
+    },
     { label: '合同编号', prop: 'contractNo', minWidth: 130, formatter: textFormatter },
     { label: '合同名称', prop: 'contractName', minWidth: 140, formatter: textFormatter },
     { label: '付款方', prop: 'payerName', minWidth: 130, formatter: textFormatter },

src/option/settlement/formalSettlement.js

@@ -1,18 +1,20 @@
 /**
  * 正式结算单列表（avue-crud）配置
  * ------------------------------------------------------------------
- * 列表页与其它模块统一使用 avue-crud，头部按钮（刷新 / 列显隐 / 显示方式）
- * 由 avue-crud 自带，不做二次封装。
- *
- * 搜索栏与应收/应付明细页统一为页面级手写搜索区（见 formal-settlement.vue），
- * 此处只保留表格列配置。
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
+ * 显示方式）由 avue-crud 自带，不做二次封装。
  *
  * 表格列复用 formalSettlementTable.js 的 formalSettlementTableColumns（与弹窗内
- * 明细表共用同一份列定义），此处只补充 avue 需要的展示属性，避免两处维护。
+ * 明细表共用同一份列定义），此处只补充 avue 需要的展示/搜索属性，避免两处维护。
+ *
+ * ⚠️ searchOrder 为降序排序，值越大越靠前。
+ * ⚠️ 仅用于搜索的列必须 hide + showColumn: false，否则会混进「列显隐」抽屉。
+ * ⚠️ column 数组顺序 = 表格列顺序，搜索专用列统一放在数组最前面。
  */
 
-import { formatSealTypes } from '@/utils/settlement-seal';
 import {
+  approvalStatusOptions,
+  invoiceStatusOptions,
   kingdeeSyncStatusOptions,
   kingdeeWriteOffStatusOptions,
   paymentStatusOptions,
@@ -22,8 +24,6 @@ import { formalSettlementTableColumns } from './formalSettlementTable';
 const textFormatter = (row, value) =>
   value === null || value === undefined || value === '' ? '-' : value;
 
-const sealTypesFormatter = (row, value) => formatSealTypes(value) || '-';
-
 /** 金额统一展示：两位小数 + 币种 */
 const moneyFormatter = (row, value) =>
   `${Number(value || 0).toFixed(2)} ${row?.currency || 'RMB'}`;
@@ -31,52 +31,95 @@ const moneyFormatter = (row, value) =>
 const pickLabel = (options, value) =>
   options.find(item => item.value === value)?.label || value || '-';
 
-/** 表格列的 avue 增量配置：插槽、覆盖宽度等 */
+const searchOnlyColumn = ({ label, prop, searchOrder, type = 'input', dicData }) => {
+  const column = {
+    label,
+    prop,
+    search: true,
+    searchOrder,
+    searchSpan: 5,
+    hide: true,
+    showColumn: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  };
+  if (type === 'select') {
+    column.type = 'select';
+    column.searchPlaceholder = '请选择';
+    column.dicData = dicData || [];
+  } else if (type === 'daterange') {
+    column.type = 'daterange';
+    column.searchType = 'daterange';
+    column.searchPlaceholder = '请选择';
+  } else {
+    column.searchPlaceholder = '请输入';
+  }
+  return column;
+};
+
+/** 表格列的 avue 增量配置：搜索项、插槽、覆盖宽度等 */
 const COLUMN_EXTRA = {
-  formalSettlementNo: { slot: true },
-  sealTypes: { formatter: sealTypesFormatter },
+  formalSettlementNo: {
+    slot: true,
+    search: true,
+    searchSpan: 5,
+    searchOrder: 12,
+    searchPlaceholder: '请输入',
+  },
+  payerName: { search: true, searchSpan: 5, searchOrder: 7, searchPlaceholder: '请输入' },
+  payeeName: { search: true, searchSpan: 5, searchOrder: 6, searchPlaceholder: '请输入' },
+  projectName: { search: true, searchSpan: 5, searchOrder: 11, searchPlaceholder: '请输入' },
+  deptName: { search: true, searchslot: true, searchSpan: 5, searchOrder: 10 },
+  contractNo: { search: true, searchSpan: 5, searchOrder: 9, searchPlaceholder: '请输入' },
   invoiceStatusName: { slot: true },
   paymentStatusName: { slot: true },
   approvalStatusName: { slot: true },
   adjustFlag: {
     formatter: row => row.adjustStatusName || (row.originFormalSettlementNo ? '调整后单' : '-'),
   },
-  kingdeeSyncStatus: { slot: true },
+  kingdeeSyncStatus: {
+    slot: true,
+    search: true,
+    type: 'select',
+    dicData: kingdeeSyncStatusOptions,
+    searchSpan: 5,
+    searchOrder: 2,
+    searchPlaceholder: '请选择',
+  },
   kingdeeLockStatus: { slot: true },
   kingdeeWriteOffStatus: { slot: true },
   kingdeeAssignStatus: { slot: true },
   createTime: { width: 180 },
 };
 
-/** 收款/付款结算单按结算类型展示各自标签 */
-const PAYMENT_FIELD_LABELS = {
-  paidAmount: { payable: '已付合计（含预付）', receivable: '已收合计（含预付）' },
-  paymentStatusName: { payable: '付款状态', receivable: '收款状态' },
-};
+const buildTableColumns = () =>
+  formalSettlementTableColumns.map(column => {
+    const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+    if (column.money) {
+      extra.formatter = moneyFormatter;
+      extra.align = 'right';
+    }
+    // link / status 标记的列统一走单元格插槽
+    if (column.link || column.status) extra.slot = true;
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
+    return { ...column, ...extra };
+  });
 
-// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不展示
-const buildTableColumns = settlementType =>
-  formalSettlementTableColumns
-    .filter(column => !(settlementType === 'receivable' && column.prop === 'kingdeeAssignStatus'))
-    .map(column => {
-      const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
-      const label = PAYMENT_FIELD_LABELS[column.prop]?.[settlementType];
-      if (label) extra.label = label;
-      if (column.money) {
-        extra.formatter = moneyFormatter;
-        extra.align = 'right';
-      }
-      // link / status 标记的列统一走单元格插槽
-      if (column.link || column.status) extra.slot = true;
-      // 插槽列不挂兜底 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,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 88,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
   border: true,
   index: true,
   indexLabel: '序号',
@@ -91,10 +134,45 @@ export const formalSettlementOption = (settlementType = '') => ({
   editBtn: false,
   menuWidth: 320,
   menuFixed: 'right',
-  column: [...buildTableColumns(settlementType)],
+  column: [
+    // ---------- 仅搜索列 ----------
+    searchOnlyColumn({
+      label: '预付结算单号',
+      prop: 'preSettlementNo',
+      searchOrder: 8,
+    }),
+    searchOnlyColumn({
+      label: '发票状态',
+      prop: 'invoiceStatus',
+      searchOrder: 5,
+      type: 'select',
+      dicData: invoiceStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '收付款状态',
+      prop: 'paymentStatus',
+      searchOrder: 4,
+      type: 'select',
+      dicData: paymentStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '审核状态',
+      prop: 'approvalStatus',
+      searchOrder: 3,
+      type: 'select',
+      dicData: approvalStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '生成日期',
+      prop: 'createDateRange',
+      searchOrder: 1,
+      type: 'daterange',
+    }),
+    // ---------- 表格列（部分兼搜索项） ----------
+    ...buildTableColumns(),
+  ],
 });
 
 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
 export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
-export const paymentStatusName = (value, settlementType) =>
-  pickLabel(paymentStatusOptions(settlementType), value);
+export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);

src/option/settlement/formalSettlementForm.js

@@ -10,12 +10,6 @@ export const formalSettlementFormFields = [
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
   { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
   { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
-  {
-    label: '用印类型',
-    prop: 'sealTypes',
-    type: 'multi-select',
-    optionsKey: 'sealTypeOptions',
-  },
   { label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
   { label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
   { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -35,7 +29,6 @@ export const createFormalSettlementForm = () => ({
   sourceDetailIds: [],
   businessModel: '',
   transportType: '',
-  sealTypes: [],
   exchangeRateDate: '',
   exchangeRate: 1,
   createUserName: '',

src/option/settlement/formalSettlementSearch.js

@@ -6,28 +6,27 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-/** 发票状态选项按结算类型区分：付款结算单=收票方向，收款结算单=开票方向 */
-export const invoiceStatusOptions = (settlementType = '') => {
-  const received = settlementType === 'payable';
-  return [
-    { label: received ? '未收票' : '未开票', value: 'unreceived' },
-    { label: received ? '部分收票' : '部分开票', value: 'partial' },
-    { label: received ? '已收票' : '已开票', value: 'completed' },
-  ];
+export const invoiceStatusOptions = [
+  { label: '未开/收票', value: 'unreceived' },
+  { label: '部分开/收票', value: 'partial' },
+  { label: '已开/收票', value: 'completed' },
+];
+
+export const invoiceStatusName = (value, settlementType) => {
+  const payable = settlementType === 'payable';
+  const labels = {
+    unreceived: payable ? '未收票' : '未开票',
+    partial: payable ? '部分收票' : '部分开票',
+    completed: payable ? '已收票' : '已开票',
+  };
+  return labels[value] || value || '-';
 };
 
-export const invoiceStatusName = (value, settlementType) =>
-  invoiceStatusOptions(settlementType).find(item => item.value === value)?.label || value || '-';
-
-/** 收付款状态选项按结算类型区分：付款结算单=付款方向，收款结算单=收款方向 */
-export const paymentStatusOptions = (settlementType = '') => {
-  const suffix = settlementType === 'payable' ? '付款' : '收款';
-  return [
-    { label: `未${suffix}`, value: 'unpaid' },
-    { label: `部分${suffix}`, value: 'partial' },
-    { label: `已${suffix}`, value: 'paid' },
-  ];
-};
+export const paymentStatusOptions = [
+  { label: '未收/付款', value: 'unpaid' },
+  { label: '部分收/付款', value: 'partial' },
+  { label: '已收/付款', value: 'paid' },
+];
 
 export const kingdeeSyncStatusOptions = [
   { label: '未同步', value: 'unsynced' },
@@ -39,3 +38,23 @@ export const kingdeeWriteOffStatusOptions = [
   { label: '未冲销', value: 'unwrittenoff' },
   { label: '已冲销', value: 'writtenoff' },
 ];
+
+export const formalSettlementSearchFields = [
+  { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '项目', prop: 'projectName', type: 'input' },
+  { label: '所属组织', prop: 'deptName', type: 'cascader' },
+  { label: '合同编号', prop: 'contractNo', type: 'input' },
+  { label: '付款方', prop: 'payerName', type: 'input' },
+  { label: '收款方', prop: 'payeeName', type: 'input' },
+  { label: '发票状态', prop: 'invoiceStatus', type: 'select', options: invoiceStatusOptions },
+  { label: '收付款状态', prop: 'paymentStatus', type: 'select', options: paymentStatusOptions },
+  { label: '审核状态', prop: 'approvalStatus', type: 'select', options: approvalStatusOptions },
+  {
+    label: '金蝶单据状态',
+    prop: 'kingdeeSyncStatus',
+    type: 'select',
+    options: kingdeeSyncStatusOptions,
+  },
+  { label: '生成日期', prop: 'createDateRange', type: 'daterange' },
+];

src/option/settlement/formalSettlementTable.js

@@ -10,7 +10,6 @@ export const formalSettlementTableColumns = [
   { label: '原币结算金额', prop: 'settlementAmount', minWidth: 145, money: true },
   { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
   { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
-  { label: '用印类型', prop: 'sealTypes', minWidth: 120 },
   { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 155, money: true },
   { label: '结算汇率', prop: 'exchangeRate', minWidth: 110 },
   { label: '申请付款金额（含预付）', prop: 'appliedPaymentAmount', minWidth: 185, money: true },

src/option/settlement/preSettlementForm.js

@@ -8,30 +8,12 @@ export const preSettlementFormFields = [
   { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
   { label: '合同编号', prop: 'contractNo', readonly: true },
   { label: '项目名称', prop: 'projectName', readonly: true },
-  {
-    label: '收款方',
-    prop: 'payeeName',
-    type: 'select',
-    optionsKey: 'payeeOptions',
-    required: true,
-  },
-  {
-    label: '付款方',
-    prop: 'payerName',
-    type: 'select',
-    optionsKey: 'payerOptions',
-    required: true,
-  },
+  { label: '收款方', prop: 'payeeName', readonly: true },
+  { label: '付款方', prop: 'payerName', readonly: true },
   { label: '结算类型', prop: 'settlementType', readonly: true },
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
   { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
   { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
-  {
-    label: '用印类型',
-    prop: 'sealTypes',
-    type: 'multi-select',
-    optionsKey: 'sealTypeOptions',
-  },
   { label: '汇率日期', prop: 'exchangeRateDate', type: 'date' },
   { label: '结算汇率', prop: 'exchangeRate', type: 'number', class: 'exchange-rate-input' },
   { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -42,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) => {
@@ -88,7 +68,6 @@ export const emptyPreSettlementForm = () => ({
   settlementAmount: 0,
   businessModel: '',
   transportType: '',
-  sealTypes: [],
   localCurrency: 'RMB',
   localSettlementAmount: 0,
   exchangeRateDate: '',

src/option/settlement/preSettlementTable.js

@@ -10,7 +10,6 @@ export const preSettlementTableColumns = [
   { label: '原币结算金额', prop: 'settlementAmount', minWidth: 140, money: true, precision: 2 },
   { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
   { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
-  { label: '用印类型', prop: 'sealTypes', minWidth: 120 },
   { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 },
   { label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 },
   {

src/option/settlement/receivable-payable-detail.js

@@ -23,7 +23,6 @@ export const searchFields = [
   { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
-  { label: '运单号', prop: 'waybillNo', type: 'input' },
   { label: '车号', prop: 'vehicleNo', type: 'input' },
 ];
 

src/option/system/user.js

@@ -492,35 +492,17 @@ export const treeOption = {
   nodeKey: 'id',
   lazy: true,
   treeLoad: function (node, resolve) {
-    const toTreeNode = item => ({
-      ...item,
-      leaf: !item.hasChildren,
-    });
-    // 用户管理组织树从第二级开始展示：根层隐藏一级组织，直接展示其子节点
-    if (node.level === 0) {
-      getDeptLazyTree(0)
-        .then(res => {
-          const roots = res.data.data || [];
-          if (!roots.length) {
-            resolve([]);
-            return;
-          }
-          return Promise.all(roots.map(root => getDeptLazyTree(root.id))).then(childResults => {
-            const secondLevel = [];
-            childResults.forEach(childRes => {
-              (childRes.data.data || []).forEach(item => secondLevel.push(toTreeNode(item)));
-            });
-            resolve(secondLevel);
-          });
+    const parentId = node.level === 0 ? 0 : node.data.id;
+    getDeptLazyTree(parentId).then(res => {
+      resolve(
+        res.data.data.map(item => {
+          return {
+            ...item,
+            leaf: !item.hasChildren,
+          };
         })
-        .catch(() => resolve([]));
-      return;
-    }
-    getDeptLazyTree(node.data.id)
-      .then(res => {
-        resolve((res.data.data || []).map(toTreeNode));
-      })
-      .catch(() => resolve([]));
+      );
+    });
   },
   addBtn: false,
   menu: false,

src/router/page/index.js

@@ -106,17 +106,6 @@ export default [
       bizType: 'project-change',
     },
   },
-  {
-    path: '/business/project-record-change/public-view',
-    name: '查看项目备案信息',
-    component: () => import('@/views/business/project-apply-public-view.vue'),
-    meta: {
-      keepAlive: false,
-      isTab: false,
-      isAuth: false,
-      bizType: 'project-record-change',
-    },
-  },
   {
     path: '/business/contract-manage/public-view',
     name: '查看合同信息',
@@ -205,39 +194,6 @@ export default [
       bizType: 'bill-payment',
     },
   },
-  {
-    path: '/business/temporary-credit-limit/public-view',
-    name: '查看临时额度申请信息',
-    component: () => import('@/views/business/temporary-credit-limit-public-view.vue'),
-    meta: {
-      keepAlive: false,
-      isTab: false,
-      isAuth: false,
-      bizType: 'temporary-credit-limit',
-    },
-  },
-  {
-    path: '/transportCapacity/cert-audit-driver/public-view',
-    name: '查看司机认证审核信息',
-    component: () => import('@/views/transportCapacity/cert-audit-driver-public-view.vue'),
-    meta: {
-      keepAlive: false,
-      isTab: false,
-      isAuth: false,
-      bizType: 'cert-audit-driver',
-    },
-  },
-  {
-    path: '/transportCapacity/cert-audit-vehicle/public-view',
-    name: '查看车辆认证审核信息',
-    component: () => import('@/views/transportCapacity/cert-audit-vehicle-public-view.vue'),
-    meta: {
-      keepAlive: false,
-      isTab: false,
-      isAuth: false,
-      bizType: 'cert-audit-vehicle',
-    },
-  },
   {
     path: '/',
     name: '主页',

src/router/views/index.js

@@ -129,39 +129,7 @@ export default [
         name: '新增编辑结算单',
         meta: {
           keepAlive: false,
-          // 付款结算单表单入口，高亮付款结算单菜单
-          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,
+          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
           activeMenu: '/settlement/payment-settlement',
         },
         component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),

src/utils/dept.js

@@ -1,39 +0,0 @@
-/**
- * 业务部门下拉规范化。
- * rawLabel 保留原始部门名供落库；展示名优先追加所属公司，缺省时用上级组织。
- *
- * @param {Array} list 业务部门原始列表
- * @param {{ alwaysShowCompany?: boolean }} [options]
- *        alwaysShowCompany=true 时始终展示「部门（公司）」；默认仅同名时追加
- */
-export function normalizeBusinessDeptOptions(list, options = {}) {
-  const alwaysShowCompany = !!options.alwaysShowCompany;
-  const source = Array.isArray(list) ? list : [];
-  const nameCount = {};
-  source.forEach(item => {
-    const name = String(item?.deptName || item?.fullName || '').trim();
-    if (!name) return;
-    nameCount[name] = (nameCount[name] || 0) + 1;
-  });
-  return source
-    .map(item => {
-      const id = item?.id == null || item?.id === '' ? '' : String(item.id);
-      if (!id) return null;
-      const rawLabel = item.deptName || item.fullName || id;
-      const companyName = String(item.belongCompanyName || item.parentName || '').trim();
-      const label =
-        companyName && (alwaysShowCompany || nameCount[rawLabel] > 1)
-          ? `${rawLabel}（${companyName}）`
-          : rawLabel;
-      return {
-        id,
-        value: id,
-        label,
-        rawLabel,
-        parentName: String(item.parentName || '').trim(),
-        belongCompanyName: String(item.belongCompanyName || '').trim(),
-        kingdeeDeptCode: item.kingdeeDeptCode || '',
-      };
-    })
-    .filter(Boolean);
-}

src/utils/kingdee-attachment.js

@@ -21,17 +21,16 @@ export const isKingdeePathAttachment = attachment => {
 };
 
 /**
- * 请求金蝶文件流（公共核）：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON
- * （响应通道未写流时后端即失败），按 Content-Type 识别并抛出带 msg 的错误；
- * 网络级失败拦截器已提示，标记 silent 避免重复提示。
+ * 请求金蝶文件流：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON（响应通道未写流时后端即失败），
+ * 按 Content-Type 识别并抛出带 msg 的错误；网络级失败拦截器已提示，标记 silent 避免重复提示。
  * 供查看（弹窗内预览）/下载两类入口复用
- * @param {Function} fetcher 文件流请求函数（返回 axios blob 响应）
+ * @param {String} invoiceNo 发票号码
  * @returns {Promise<Blob>}
  */
-const fetchKingdeeBlob = async fetcher => {
+export const requestKingdeeFile = async invoiceNo => {
   let res;
   try {
-    res = await fetcher();
+    res = await downloadInvoicePoolAttachment(invoiceNo);
   } catch (error) {
     throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
   }
@@ -52,45 +51,6 @@ const fetchKingdeeBlob = async fetcher => {
   return blob;
 };
 
-/**
- * 请求金蝶文件流：票池发票按发票号回源（后端代理 A801-2）
- * @param {String} invoiceNo 发票号码
- * @returns {Promise<Blob>}
- */
-export const requestKingdeeFile = invoiceNo => fetchKingdeeBlob(() => downloadInvoicePoolAttachment(invoiceNo));
-
-/**
- * 下载金蝶侧附件（经 A801-2 后端代理，公共入口），失败统一 ElMessage 提示
- * @param {Function} fetcher 文件流请求函数
- * @param {String} fileName 下载文件名
- */
-export const downloadKingdeeFile = async (fetcher, fileName) => {
-  try {
-    const blob = await fetchKingdeeBlob(fetcher);
-    downloadFile(blob, fileName);
-  } catch (error) {
-    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
-  }
-};
-
-/**
- * 新窗口预览金蝶侧附件（经 A801-2 后端代理，公共入口）：拉取 Blob 转 objectURL
- * （PDF 可预览；OFD 等浏览器不可预览的格式由浏览器触发下载）
- * @param {Function} fetcher 文件流请求函数
- * @param {String} fileName 预览文件名
- */
-export const viewKingdeeFile = async (fetcher, fileName) => {
-  try {
-    const blob = await fetchKingdeeBlob(fetcher);
-    const url = URL.createObjectURL(blob);
-    window.open(url, '_blank');
-    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
-    setTimeout(() => URL.revokeObjectURL(url), 60000);
-  } catch (error) {
-    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
-  }
-};
-
 /**
  * 下载金蝶侧发票附件（经 A801-2 后端代理），失败统一 ElMessage 提示
  * @param {String} invoiceNo 发票号码
@@ -101,7 +61,12 @@ export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
     ElMessage.warning('当前发票缺少发票号码，无法下载金蝶侧附件');
     return;
   }
-  await downloadKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    downloadFile(blob, fileName || `${invoiceNo}.pdf`);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
+  }
 };
 
 /**
@@ -114,5 +79,13 @@ export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
     ElMessage.warning('当前发票缺少发票号码，无法预览金蝶侧附件');
     return;
   }
-  await viewKingdeeFile(() => downloadInvoicePoolAttachment(invoiceNo), fileName || `${invoiceNo}.pdf`);
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    const url = URL.createObjectURL(blob);
+    window.open(url, '_blank');
+    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+    setTimeout(() => URL.revokeObjectURL(url), 60000);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
+  }
 };

src/utils/kingdee.js

@@ -14,17 +14,6 @@ export const KINGDEE_STATUS_TAG_TYPES = {
 /** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
 export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
 
-/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */
-export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
-  unsynced: 'info',
-  pushed: 'warning',
-  assigned: 'success',
-  failed: 'danger',
-};
-
-/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */
-export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info';
-
 /** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
 export const KINGDEE_WRITEOFF_TAG_TYPES = {
   writtenoff: 'success',

src/utils/mk-approval.js

@@ -21,19 +21,6 @@ export const MK_BIZ = {
     rejected: ['rejected', 'withdrawn'],
     approved: ['approved'],
   },
-  /** 项目备案流程（本部/运输部）共用 */
-  'project-record-change': {
-    dictName: '提交项目备案审核流',
-    subjectPrefix: '项目备案审批',
-    rejected: ['rejected', 'withdrawn'],
-    approved: ['approved'],
-  },
-  'temporary-credit-limit': {
-    dictName: '提交临时额度审核流',
-    subjectPrefix: '临时额度审批',
-    rejected: ['rejected', 'withdrawn'],
-    approved: ['approved'],
-  },
   'contract-manage': {
     dictName: '提交合同审核流',
     subjectPrefix: '合同审批',
@@ -82,42 +69,10 @@ export const MK_BIZ = {
     rejected: ['returned'],
     approved: ['approved'],
   },
-  'cert-audit-driver': {
-    dictName: '提交司机审核流',
-    subjectPrefix: '司机认证审批',
-    // 认证记录 status：0审核中 1已通过 2已驳回
-    rejected: ['2'],
-    approved: ['1'],
-  },
-  'cert-audit-vehicle': {
-    dictName: '提交车辆审核流',
-    subjectPrefix: '车辆认证审批',
-    rejected: ['2'],
-    approved: ['1'],
-  },
 };
 
-/** 按认证对象类型解析 MK 业务类型 */
-export function resolveCertAuditMkBizType(bizType) {
-  return String(bizType || '') === 'vehicle' ? 'cert-audit-vehicle' : 'cert-audit-driver';
-}
-
 const MK_SWITCH_NAME = '开启MK';
 
-/** 项目备案类变更类型（含历史「项目备案调整」） */
-export const PROJECT_RECORD_CHANGE_TYPES = [
-  '项目备案流程（本部流程）',
-  '项目备案流程（运输部流程）',
-  '项目备案调整',
-];
-
-/** 按变更类型选择项目变更 / 项目备案 MK 业务类型 */
-export function resolveProjectChangeMkBizType(changeType) {
-  return PROJECT_RECORD_CHANGE_TYPES.includes(String(changeType || '').trim())
-    ? 'project-record-change'
-    : 'project-change';
-}
-
 /** 进程内缓存，避免每次提交都打字典；登录后同一会话开关一般不变 */
 let mkEnabledCache = null;
 let mkEnabledPromise = null;
@@ -199,7 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
  * @param {string} [options.subjectName] 标题后缀
  * @param {string} [options.approvalStatus] 提交前的审批状态
  * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
- * @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType、用印类型 sealTypes）
+ * @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType）
  * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
  */
 export async function submitMkApprovalFlow({

src/utils/settlement-seal.js

@@ -1,31 +0,0 @@
-/** 结算单用印类型固定选项（展示顺序固定） */
-export const SETTLEMENT_SEAL_TYPE_OPTIONS = [
-  { dictKey: '公章', dictValue: '公章' },
-  { dictKey: '业务章', dictValue: '业务章' },
-];
-
-const SEAL_TYPE_ORDER = SETTLEMENT_SEAL_TYPE_OPTIONS.map(item => item.dictKey);
-
-/**
- * 解析用印类型为数组（兼容顿号、逗号分隔）
- */
-export const parseSealTypes = value => {
-  if (Array.isArray(value)) {
-    return value.map(item => String(item || '').trim()).filter(Boolean);
-  }
-  if (value === undefined || value === null || value === '') {
-    return [];
-  }
-  return String(value)
-    .split(/[、,，\s]+/)
-    .map(item => item.trim())
-    .filter(Boolean);
-};
-
-/**
- * 用印类型按固定顺序顿号拼接，供保存与列表展示
- */
-export const formatSealTypes = value => {
-  const selected = new Set(parseSealTypes(value));
-  return SEAL_TYPE_ORDER.filter(item => selected.has(item)).join('、');
-};

src/views/authority/role.vue

@@ -6,7 +6,6 @@
       :data="data"
       ref="crud"
       v-model="form"
-      v-model:page="page"
       :permission="permissionList"
       :before-open="beforeOpen"
       @row-del="rowDel"
@@ -92,7 +91,6 @@
             ref="treeMenu"
             :default-checked-keys="menuTreeObj"
             :props="props"
-            @check="handleMenuCheck"
           >
           </el-tree>
         </el-tab-pane>
@@ -103,7 +101,7 @@
             style="margin-bottom: 12px; background: #f5f7fa; padding: 6px 10px; border-radius: 4px"
           >
             <span style="color: #606266; font-size: 13px"
-              >菜单权限勾选/反选会自动同步到此页；仅展示已勾选菜单，已配置的数据权限会保留。可再调整勾选后点击「设置」批量配置</span
+              >勾选多个菜单后点击「设置」，可批量配置数据权限；设置后菜单旁展示当前范围</span
             >
             <el-button type="primary" size="small" @click="openDataScopeSetting">设置</el-button>
           </el-row>
@@ -192,8 +190,20 @@
             <el-radio :value="1">所在部门及下级</el-radio>
             <el-radio :value="2">全部组织</el-radio>
             <el-radio :value="3">本人创建</el-radio>
+            <el-radio :value="4">自定义组织</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item v-if="Number(dataScopeSetting.scopeType) === 4" label="组织">
+          <el-tree
+            ref="treeCustomDept"
+            :data="deptTree"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            :props="{ label: 'title', children: 'children' }"
+            style="width: 100%; max-height: 320px; overflow: auto; border: 1px solid #ebeef5; padding: 8px"
+          />
+        </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -217,6 +227,7 @@ import {
   update,
 } from '@/api/system/role';
 import { getRoleMenuDataScopeTree, submitRoleMenuDataScope } from '@/api/system/roleDataScope';
+import { getDeptTree } from '@/api/system/dept';
 import { mapGetters } from 'vuex';
 import website from '@/config/website';
 
@@ -241,6 +252,7 @@ export default {
       currentRoleName: '',
       roleDataScopeMenuTree: [],
       roleDataScopeMap: {},
+      deptTree: [],
       dataScopeSetting: {
         roleName: '',
         scopeType: 2,
@@ -417,11 +429,6 @@ export default {
       if (!tree) return;
       const allKeys = this.getAllNodeKeys(dataList);
       tree.setCheckedKeys(allKeys);
-      if (treeRef === 'treeMenu') {
-        this.$nextTick(() => {
-          this.syncDataScopeTreeFromMenu();
-        });
-      }
     },
     handleInvertSelect(treeRef, dataList, isLinked) {
       const tree = this.$refs[treeRef];
@@ -436,11 +443,6 @@ export default {
         const invertedKeys = allKeys.filter(key => !checkedKeys.has(key));
         tree.setCheckedKeys(invertedKeys);
       }
-      if (treeRef === 'treeMenu') {
-        this.$nextTick(() => {
-          this.syncDataScopeTreeFromMenu();
-        });
-      }
     },
     handleLinkedChange(treeRef) {
       const tree = this.$refs[treeRef];
@@ -449,9 +451,6 @@ export default {
       const halfCheckedKeys = tree.getHalfCheckedKeys();
       this.$nextTick(() => {
         tree.setCheckedKeys([...checkedKeys, ...halfCheckedKeys]);
-        if (treeRef === 'treeMenu') {
-          this.syncDataScopeTreeFromMenu();
-        }
       });
     },
     // el-tree 会把 setCheckedKeys 的入参记录为默认勾选集并在树数据重载时回放，
@@ -461,50 +460,6 @@ export default {
       if (!tree) return;
       tree.setCheckedKeys(keys);
     },
-    handleMenuCheck() {
-      this.syncDataScopeTreeFromMenu();
-    },
-    /**
-     * 按当前菜单权限勾选结果过滤数据权限树，并同步勾选状态。
-     * 取消勾选的菜单从数据权限树移除；已配置的数据权限标签仍保留在 roleDataScopeMap。
-     */
-    syncDataScopeTreeFromMenu() {
-      const treeMenu = this.$refs.treeMenu;
-      if (!treeMenu) {
-        return;
-      }
-      const checkedKeys = treeMenu.getCheckedKeys() || [];
-      const checkedKeySet = new Set(checkedKeys);
-      this.roleDataScopeMenuTree = this.filterMenuTreeByChecked(this.menuGrantList, checkedKeySet);
-      this.$nextTick(() => {
-        const treeDataScope = this.$refs.treeRoleDataScope;
-        if (!treeDataScope) {
-          return;
-        }
-        const visibleKeys = new Set(this.getAllNodeKeys(this.roleDataScopeMenuTree));
-        const syncKeys = checkedKeys.filter(key => visibleKeys.has(key));
-        treeDataScope.setCheckedKeys(syncKeys);
-      });
-    },
-    /**
-     * 仅保留已勾选菜单及其祖先节点，保持树层级。
-     */
-    filterMenuTreeByChecked(nodes, checkedKeySet) {
-      if (!nodes || nodes.length === 0) {
-        return [];
-      }
-      const result = [];
-      nodes.forEach(node => {
-        const children = this.filterMenuTreeByChecked(node.children || [], checkedKeySet);
-        if (checkedKeySet.has(node.id) || children.length > 0) {
-          result.push({
-            ...node,
-            children,
-          });
-        }
-      });
-      return result;
-    },
     submit() {
       const menuList = this.$refs.treeMenu.getCheckedKeys();
       const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
@@ -528,7 +483,7 @@ export default {
       return getRoleMenuDataScopeTree(roleId).then(res => {
         const data = res.data.data || {};
         this.currentRoleName = data.roleName || '';
-        // 菜单树由菜单权限勾选实时联动生成；这里只加载已配置的数据权限标签
+        this.roleDataScopeMenuTree = data.menuTree || [];
         const scopeMap = {};
         (data.scopes || []).forEach(item => {
           scopeMap[String(item.menuId)] = item;
@@ -551,7 +506,20 @@ export default {
         scopeType: 2,
         menuIds,
       };
-      this.dataScopeSettingBox = true;
+      const loadDept =
+        this.deptTree && this.deptTree.length
+          ? Promise.resolve()
+          : getDeptTree(this.userInfo.tenantId).then(res => {
+              this.deptTree = res.data.data || [];
+            });
+      loadDept.then(() => {
+        this.dataScopeSettingBox = true;
+        this.$nextTick(() => {
+          if (this.$refs.treeCustomDept) {
+            this.$refs.treeCustomDept.setCheckedKeys([]);
+          }
+        });
+      });
     },
     submitDataScopeSetting() {
       const roleId = this.currentRoleIds && this.currentRoleIds[0];
@@ -560,17 +528,27 @@ export default {
         return;
       }
       const scopeType = Number(this.dataScopeSetting.scopeType || 2);
+      let deptIds = [];
+      if (scopeType === 4) {
+        deptIds = this.$refs.treeCustomDept ? this.$refs.treeCustomDept.getCheckedKeys() : [];
+        if (!deptIds.length) {
+          this.$message.warning('自定义组织时请勾选组织');
+          return;
+        }
+      }
       submitRoleMenuDataScope({
         roleId,
         menuIds: this.dataScopeSetting.menuIds,
         scopeType,
-        deptIds: [],
+        deptIds,
       }).then(() => {
         this.$message.success('数据权限设置成功');
         this.dataScopeSettingBox = false;
         this.loadRoleDataScopeTree(roleId).then(() => {
           this.$nextTick(() => {
-            this.syncDataScopeTreeFromMenu();
+            if (this.$refs.treeRoleDataScope) {
+              this.$refs.treeRoleDataScope.setCheckedKeys([]);
+            }
           });
         });
       });
@@ -684,7 +662,6 @@ export default {
         this.$nextTick(() => {
           this.applyCheckedKeys('treeMenu', this.menuTreeObj);
           this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          this.syncDataScopeTreeFromMenu();
         });
       });
     },
@@ -704,7 +681,6 @@ export default {
         this.$nextTick(() => {
           this.applyCheckedKeys('treeMenu', this.menuTreeObj);
           this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          this.syncDataScopeTreeFromMenu();
         });
       });
     },
@@ -753,9 +729,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data || {};
-        this.data = data.records || [];
-        this.page.total = data.total || 0;
+        this.data = res.data.data;
         this.loading = false;
         this.selectionClear();
       });

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.carrierPartyRole = route.carrierType !== '自运' ? contract?.carrierPartyRole || '' : '';
-      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || contract?.customerId || '' : '';
+      route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
       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(
-        '__'
-      );
-    },
-    carrierSelectedValue(route = {}) {
-      return this.carrierOptionValue({
-        contractId: route.carrierContractId,
-        carrierPartyId: route.carrierPartyId,
-        carrierName: route.carrierName,
-      });
+      return item.contractId || item.id || item.value || item.carrierName || '';
     },
     carrierOptionLabel(item) {
-      const roleLabel = item.carrierPartyRole === 'C' ? '丙方' : item.carrierPartyRole === 'B' ? '乙方' : '';
-      const nameWithRole =
-        roleLabel && item.carrierName ? `${item.carrierName}（${roleLabel}）` : item.carrierName;
+      const duplicateCount = this.carrierOptions.filter(option => option.carrierName === item.carrierName).length;
+      if (duplicateCount <= 1) {
+        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

@@ -1861,7 +1861,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="司机">
+            <el-form-item label="司机" required>
               <el-autocomplete
                 v-model="dispatchItemForm.driverName"
                 placeholder="请输入"
@@ -1878,6 +1878,7 @@
             </el-form-item>
             <el-form-item
               :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
+              required
             >
               <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
             </el-form-item>
@@ -2103,7 +2104,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="司机">
+          <el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
             <el-autocomplete
               v-model="dispatchItemForm.driverName"
               placeholder="请输入"
@@ -2114,7 +2115,7 @@
               @select="item => handleTaskDriverSelect('dispatch', item)"
             />
           </el-form-item>
-          <el-form-item v-if="dispatchIsRoadTransport" label="手机号">
+          <el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
             <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
           </el-form-item>
           <el-form-item
@@ -3948,9 +3949,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatDispatchQuantity(group.quantity);
-          const typeName =
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
         })
         .join('； ');
     },
@@ -7548,13 +7549,12 @@ export default {
       }, {});
 
       const cargoInfo = Object.values(groups)
-        .map(group => {
-          const typeName =
-            group.count > 1 ? `${group.cargoType}等${group.count}种货物` : group.cargoType;
-          return `${typeName} | ${this.formatDispatchQuantity(group.quantity)}${
-            group.unit ? ` ${group.unit}` : ''
-          }`;
-        })
+        .map(
+          group =>
+            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
+              group.quantity
+            )}${group.unit ? ` ${group.unit}` : ''}`
+        )
         .join('； ');
       return cargoInfo || plan.goodsInfo || '';
     },
@@ -8364,7 +8364,19 @@ export default {
       }
       const fullEntry = row.taskEntryMode === 'full';
       const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
-      // 司机与手机号对全部承运类型（承运商 / 自运 / 平台）都是选填，填了才校验格式与长度
+      if (fullEntry) {
+        // 公路运输时司机/手机号一律必填（含承运类型为承运商）
+        if (roadTransport && row.carrierType) {
+          requiredFields.push(['driverName', '司机']);
+          requiredFields.push(['driverPhone', '手机号']);
+        }
+      } else if (row.carrierType) {
+        requiredFields.push(['driverName', '司机']);
+        requiredFields.push([
+          'driverPhone',
+          row.carrierType === '承运商' ? '手机号' : '司机手机号',
+        ]);
+      }
       const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
       if (emptyField) return requiredMessage(emptyField[1]);
 

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}）`"
-          name="duplicate" /><el-tab-pane
-          :label="`与已有运单重复（${historyDuplicateRows.length}）`"
-          name="history" /></el-tabs
+          :label="`疑似重复（${duplicateRows.length}）`"
+          name="duplicate" /></el-tabs
       ><el-table
         :data="previewRows"
         border
         max-height="440"
-        :row-class-name="
-          ({ row }) => (row._duplicate || row._historyWaybillNo ? 'is-duplicate-row' : '')
-        "
+        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
         @selection-change="rowSelection = $event"
         ><el-table-column type="selection" width="55" /><el-table-column
           type="index"
           label="序号"
           width="65"
         /><el-table-column
-          v-for="column in previewColumns"
+          v-for="column in detailColumns"
           :key="column.prop"
           :prop="column.prop"
           :label="column.label"
@@ -587,6 +583,8 @@
                 ><el-link type="primary" @click="saveRow(row)">保存</el-link
                 ><el-link type="primary" @click="cancelRow(row)">取消</el-link></template
               ><template v-else
+                ><el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)"
+                  >确认</el-link
                 ><el-link type="primary" @click="editRow(row)">编辑</el-link
                 ><el-link type="danger" @click="deleteRow(row)">删除</el-link></template
               ></div
@@ -718,12 +716,9 @@ const transportTypeOptions = ref([]),
 const rowSelection = ref([]),
   previewTab = ref('all');
 const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
-const historyDuplicateRows = computed(() => rows.value.filter(row => row._historyWaybillNo));
-const previewRows = computed(() => {
-  if (previewTab.value === 'duplicate') return duplicateRows.value;
-  if (previewTab.value === 'history') return historyDuplicateRows.value;
-  return rows.value;
-});
+const previewRows = computed(() =>
+  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
+);
 const carrierContractsLoaded = ref(false),
   hasCarrierContracts = ref(null);
 const carrierTypes = ['承运商', '自运'];
@@ -800,16 +795,6 @@ const detailColumns = [
   { prop: 'remark', label: '备注', editor: 'textarea', minWidth: 200 },
   { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
 ];
-// 与已有运单重复页签的列与明细一致，只在运单批次号后多一列已有运单号。
-const previewColumns = computed(() =>
-  previewTab.value === 'history'
-    ? [
-        detailColumns[0],
-        { prop: '_historyWaybillNo', label: '已有运单号', minWidth: 220 },
-        ...detailColumns.slice(1),
-      ]
-    : detailColumns
-);
 const requiredDetailFields = [
   { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
   { prop: 'transportType', label: '运输方式' },
@@ -1202,7 +1187,6 @@ const loadBatchRows = async batchId => {
     batchNo: item.batchNo || form.batchNo,
   }));
   refreshDuplicateFlags();
-  await refreshHistoryDuplicates();
   rowSelection.value = [];
   previewTab.value = 'all';
 };
@@ -1525,8 +1509,6 @@ const fileChange = async (file, list) => {
   if (isValid) {
     // 校验通过，填充表格数据
     rows.value = parsedRows;
-    // 传 rows.value（响应式代理），否则后续写入不触发重新渲染
-    await refreshHistoryDuplicates(rows.value);
   } else {
     // 校验失败，清空数据
     rows.value = [];
@@ -1544,12 +1526,16 @@ const IMPORT_BATCH_SIZE = 100;
 
 const importFieldText = value => String(value ?? '').trim();
 
-/** 同一运单批次号下，全部导入字段一致时标记为 Excel 内重复。 */
+/** 同一运单批次号下，全部导入字段一致时标记为疑似重复。已在线确认的行不再标为重复。 */
 const refreshDuplicateFlags = (list = rows.value) => {
   const groups = new Map();
   list.forEach(row => {
     const signature = detailColumns.map(column => importFieldText(row[column.prop])).join('\u0001');
     const batchNo = importFieldText(row.batchNo || form.batchNo);
+    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
+      row._duplicateConfirmed = false;
+    }
+    row._duplicateSignature = signature;
     const groupKey = `${batchNo}\u0002${signature}`;
     const group = groups.get(groupKey) || [];
     group.push(row);
@@ -1558,39 +1544,19 @@ const refreshDuplicateFlags = (list = rows.value) => {
   groups.forEach(group => {
     const duplicated = group.length > 1;
     group.forEach(row => {
-      row._duplicate = duplicated;
+      row._duplicate = duplicated && !row._duplicateConfirmed;
     });
   });
 };
 
-/** 逐行提交给后端与项目下已有运单比对，命中的行带上已有运单号。比对失败不影响导入。 */
-const refreshHistoryDuplicates = async (list = rows.value) => {
-  if (!list.length || !form.projectId) {
-    list.forEach(row => {
-      row._historyWaybillNo = '';
-    });
-    return;
-  }
-  let duplicates = [];
-  try {
-    const res = await api.checkImportDuplicates(buildImportPayload(form.status, list));
-    const data = res?.data?.data ?? res?.data ?? res;
-    duplicates = Array.isArray(data) ? data : [];
-  } catch (error) {
-    console.error('与已有运单重复校验失败:', error);
-    duplicates = [];
-  }
-  const numbersByRow = new Map(
-    duplicates.map(item => [item.rowIndex, (item.waybillNos || []).filter(Boolean)])
-  );
-  list.forEach((row, index) => {
-    row._historyWaybillNo = (numbersByRow.get(index) || []).join('、');
-  });
+const confirmDuplicateRow = row => {
+  row._duplicateConfirmed = true;
+  refreshDuplicateFlags();
+  ElMessage.success('已确认，该行将按正常数据导入');
 };
 
 const stripInternalRowFields = row => {
-  const { _key, _duplicate, _duplicateKey, _editing, _editSnapshot, _historyWaybillNo, ...data } =
-    row;
+  const { _key, _duplicate, _duplicateKey, _duplicateConfirmed, _duplicateSignature, _editing, _editSnapshot, ...data } = row;
   return data;
 };
 
@@ -1805,7 +1771,6 @@ const saveRow = row => {
   row._editing = false;
   delete row._editSnapshot;
   refreshDuplicateFlags();
-  refreshHistoryDuplicates();
 };
 const cancelRow = row => {
   if (row._editSnapshot) Object.assign(row, row._editSnapshot);
@@ -1815,14 +1780,12 @@ const cancelRow = row => {
 const deleteRow = row => {
   rows.value = rows.value.filter(item => item !== row);
   refreshDuplicateFlags();
-  refreshHistoryDuplicates();
 };
 const removeSelectedRows = () => {
   const keys = new Set(rowSelection.value.map(row => row._key));
   rows.value = rows.value.filter(row => !keys.has(row._key));
   rowSelection.value = [];
   refreshDuplicateFlags();
-  refreshHistoryDuplicates();
 };
 const normalizeOptionalPlanId = value => {
   if (value === undefined || value === null || value === '') return null;
@@ -1886,11 +1849,7 @@ const confirmImport = async () => {
   await formRef.value?.validate();
   if (!validateImportRows()) return;
   const count = rows.value.filter(row => row._duplicate).length;
-  if (count)
-    await ElMessageBox.confirm(`当前导入有${count}条Excel内重复数据，是否确认导入？`, '提示');
-  const historyCount = rows.value.filter(row => row._historyWaybillNo).length;
-  if (historyCount)
-    await ElMessageBox.confirm(`当前导入有${historyCount}条与已有运单重复，是否确认导入？`, '提示');
+  if (count) await ElMessageBox.confirm(`当前导入有${count}条疑似重复数据，是否确认导入？`, '提示');
   if (form.importType === 'settlement' && form.status === 'completed')
     await ElMessageBox.confirm('确认后将同时生成运单、应收应付明细、计结算单，是否继续？', '提示');
 

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"
                 />
@@ -1599,7 +1599,14 @@
           <el-link type="primary" v-if="canCancel(row)" @click="handleAction('cancel', row)">
             取消
           </el-link>
-          <el-link type="primary" v-if="canComplete(row)" @click="handleComplete(row)">
+          <el-link type="primary" v-if="canComplete(row)" @click="handleAction('complete', row)">
+            {{ completeActionLabel }}
+          </el-link>
+          <el-link
+            type="primary"
+            v-if="canConfirmReturn(row)"
+            @click="handleAction('confirmReturn', row)"
+          >
             {{ completeActionLabel }}
           </el-link>
           <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
@@ -4643,14 +4650,9 @@ export default {
     },
     taskCarrierValue: {
       get() {
-        if (this.form.carrierType === '自运') {
-          return this.form.carrierName || '';
-        }
-        return this.taskCarrierOptionValue({
-          carrierContractId: this.form.carrierContractId,
-          carrierPartyId: this.form.carrierPartyId,
-          carrierName: this.form.carrierName,
-        });
+        return this.form.carrierType === '自运'
+          ? this.form.carrierName || ''
+          : this.form.carrierContractId || this.form.carrierName || '';
       },
       set(value) {
         this.handleTaskCarrierChange(value);
@@ -5011,9 +5013,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatQuantity(group.quantity);
-          const typeName =
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
+            group.unit ? ` ${group.unit}` : ''
+          }`;
         })
         .join('； ');
     },
@@ -5171,9 +5173,12 @@ export default {
         return false;
       }
       const status = this.statusValue(row);
-      // 同一枚「完成」按钮覆盖两种状态：待回单确认走确认回单（后端校验司机打卡节点齐全且无未了结异常），
-      // 进行中/处理中二次确认后直接置完成
-      return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
+      return status === 'processing' || status === 'running';
     },
     canConfirmReturn(row) {
       return (
@@ -7285,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;
@@ -7301,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) {
@@ -7759,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 = '';
@@ -7815,9 +7814,7 @@ export default {
     },
     taskCarrierOptionValue(item = {}) {
       if (this.form.carrierType !== '自运') {
-        if (item.value) return item.value;
-        return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
-          .join('__');
+        return item.carrierContractId || item.value || item.id || '';
       }
       return (
         item.carrierName ||
@@ -7855,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 = [];
-      contracts.forEach(contract => {
-        if (!contract?.id) return;
-        const parties = [
-          ...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
-          ...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
-        ];
-        if (!parties.length) {
-          const fallbackName = String(
+      const carrierNameCounts = contracts.reduce((counts, contract) => {
+        const carrierName = String(
+          contract.partyB ||
+          contract.partyBName ||
+          contract.contractPartyB ||
+          contract.customerContractPartyB ||
+          contract.secondParty ||
+          contract.secondPartyName ||
+          ''
+        ).trim();
+        if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
+        return counts;
+      }, {});
+      return contracts
+        .map(contract => {
+          const carrierName = String(
             contract.partyB ||
-              contract.partyBName ||
-              contract.contractPartyB ||
-              contract.customerContractPartyB ||
-              contract.secondParty ||
-              contract.secondPartyName ||
-              ''
+            contract.partyBName ||
+            contract.contractPartyB ||
+            contract.customerContractPartyB ||
+            contract.secondParty ||
+            contract.secondPartyName ||
+            ''
           ).trim();
-          if (fallbackName) {
-            parties.push({
-              id: '',
-              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({
+          if (!carrierName || !contract.id) return null;
+          const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
+          return {
             id: contract.id,
-            carrierId: party.customerId || '',
-            value: optionValue,
-            label: `${party.customerName}（${roleLabel}） - ${contractIdentifier}`,
-            carrierName: party.customerName,
-            fullName: party.customerName,
+            carrierId:
+              contract.partyBId ||
+              contract.partyBUserId ||
+              contract.contractPartyBId ||
+              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 || '',
-          });
-        });
-      });
-      return options;
+          };
+        })
+        .filter(Boolean);
     },
     resetWaybillCarrierContractState() {
       this.waybillCarrierContractRequestId += 1;
@@ -7954,8 +7930,6 @@ export default {
             this.form.carrierName = '';
             this.form.carrierId = '';
             this.form.carrierContractId = '';
-            this.form.carrierPartyId = '';
-            this.form.carrierPartyRole = '';
           }
           return options;
         })
@@ -8046,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 || '';
       }
       // 承运商变更后清空司机/车辆，避免跨组织脏数据
@@ -8443,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]));
@@ -10242,14 +10213,6 @@ export default {
       this.mileageForm = { id: '', mileage: '', mileageRemark: '' };
       this.$refs.mileageFormRef?.clearValidate();
     },
-    // 行操作「完成」的唯一入口：待回单确认的运单走确认回单（后端校验司机打卡节点齐全且无未了结异常，
-    // 配置里没有确认回单动作时退回普通完成）；进行中/处理中的运单二次确认后直接置完成。
-    handleComplete(row) {
-      if (this.canConfirmReturn(row)) {
-        return this.handleAction('confirmReturn', row);
-      }
-      return this.handleAction('complete', row);
-    },
     handleAction(action, row) {
       if (action === 'reassign') {
         this.openReassignDrawer(row);
@@ -10263,13 +10226,11 @@ export default {
         reassign: '重新派单',
         confirmReturn: '完成',
       }[action];
-      // 回单确认与「完成」都是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
-      let confirmText = `确定${actionName}该${this.config.title}?`;
-      if (action === 'confirmReturn') {
-        confirmText = '回单确认后该运单将置为已完成，且不可撤销。是否继续?';
-      } else if (action === 'complete') {
-        confirmText = `确定完成该${this.config.title}?完成后将置为已完成，且不可撤销。`;
-      }
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      const confirmText =
+        action === 'confirmReturn'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
+          : `确定${actionName}该${this.config.title}?`;
       this.$confirm(confirmText, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/business/contract-change-public-view.vue

@@ -13,18 +13,8 @@ export default {
   components: { MkPublicShell, ContractManageChange },
   methods: {
     getForm() {
-      const page = this.$refs.page;
-      const row = page?.form || {};
-      return {
-        ...row,
-        partyAJson: row.partyAJson || '',
-        partyBJson: row.partyBJson || '',
-        partyCJson: row.partyCJson || '',
-        partyARows: page?.partyARows || [],
-        partyBRows: page?.partyBRows || [],
-        partyCRows: page?.partyCRows || [],
-        subject: row.contractName || row.contractNo || '',
-      };
+      const row = this.$refs.page?.form || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
     },
   },
 };

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

@@ -66,41 +66,14 @@
           <el-form-item label="项目">
             <el-input v-model="form.projectName" disabled />
           </el-form-item>
-          <el-form-item label="合同负责部门" prop="organizationName">
-            <el-select
-              v-model="selectedOrganizationId"
-              placeholder="请选择"
-              filterable
-              clearable
-              :loading="businessDeptLoading"
-              :disabled="isSettlementRuleChange"
-              @visible-change="visible => visible && loadBusinessDeptOptions()"
-              @change="handleOrganizationChange"
-            >
-              <el-option
-                v-for="item in businessDeptOptions"
-                :key="item.id"
-                :label="item.label"
-                :value="item.id"
-              />
-            </el-select>
+          <el-form-item label="合同负责部门">
+            <el-input v-model="form.organizationName" disabled />
           </el-form-item>
-          <el-form-item label="平台公司" prop="platformCompanyName">
-            <el-select
-              v-model="form.platformCompanyId"
-              placeholder="请选择平台公司"
-              filterable
-              clearable
-              :disabled="isSettlementRuleChange || !form.projectId"
-              @change="handlePlatformCompanyChange"
-            >
-              <el-option
-                v-for="item in platformCompanyOptions"
-                :key="item.id"
-                :label="item.label"
-                :value="item.id"
-              />
-            </el-select>
+          <el-form-item label="甲方">
+            <el-input v-model="form.partyA" disabled />
+          </el-form-item>
+          <el-form-item label="乙方">
+            <el-input v-model="form.partyB" disabled />
           </el-form-item>
           <el-form-item label="签订日期">
             <el-date-picker
@@ -299,29 +272,6 @@
         </div>
       </section>
 
-      <section
-        v-for="party in partySections"
-        :key="party.role"
-        class="change-section contract-party-section"
-      >
-        <div class="dialog-section-title">{{ party.label }}</div>
-        <el-table :data="party.rows" border empty-text="暂无数据" class="change-table">
-          <el-table-column type="index" label="序号" width="70" align="center" />
-          <el-table-column prop="customerName" label="客商名称" min-width="200" align="center">
-            <template #default="{ row }">{{ row.customerName || '-' }}</template>
-          </el-table-column>
-          <el-table-column prop="creditCode" label="统一信用代码" min-width="180" align="center">
-            <template #default="{ row }">{{ row.creditCode || '-' }}</template>
-          </el-table-column>
-          <el-table-column prop="contactName" label="联系人" min-width="160" align="center">
-            <template #default="{ row }">{{ row.contactName || '-' }}</template>
-          </el-table-column>
-          <el-table-column prop="contactPhone" label="联系电话" min-width="150" align="center">
-            <template #default="{ row }">{{ row.contactPhone || '-' }}</template>
-          </el-table-column>
-        </el-table>
-      </section>
-
       <contract-attachment-section
         title="用印材料"
         description
@@ -349,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-column type="index" label="序号" width="70" />
-          <el-table-column prop="planName" label="方案名称" min-width="180" />
-          <el-table-column label="适用客商" min-width="180">
-            <template #default="{ row }">
-              {{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="remark" label="备注" min-width="200" />
-          <el-table-column v-if="!pageReadonly" label="操作" width="180">
-            <template #default="{ row, $index }">
-              <el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
-              <el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
-            </template>
-          </el-table-column>
-          <el-table-column v-else label="操作" width="100">
-            <template #default="{ row, $index }">
-              <el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-table :data="plans" border class="change-table"
+          ><el-table-column type="index" label="序号" width="70" /><el-table-column
+            prop="planName"
+            label="方案名称"
+            min-width="220"
+          /><el-table-column label="默认方案" min-width="120"
+            ><template #default="{ row }">{{
+              row.defaultPlan ? '是' : '否'
+            }}</template></el-table-column
+          ><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
+            v-if="!pageReadonly"
+            label="操作"
+            width="180"
+            ><template #default="{ row, $index }"
+              ><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
+              ><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
+            ></el-table-column
+          ></el-table
+        >
       </section>
 
       <section class="change-section">
@@ -543,9 +491,7 @@
         v-model="planDialogVisible"
         :value="planEditor"
         :index="planEditorIndex"
-        :readonly="pageReadonly"
         :settlement-currency="form.settlementCurrency"
-        :party-options="billingPartyOptions"
         @save="savePlan"
       />
 
@@ -605,11 +551,8 @@
 <script>
 import * as contractApi from '@/api/business/contract-manage';
 import * as changeApi from '@/api/business/contract-change';
-import { getDetail as getProjectDetail } from '@/api/business/project-apply';
-import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
-import { normalizeBusinessDeptOptions } from '@/utils/dept';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
   isContractSealMaterialLocation,
@@ -687,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() {
@@ -733,9 +637,6 @@ export default {
       form: {},
       period: [],
       plans: [],
-      partyARows: [],
-      partyBRows: [],
-      partyCRows: [],
       attachments: [],
       contractFiles: [],
       contractFileRows: [],
@@ -773,12 +674,8 @@ export default {
       settlementCurrencyOptions: [],
       settlementModeDictOptions: [],
       contractFormatDictOptions: [],
-      selectedOrganizationId: '',
-      businessDeptOptions: [],
-      businessDeptLoading: false,
-      platformCompanyOptions: [],
       planDialogVisible: false,
-      planEditor: { planName: '', remark: '', rules: [] },
+      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
       planEditorIndex: -1,
       billingElements: [
         '按重量',
@@ -809,34 +706,6 @@ export default {
           },
         ],
         contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
-        organizationName: [
-          {
-            validator: (rule, value, callback) => {
-              if (this.isSettlementRuleChange) {
-                return callback();
-              }
-              if (!String(value || '').trim()) {
-                return callback(new Error('请选择合同负责部门'));
-              }
-              callback();
-            },
-            trigger: 'change',
-          },
-        ],
-        platformCompanyName: [
-          {
-            validator: (rule, value, callback) => {
-              if (this.isSettlementRuleChange) {
-                return callback();
-              }
-              if (!String(value || '').trim()) {
-                return callback(new Error('请选择平台公司'));
-              }
-              callback();
-            },
-            trigger: 'change',
-          },
-        ],
         contractAmount: [
           { required: true, message: '请输入合同金额', trigger: 'blur' },
           {
@@ -884,39 +753,9 @@ export default {
         .join('、');
       return `【${parties || '相对方'}】：被列入外部黑名单；涉贪污受贿裁判相关提及方（3年以上及其他）；被执行人信息；买卖合同纠纷；劳动纠纷；重大纠纷。提交变更前须上传「特批附件」类型附件`;
     },
-    partySections() {
-      return [
-        { role: 'A', label: '甲方', rows: this.partyARows },
-        { role: 'B', label: '乙方', rows: this.partyBRows },
-        { role: 'C', label: '丙方', rows: this.partyCRows },
-      ];
-    },
     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 ['变更材料'];
@@ -989,136 +828,6 @@ export default {
     formatContractAmountField() {
       this.form.contractAmount = formatContractAmountInput(this.form.contractAmount);
     },
-    handleOrganizationChange(id) {
-      const organizationId = Array.isArray(id) ? id.at(-1) : id;
-      const organization = this.businessDeptOptions.find(
-        item => String(item.id) === String(organizationId)
-      );
-      Object.assign(
-        this.form,
-        organization
-          ? {
-              organizationId: organization.id,
-              organizationName: organization.rawLabel || organization.label,
-            }
-          : { organizationId: '', organizationName: '' }
-      );
-      this.selectedOrganizationId = this.form.organizationId
-        ? String(this.form.organizationId)
-        : '';
-    },
-    handlePlatformCompanyChange(value) {
-      const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
-      this.form.platformCompanyId = matched ? matched.id : '';
-      this.form.platformCompanyName = matched ? matched.label : '';
-    },
-    loadBusinessDeptOptions() {
-      if (this.businessDeptLoading) return;
-      this.businessDeptLoading = true;
-      getBusinessDeptSelect()
-        .then(res => {
-          this.businessDeptOptions = normalizeBusinessDeptOptions(res.data?.data || []);
-          this.syncCurrentBusinessDeptOption();
-        })
-        .finally(() => {
-          this.businessDeptLoading = false;
-        });
-    },
-    syncCurrentBusinessDeptOption() {
-      if (!this.form.organizationId || !this.form.organizationName) return;
-      if (
-        this.businessDeptOptions.some(item => String(item.id) === String(this.form.organizationId))
-      ) {
-        return;
-      }
-      this.businessDeptOptions.unshift({
-        id: String(this.form.organizationId),
-        value: String(this.form.organizationId),
-        label: this.form.organizationName,
-        rawLabel: this.form.organizationName,
-      });
-    },
-    parseUndertakeDeptIds(value) {
-      if (Array.isArray(value)) {
-        return value.map(item => String(item || '').trim()).filter(Boolean);
-      }
-      return String(value || '')
-        .split(',')
-        .map(item => item.trim())
-        .filter(Boolean);
-    },
-    parseUndertakeDeptNames(value) {
-      if (Array.isArray(value)) {
-        return value.map(item => String(item || '').trim()).filter(Boolean);
-      }
-      return String(value || '')
-        .split(/[、,，]/)
-        .map(item => item.trim())
-        .filter(Boolean);
-    },
-    loadProjectPlatformCompanies() {
-      const projectId = this.form.projectId;
-      if (!projectId || String(projectId) === '-1') {
-        this.syncCurrentPlatformCompanyOption();
-        return Promise.resolve([]);
-      }
-      return getProjectDetail(projectId)
-        .then(res => {
-          const project = res.data?.data || res.data || {};
-          const ids = this.parseUndertakeDeptIds(project.undertakeDeptId);
-          const names = this.parseUndertakeDeptNames(project.undertakeDeptName);
-          return this.resolveProjectPlatformCompanyOptions(ids, names);
-        })
-        .then(options => {
-          this.platformCompanyOptions = options;
-          this.syncCurrentPlatformCompanyOption();
-          return options;
-        })
-        .catch(() => {
-          this.syncCurrentPlatformCompanyOption();
-          return this.platformCompanyOptions;
-        });
-    },
-    resolveProjectPlatformCompanyOptions(ids, names) {
-      const fallback = ids.map((id, index) => ({
-        id: String(id),
-        label: names[index] || String(id),
-      }));
-      if (!ids.length) return Promise.resolve([]);
-      return getPlatformCompanySelect()
-        .then(res => {
-          const liveList = (res.data?.data || []).map(item => ({
-            id: String(item.id),
-            label: item.deptName || item.fullName || String(item.id),
-          }));
-          return ids.map((id, index) => {
-            const name = String(names[index] || '').trim();
-            const byId = liveList.find(item => String(item.id) === String(id));
-            if (byId) return byId;
-            const byName = name ? liveList.find(item => item.label === name) : null;
-            if (byName) return byName;
-            return {
-              id: String(id),
-              label: name || String(id),
-            };
-          });
-        })
-        .catch(() => fallback);
-    },
-    syncCurrentPlatformCompanyOption() {
-      if (!this.form.platformCompanyId || !this.form.platformCompanyName) return;
-      if (
-        this.platformCompanyOptions.some(
-          item => String(item.id) === String(this.form.platformCompanyId)
-        )
-      ) {
-        return;
-      }
-      this.platformCompanyOptions.unshift({
-        id: String(this.form.platformCompanyId),
-        label: this.form.platformCompanyName,
-      });
-    },
     loadDictionaries() {
       Promise.all([
         getSystemDictionary({ code: 'currency_type' }),
@@ -1167,10 +876,6 @@ export default {
         ...data,
         // 独立变更单保留 contractId；旧路由以合同 id 作为主键
         contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
-        organizationId: data.organizationId ? String(data.organizationId) : '',
-        organizationName: data.organizationName || '',
-        platformCompanyId: data.platformCompanyId ? String(data.platformCompanyId) : '',
-        platformCompanyName: data.platformCompanyName || '',
         changeContent: isChangeRecord ? data.changeContent || '' : '',
         changeReason: isChangeRecord ? data.changeReason || '' : '',
         changeAttachmentsJson: data.changeAttachmentsJson || '',
@@ -1183,12 +888,8 @@ export default {
         archiveStatus: data.archiveStatus || '未归档',
         changeType: data.changeType || '合同信息变更',
       };
-      this.selectedOrganizationId = this.form.organizationId ? String(this.form.organizationId) : '';
       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),
@@ -1233,8 +934,6 @@ export default {
       this.feeGenerationMode =
         data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
       this.paymentRatioRows = this.parse(data.paymentRatioJson);
-      this.loadBusinessDeptOptions();
-      this.loadProjectPlatformCompanies();
     },
     goBack() {
       if (this.isContractChangeModule) {
@@ -1349,32 +1048,10 @@ export default {
         .replace(/\D/g, '')
         .replace(/^0+/, '');
     },
-    addPlan() {
-      this.planEditorIndex = -1;
-      this.planEditor = {
-        planName: `计费方案${this.plans.length + 1}`,
-        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);
-    },
+    addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
+    editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
+    toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
+    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; }); },
     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 || ''; },
@@ -1433,14 +1110,6 @@ export default {
           return;
         }
         this.form.contractNo = contractNo;
-        if (!String(this.form.organizationName || '').trim()) {
-          this.$message.warning('请选择合同负责部门');
-          return;
-        }
-        if (!String(this.form.platformCompanyName || '').trim()) {
-          this.$message.warning('请选择平台公司');
-          return;
-        }
         const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0);
         if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) {
           this.$message.warning('付款比例上限合计必须等于100%');
@@ -1490,16 +1159,6 @@ export default {
 .contract-change-page :deep(.basic-container__card) { border: 0; background: transparent; box-shadow: none; }
 .contract-change-form { background: #f5f6fa; }
 .change-section { padding: 20px 24px; background: #fff; border-bottom: 1px solid #eff1f7; margin-top: 12px; }
-.contract-party-section {
-  margin-bottom: 12px;
-  padding: 14px 16px 16px;
-  overflow: hidden;
-  background: #fff;
-  border-bottom: 0;
-  border-radius: 6px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-}
-.contract-party-section > .dialog-section-title { margin-bottom: 16px; color: #303133; }
 .contract-basic-section { margin-bottom: 12px; padding: 14px 16px 16px; overflow: hidden; background: #fff; border-bottom: 0; border-radius: 6px; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); }
 .contract-basic-section > .dialog-section-title { margin-bottom: 20px; color: #303133; }
 .contract-basic-section__grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); column-gap: 48px; }

src/views/business/contract-manage-public-view.vue

@@ -13,18 +13,8 @@ export default {
   components: { MkPublicShell, ContractManage },
   methods: {
     getForm() {
-      const page = this.$refs.page;
-      const row = page?.detailRow || {};
-      return {
-        ...row,
-        partyAJson: row.partyAJson || '',
-        partyBJson: row.partyBJson || '',
-        partyCJson: row.partyCJson || '',
-        partyARows: page?.detailPartyARows || [],
-        partyBRows: page?.detailPartyBRows || [],
-        partyCRows: page?.detailPartyCRows || [],
-        subject: row.contractName || row.contractNo || '',
-      };
+      const row = this.$refs.page?.detailRow || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
     },
   },
 };

src/views/business/contract-manage.vue

@@ -174,6 +174,9 @@
             <el-descriptions-item label="项目">{{
               detailValue('projectName')
             }}</el-descriptions-item>
+            <el-descriptions-item label="甲方">{{ detailValue('partyA') }}</el-descriptions-item>
+            <el-descriptions-item label="乙方">{{ detailValue('partyB') }}</el-descriptions-item>
+            <el-descriptions-item label="丙方">{{ detailValue('partyC') || '-' }}</el-descriptions-item>
             <el-descriptions-item label="合同期限">{{ detailContractPeriod }}</el-descriptions-item>
             <el-descriptions-item label="合同负责部门">{{
               detailValue('organizationName')
@@ -236,29 +239,6 @@
           </el-descriptions>
         </section>
 
-        <section
-          v-for="party in detailPartySections"
-          :key="`detail-${party.role}`"
-          class="contract-manage-form__section contract-manage-form__section--panel"
-        >
-          <div class="dialog-section-title">{{ party.label }}</div>
-          <el-table :data="party.rows" border empty-text="暂无数据">
-            <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column prop="customerName" label="客商名称" min-width="200" align="center">
-              <template #default="{ row }">{{ row.customerName || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="creditCode" label="统一信用代码" min-width="180" align="center">
-              <template #default="{ row }">{{ row.creditCode || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="contactName" label="联系人" min-width="160" align="center">
-              <template #default="{ row }">{{ row.contactName || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="contactPhone" label="联系电话" min-width="150" align="center">
-              <template #default="{ row }">{{ row.contactPhone || '-' }}</template>
-            </el-table-column>
-          </el-table>
-        </section>
-
         <hcs-contract-panel
           v-if="!isPublicViewPage"
           :contract="detailRow"
@@ -1225,8 +1205,7 @@ import {
   getDetail as getCustomerArchiveDetail,
   getList as getCustomerArchiveList,
 } from '@/api/vehicle/customer-archive';
-import { getBusinessDeptSelect, getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
-import { normalizeBusinessDeptOptions } from '@/utils/dept';
+import { getBusinessDeptSelect, getDeptTree } from '@/api/system/dept';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { config, option } from '@/option/business/contract-manage';
@@ -1600,9 +1579,6 @@ export default {
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       detailLoading: false,
       detailRow: {},
-      detailPartyARows: [],
-      detailPartyBRows: [],
-      detailPartyCRows: [],
       // 合规（HCS）推送/对账状态；受 thirdParty.hcs.push.immediate-enabled 控制显隐
       hcsRepushingId: null,
       hcsImmediateEnabled: false,
@@ -1731,28 +1707,12 @@ export default {
         { role: 'C', label: '丙方', rows: this.partyCRows },
       ];
     },
-    detailPartySections() {
-      return [
-        { role: 'A', label: '甲方', rows: this.detailPartyARows },
-        { role: 'B', label: '乙方', rows: this.detailPartyBRows },
-        { role: 'C', label: '丙方', rows: this.detailPartyCRows },
-      ];
-    },
-    /**
-     * 计费方案适用客商：
-     * - 客户合同：仅甲方（仅 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,
@@ -2384,6 +2344,7 @@ export default {
       if (!this.validatePartyRows(true)) return false;
       return (
         this.validateBillingPlanBindings() &&
+        this.validateBillingPlanDefault() &&
         this.validateSettlementRules() &&
         this.validatePaymentRatios()
       );
@@ -2709,55 +2670,28 @@ export default {
     applyProjectPlatformCompanies(project, autoSelect = false) {
       const ids = this.parseUndertakeDeptIds(project?.undertakeDeptId);
       const names = this.parseUndertakeDeptNames(project?.undertakeDeptName);
-      // 项目可能仍挂旧组织 ID（已删/非平台公司），按名称映射到现行「是否平台公司=是」的组织
-      return this.resolveProjectPlatformCompanyOptions(ids, names).then(options => {
-        this.platformCompanyOptions = options;
-        if (!autoSelect) {
-          this.syncCurrentPlatformCompanyOption();
-          return options;
-        }
-        if (this.platformCompanyOptions.length === 1) {
-          this.form.platformCompanyId = this.platformCompanyOptions[0].id;
-          this.form.platformCompanyName = this.platformCompanyOptions[0].label;
-        } else if (
-          !this.platformCompanyOptions.some(
-            item => String(item.id) === String(this.form.platformCompanyId)
-          )
-        ) {
-          this.form.platformCompanyId = '';
-          this.form.platformCompanyName = '';
-        } else {
-          this.handlePlatformCompanyChange(this.form.platformCompanyId);
-        }
-        if (this.formMode === 'add') this.refreshPreviewContractNo();
-        return options;
-      });
-    },
-    resolveProjectPlatformCompanyOptions(ids, names) {
-      const fallback = ids.map((id, index) => ({
+      this.platformCompanyOptions = ids.map((id, index) => ({
         id: String(id),
         label: names[index] || String(id),
       }));
-      if (!ids.length) return Promise.resolve([]);
-      return getPlatformCompanySelect()
-        .then(res => {
-          const liveList = (res.data?.data || []).map(item => ({
-            id: String(item.id),
-            label: item.deptName || item.fullName || String(item.id),
-          }));
-          return ids.map((id, index) => {
-            const name = String(names[index] || '').trim();
-            const byId = liveList.find(item => String(item.id) === String(id));
-            if (byId) return byId;
-            const byName = name ? liveList.find(item => item.label === name) : null;
-            if (byName) return byName;
-            return {
-              id: String(id),
-              label: name || String(id),
-            };
-          });
-        })
-        .catch(() => fallback);
+      if (!autoSelect) {
+        this.syncCurrentPlatformCompanyOption();
+        return;
+      }
+      if (this.platformCompanyOptions.length === 1) {
+        this.form.platformCompanyId = this.platformCompanyOptions[0].id;
+        this.form.platformCompanyName = this.platformCompanyOptions[0].label;
+      } else if (
+        !this.platformCompanyOptions.some(
+          item => String(item.id) === String(this.form.platformCompanyId)
+        )
+      ) {
+        this.form.platformCompanyId = '';
+        this.form.platformCompanyName = '';
+      } else {
+        this.handlePlatformCompanyChange(this.form.platformCompanyId);
+      }
+      if (this.formMode === 'add') this.refreshPreviewContractNo();
     },
     handlePlatformCompanyChange(value) {
       const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
@@ -3006,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;
         }
       }
@@ -3142,7 +3069,7 @@ export default {
           const message =
             error?.response?.data?.msg ||
             error?.message ||
-            '业务部门配置中未维护该平台公司与业务部门的合同编码前缀，无法自动生成，请先在业务部门配置中维护或手动输入合同编号';
+            '部门合同前缀未配置，无法自动生成，请手动输入合同编号';
           this.$message.warning(message);
         });
     },
@@ -3151,8 +3078,11 @@ export default {
       this.businessDeptLoading = true;
       getBusinessDeptSelect()
         .then(res => {
-          // 同名业务部门（不同上级公司）展示「部门（上级）」；落库仍用 rawLabel 原始部门名
-          this.businessDeptOptions = normalizeBusinessDeptOptions(res.data?.data || []);
+          this.businessDeptOptions = (res.data?.data || []).map(item => ({
+            id: String(item.id),
+            label: item.deptName || item.fullName || String(item.id),
+            rawLabel: item.deptName || item.fullName || String(item.id),
+          }));
           this.syncCurrentBusinessDeptOption();
         })
         .finally(() => {
@@ -3168,7 +3098,6 @@ export default {
       }
       this.businessDeptOptions.unshift({
         id: String(this.form.organizationId),
-        value: String(this.form.organizationId),
         label: this.form.organizationName,
         rawLabel: this.form.organizationName,
       });
@@ -3269,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;
@@ -3285,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 === '固定天数周期结算';
     },
@@ -3512,9 +3474,6 @@ export default {
         invoiceCycle: normalizeOptionalInteger(detail.invoiceCycle),
         paymentDays: normalizeOptionalInteger(detail.paymentDays),
       };
-      this.detailPartyARows = this.normalizePartyRows(detail.partyAJson, detail.partyA, true);
-      this.detailPartyBRows = this.normalizePartyRows(detail.partyBJson, detail.partyB, true);
-      this.detailPartyCRows = this.normalizePartyRows(detail.partyCJson, detail.partyC, false);
       this.detailContractFileRows = normalizeContractFileRows(parseArray(detail.contractFileJson));
       this.detailAttachmentRows = parseArray(detail.attachmentsJson);
       this.detailBillingPlanRows = parseArray(detail.billingPlanJson);
@@ -3621,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 (nameWithRole && contractLabel) {
-        return `${nameWithRole} - ${contractLabel}`;
+      if (carrierName && contractLabel) {
+        return `${carrierName}（${contractLabel}）`;
       }
-      return nameWithRole || contractLabel;
-    },
-    carrierOptionValue(item = {}) {
-      return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
-        '__'
-      );
+      return carrierName || contractLabel;
     },
     syncStandaloneTagTitle() {
       if (!this.isStandalonePage) return;
@@ -2545,9 +2524,9 @@ export default {
         Object.values(groups)
           .map(group => {
             const quantity = this.formatGoodsQuantity(group.quantity);
-            const typeName =
-              group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
-            return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+            return `${group.typeName}等${group.count}种货物 | ${quantity}${
+              group.unit ? ` ${group.unit}` : ''
+            }`;
           })
           .join('； ') || '-'
       );
@@ -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) {
-      const contract = this.taskCarrierOptions.find(
-        item =>
-          this.carrierOptionValue(item) === String(selectedValue || '') ||
-          [item.id, item.carrierName, item.partyB].some(
-            value => String(value || '') === String(selectedValue || '')
-          )
+    handleTaskCarrierChange(contractId) {
+      const contract = this.taskCarrierOptions.find(item =>
+        [item.id, item.carrierName, item.partyB].some(
+          value => String(value || '') === String(contractId || '')
+        )
       );
       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(
-              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))
-            ) ||
+            contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
             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 (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
-        this.$message.warning('发货、装货、到场至少选择一个');
-        return false;
-      }
-      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
-        this.$message.warning('卸货、到货、签收、回单至少选择一个');
-        return false;
-      }
-      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
-      const collectsCargo = CARGO_NODE_KEYS.some(key =>
-        this.nodeRows.some(
-          item =>
-            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
-        )
-      );
-      if (!collectsCargo) {
-        this.$message.warning('发货或装货至少勾选一个货量类型');
+      if (!this.enabledNodes.length) {
+        this.$message.warning('请至少选择一个过程节点');
         return false;
       }
       const transit = this.nodeRows.find(item => item.key === 'transit');

src/views/business/project-apply.vue

@@ -676,7 +676,7 @@
           <div class="project-apply-form__material-head">
             <div class="dialog-section-title project-apply-form__material-title">项目材料</div>
             <span
-              v-if="!isChangeDialog && missingRequiredAttachmentTypes.length"
+              v-if="missingRequiredAttachmentTypes.length"
               class="project-apply-form__material-warn"
             >
               未上传：{{ missingRequiredAttachmentTypes.join('、') }}
@@ -698,11 +698,7 @@
             <el-table-column type="index" label="序号" width="80" align="center" />
             <el-table-column label="附件类型" min-width="160" align="center">
               <template #default="{ row }">
-                <el-select
-                  v-model="row.fileType"
-                  placeholder="请选择"
-                  :disabled="dialogReadonly || isChangeDialog"
-                >
+                <el-select v-model="row.fileType" placeholder="请选择" :disabled="dialogReadonly">
                   <el-option
                     v-for="item in projectAttachmentTypeOptions"
                     :key="item.value"
@@ -735,7 +731,7 @@
                 <el-input
                   v-model="row.description"
                   placeholder="请输入"
-                  :disabled="dialogReadonly || isChangeDialog"
+                  :disabled="dialogReadonly"
                 />
               </template>
             </el-table-column>
@@ -745,26 +741,14 @@
             <el-table-column prop="uploadUserName" label="上传人" min-width="140" align="center" />
             <el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center"  sortable/>
             <el-table-column label="操作" width="110" align="center">
-              <template #default="{ row, $index }">
-                <el-link
-                  v-if="isChangeDialog && !dialogReadonly"
-                  type="primary"
-                  @click="openAdjustAttachmentDialog(row, $index)"
+              <template #default="{ $index }">
+                <el-link v-if="!dialogReadonly" type="danger" @click="removeAttachment($index)"
+                  >删除</el-link
                 >
-                  调整
-                </el-link>
-                <el-link
-                  v-else-if="!dialogReadonly && !isChangeDialog"
-                  type="danger"
-                  @click="removeAttachment($index)"
-                >
-                  删除
-                </el-link>
               </template>
             </el-table-column>
           </el-table>
           <vehicle-attachment-upload
-            v-if="!isChangeDialog"
             v-model="attachmentRows"
             class="project-apply-form__upload"
             :readonly="dialogReadonly"
@@ -777,147 +761,6 @@
           />
         </div>
 
-        <div v-if="isChangeDialog" class="project-apply-form__material-card">
-          <div class="project-apply-form__material-head">
-            <div class="dialog-section-title project-apply-form__material-title">调整材料</div>
-          </div>
-          <el-table :data="adjustAttachmentRows" border class="project-apply-form__material-table">
-            <el-table-column type="index" label="序号" width="80" align="center" />
-            <el-table-column label="原附件" min-width="180" align="center" show-overflow-tooltip>
-              <template #default="{ row }">
-                {{ attachmentName(row.originAttachment) || '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="附件类型" min-width="160" align="center">
-              <template #default="{ row }">{{ row.fileType || '-' }}</template>
-            </el-table-column>
-            <el-table-column
-              label="文件名"
-              min-width="220"
-              align="center"
-              show-overflow-tooltip
-              class-name="is-ellipsis-link"
-            >
-              <template #default="{ row }">
-                <span
-                  class="attachment-file-name"
-                  role="button"
-                  tabindex="0"
-                  @click="previewAttachment(row)"
-                  @keydown.enter="previewAttachment(row)"
-                  @keydown.space.prevent="previewAttachment(row)"
-                >{{ attachmentName(row) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="附件描述" min-width="200" align="center" show-overflow-tooltip>
-              <template #default="{ row }">{{ row.description || '-' }}</template>
-            </el-table-column>
-            <el-table-column label="调整原因" min-width="180" align="center" show-overflow-tooltip>
-              <template #default="{ row }">{{ row.adjustReason || '-' }}</template>
-            </el-table-column>
-            <el-table-column label="文件大小" min-width="120" align="center">
-              <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
-            </el-table-column>
-            <el-table-column prop="uploadUserName" label="上传人" min-width="140" align="center" />
-            <el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center" />
-            <el-table-column v-if="!dialogReadonly" label="操作" width="110" align="center">
-              <template #default="{ $index }">
-                <el-link type="danger" @click="removeAdjustAttachment($index)">删除</el-link>
-              </template>
-            </el-table-column>
-          </el-table>
-        </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"
@@ -1078,86 +921,6 @@
       @close="attachmentImagePreviewVisible = false"
     />
 
-    <el-dialog
-      v-model="adjustAttachmentBox"
-      title="调整材料"
-      append-to-body
-      destroy-on-close
-      width="720px"
-      class="project-apply-adjust-dialog"
-      @closed="resetAdjustAttachmentForm"
-    >
-      <el-form
-        ref="adjustAttachmentFormRef"
-        :model="adjustAttachmentForm"
-        :rules="adjustAttachmentRules"
-        label-position="right"
-        label-width="auto"
-      >
-        <el-form-item label="原附件">
-          <span>{{ attachmentName(adjustAttachmentForm.originAttachment) || '-' }}</span>
-        </el-form-item>
-        <el-form-item label="附件类型" prop="fileType">
-          <el-select v-model="adjustAttachmentForm.fileType" placeholder="请选择" clearable>
-            <el-option
-              v-for="item in projectAttachmentTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="附件文件" prop="url">
-          <div class="project-apply-adjust-dialog__upload">
-            <span
-              v-if="attachmentName(adjustAttachmentForm)"
-              class="attachment-file-name"
-              role="button"
-              tabindex="0"
-              @click="previewAttachment(adjustAttachmentForm)"
-              @keydown.enter="previewAttachment(adjustAttachmentForm)"
-              @keydown.space.prevent="previewAttachment(adjustAttachmentForm)"
-            >
-              {{ attachmentName(adjustAttachmentForm) }}
-            </span>
-            <span v-else class="project-apply-adjust-dialog__upload-empty">请上传新材料</span>
-            <vehicle-attachment-upload
-              v-model="adjustAttachmentUploadRows"
-              :readonly="false"
-              :multiple="false"
-              :limit="1"
-              :file-types="attachmentFileTypes"
-              :max-size="50"
-              :show-file-list="false"
-              button-text="上传附件"
-              tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip，单个文件不超过50M"
-              @change="handleAdjustAttachmentUploadChange"
-            />
-          </div>
-        </el-form-item>
-        <el-form-item label="附件描述" prop="description">
-          <el-input v-model="adjustAttachmentForm.description" placeholder="请输入" maxlength="200" />
-        </el-form-item>
-        <el-form-item label="文件大小">
-          <span>{{ formatFileSize(adjustAttachmentForm.size) || '-' }}</span>
-        </el-form-item>
-        <el-form-item label="调整原因" prop="adjustReason" class="project-apply-form__change-textarea">
-          <el-input
-            v-model="adjustAttachmentForm.adjustReason"
-            type="textarea"
-            :rows="3"
-            maxlength="2000"
-            show-word-limit
-            placeholder="请输入调整原因"
-          />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="adjustAttachmentBox = false">取消</el-button>
-        <el-button type="primary" @click="confirmAdjustAttachment">确定</el-button>
-      </template>
-    </el-dialog>
-
     <el-dialog
       v-model="userBox"
       title="选择用户"
@@ -1227,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,
@@ -1241,18 +1003,13 @@ import {
   getDetail as getCustomerArchiveDetail,
 } from '@/api/vehicle/customer-archive';
 import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
-import { normalizeBusinessDeptOptions } from '@/utils/dept';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { getMKApprovalUrl } from '@/api/system/business-process';
-import {
-  loadMkEnabled,
-  resolveProjectChangeMkBizType,
-  submitMkApprovalFlow,
-} from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import PdfPreview from '@/components/pdf-preview/main.vue';
@@ -1317,7 +1074,6 @@ const emptyForm = () => ({
   customerJson: '',
   carrierJson: '',
   attachmentsJson: '',
-  adjustAttachmentsJson: '',
   situationRemark: '',
   projectIntro: '',
   profitRemark: '',
@@ -1327,24 +1083,6 @@ const emptyForm = () => ({
   changeReason: '',
 });
 
-const emptyAdjustAttachmentForm = () => ({
-  uid: '',
-  fileType: '',
-  originalName: '',
-  name: '',
-  fileName: '',
-  url: '',
-  link: '',
-  fileUrl: '',
-  description: '',
-  size: '',
-  uploadUserName: '',
-  uploadTime: '',
-  adjustReason: '',
-  originAttachment: null,
-  originKey: '',
-});
-
 const optionalSentinelFields = [
   'projectScale',
   'estimatedProfit',
@@ -1357,8 +1095,7 @@ const optionalSentinelFields = [
 
 const changeTypeOptions = [
   { label: '项目变更', value: '项目变更' },
-  { label: '项目备案流程（本部流程）', value: '项目备案流程（本部流程）' },
-  { label: '项目备案流程（运输部流程）', value: '项目备案流程（运输部流程）' },
+  { label: '项目备案调整', value: '项目备案调整' },
 ];
 
 const attachmentViewerPlugins = [
@@ -1620,29 +1357,6 @@ export default {
       customerRows: [],
       carrierRows: [],
       attachmentRows: [],
-      adjustAttachmentRows: [],
-      adjustAttachmentBox: false,
-      adjustAttachmentForm: emptyAdjustAttachmentForm(),
-      adjustAttachmentUploadRows: [],
-      adjustAttachmentRules: {
-        fileType: [{ required: true, message: '请选择附件类型', trigger: 'change' }],
-        url: [
-          {
-            validator: (rule, value, callback) => {
-              if (!this.attachmentUrl(this.adjustAttachmentForm)) {
-                callback(new Error('请上传新材料'));
-                return;
-              }
-              callback();
-            },
-            trigger: 'change',
-          },
-        ],
-        adjustReason: [
-          { required: true, message: '请输入调整原因', trigger: 'blur' },
-          { max: 2000, message: '调整原因不能超过2000个字符', trigger: 'blur' },
-        ],
-      },
       selectedAttachmentRows: [],
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
@@ -1674,8 +1388,6 @@ export default {
         'zip',
       ],
       changeRows: [],
-      projectContractRows: [],
-      projectContractLoading: false,
       changeRecordDetailVisible: false,
       changeRecordDetail: null,
       changeRecordDetailRows: [],
@@ -1752,25 +1464,18 @@ export default {
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
-    showProjectContractSection() {
-      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
-    },
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
     isPublicViewPage() {
       return (
         this.$route.path === '/business/project-apply/public-view' ||
-        this.$route.path === '/business/project-change/public-view' ||
-        this.$route.path === '/business/project-record-change/public-view'
+        this.$route.path === '/business/project-change/public-view'
       );
     },
     publicBizType() {
       return this.$route.meta?.bizType || 'project-apply';
     },
-    isPublicProjectChangeView() {
-      return ['project-change', 'project-record-change'].includes(this.publicBizType);
-    },
     projectFormContainer() {
       // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
       return this.isFormPageInstance ? 'div' : 'el-dialog';
@@ -1909,7 +1614,7 @@ export default {
     },
     openPublicProjectForm() {
       const id = this.$route.query.id;
-      this.dialogType = this.isPublicProjectChangeView ? 'change' : 'view';
+      this.dialogType = this.publicBizType === 'project-change' ? 'change' : 'view';
       this.dialogReadonly = true;
       this.projectBox = true;
       if (!id) {
@@ -2405,13 +2110,8 @@ export default {
       this.customerRows = [];
       this.carrierRows = [];
       this.attachmentRows = [];
-      this.adjustAttachmentRows = [];
-      this.adjustAttachmentBox = false;
-      this.resetAdjustAttachmentForm();
       this.selectedAttachmentRows = [];
       this.changeRows = [];
-      this.projectContractRows = [];
-      this.projectContractLoading = false;
       this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
@@ -2449,7 +2149,6 @@ export default {
       this.carrierRows = carrierRows;
       this.attachmentRows = this.parseJsonArray(displayRow.attachmentsJson);
       this.normalizeAttachmentFileTypes();
-      this.adjustAttachmentRows = this.parseJsonArray(displayRow.adjustAttachmentsJson);
       this.selectedAttachmentRows = [];
       this.changeRows = this.buildChangeRows(displayRow);
       this.selectedCustomerId = this.customerRows
@@ -2461,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 || '';
@@ -2544,20 +2209,10 @@ export default {
     },
     resolveChangeType(row = {}) {
       if (row.changeType) return row.changeType;
-      const node = String(row.currentNode || '');
-      if (node.includes('运输部')) return '项目备案流程（运输部流程）';
-      if (node.includes('本部') || node.includes('备案')) return '项目备案流程（本部流程）';
+      const node = row.currentNode || '';
+      if (String(node).includes('备案')) return '项目备案调整';
       return '项目变更';
     },
-    buildProjectChangeMkTempVarData(row = {}) {
-      const changeType = this.resolveChangeType(row);
-      return {
-        projectType: row.projectType || this.form.projectType || '',
-        // MK 临时变量：变更类型（本部/运输部备案分流）
-        changeType,
-        变更类型: changeType,
-      };
-    },
     submitProject() {
       this.$refs.projectForm.validate(valid => {
         if (!valid) {
@@ -2700,7 +2355,6 @@ export default {
         if (this.isProjectChangeModule) {
           const payload = this.normalizeSubmitForm({ includeChangeType: true });
           const approvalStatus = this.form.approvalStatus || '';
-          const changeType = this.resolveChangeType(this.form);
           projectChangeApi
             .submit(payload)
             .then(res => {
@@ -2710,15 +2364,12 @@ export default {
               }
               const id = this.form.id;
               return submitMkApprovalFlow({
-                bizType: resolveProjectChangeMkBizType(changeType),
+                bizType: 'project-change',
                 bizId: id,
                 subjectName: this.form.projectName || '',
                 approvalStatus,
                 mkEnabled: this.mkEnabled,
-                tempVarData: this.buildProjectChangeMkTempVarData({
-                  ...this.form,
-                  changeType,
-                }),
+                tempVarData: { projectType: this.form.projectType || '' },
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2738,17 +2389,13 @@ export default {
               return;
             }
             const id = this.form.id;
-            const changeType = this.resolveChangeType(this.form);
             return submitMkApprovalFlow({
               bizType: 'project-apply',
               bizId: id,
               subjectName: this.form.projectName || '',
               approvalStatus: this.form.approvalStatus || 'change_rejected',
               mkEnabled: this.mkEnabled,
-              tempVarData: this.buildProjectChangeMkTempVarData({
-                ...this.form,
-                changeType,
-              }),
+              tempVarData: { projectType: this.form.projectType || '' },
             }).then(() => {
               this.$message.success('提交成功!');
               this.closeProjectForm();
@@ -2776,9 +2423,6 @@ export default {
         customerJson: JSON.stringify(this.customerRows),
         carrierJson: JSON.stringify(this.carrierRows),
         attachmentsJson: JSON.stringify(this.attachmentRows),
-        adjustAttachmentsJson: this.isChangeDialog
-          ? JSON.stringify(this.adjustAttachmentRows || [])
-          : undefined,
         situationRemark: JSON.stringify({
           projectIntro: this.form.projectIntro || '',
           profitRemark: this.form.profitRemark || '',
@@ -2794,9 +2438,6 @@ export default {
       if (this.isNewProjectDialog && !options.includeChangeType) {
         delete submitRow.changeReason;
       }
-      if (!this.isChangeDialog) {
-        delete submitRow.adjustAttachmentsJson;
-      }
       ['projectIntro', 'profitRemark', 'riskPoint', 'emergencyPlan'].forEach(
         key => delete submitRow[key]
       );
@@ -3206,8 +2847,19 @@ export default {
     loadDeptOptions() {
       getBusinessDeptSelect()
         .then(res => {
-          // 仅展示「是否业务部门=是」；同名部门追加上级组织名区分
-          this.deptOptions = normalizeBusinessDeptOptions(res.data.data || []);
+          const bizList = res.data.data || [];
+          // 仅展示「是否业务部门=是」的本级部门，扁平下拉
+          this.deptOptions = bizList
+            .map(item => {
+              const value = item.id == null || item.id === '' ? '' : String(item.id);
+              const label = item.deptName || item.fullName || item.title || item.name || value;
+              return {
+                label,
+                rawLabel: label,
+                value,
+              };
+            })
+            .filter(item => item.value);
           this.fillDefaultBusinessDept();
           this.ensureCurrentBusinessDeptOption();
         })
@@ -3417,112 +3069,6 @@ export default {
     removeAttachment(index) {
       this.attachmentRows.splice(index, 1);
     },
-    attachmentIdentity(row = {}) {
-      const uid = String(row.uid || '').trim();
-      if (uid) return `uid:${uid}`;
-      const url = String(this.attachmentUrl(row) || '').trim();
-      if (url) return `url:${url}`;
-      const name = String(this.attachmentName(row) || '').trim();
-      const fileType = String(row.fileType || '').trim();
-      if (name || fileType) return `name:${fileType}|${name}`;
-      return '';
-    },
-    openAdjustAttachmentDialog(row) {
-      const originKey = this.attachmentIdentity(row);
-      const existing = this.adjustAttachmentRows.find(item => item.originKey === originKey);
-      if (existing) {
-        this.adjustAttachmentForm = {
-          ...emptyAdjustAttachmentForm(),
-          ...existing,
-          originAttachment: existing.originAttachment || { ...row },
-          originKey,
-        };
-        this.adjustAttachmentUploadRows = this.attachmentUrl(existing)
-          ? [{ ...existing }]
-          : [];
-      } else {
-        this.adjustAttachmentForm = {
-          ...emptyAdjustAttachmentForm(),
-          fileType: row.fileType || '',
-          description: row.description || '',
-          originAttachment: { ...row },
-          originKey,
-        };
-        this.adjustAttachmentUploadRows = [];
-      }
-      this.adjustAttachmentBox = true;
-      this.$nextTick(() => this.$refs.adjustAttachmentFormRef?.clearValidate?.());
-    },
-    resetAdjustAttachmentForm() {
-      this.adjustAttachmentForm = emptyAdjustAttachmentForm();
-      this.adjustAttachmentUploadRows = [];
-      this.$refs.adjustAttachmentFormRef?.clearValidate?.();
-    },
-    handleAdjustAttachmentUploadChange(list) {
-      const latest = Array.isArray(list) && list.length ? list[list.length - 1] : null;
-      if (!latest) {
-        this.adjustAttachmentForm = {
-          ...this.adjustAttachmentForm,
-          uid: '',
-          originalName: '',
-          name: '',
-          fileName: '',
-          url: '',
-          link: '',
-          fileUrl: '',
-          size: '',
-          uploadUserName: '',
-          uploadTime: '',
-        };
-        this.adjustAttachmentUploadRows = [];
-        return;
-      }
-      const userName = this.userInfo?.realName || this.userInfo?.userName || '';
-      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
-      this.adjustAttachmentForm = {
-        ...this.adjustAttachmentForm,
-        ...latest,
-        fileType:
-          this.adjustAttachmentForm.fileType || this.resolveAttachmentFileType(latest),
-        description: this.adjustAttachmentForm.description || latest.description || '',
-        uploadUserName: latest.uploadUserName || userName,
-        uploadTime: latest.uploadTime || uploadTime,
-      };
-      this.adjustAttachmentUploadRows = [{ ...latest }];
-      this.$refs.adjustAttachmentFormRef?.validateField?.('url');
-    },
-    confirmAdjustAttachment() {
-      this.$refs.adjustAttachmentFormRef?.validate(valid => {
-        if (!valid) return;
-        if (!this.attachmentUrl(this.adjustAttachmentForm)) {
-          this.$message.warning('请上传新材料');
-          return;
-        }
-        const nextRow = {
-          ...this.adjustAttachmentForm,
-          fileType: this.adjustAttachmentForm.fileType,
-          description: this.adjustAttachmentForm.description || '',
-          adjustReason: String(this.adjustAttachmentForm.adjustReason || '').trim(),
-          originAttachment: this.adjustAttachmentForm.originAttachment
-            ? { ...this.adjustAttachmentForm.originAttachment }
-            : null,
-          originKey: this.adjustAttachmentForm.originKey,
-        };
-        const index = this.adjustAttachmentRows.findIndex(
-          item => item.originKey === nextRow.originKey
-        );
-        if (index >= 0) {
-          this.adjustAttachmentRows.splice(index, 1, nextRow);
-        } else {
-          this.adjustAttachmentRows.push(nextRow);
-        }
-        this.adjustAttachmentBox = false;
-        this.$message.success('已加入调整材料');
-      });
-    },
-    removeAdjustAttachment(index) {
-      this.adjustAttachmentRows.splice(index, 1);
-    },
     formatFileSize(size) {
       const number = Number(size);
       if (!number) return '';
@@ -4040,24 +3586,6 @@ export default {
   }
 }
 
-.project-apply-adjust-dialog {
-  &__upload {
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    width: 100%;
-  }
-
-  &__upload-empty {
-    color: #909399;
-  }
-
-  :deep(.el-select),
-  :deep(.el-input) {
-    width: 100%;
-  }
-}
-
 @media (max-width: 1200px) {
   .project-apply-form {
     &__grid {

src/views/business/project-change.vue

@@ -75,11 +75,7 @@ import * as api from '@/api/business/project-change';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { config, option } from '@/option/business/project-change';
 import { approvalStatusOptions } from '@/option/business/common';
-import {
-  loadMkEnabled,
-  resolveProjectChangeMkBizType,
-  submitMkApprovalFlow,
-} from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { isAdministrator } from '@/utils/auth';
 import { mapGetters } from 'vuex';
 
@@ -221,21 +217,16 @@ export default {
         // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
         const afterMk =
           operation.action === 'submitApproval'
-            ? request().then(() => {
-                const changeType = row.changeType || '项目变更';
-                return submitMkApprovalFlow({
-                  bizType: resolveProjectChangeMkBizType(changeType),
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'project-change',
                   bizId: row.id,
                   subjectName: row.projectName || '',
                   approvalStatus: row.approvalStatus || '',
                   mkEnabled: this.mkEnabled,
-                  tempVarData: {
-                    projectType: row.projectType || '',
-                    changeType,
-                    变更类型: changeType,
-                  },
-                });
-              })
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
             : request();
         const loading =
           operation.action === 'approve'

src/views/business/temporary-credit-limit-public-view.vue

@@ -1,113 +0,0 @@
-<template>
-  <mk-public-shell biz-type="temporary-credit-limit" :get-form="getForm">
-    <div class="temporary-credit-limit-public-view">
-      <div class="temporary-credit-limit-public-view__title">查看临时额度申请</div>
-      <template v-if="detail">
-        <div class="temporary-credit-limit-public-view__section-title">项目额度信息</div>
-        <el-descriptions :column="2" border>
-          <el-descriptions-item label="项目名称">{{ detail.projectName || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="项目编号">{{ detail.projectCode || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="承办部门">{{ detail.undertakeDeptName || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="项目资金使用额度（万元）">
-            {{ formatAmount(detail.projectFundLimit) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="已使用项目资金使用额度（万元）">
-            {{ formatAmount(detail.usedFundLimit) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="剩余项目资金使用额度（万元）">
-            {{ formatAmount(detail.remainingFundLimit) }}
-          </el-descriptions-item>
-        </el-descriptions>
-
-        <div class="temporary-credit-limit-public-view__section-title">临时额度信息</div>
-        <el-descriptions :column="2" border>
-          <el-descriptions-item label="申请单号">{{ detail.applicationNo || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="申请临时额度（万元）">
-            {{ formatAmount(detail.applyLimit) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="申请有效期至">{{ detail.validUntil || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="审批状态">
-            {{ detail.approvalStatusName || detail.approvalStatus || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="申请人">{{ detail.applicantName || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="申请部门">{{ detail.applyDeptName || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">{{ detail.remark || '-' }}</el-descriptions-item>
-        </el-descriptions>
-      </template>
-      <el-empty v-else description="暂无数据" />
-    </div>
-  </mk-public-shell>
-</template>
-
-<script>
-import { getMkPublicDetail } from '@/api/mk-process';
-import MkPublicShell from '@/views/mk/mk-public-shell.vue';
-
-export default {
-  name: 'TemporaryCreditLimitPublicView',
-  components: { MkPublicShell },
-  data() {
-    return {
-      detail: null,
-    };
-  },
-  mounted() {
-    this.loadDetail();
-  },
-  methods: {
-    loadDetail() {
-      const id = this.$route.query.id;
-      if (!id) return;
-      getMkPublicDetail('temporary-credit-limit', id).then(res => {
-        this.detail = res.data?.data || null;
-      });
-    },
-    formatAmount(value) {
-      if (value === undefined || value === null || value === '' || Number(value) === -1) {
-        return '-';
-      }
-      return value;
-    },
-    getForm() {
-      const detail = this.detail || {};
-      return {
-        ...detail,
-        subject: detail.projectName || detail.applicationNo || '',
-      };
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.temporary-credit-limit-public-view {
-  padding: 16px 20px 24px;
-
-  &__title {
-    margin-bottom: 16px;
-    font-size: 18px;
-    font-weight: 600;
-    color: #303133;
-  }
-
-  &__section-title {
-    position: relative;
-    margin: 16px 0 12px;
-    padding-left: 12px;
-    font-size: 15px;
-    font-weight: 600;
-    color: #303133;
-
-    &::before {
-      content: '';
-      position: absolute;
-      left: 0;
-      top: 50%;
-      width: 4px;
-      height: 14px;
-      margin-top: -7px;
-      background: #409eff;
-    }
-  }
-}
-</style>

src/views/business/temporary-credit-limit.vue

@@ -329,10 +329,8 @@ import {
   getDetail as getProjectDetail,
   getList as getProjectList,
 } from '@/api/business/project-apply';
-import { getMKApprovalUrl } from '@/api/system/business-process';
 import { config, option } from '@/option/business/temporary-credit-limit';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
@@ -428,7 +426,6 @@ export default {
       flowBox: false,
       flowUrl: '',
       processInstanceId: '',
-      mkEnabled: false,
     };
   },
   computed: {
@@ -458,13 +455,6 @@ export default {
   },
   created() {
     this.loadProjectOptions();
-    loadMkEnabled()
-      .then(enabled => {
-        this.mkEnabled = !!enabled;
-      })
-      .catch(() => {
-        this.mkEnabled = false;
-      });
   },
   methods: {
     buildTableOption() {
@@ -553,19 +543,11 @@ export default {
     },
     customOperations(row) {
       return (this.config.operations || []).filter(operation => {
-        if (operation.mkOnly && !this.mkEnabled) return false;
-        if (operation.localOnly && this.mkEnabled) return false;
         const permission = operation.permission || `${this.config.permission}_${operation.action}`;
         const statusProp = operation.statusProp || this.config.statusProp || 'status';
-        // MK「流程」入口允许只读行查看审核页；本地审批/提交/撤回仍禁止只读
-        if (
-          row.readonly &&
-          ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
-        ) {
-          return false;
-        }
         return (
           this.hasPermission(permission) &&
+          !row.readonly &&
           (!operation.status?.length || operation.status.includes(row[statusProp]))
         );
       });
@@ -754,10 +736,6 @@ export default {
         });
     },
     handleOperation(operation, row) {
-      if (operation.action === 'mkAudit') {
-        this.handleMkAudit(row);
-        return;
-      }
       if (operation.action === 'flow') {
         this.openFlow(row);
         return;
@@ -766,49 +744,12 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {
-        const previousApprovalStatus = row.approvalStatus || '';
-        const request = () => this.api[operation.action](row.id);
-        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住
-        const afterMk =
-          operation.action === 'submitApproval'
-            ? request().then(() =>
-                submitMkApprovalFlow({
-                  bizType: 'temporary-credit-limit',
-                  bizId: row.id,
-                  subjectName: row.projectName || row.applicationNo || '',
-                  approvalStatus: previousApprovalStatus,
-                  mkEnabled: this.mkEnabled,
-                })
-              )
-            : request();
-        return afterMk.then(res => {
-          if (res?.data?.success === false) {
-            this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
-            return;
-          }
+      })
+        .then(() => this.api[operation.action](row.id))
+        .then(() => {
           this.$message.success(`${operation.label}成功`);
           this.onLoad(this.page, this.query);
         });
-      });
-    },
-    handleMkAudit(row) {
-      if (!row?.id) {
-        this.$message.warning('临时额度申请ID为空，无法打开审核页');
-        return;
-      }
-      getMKApprovalUrl({ bizId: String(row.id) })
-        .then(res => {
-          const url = res?.data?.data;
-          if (!url) {
-            this.$message.error('获取审核跳转地址失败');
-            return;
-          }
-          window.open(url, '_blank');
-        })
-        .catch(() => {
-          this.$message.error('获取审核跳转地址失败');
-        });
     },
     openFlow(row, loaded = false) {
       const processInstanceId = row.processInstanceId || row.processInstanceID || row.procInstId;

src/views/business/transport-plan-dispatch.vue

@@ -577,7 +577,7 @@ export default {
           this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
           return;
         }
-        // 司机与手机号对全部承运类型都是选填，由调度明细弹窗校验已填部分的格式，此处不重复校验
+        // 司机是否必填由调度明细弹窗按承运类型判定（承运商承运时司机选填），此处不再重复校验
         if (!row.vehicleNo) {
           this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
           return;

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({
-  batchNo: '',
-  projectId: '',
-  createUser: '',
-  waybillCount: undefined,
-});
+const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
 const batchPage = reactive({ current: 1, size: 10, total: 0 });
 const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
 const progressPage = reactive({ current: 1, size: 10, total: 0 });
@@ -1044,12 +1023,7 @@ const openBatchDialog = async row => {
   batchDialogMode.value = voucher?.id ? 'change' : 'upload';
   batchTarget.value = voucher?.id ? voucher : undefined;
   batchSelection.value = [];
-  // 弹窗内的搜索条件是模块级状态，不重置就会带着上一次的筛选条件打开。
-  resetBatchSearch();
-  batchRows.value = [];
-  batchPage.total = 0;
   batchVisible.value = true;
-  if (!projectOptions.value.length) await loadProjects();
   await loadBatches();
   if (voucher?.waybillBatchNo) {
     const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
@@ -1059,7 +1033,6 @@ const openBatchDialog = async row => {
 const loadBatches = async () => {
   const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
     batchNo: batchQuery.batchNo,
-    projectId: batchQuery.projectId,
     createUser: batchQuery.createUser,
     waybillCount: batchQuery.waybillCount,
     createTimeStart: batchCreateRange.value?.[0] ? `${batchCreateRange.value[0]} 00:00:00` : '',
@@ -1080,18 +1053,10 @@ const handleWaybillCountInput = value => {
     batchQuery.waybillCount = filtered.replace(/^0+/, '');
   }
 };
-const resetBatchSearch = () => {
-  Object.assign(batchQuery, {
-    batchNo: '',
-    projectId: '',
-    createUser: '',
-    waybillCount: undefined,
-  });
+const resetBatchQuery = () => {
+  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
   batchCreateRange.value = [];
   batchPage.current = 1;
-};
-const resetBatchQuery = () => {
-  resetBatchSearch();
   loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {

src/views/mk/public-biz-view.vue

@@ -2,40 +2,16 @@
   <div ref="page" class="mk-public-biz-view">
     <basic-container>
       <div class="mk-public-biz-view__title">{{ pageTitle }}</div>
-      <template v-if="detail">
-        <el-descriptions :column="2" border>
-          <el-descriptions-item
-            v-for="item in visibleFields"
-            :key="item.prop"
-            :label="item.label"
-            :span="item.span || 1"
-          >
-            {{ fieldDisplayValue(item.prop, detail[item.prop]) }}
-          </el-descriptions-item>
-        </el-descriptions>
-        <section
-          v-for="party in partySections"
-          :key="party.role"
-          class="mk-public-biz-view__party"
+      <el-descriptions v-if="detail" :column="2" border>
+        <el-descriptions-item
+          v-for="item in visibleFields"
+          :key="item.prop"
+          :label="item.label"
+          :span="item.span || 1"
         >
-          <div class="mk-public-biz-view__party-title">{{ party.label }}</div>
-          <el-table :data="party.rows" border empty-text="暂无数据">
-            <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column prop="customerName" label="客商名称" min-width="180" align="center">
-              <template #default="{ row }">{{ row.customerName || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="creditCode" label="统一信用代码" min-width="160" align="center">
-              <template #default="{ row }">{{ row.creditCode || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="contactName" label="联系人" min-width="140" align="center">
-              <template #default="{ row }">{{ row.contactName || '-' }}</template>
-            </el-table-column>
-            <el-table-column prop="contactPhone" label="联系电话" min-width="140" align="center">
-              <template #default="{ row }">{{ row.contactPhone || '-' }}</template>
-            </el-table-column>
-          </el-table>
-        </section>
-      </template>
+          {{ displayValue(detail[item.prop]) }}
+        </el-descriptions-item>
+      </el-descriptions>
       <el-empty v-else description="暂无数据" />
     </basic-container>
   </div>
@@ -43,36 +19,6 @@
 
 <script>
 import { getMkPublicDetail, postMkPublicProcessMessage } from '@/api/mk-process';
-import { formatSealTypes } from '@/utils/settlement-seal';
-
-const createPartyRow = (row = {}) => ({
-  customerId: row.customerId || '',
-  customerName: row.customerName || '',
-  creditCode: row.creditCode || row.unifiedCreditCode || '',
-  contactId: row.contactId || '',
-  contactName: row.contactName || '',
-  contactPhone: row.contactPhone || '',
-});
-
-const parsePartyRows = (partyJson, fallbackName) => {
-  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 [];
-  return String(fallbackName)
-    .split(/[、,]/)
-    .map(name => name.trim())
-    .filter(Boolean)
-    .map(name => createPartyRow({ customerName: name }));
-};
 
 const FIELD_MAP = {
   'project-apply': [
@@ -92,6 +38,8 @@ const FIELD_MAP = {
     { label: '审核状态', prop: 'approvalStatusName' },
     { label: '当前节点', prop: 'currentNode' },
     { label: '当前处理人', prop: 'currentProcessor' },
+    { label: '甲方', prop: 'partyA' },
+    { label: '乙方', prop: 'partyB' },
     { label: '项目名称', prop: 'projectName', span: 2 },
   ],
   'pre-settlement': [
@@ -99,7 +47,6 @@ const FIELD_MAP = {
     { label: '合同名称', prop: 'contractName' },
     { label: '项目名称', prop: 'projectName' },
     { label: '结算金额', prop: 'settlementAmount' },
-    { label: '用印类型', prop: 'sealTypes' },
     { label: '审核状态', prop: 'approvalStatusName' },
     { label: '当前节点', prop: 'currentNode' },
     { label: '当前处理人', prop: 'currentProcessor' },
@@ -111,7 +58,6 @@ const FIELD_MAP = {
     { label: '项目名称', prop: 'projectName' },
     { label: '合同名称', prop: 'contractName' },
     { label: '结算金额', prop: 'settlementAmount' },
-    { label: '用印类型', prop: 'sealTypes' },
     { label: '审核状态', prop: 'approvalStatusName' },
     { label: '当前节点', prop: 'currentNode' },
     { label: '当前处理人', prop: 'currentProcessor' },
@@ -153,26 +99,6 @@ export default {
     visibleFields() {
       return FIELD_MAP[this.bizType] || [];
     },
-    partySections() {
-      if (!this.detail || this.bizType !== 'contract-manage') return [];
-      return [
-        {
-          role: 'A',
-          label: '甲方',
-          rows: parsePartyRows(this.detail.partyAJson, this.detail.partyA),
-        },
-        {
-          role: 'B',
-          label: '乙方',
-          rows: parsePartyRows(this.detail.partyBJson, this.detail.partyB),
-        },
-        {
-          role: 'C',
-          label: '丙方',
-          rows: parsePartyRows(this.detail.partyCJson, this.detail.partyC),
-        },
-      ];
-    },
   },
   created() {
     this.handleIframeHeight = () => this.sendIframeHeight();
@@ -266,7 +192,6 @@ export default {
         id: this.getFormId() || detail.id,
         subject: this.pageTitle,
         formInstanceId: this.getFormId(),
-        sealTypes: formatSealTypes(detail.sealTypes) || detail.sealTypes || '',
       };
     },
     getFormId() {
@@ -280,12 +205,6 @@ export default {
         ''
       );
     },
-    fieldDisplayValue(prop, value) {
-      if (prop === 'sealTypes') {
-        return formatSealTypes(value) || '-';
-      }
-      return this.displayValue(value);
-    },
     displayValue(value) {
       if (value === null || value === undefined || value === '') return '-';
       if (Array.isArray(value)) return value.join('、') || '-';
@@ -336,33 +255,5 @@ html.mk-iframe-page #app.mk-iframe-page {
       background: #409eff;
     }
   }
-
-  &__party {
-    margin-top: 16px;
-    padding: 14px 16px 16px;
-    background: #fff;
-    border-radius: 6px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-  }
-
-  &__party-title {
-    position: relative;
-    padding-left: 12px;
-    margin-bottom: 12px;
-    font-size: 14px;
-    font-weight: 600;
-    line-height: 22px;
-    color: #303133;
-
-    &::before {
-      content: '';
-      position: absolute;
-      left: 0;
-      top: 2px;
-      width: 4px;
-      height: 18px;
-      background: #409eff;
-    }
-  }
 }
 </style>

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',
-          query: {
-            mode: 'view',
-            id: row.id,
-            settlementType: row.settlementType,
-            name: '查看正式结算',
-          },
+          path: '/settlement/formal-settlement/form',
+          query: { mode: 'view', id: row.id, 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-tooltip
-                :content="form.contractName"
-                :disabled="!form.contractName"
-                placement="top"
-                :show-after="200"
-              >
-                <div class="receipt-form-page__overflow-trigger">
-                  <el-input :model-value="form.contractNo" readonly placeholder="请选择承运商合同">
-                    <template v-if="!readonly" #append>
-                      <el-tooltip content="选择承运商合同" placement="top">
-                        <el-button :icon="Search" @click="openContractDialog" />
-                      </el-tooltip>
-                    </template>
-                  </el-input>
-                </div>
-              </el-tooltip>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="承办部门">
-              <el-input :model-value="form.deptName" disabled placeholder="从所属合同带出" />
+            <el-form-item label="结算组织" prop="deptId">
+              <el-cascader
+                v-if="!readonly"
+                :model-value="deptCascaderValue"
+                :options="deptTreeOptions"
+                :props="deptCascaderProps"
+                placeholder="请选择结算组织（合同承办部门）"
+                filterable
+                clearable
+                @change="handleDeptChange"
+              />
+              <el-input v-else :model-value="form.deptName" disabled />
             </el-form-item>
           </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: {
-        visible: false,
-        loading: false,
-        rows: [],
-        page: { current: 1, size: 10, total: 0 },
-        query: { contractNo: '', contractName: '' },
-      },
+      deptTreeOptions: [],
+      deptMap: new Map(),
+      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
+      deptCascaderProps: { checkStrictly: true, emitPath: true },
       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) {
-      if (!this.form.contractNo) {
-        callback(new Error('请选择所属合同'));
+    validateDept(rule, value, callback) {
+      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
+        callback(new Error('请选择结算组织'));
         return;
       }
       callback();
@@ -504,43 +454,47 @@ export default {
         this.invoiceItems = [];
       }
     },
-    // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
-    openContractDialog() {
-      this.contractDialog.visible = true;
-      this.searchContracts();
+    loadDepartments() {
+      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
+      getDeptTree(this.userInfo?.tenantId)
+        .then(response => {
+          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
+          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
+          this.deptMap = new Map();
+          this.flattenDepartments(rows).forEach(item =>
+            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
+          );
+        })
+        .catch(() => {});
     },
-    searchContracts() {
-      this.contractDialog.page.current = 1;
-      this.loadContracts();
-    },
-    resetContractQuery() {
-      this.contractDialog.query = { contractNo: '', contractName: '' };
-      this.searchContracts();
-    },
-    async loadContracts() {
-      this.contractDialog.loading = true;
-      try {
-        const res = await getContractList(this.contractDialog.page.current, this.contractDialog.page.size, {
-          ...this.contractDialog.query,
-          contractCategory: '承运商合同',
-          approvalStatuses: 'approved,change_approved',
+    excludeExternalOrganization(list = []) {
+      return list.reduce((result, item) => {
+        const deptName = item.title || item.deptName || item.name;
+        if (String(deptName || '').trim() === '外部组织') return result;
+        result.push({
+          ...item,
+          children: item.children?.length
+            ? this.excludeExternalOrganization(item.children)
+            : item.children,
         });
-        const data = this.unwrapData(res) || {};
-        this.contractDialog.rows = data.records || [];
-        this.contractDialog.page.total = Number(data.total || 0);
-      } finally {
-        this.contractDialog.loading = false;
-      }
+        return result;
+      }, []);
     },
-    pickContract(row) {
-      if (!row) return;
-      Object.assign(this.form, {
-        contractNo: row.contractNo,
-        contractName: row.contractName,
-        deptName: row.organizationName,
-      });
-      this.contractDialog.visible = false;
-      this.$refs.formRef?.validateField('contractNo').catch(() => {});
+    toDeptCascaderOptions(list = []) {
+      return list.map(item => ({
+        label: item.title || item.deptName || item.name,
+        value: item.id == null || item.id === '' ? '' : String(item.id),
+        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
+      }));
+    },
+    flattenDepartments(rows) {
+      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
+    },
+    handleDeptChange(value) {
+      const deptId = Array.isArray(value) ? value.at(-1) : value;
+      this.form.deptId = deptId || null;
+      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
+      this.$refs.formRef?.validateField('deptId').catch(() => {});
     },
     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,
-        // 所属合同仅传编号，合同名称/承办部门由后端按编号带出（结算组织=合同承办部门）
-        contractNo: this.form.contractNo,
+        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
+        deptId: this.form.deptId,
+        deptName: this.form.deptName,
       };
     },
     async saveDraft() {

src/views/payment/invoice-receipt.vue

@@ -119,9 +119,6 @@
             <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
               {{ displayValue(row[column.prop]) }}
             </el-tag>
-            <el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
-              {{ displayValue(row[column.prop]) }}
-            </el-tag>
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
@@ -225,7 +222,6 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
-import { kingdeePushStatusType } from '@/utils/kingdee';
 
 // 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
 const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
@@ -484,7 +480,6 @@ export default {
         ''
       );
     },
-    kingdeePushStatusType,
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

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

@@ -97,7 +97,7 @@
                 <el-option
                   v-for="item in contractOptions"
                   :key="item.id"
-                  :label="item.contractName || item.contractNo"
+                  :label="formatContractOptionLabel(item)"
                   :value="item.id"
                 />
               </el-select>
@@ -354,23 +354,11 @@
           ><el-table-column prop="paidDate" label="付款日期" min-width="150" /><el-table-column
             prop="paymentNo"
             label="付款单号"
-            min-width="160" /><el-table-column label="付款凭证" min-width="160"
-            ><template #default="{ row }"
-              ><div v-if="row.voucherFileName" class="payment-form-page__invoice-actions"
-                ><el-link
-                  type="primary"
-                  :disabled="kingdeeAttachmentBusy"
-                  @click="viewRecordVoucher(row)"
-                  >查看</el-link
-                ><el-link
-                  type="primary"
-                  :disabled="kingdeeAttachmentBusy"
-                  @click="downloadRecordVoucher(row)"
-                  >下载</el-link
-                ></div
-              ><span v-else>-</span></template
-            ></el-table-column
-          ></el-table>
+            min-width="160" /><el-table-column
+            prop="kingdeeBillNo"
+            label="付款凭证"
+            min-width="160"
+        /></el-table>
       </section-card>
       <section-card>
         <template #title>
@@ -427,8 +415,7 @@
               ><el-input
                 v-model="row.description"
                 :disabled="readonly"
-                maxlength="200"
-                placeholder="请输入" /></template></el-table-column
+                maxlength="200" /></template></el-table-column
           ><el-table-column label="文件大小" width="120"
             ><template #default="{ row }">{{
               formatAttachmentSize(row)
@@ -745,12 +732,13 @@ import {
   getList as getCustomerArchiveList,
 } from '@/api/vehicle/customer-archive';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
-import { downloadFile, downloadFileByUrl } from '@/utils/util';
+import { formatContractOptionLabel } from '@/utils/contract';
+import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
-  downloadKingdeeFile,
-  requestKingdeeFile,
-  viewKingdeeFile,
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
 } from '@/utils/kingdee-attachment';
 import PdfPreview from '@/components/pdf-preview/main.vue';
 
@@ -1115,8 +1103,6 @@ export default {
       );
       this.$nextTick(() => {
         this.amountSyncing = false;
-        // 程序化赋值不触发校验，需手动重校验以清除/刷新残留错误
-        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
       });
     },
     'form.appliedAmount'(value) {
@@ -1146,7 +1132,6 @@ export default {
       );
       this.$nextTick(() => {
         this.amountSyncing = false;
-        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
       });
     },
   },
@@ -1155,6 +1140,7 @@ export default {
     this.initialize();
   },
   methods: {
+    formatContractOptionLabel,
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -1310,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),
@@ -1360,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),
@@ -1607,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(
-            item => item.referenceType === 'pre' && this.isValidReferenceId(item.id)
-          )?.id ||
-          (progressAdvance && this.isValidReferenceId(this.form.settlementId)
-            ? this.form.settlementId
-            : null);
-        if (this.isValidReferenceId(preId)) {
+          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
+          (progressAdvance ? this.form.settlementId : null);
+        if (preId) {
           this.form.preSettlementId = preId;
           this.form.preSettlementIds = [preId];
         }
@@ -1633,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 preId = this.isValidReferenceId(item.preSettlementId) ? item.preSettlementId : null;
-          const isPre = Boolean(preId || item.preSettlementNo);
+          const isPre = Boolean(item.preSettlementId || 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)),
@@ -1670,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'
       );
@@ -1913,80 +1884,55 @@ export default {
         return {};
       }
     },
+    invoiceAttachmentUrl(row) {
+      return this.attachmentFileUrl(this.invoiceAttachment(row));
+    },
     invoiceAttachmentName(row) {
       return (
         this.attachmentFileName(this.invoiceAttachment(row)) || `${row.invoiceNo || '发票'}.pdf`
       );
     },
-    /** 金蝶附件查看/下载互斥闸门（A801-2 拉流较慢，进行中忽略重复点击，结束自动释放） */
-    async withKingdeeAttachmentBusy(action) {
-      if (this.kingdeeAttachmentBusy) return;
-      this.kingdeeAttachmentBusy = true;
-      try {
-        await action();
-      } finally {
-        this.kingdeeAttachmentBusy = false;
-      }
-    },
     async viewInvoiceAttachment(row) {
-      await this.withKingdeeAttachmentBusy(async () => {
-        // 发票版式文件按票号走金蝶票池（A801-2 镜像优先/实时回源），登记扫描件仅在票池无此票时兜底
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 预览，OSS 直链维持本地预览组件
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
         try {
-          const blob = await requestKingdeeFile(row.invoiceNo);
-          const url = URL.createObjectURL(blob);
-          window.open(url, '_blank');
-          // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
-          setTimeout(() => URL.revokeObjectURL(url), 60000);
-          return;
-        } catch (error) {
-          // 网络级失败（silent，拦截器已提示）不再回退；票池无此票回退登记附件
-          if (error?.silent) return;
+          await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
         }
-        const attachment = this.invoiceAttachment(row);
-        if (!this.attachmentFileUrl(attachment)) {
-          this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
-          return;
-        }
-        this.previewAttachment(
-          { ...attachment, name: this.invoiceAttachmentName(row) },
-          [attachment]
-        );
-      });
+        return;
+      }
+      if (!this.attachmentFileUrl(attachment)) {
+        this.$message.warning('当前发票暂无可查看附件');
+        return;
+      }
+      this.previewAttachment(
+        { ...attachment, name: this.invoiceAttachmentName(row) },
+        [attachment]
+      );
     },
     async downloadInvoiceAttachment(row) {
-      await this.withKingdeeAttachmentBusy(async () => {
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
         try {
-          const blob = await requestKingdeeFile(row.invoiceNo);
-          downloadFile(blob, this.invoiceAttachmentName(row));
-          return;
-        } catch (error) {
-          if (error?.silent) return;
+          await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
         }
-        const attachment = this.invoiceAttachment(row);
-        const url = this.attachmentFileUrl(attachment);
-        if (!url) {
-          this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
-          return;
-        }
-        downloadFileByUrl(url, this.invoiceAttachmentName(row));
-      });
-    },
-    /** 付款记录付款凭证（金蝶电子回单，A801-2 代理）：查看=新窗口预览，下载=保存文件 */
-    viewRecordVoucher(row) {
-      return this.withKingdeeAttachmentBusy(() =>
-        viewKingdeeFile(
-          () => api.downloadRecordVoucher(row.id),
-          `${row.paymentNo || '付款记录'}-付款凭证.pdf`
-        )
-      );
-    },
-    downloadRecordVoucher(row) {
-      return this.withKingdeeAttachmentBusy(() =>
-        downloadKingdeeFile(
-          () => api.downloadRecordVoucher(row.id),
-          `${row.paymentNo || '付款记录'}-付款凭证.pdf`
-        )
-      );
+        return;
+      }
+      const url = this.attachmentFileUrl(attachment);
+      if (!url) {
+        this.$message.warning('当前发票暂无可下载附件');
+        return;
+      }
+      downloadFileByUrl(url, this.invoiceAttachmentName(row));
     },
     attachmentFileName(file) {
       return String(file?.originalName || file?.name || file?.fileName || '').trim();
@@ -2125,10 +2071,10 @@ export default {
     mergeAutomaticAttachments(
       files,
       materials,
+      sourceName,
       defaultMaterial = null,
       sourceKey = '',
-      keepUnmatched = false,
-      insertIndex = -1
+      keepUnmatched = false
     ) {
       const existingUrls = new Set(
         (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
@@ -2152,39 +2098,35 @@ export default {
             url,
             link: file.link || url,
             attachmentType: material ? MATERIAL_TYPE_MAP[material.key] : 'other',
-            description: file.description || '',
+            description: file.description || `自动取自${sourceName}`,
             sourceImported: true,
             sourceKey: sourceKey || undefined,
           };
         });
-      if (imported.length) {
-        // 回填到被替换附件的原起始位置，避免回显/切换时把用户新传附件顶到前面
-        const attachments = [...this.form.attachments];
-        const insertAt =
-          insertIndex >= 0 ? Math.min(insertIndex, attachments.length) : attachments.length;
-        attachments.splice(insertAt, 0, ...imported);
-        this.form.attachments = attachments;
-      }
+      if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
       return imported;
     },
-    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换），返回首个被移除的位置 */
-    removeAutomaticAttachments(sourceKey) {
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
+    removeAutomaticAttachments(sourceKey, sourceName = '') {
       const previousUrls = new Set(
         sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
       );
-      let firstRemovedIndex = -1;
-      this.form.attachments = (this.form.attachments || []).filter((file, index) => {
+      this.form.attachments = (this.form.attachments || []).filter(file => {
         const url = this.attachmentFileUrl(file);
-        const keep =
-          !(sourceKey && file.sourceKey === sourceKey) &&
-          !(previousUrls.size && url && previousUrls.has(url));
-        if (!keep && firstRemovedIndex === -1) firstRemovedIndex = index;
-        return keep;
+        if (sourceKey && file.sourceKey === sourceKey) return false;
+        if (
+          sourceName &&
+          file.sourceImported &&
+          String(file.description || '').includes(`自动取自${sourceName}`)
+        ) {
+          return false;
+        }
+        if (previousUrls.size && url && previousUrls.has(url)) return false;
+        return true;
       });
       if (sourceKey === 'settlement') {
         this.linkedSettlementAttachmentUrls = [];
       }
-      return firstRemovedIndex;
     },
     /** 按当前结算单附件整批同步：先清旧关联，再写入新结算单上传的附件 */
     syncSettlementAttachments(settlementRows = []) {
@@ -2199,14 +2141,14 @@ export default {
           .map(file => this.attachmentFileUrl(file))
           .filter(url => url && nextUrlSet.has(url));
       }
-      const removedAt = this.removeAutomaticAttachments('settlement');
+      this.removeAutomaticAttachments('settlement', '结算单');
       const imported = this.mergeAutomaticAttachments(
         settlementFiles,
         settlementMaterials,
+        '结算单',
         null,
         'settlement',
-        true,
-        removedAt
+        true
       );
       this.linkedSettlementAttachmentUrls = imported
         .map(file => this.attachmentFileUrl(file))
@@ -2257,7 +2199,7 @@ export default {
         this.syncSettlementAttachments(settlementRows);
         if (!this.form.contractId) {
           this.firstContractPayment = false;
-          this.removeAutomaticAttachments('contract');
+          this.removeAutomaticAttachments('contract', '合同');
           return;
         }
         const contractResponse = await getContractDetail(this.form.contractId);
@@ -2269,14 +2211,13 @@ export default {
           this.contractSignatureFileAvailable = contractFiles.some(file =>
             Boolean(this.attachmentFileUrl(file))
           );
-          const contractRemovedAt = this.removeAutomaticAttachments('contract');
+          this.removeAutomaticAttachments('contract', '合同');
           this.mergeAutomaticAttachments(
             contractFiles,
             [ATTACHMENT_MATERIALS.contract],
+            '合同',
             ATTACHMENT_MATERIALS.contract,
-            'contract',
-            false,
-            contractRemovedAt
+            'contract'
           );
           return;
         }
@@ -2290,15 +2231,14 @@ export default {
             String(item.id || '') !== String(this.form.id || '') &&
             item.approvalStatus !== 'voided'
         );
-        const contractRemovedAt = this.removeAutomaticAttachments('contract');
+        this.removeAutomaticAttachments('contract', '合同');
         if (this.firstContractPayment) {
           this.mergeAutomaticAttachments(
             this.parse(contract.contractFileJson),
             [ATTACHMENT_MATERIALS.contract],
+            '合同',
             ATTACHMENT_MATERIALS.contract,
-            'contract',
-            false,
-            contractRemovedAt
+            'contract'
           );
         }
       } catch (error) {
@@ -2830,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' ||
-        (!referenceType &&
-          (this.form.paymentType === 'progress_advance' ||
-            Boolean(
-              this.isValidReferenceId(this.form.preSettlementId) || this.form.preSettlementNo
-            )));
+        row.referenceType === 'pre' ||
+        this.form.paymentType === 'progress_advance' ||
+        Boolean(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/payment/payment-application.vue

@@ -1,61 +1,13 @@
 <template>
   <basic-container class="payment-page">
-    <section class="payment-search">
-      <el-form :model="searchForm" label-position="right" label-width="88px" @submit.prevent>
-        <div class="payment-search__grid">
-          <template v-for="field in visibleSearchFields" :key="field.prop">
-            <el-form-item :label="field.label">
-              <el-date-picker
-                v-if="field.type === 'daterange'"
-                v-model="searchForm[field.prop]"
-                type="daterange"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                range-separator="~"
-                start-placeholder="年/月/日"
-                end-placeholder="年/月/日"
-              />
-              <el-select
-                v-else-if="field.type === 'select'"
-                v-model="searchForm[field.prop]"
-                clearable
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in field.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-              <el-cascader
-                v-else-if="field.type === 'cascader'"
-                v-model="searchForm[field.prop]"
-                :options="organizationSearchTreeOptions"
-                :props="organizationCascaderProps"
-                filterable
-                clearable
-                placeholder="请选择 所属组织"
-              />
-              <el-input v-else v-model="searchForm[field.prop]" clearable placeholder="请输入" />
-            </el-form-item>
-          </template>
-          <div class="payment-search__actions">
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="handleReset">重置</el-button>
-            <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
-              {{ searchExpanded ? '收起' : '展开' }}
-            </el-button>
-          </div>
-        </div>
-      </el-form>
-    </section>
     <avue-crud
       ref="crud"
       :option="option"
       :table-loading="loading"
       :data="rows"
       v-model:page="page"
+      @search-change="searchChange"
+      @search-reset="searchReset"
       @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
@@ -222,7 +174,6 @@
 </template>
 
 <script>
-import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/paymentApplication';
 import { paymentApplicationOption } from '@/option/payment/paymentApplication';
@@ -239,8 +190,6 @@ export default {
   mixins: [organizationSearch],
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
       rows: [],
       selection: [],
       loading: false,
@@ -248,9 +197,6 @@ export default {
       syncLoading: false,
       resultSyncing: false,
       query: {},
-      // 手写搜索区（与应收/应付明细同款）：模型与展开状态
-      searchForm: {},
-      searchExpanded: false,
       option: {},
       page: {
         currentPage: 1,
@@ -263,37 +209,13 @@ export default {
   },
   computed: {
     ...mapGetters(['permission']),
-    // 搜索字段与应收/应付明细同结构；下拉选项沿用 api 常量
-    searchFields() {
-      return [
-        { label: '单据号', prop: 'paymentNo', type: 'input' },
-        { label: '日期', prop: 'applyDateRange', type: 'daterange' },
-        { label: '客户名称', prop: 'payeeName', type: 'input' },
-        { label: '项目名称', prop: 'projectName', type: 'input' },
-        { label: '所属组织', prop: 'deptName', type: 'cascader' },
-        { label: '关联结算单', prop: 'settlementNo', type: 'input' },
-        { label: '付款类型', prop: 'paymentType', type: 'select', options: api.paymentTypeOptions },
-        {
-          label: '审核状态',
-          prop: 'approvalStatus',
-          type: 'select',
-          options: api.approvalStatusOptions,
-        },
-        {
-          label: '金蝶单据状态',
-          prop: 'kingdeeStatus',
-          type: 'select',
-          options: api.kingdeeStatusOptions,
-        },
-      ];
-    },
-    // 默认折叠只展示一行 4 个条件
-    visibleSearchFields() {
-      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
-    },
   },
   created() {
-    this.option = paymentApplicationOption();
+    this.option = paymentApplicationOption({
+      paymentTypeOptions: api.paymentTypeOptions,
+      approvalStatusOptions: api.approvalStatusOptions,
+      kingdeeStatusOptions: api.kingdeeStatusOptions,
+    });
     this.loadOrganizationOptions();
   },
   mounted() {
@@ -349,30 +271,26 @@ export default {
           this.$refs.crud?.toggleSelection?.();
         });
     },
-    // 搜索提交：组织级联路径转名称、日期区间拆成起止参数（与原 avue searchChange 同规则）
-    buildSearchParams() {
-      const params = { ...this.searchForm };
+    searchChange(params, done) {
+      // 所属组织级联返回 id 路径数组，转成部门名称给后端
       this.normalizeOrganizationSearch(params, 'deptName');
+      // 日期区间拆成后端需要的起止字段
       const range = params.applyDateRange || [];
       delete params.applyDateRange;
-      return { ...params, applyStartDate: range[0] || '', applyEndDate: range[1] || '' };
-    },
-    handleSearch() {
-      this.query = this.buildSearchParams();
+      this.query = {
+        ...params,
+        applyStartDate: range[0] || '',
+        applyEndDate: range[1] || '',
+      };
       this.page.currentPage = 1;
       this.onLoad(this.page);
+      done();
     },
-    handleReset() {
-      this.searchForm = {};
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    toggleSearch() {
-      this.searchExpanded = !this.searchExpanded;
-      // 搜索区在 avue 外部，高度变化 avue 感知不到，手动触发表格高度重算，保证分页在一屏内
-      this.$nextTick(() => this.$refs.crud?.getTableHeight?.());
-    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
@@ -626,56 +544,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-// 搜索区与应收/应付明细页（settlement-detail-page__search）同款样式
-.payment-search {
-  margin-bottom: 8px;
-  padding: 12px 12px 4px;
-  background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-
-  :deep(.el-form-item__label) {
-    white-space: nowrap;
-  }
-}
-
-.payment-search__grid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(220px, 1fr));
-  gap: 8px 24px;
-  align-items: start;
-
-  :deep(.el-form-item) {
-    margin-bottom: 8px;
-  }
-
-  :deep(.el-input),
-  :deep(.el-select),
-  :deep(.el-cascader),
-  :deep(.el-date-editor) {
-    width: 100%;
-  }
-}
-
-.payment-search__actions {
-  grid-column: 1 / -1;
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-bottom: 8px;
-}
-
-@media screen and (max-width: 1200px) {
-  .payment-search__grid {
-    grid-template-columns: repeat(2, minmax(220px, 1fr));
-  }
-}
-
-@media screen and (max-width: 760px) {
-  .payment-search__grid {
-    grid-template-columns: 1fr;
-  }
-}
-
 .payment-page :deep(.el-table) {
   --el-table-border-color: #eff1f7;
 }

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

@@ -78,35 +78,14 @@
                     :value="item.dictKey"
                   />
                 </el-select>
-                <el-select
-                  v-else-if="field.type === 'multi-select' && editable"
-                  v-model="form[field.prop]"
-                  multiple
-                  collapse-tags
-                  collapse-tags-tooltip
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in formSelectOptions(field)"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
-                </el-select>
                 <span
                   v-else-if="field.prop === 'formalSettlementNo'"
                   :class="{ 'form-readonly--code': form.formalSettlementNo }"
                 >
                   {{ form.formalSettlementNo || (form.id ? '-' : '系统自动生成') }}
                 </span>
-                <span v-else-if="field.money">{{
-                  formatMoney(
-                    form[field.prop],
-                    field.prop === 'settlementAmount' ? settlementCurrencyCode : 'RMB'
-                  )
-                }}</span>
-                <span v-else-if="field.type === 'select' || field.type === 'multi-select'">{{
+                <span v-else-if="field.money">{{ formatMoney(form[field.prop]) }}</span>
+                <span v-else-if="field.type === 'select'">{{
                   formSelectLabel(field, form[field.prop])
                 }}</span>
                 <span v-else-if="field.type === 'contract'">{{
@@ -201,7 +180,7 @@
                   'formal-editor__negative-amount': isNegativeAdjustedAmount(row, column.prop),
                 }"
               >
-                {{ formatMoney(row[column.prop], settlementCurrencyCode) }}
+                {{ formatMoney(row[column.prop]) }}
               </span>
               <span v-else-if="column.prop === 'feeType'">{{ feeCategoryName(row.feeType) }}</span>
               <span v-else>{{ displayValue(row[column.prop]) }}</span>
@@ -222,7 +201,7 @@
           class="formal-editor__settle-summary"
         >
           <el-descriptions-item label="结算合计（原金额）">
-            {{ formatMoney(form.settlementAmount, settlementCurrencyCode) }}
+            {{ formatMoney(form.settlementAmount) }}
           </el-descriptions-item>
           <el-descriptions-item label="已付金额（含预付、核销）">
             {{ formatMoney(settlePaidTotal) }}
@@ -327,7 +306,7 @@
               </el-link>
               <span v-else-if="item.column.money">{{ formatMoney(row[item.column.prop]) }}</span>
               <span v-else-if="item.column.prop === 'transportQuantity'">
-                {{ formatDetailTransportQuantity(row) }}
+                {{ formatDetailTransportQuantity(row[item.column.prop]) }}
               </span>
               <span v-else-if="item.column.prop === 'mileage'">
                 {{ formatDetailMileage(row[item.column.prop]) }}
@@ -383,6 +362,7 @@
                 v-model="row.type"
                 filterable
                 placeholder="请选择类型"
+                @change="sortAttachments"
               >
                 <el-option
                   v-for="item in attachmentTypeOptions"
@@ -514,12 +494,7 @@
               <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            v-if="form.settlementType !== 'receivable'"
-            label="是否已指定应付"
-            min-width="130"
-            align="center"
-          >
+          <el-table-column label="是否已指定应付" min-width="130" align="center">
             <template #default="{ row }">
               <el-tooltip
                 :disabled="row.kingdeePushStatus !== 'failed'"
@@ -1153,18 +1128,17 @@ import {
   settlementRecordTypeName,
   settlementStatusName,
 } from '@/utils/settlementStatus';
-import { downloadFile, downloadFileByUrl } from '@/utils/util';
-import { requestKingdeeFile } from '@/utils/kingdee-attachment';
+import { downloadFileByUrl } from '@/utils/util';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
+} from '@/utils/kingdee-attachment';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
-import {
-  formatSealTypes,
-  parseSealTypes,
-  SETTLEMENT_SEAL_TYPE_OPTIONS,
-} from '@/utils/settlement-seal';
 import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment';
 
 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
@@ -1256,7 +1230,6 @@ export default {
       feeCategoryOptions: [],
       businessModelOptions: [],
       transportTypeOptions: [],
-      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
       fields: formalSettlementFormFields,
       sourceTableColumns: sourceColumns,
       summaryTableColumns: summaryColumns,
@@ -1396,10 +1369,6 @@ export default {
     isLocalCurrencySettlement() {
       return normalizeCurrencyCode(this.form.currency) === 'RMB';
     },
-    // 结算单据币种：本位币结算固定 RMB，外币结算取归一化后的合同结算币种
-    settlementCurrencyCode() {
-      return this.isLocalCurrencySettlement ? 'RMB' : normalizeCurrencyCode(this.form.currency);
-    },
     visibleFields() {
       if (!this.isLocalCurrencySettlement) return this.fields;
       return this.fields.filter(field => !LOCAL_CURRENCY_HIDDEN_FIELDS.includes(field.prop));
@@ -1524,7 +1493,6 @@ export default {
       this.form = {
         ...createFormalSettlementForm(),
         ...data,
-        sealTypes: parseSealTypes(data.sealTypes),
         sourcePreSettlementIds: (data.sources || []).map(item => item.preSettlementId),
         sourceDetailIds: (data.details || [])
           .filter(item => !item.sourcePreSettlementId)
@@ -1557,6 +1525,7 @@ export default {
       this.selectedAttachmentRows = [];
       this.invoices = data.invoices || [];
       this.issuedInvoices = data.issuedInvoices || [];
+      this.sortAttachments();
       this.contracts = this.filterContracts(this.allContracts, this.form.projectId);
     },
     async initialize() {
@@ -1728,7 +1697,6 @@ export default {
         contractId,
         settlementType,
         settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
-        sealTypes: parseSealTypes(first.sealTypes),
         sourcePreSettlementIds: this.form.sourcePreSettlementIds,
       });
       const responses = await Promise.all(
@@ -1971,17 +1939,15 @@ export default {
         Object.assign(this.form, this.sources[0], {
           contractId: this.sources[0].contractId,
           formalSettlementNo: this.form.formalSettlementNo,
-          sealTypes: parseSealTypes(this.sources[0].sealTypes),
         });
         this.refreshFormalSettlementNo();
       }
-      // 来源预结算金额为本位币；外币结算时结算金额按汇率反算，本位币合计保留本位币汇总
-      const sourceTotal = this.sources.reduce(
+      this.form.settlementAmount = this.sources.reduce(
         (sum, item) => sum + Number(item.settlementAmount || 0),
         0
       );
-      this.form.settlementAmount = this.convertLocalToSettlementAmount(sourceTotal);
-      this.form.localSettlementAmount = Number(sourceTotal).toFixed(2);
+      this.form.localSettlementAmount =
+        this.form.settlementAmount * Number(this.form.exchangeRate || 1);
       this.candidate.visible = false;
       // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行，额度单份占用）
       const newIds = this.sources
@@ -2131,7 +2097,7 @@ export default {
         if (index === 0) return '合计';
         if (!sumProps.includes(column.property)) return '';
         const total = data.reduce((sum, row) => sum + Number(row[column.property] || 0), 0);
-        const totalText = this.formatMoney(total, this.settlementCurrencyCode);
+        const totalText = this.formatMoney(total);
         if (column.property === 'settlementAmount' && hasNegativeAdjustment) {
           return h('span', { style: { color: 'var(--el-color-danger)' } }, totalText);
         }
@@ -2947,45 +2913,38 @@ export default {
       return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
     },
     async viewInvoiceAttachment(row) {
-      if (this.kingdeeAttachmentBusy) return;
-      this.kingdeeAttachmentBusy = true;
-      try {
-        // 发票版式文件按票号走金蝶票池（A801-2 镜像优先/实时回源），登记扫描件仅在票池无此票时兜底
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 预览，OSS 直链维持 window.open
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
         try {
-          const blob = await requestKingdeeFile(row.invoiceNo);
-          const url = URL.createObjectURL(blob);
-          window.open(url, '_blank');
-          // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
-          setTimeout(() => URL.revokeObjectURL(url), 60000);
-          return;
-        } catch (error) {
-          // 网络级失败（silent，拦截器已提示）不再回退；票池无此票回退登记附件
-          if (error?.silent) return;
+          await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
         }
-        const url = this.invoiceAttachmentUrl(row);
-        if (!url) return this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
-        window.open(url, '_blank');
-      } finally {
-        this.kingdeeAttachmentBusy = false;
+        return;
       }
+      const url = this.invoiceAttachmentUrl(row);
+      if (!url) return this.$message.warning('当前发票暂无可查看附件');
+      window.open(url, '_blank');
     },
     async downloadInvoiceAttachment(row) {
-      if (this.kingdeeAttachmentBusy) return;
-      this.kingdeeAttachmentBusy = true;
-      try {
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
         try {
-          const blob = await requestKingdeeFile(row.invoiceNo);
-          downloadFile(blob, this.invoiceAttachmentName(row));
-          return;
-        } catch (error) {
-          if (error?.silent) return;
+          await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
         }
-        const url = this.invoiceAttachmentUrl(row);
-        if (!url) return this.$message.warning('当前发票没有金蝶版式文件，也没有登记附件');
-        downloadFileByUrl(url, this.invoiceAttachmentName(row));
-      } finally {
-        this.kingdeeAttachmentBusy = false;
+        return;
       }
+      const url = this.invoiceAttachmentUrl(row);
+      if (!url) return this.$message.warning('当前发票暂无可下载附件');
+      downloadFileByUrl(url, this.invoiceAttachmentName(row));
     },
     // 开票发票预览地址：数电PDF优先（OFD浏览器无法预览），退预览图、板式文件
     issuedInvoicePreviewUrl(row) {
@@ -3029,7 +2988,6 @@ export default {
           })),
         businessModel: this.form.businessModel || undefined,
         transportType: this.form.transportType || undefined,
-        sealTypes: formatSealTypes(this.form.sealTypes) || undefined,
         exchangeRateDate: this.form.exchangeRateDate,
         exchangeRate: this.form.exchangeRate,
         summaryFees: this.summaryFees
@@ -3206,16 +3164,16 @@ export default {
       const body = response?.data || response || {};
       return body?.data || body;
     },
-    formatMoney(value, currency = 'RMB') {
-      return `${Number(value || 0).toFixed(2)} ${currency}`;
+    formatMoney(value) {
+      return `${Number(value || 0).toFixed(2)} RMB`;
     },
-    formatDetailTransportQuantity(row) {
-      const value = row.transportQuantity;
-      if (this.readonly && Number(value) === -1) return '-';
+    formatQuantity(value) {
+      if (value === undefined || value === null || value === '') return '-';
       const quantity = Number(value);
-      if (!Number.isFinite(quantity)) return '-';
-      // 与预结算编辑器 formatQuantity 保持一致，拼接计量单位
-      return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
+      return Number.isFinite(quantity) ? quantity.toFixed(2) : '-';
+    },
+    formatDetailTransportQuantity(value) {
+      return this.readonly && Number(value) === -1 ? '-' : this.formatQuantity(value);
     },
     formatDetailMileage(value) {
       return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);
@@ -3242,9 +3200,6 @@ export default {
       return Array.isArray(options) ? options : [];
     },
     formSelectLabel(field, value) {
-      if (field?.type === 'multi-select') {
-        return formatSealTypes(value) || '-';
-      }
       if (value === undefined || value === null || value === '') return '-';
       const normalized = String(value).trim();
       const option = this.formSelectOptions(field).find(
@@ -3275,6 +3230,7 @@ export default {
         label: item.dictValue,
         value: item.dictValue,
       }));
+      this.sortAttachments();
     },
     resolveAttachmentType(fileName) {
       const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3298,6 +3254,25 @@ export default {
       const typeText = String(item?.label || item?.value || '').trim();
       return typeText === '其他' || typeText === '其他附件';
     },
+    getAttachmentTypeOrder(type) {
+      const normalizedType = String(type || '').trim();
+      const index = this.attachmentTypeOptions.findIndex(
+        item =>
+          String(item.value || '').trim() === normalizedType ||
+          String(item.label || '').trim() === normalizedType
+      );
+      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
+    },
+    sortAttachments() {
+      this.attachments = (this.attachments || [])
+        .map((file, index) => ({ file, index }))
+        .sort((a, b) => {
+          const orderDifference =
+            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
+          return orderDifference || a.index - b.index;
+        })
+        .map(item => item.file);
+    },
     getMissingAttachmentTypes(files = this.attachments) {
       const uploadedTypes = new Set(
         (files || [])
@@ -3327,6 +3302,7 @@ export default {
         size: this.formatAttachmentSize(file.size),
         url: file.url || file.link || '',
       });
+      this.sortAttachments();
     },
     handleAttachmentSelectionChange(rows) {
       this.selectedAttachmentRows = rows || [];

src/views/settlement/components/formal-settlement-table-panel.vue

@@ -5,6 +5,8 @@
     :table-loading="loading"
     :data="rows"
     v-model:page="crudPage"
+    @search-change="(params, done) => $emit('search-change', params, done)"
+    @search-reset="$emit('search-reset')"
     @selection-change="handleSelectionChange"
     @refresh-change="$emit('refresh')"
     @on-load="page => $emit('load', page)"
@@ -59,9 +61,7 @@
       }}</span>
     </template>
 
-    <template #paymentStatusName="{ row }">{{
-      paymentName(row.paymentStatus, row.settlementType)
-    }}</template>
+    <template #paymentStatusName="{ row }">{{ paymentName(row.paymentStatus) }}</template>
 
     <template #approvalStatusName="{ row }">
       <el-tag :type="statusType(row.approvalStatus)" class="status-text">{{
@@ -154,6 +154,8 @@ export default {
     'load',
     'action',
     'update:selection',
+    'search-change',
+    'search-reset',
   ],
   data() {
     return {
@@ -179,10 +181,6 @@ export default {
     },
   },
   methods: {
-    /** 搜索区展开/收起后由父级调用：avue 表格是固定像素高度，需手动触发了重新计算，否则分页会被推出视口 */
-    recalcTableHeight() {
-      this.$nextTick(() => this.$refs.crud?.getTableHeight?.());
-    },
     handleSelectionChange(selection) {
       this.selection = selection;
       this.$emit('update:selection', selection);
@@ -238,8 +236,8 @@ export default {
     invoiceName(value, settlementType) {
       return invoiceStatusName(value, settlementType);
     },
-    paymentName(value, settlementType) {
-      return paymentStatusName(value, settlementType);
+    paymentName(value) {
+      return paymentStatusName(value);
     },
     kingdeeSyncName(value) {
       return kingdeeSyncName(value);

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

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

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

@@ -67,26 +67,7 @@
                     :value="item.dictKey"
                   />
                 </el-select>
-                <el-select
-                  v-else-if="field.type === 'multi-select' && editable"
-                  v-model="form[field.prop]"
-                  multiple
-                  collapse-tags
-                  collapse-tags-tooltip
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in formSelectOptions(field)"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
-                </el-select>
-                <span
-                  v-else-if="field.type === 'select' || field.type === 'multi-select'"
-                  class="form-readonly"
-                >
+                <span v-else-if="field.type === 'select'" class="form-readonly">
                   {{ formSelectLabel(field, form[field.prop]) }}
                 </span>
                 <el-input
@@ -390,6 +371,7 @@
                   v-model="row.type"
                   filterable
                   placeholder="请选择"
+                  @change="sortAttachments"
                 >
                   <el-option
                     v-for="item in attachmentTypeOptions"
@@ -1007,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,
@@ -1043,11 +1024,6 @@ import { downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
-import {
-  formatSealTypes,
-  parseSealTypes,
-  SETTLEMENT_SEAL_TYPE_OPTIONS,
-} from '@/utils/settlement-seal';
 
 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
 const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
@@ -1096,8 +1072,6 @@ export default {
       changeTableColumns: changeRecordColumns,
       candidateColumns: candidateDetailColumns,
       contractOptions: [],
-      payerOptions: [],
-      payeeOptions: [],
       contractCategoryOptions,
       signTypeOptions,
       effectiveTypeOptions,
@@ -1140,7 +1114,6 @@ export default {
       feeCategoryOptions: [],
       businessModelOptions: [],
       transportTypeOptions: [],
-      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
       summaryFees: [],
       details: [],
       detailCollapsed: false,
@@ -1418,34 +1391,18 @@ export default {
       const first = rows[0];
       const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
       const contractId = first.contractId || '';
-      let contractPartyA = '';
-      let contractPartyB = '';
-      let contractPartyAJson = '';
-      let contractPartyBJson = '';
-      if (contractId) {
+      let contractPartyA = first.payerName || '';
+      let contractPartyB = first.payeeName || '';
+      if (contractId && (!contractPartyA || !contractPartyB)) {
         try {
-          const contractDetail = await this.fetchContractPartyDetail(contractId);
-          if (contractDetail) {
-            contractPartyA = contractDetail.partyA || '';
-            contractPartyB = contractDetail.partyB || '';
-            contractPartyAJson = contractDetail.partyAJson || '';
-            contractPartyBJson = contractDetail.partyBJson || '';
-          }
+          const { data } = await getContractOptions(first.contractNo || '');
+          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
+          contractPartyA = contractPartyA || matched?.partyA || '';
+          contractPartyB = contractPartyB || matched?.partyB || '';
         } 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({
@@ -1459,8 +1416,6 @@ export default {
           settlementType,
           partyA: contractPartyA,
           partyB: contractPartyB,
-          partyAJson: contractPartyAJson,
-          partyBJson: contractPartyBJson,
         });
       }
       this.handleContractChange(contractId);
@@ -1472,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;
@@ -1561,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 = [];
@@ -1577,11 +1530,7 @@ export default {
           ? await getMkPublicDetail('pre-settlement', this.form.id || this.recordId)
           : await getDetail(this.form.id || this.recordId);
         const detail = response.data?.data || {};
-        this.form = {
-          ...emptyPreSettlementForm(),
-          ...detail,
-          sealTypes: parseSealTypes(detail.sealTypes),
-        };
+        this.form = { ...emptyPreSettlementForm(), ...detail };
         this.summaryFees = (detail.summaryFees || []).map(row => ({ ...row }));
         this.details = (detail.details || []).map(row => this.normalizeSourceDetail(row));
         this.detailPage.current = 1;
@@ -1601,21 +1550,23 @@ export default {
           row => !isApprovalSettlementChange(row.changeContent)
         );
         this.attachments = this.parseAttachments(detail.attachmentsJson);
+        this.sortAttachments();
         this.selectedAttachmentRows = [];
-        if (detail.contractId) {
-          await this.ensureContractPartyOptions(detail.contractId, {
+        if (
+          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]) => {
@@ -1689,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'),
       };
@@ -1700,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 (
@@ -1744,9 +1693,6 @@ export default {
       return Array.isArray(options) ? options : [];
     },
     formSelectLabel(field, value) {
-      if (field?.type === 'multi-select') {
-        return formatSealTypes(value) || '-';
-      }
       if (value === undefined || value === null || value === '') return '-';
       const normalized = String(value).trim();
       const option = this.formSelectOptions(field).find(
@@ -1768,8 +1714,6 @@ export default {
         this.form.deptName = '';
         this.form.payerName = '';
         this.form.payeeName = '';
-        this.payerOptions = [];
-        this.payeeOptions = [];
         this.summaryFees = [];
         this.projectAdvanceWriteOffs = [];
         return;
@@ -1782,8 +1726,9 @@ export default {
       this.form.deptId = contract.deptId;
       this.form.deptName = contract.deptName;
       this.form.settlementType = contract.settlementType || 'payable';
-      this.syncPartyOptionsFromContract(contract);
-      this.applyPartySelection('', '');
+      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
+      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 = [];
@@ -1792,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) {
@@ -1972,9 +1771,6 @@ export default {
             subjectName: this.form.preSettlementNo || this.form.contractName || '',
             approvalStatus: previousApprovalStatus,
             mkEnabled: await loadMkEnabled().catch(() => false),
-            tempVarData: {
-              sealTypes: formatSealTypes(this.form.sealTypes) || '',
-            },
           });
           this.$message.success(mkStarted ? '审批流程已发起' : '提交成功');
           this.visible = false;
@@ -1994,7 +1790,6 @@ export default {
         contractId: this.form.contractId,
         businessModel: this.form.businessModel || undefined,
         transportType: this.form.transportType || undefined,
-        sealTypes: formatSealTypes(this.form.sealTypes) || undefined,
         exchangeRateDate: this.form.exchangeRateDate || undefined,
         exchangeRate: this.form.exchangeRate,
         attachmentsJson: JSON.stringify(this.attachments || []),
@@ -3133,6 +2928,7 @@ export default {
           uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
         };
       });
+      this.sortAttachments();
       this.selectedAttachmentRows = [];
     },
     async loadAttachmentTypeOptions() {
@@ -3148,6 +2944,7 @@ export default {
       } catch (error) {
         this.attachmentTypeOptions = [];
       }
+      this.sortAttachments();
     },
     resolveAttachmentType(fileName) {
       const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3175,6 +2972,25 @@ export default {
         typeText === '其它附件'
       );
     },
+    getAttachmentTypeOrder(type) {
+      const normalizedType = String(type || '').trim();
+      const index = this.attachmentTypeOptions.findIndex(
+        item =>
+          String(item.value || '').trim() === normalizedType ||
+          String(item.label || '').trim() === normalizedType
+      );
+      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
+    },
+    sortAttachments() {
+      this.attachments = (this.attachments || [])
+        .map((file, index) => ({ file, index }))
+        .sort((a, b) => {
+          const orderDifference =
+            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
+          return orderDifference || a.index - b.index;
+        })
+        .map(item => item.file);
+    },
     attachmentTypeName(type) {
       const option = this.attachmentTypeOptions.find(
         item => String(item.value) === String(type) || String(item.label) === String(type)

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"
-                  :key="item.optionValue"
-                  :label="item.optionLabel"
-                  :value="item.optionValue"
+                  v-for="item in filteredCarrierContracts"
+                  :key="item.id"
+                  :label="formatContractLabel(item)"
+                  :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 item = filteredCarrierContractOptions.value.find(
-    row => String(row.optionValue) === String(optionValue)
-  );
-  form.carrierOptionValue = item?.optionValue || '';
-  form.carrierContractId = item?.id || '';
+const onCarrierContractChange = id => {
+  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
   form.carrierContractName = item?.contractName || '';
-  form.carrierPartyId = item?.carrierPartyId || '';
-  form.carrierPartyRole = item?.carrierPartyRole || '';
   form.carrierName = item?.carrierName || item?.partyB || '';
 };
 

src/views/settlement/formal-settlement-public-view.vue

@@ -17,7 +17,6 @@
 <script>
 import MkPublicShell from '@/views/mk/mk-public-shell.vue';
 import FormalSettlementEditor from '@/views/settlement/components/formal-settlement-editor.vue';
-import { formatSealTypes } from '@/utils/settlement-seal';
 
 export default {
   name: 'FormalSettlementPublicView',
@@ -30,11 +29,7 @@ export default {
   methods: {
     getForm() {
       const form = this.$refs.page?.form || {};
-      return {
-        ...form,
-        sealTypes: formatSealTypes(form.sealTypes) || '',
-        subject: form.formalSettlementNo || form.contractName || '',
-      };
+      return { ...form, subject: form.formalSettlementNo || form.contractName || '' };
     },
   },
 };

src/views/settlement/formal-settlement.vue

@@ -1,55 +1,5 @@
 <template>
   <basic-container class="formal-page">
-    <section class="formal-search">
-      <el-form :model="searchForm" label-position="right" label-width="88px" @submit.prevent>
-        <div class="formal-search__grid">
-          <template v-for="field in visibleSearchFields" :key="field.prop">
-            <el-form-item :label="field.label">
-              <el-date-picker
-                v-if="field.type === 'daterange'"
-                v-model="searchForm[field.prop]"
-                type="daterange"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                range-separator="~"
-                start-placeholder="年/月/日"
-                end-placeholder="年/月/日"
-              />
-              <el-select
-                v-else-if="field.type === 'select'"
-                v-model="searchForm[field.prop]"
-                clearable
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in field.options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-              <el-cascader
-                v-else-if="field.type === 'cascader'"
-                v-model="searchForm[field.prop]"
-                :options="organizationSearchTreeOptions"
-                :props="organizationCascaderProps"
-                filterable
-                clearable
-                placeholder="请选择 所属组织"
-              />
-              <el-input v-else v-model="searchForm[field.prop]" clearable placeholder="请输入" />
-            </el-form-item>
-          </template>
-          <div class="formal-search__actions">
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="handleReset">重置</el-button>
-            <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
-              {{ searchExpanded ? '收起' : '展开' }}
-            </el-button>
-          </div>
-        </div>
-      </el-form>
-    </section>
     <el-tabs
       v-if="!lockedSettlementType"
       type="border-card"
@@ -60,7 +10,6 @@
         <formal-settlement-table-panel
           v-if="activeSettlementType === 'payable'"
           key="payable"
-          ref="panel"
           v-bind="tablePanelProps"
           v-on="tablePanelListeners"
         />
@@ -69,7 +18,6 @@
         <formal-settlement-table-panel
           v-if="activeSettlementType === 'receivable'"
           key="receivable"
-          ref="panel"
           v-bind="tablePanelProps"
           v-on="tablePanelListeners"
         />
@@ -78,7 +26,6 @@
     <formal-settlement-table-panel
       v-else
       key="locked"
-      ref="panel"
       v-bind="tablePanelProps"
       v-on="tablePanelListeners"
     />
@@ -198,10 +145,10 @@
           <el-descriptions-item label="创建时间">
             {{ invoiceRegisterDialog.row.createTime || '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态">
+          <el-descriptions-item label="金蝶同步状态" :span="2">
             {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
           </el-descriptions-item>
-          <el-descriptions-item label="备注">
+          <el-descriptions-item label="备注" :span="2">
             {{ invoiceRegisterDialog.row.remark || '-' }}
           </el-descriptions-item>
         </el-descriptions>
@@ -275,7 +222,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
 import {
   hasSettlementPermission,
@@ -288,20 +234,12 @@ import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
 import * as invoiceReceiptApi from '@/api/payment/invoiceReceipt';
 import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement';
-import {
-  approvalStatusOptions,
-  invoiceStatusOptions,
-  kingdeeSyncStatusOptions,
-  paymentStatusOptions,
-} from '@/option/settlement/formalSettlementSearch';
-import { getDictionary } from '@/api/system/dictbiz';
 import organizationSearch from '@/mixins/organization-search';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
 import InvoiceReceiptCandidatesDialog from './components/invoice-receipt-candidates-dialog.vue';
 import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
 import { getMKApprovalUrl } from '@/api/system/business-process';
-import { formatSealTypes } from '@/utils/settlement-seal';
 
 export default {
   name: 'FormalSettlement',
@@ -317,16 +255,8 @@ export default {
   },
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
+      option: formalSettlementOption(),
       query: {},
-      // 手写搜索区（与应收/应付明细同款）：模型与展开状态
-      searchForm: {},
-      searchExpanded: false,
-      // 发票状态/收付款状态下拉选项：来自数据字典（按结算类型区分收/付方向），
-      // 字典未配置时回退前端默认文案（见 loadStatusDicts）
-      invoiceStatusDict: [],
-      paymentStatusDict: [],
       activeSettlementType: 'payable',
       rows: [],
       selection: [],
@@ -359,51 +289,6 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
-    // 搜索字段与应收/应付明细同结构；收付款/发票状态选项随结算类型区分
-    searchFields() {
-      return [
-        { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
-        { label: '项目名称', prop: 'projectName', type: 'input' },
-        { label: '所属组织', prop: 'deptName', type: 'cascader' },
-        { label: '合同编号', prop: 'contractNo', type: 'input' },
-        { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
-        { label: '付款方', prop: 'payerName', type: 'input' },
-        { label: '收款方', prop: 'payeeName', type: 'input' },
-        {
-          label: '发票状态',
-          prop: 'invoiceStatus',
-          type: 'select',
-          options: this.invoiceStatusDict,
-        },
-        {
-          label: this.activeSettlementType === 'payable' ? '付款状态' : '收款状态',
-          prop: 'paymentStatus',
-          type: 'select',
-          options: this.paymentStatusDict,
-        },
-        {
-          label: '审核状态',
-          prop: 'approvalStatus',
-          type: 'select',
-          options: approvalStatusOptions,
-        },
-        {
-          label: '金蝶单据状态',
-          prop: 'kingdeeSyncStatus',
-          type: 'select',
-          options: kingdeeSyncStatusOptions,
-        },
-        { label: '生成日期', prop: 'createDateRange', type: 'daterange' },
-      ];
-    },
-    // 默认折叠只展示一行 4 个条件
-    visibleSearchFields() {
-      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
-    },
-    // 列随结算类型切换重建：收款结算单不展示「已指定应付」
-    option() {
-      return formalSettlementOption(this.activeSettlementType);
-    },
     isAdmin() {
       return isAdministrator(this.userInfo);
     },
@@ -441,6 +326,8 @@ export default {
         refresh: () => this.onLoad(this.page),
         load: this.onLoad,
         action: this.onAction,
+        'search-change': this.searchChange,
+        'search-reset': this.searchReset,
         'update:selection': selection => {
           this.selection = selection;
         },
@@ -462,8 +349,6 @@ export default {
     activeSettlementType() {
       // 切换结算类型后由新挂载的 avue-crud 触发 on-load，此处只重置分页，避免重复请求
       this.page.currentPage = 1;
-      // 收/付方向的字典文案不同，切 tab 后重拉
-      this.loadStatusDicts();
     },
     '$route.query.detailNo'(detailNo) {
       if (detailNo) this.openRouteDetail(detailNo);
@@ -471,7 +356,6 @@ export default {
   },
   created() {
     this.loadOrganizationOptions();
-    this.loadStatusDicts();
   },
   mounted() {
     this.isPageActive = true;
@@ -514,57 +398,25 @@ export default {
         this.loading = false;
       }
     },
-    /**
-     * 发票状态/收付款状态下拉选项从字典加载（dictKey=后端状态值，dictValue=文案）。
-     * 收/付两个方向文案不同，按结算类型区分字典编码：
-     *   invoice_status_payable / invoice_status_receivable
-     *   payment_status_payable / payment_status_receivable
-     * 字典未配置或为空时回退前端默认文案，保证页面可用。
-     */
-    loadStatusDicts() {
-      const type = this.activeSettlementType;
-      const fallback = {
-        invoice: invoiceStatusOptions(type),
-        payment: paymentStatusOptions(type),
-      };
-      const pick = res =>
-        (res?.data?.data || [])
-          .map(item => ({ label: item.dictValue, value: String(item.dictKey) }))
-          .filter(item => item.label && item.value);
-      Promise.all([
-        getDictionary({ code: `invoice_status_${type}` }).catch(() => null),
-        getDictionary({ code: `payment_status_${type}` }).catch(() => null),
-      ]).then(([invoiceRes, paymentRes]) => {
-        const invoice = pick(invoiceRes);
-        const payment = pick(paymentRes);
-        this.invoiceStatusDict = invoice.length ? invoice : fallback.invoice;
-        this.paymentStatusDict = payment.length ? payment : fallback.payment;
-      });
-    },
-    // 搜索提交：组织级联路径转名称、日期区间拆成起止参数（与原 avue searchChange 同规则）
-    buildSearchParams() {
-      const params = { ...this.searchForm };
+    searchChange(params, done) {
+      // 所属组织级联返回 id 路径，转成组织名称传给后端
       this.normalizeOrganizationSearch(params, 'deptName');
       const range = params.createDateRange || [];
       delete params.createDateRange;
-      return { ...params, createStartDate: range[0] || '', createEndDate: range[1] || '' };
-    },
-    handleSearch() {
-      this.query = this.buildSearchParams();
+      this.query = {
+        ...params,
+        createStartDate: range[0] || '',
+        createEndDate: range[1] || '',
+      };
       this.page.currentPage = 1;
       this.onLoad(this.page);
+      done();
     },
-    handleReset() {
-      this.searchForm = {};
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    toggleSearch() {
-      this.searchExpanded = !this.searchExpanded;
-      // 搜索区在 avue 外部，高度变化 avue 感知不到，需手动触发表格高度重算，保证分页在一屏内
-      this.$refs.panel?.recalcTableHeight();
-    },
     onAction({ type, row }) {
       const handlers = {
         view: () => this.openView(row),
@@ -581,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}`,
@@ -594,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,
@@ -652,9 +502,6 @@ export default {
         subjectName: row.formalSettlementNo || '',
         approvalStatus: previousApprovalStatus,
         mkEnabled: this.mkEnabled,
-        tempVarData: {
-          sealTypes: formatSealTypes(row.sealTypes) || '',
-        },
       });
       this.$message.success('提交成功');
       this.onLoad(this.page);
@@ -995,10 +842,6 @@ export default {
     settlementTypeName(value) {
       return { payable: '付款', receivable: '收款' }[value] || '-';
     },
-    // 模板无法直接访问 script 顶部 import，包装成实例方法（与 formal-settlement-table-panel 同模式）
-    kingdeeSyncName(value) {
-      return kingdeeSyncName(value);
-    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -1025,56 +868,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-// 搜索区与应收/应付明细页（settlement-detail-page__search）同款样式
-.formal-search {
-  margin-bottom: 8px;
-  padding: 12px 12px 4px;
-  background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-
-  :deep(.el-form-item__label) {
-    white-space: nowrap;
-  }
-}
-
-.formal-search__grid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(220px, 1fr));
-  gap: 8px 24px;
-  align-items: start;
-
-  :deep(.el-form-item) {
-    margin-bottom: 8px;
-  }
-
-  :deep(.el-input),
-  :deep(.el-select),
-  :deep(.el-cascader),
-  :deep(.el-date-editor) {
-    width: 100%;
-  }
-}
-
-.formal-search__actions {
-  grid-column: 1 / -1;
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-bottom: 8px;
-}
-
-@media screen and (max-width: 1200px) {
-  .formal-search__grid {
-    grid-template-columns: repeat(2, minmax(220px, 1fr));
-  }
-}
-
-@media screen and (max-width: 760px) {
-  .formal-search__grid {
-    grid-template-columns: 1fr;
-  }
-}
-
 .formal-page {
   :deep(.el-table) {
     --el-table-border-color: #eff1f7;

src/views/settlement/pre-settlement-public-view.vue

@@ -17,7 +17,6 @@
 <script>
 import MkPublicShell from '@/views/mk/mk-public-shell.vue';
 import PreSettlementEditor from '@/views/settlement/components/pre-settlement-editor.vue';
-import { formatSealTypes } from '@/utils/settlement-seal';
 
 export default {
   name: 'PreSettlementPublicView',
@@ -30,11 +29,7 @@ export default {
   methods: {
     getForm() {
       const form = this.$refs.page?.form || {};
-      return {
-        ...form,
-        sealTypes: formatSealTypes(form.sealTypes) || '',
-        subject: form.preSettlementNo || form.contractName || '',
-      };
+      return { ...form, subject: form.preSettlementNo || form.contractName || '' };
     },
   },
 };

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"
       >
@@ -148,9 +147,6 @@
             <span v-else-if="column.prop === 'sourceType'">
               {{ row[column.prop] === '应收应付' ? '应付' : displayValue(row[column.prop]) }}
             </span>
-            <span v-else-if="column.prop === 'sealTypes'">
-              {{ formatSealTypes(row[column.prop]) || '-' }}
-            </span>
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
@@ -309,7 +305,6 @@ import { preSettlementSearchFields } from '@/option/settlement/preSettlementSear
 import organizationSearch from '@/mixins/organization-search';
 import { preSettlementTableColumns } from '@/option/settlement/preSettlementTable';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
-import { formatSealTypes } from '@/utils/settlement-seal';
 import { downloadFile } from '@/utils/util';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
@@ -405,7 +400,6 @@ export default {
       });
   },
   methods: {
-    formatSealTypes,
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
@@ -675,9 +669,6 @@ export default {
         subjectName: row.preSettlementNo || '',
         approvalStatus: previousApprovalStatus,
         mkEnabled: this.mkEnabled,
-        tempVarData: {
-          sealTypes: formatSealTypes(row.sealTypes) || '',
-        },
       });
       this.$message.success('提交成功');
       this.loadTable();
@@ -777,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);
@@ -829,10 +801,6 @@ $pre_page_height: calc(100vh - 114px);
   }
 
   &__table-panel {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    min-height: 0;
     margin-top: 8px;
   }
 
@@ -855,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

@@ -136,7 +136,7 @@
         <div class="settlement-detail-page__detail-panel-body">
           <el-tabs v-model="detailDialog.activeTab" @tab-change="handleDetailTabChange">
             <el-tab-pane label="费用明细" name="fee">
-              <el-table v-loading="detailDialog.loading" :data="feeRows" :max-height="detailTableMaxHeight" border>
+              <el-table v-loading="detailDialog.loading" :data="feeRows" border>
                 <el-table-column type="index" label="序号" width="64" align="center" />
                 <el-table-column
                   v-for="column in feeDetailColumns"
@@ -168,7 +168,7 @@
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="变更记录" name="change">
-              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" :max-height="detailTableMaxHeight" border>
+              <el-table v-loading="latestChangeLoading" :data="latestChangeRows" border>
                 <el-table-column type="index" label="序号" width="64" align="center" />
                 <el-table-column
                   v-for="column in changeRecordColumns"
@@ -507,13 +507,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog
-      v-model="transferDialog.visible"
-      title="批量转结算"
-      width="72%"
-      append-to-body
-      align-center
-    >
+    <el-dialog v-model="transferDialog.visible" title="批量转结算" width="86%" append-to-body>
       <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="序号"
@@ -1063,11 +1056,10 @@ import { getContractOptions as getSettlementContractOptions } from '@/api/settle
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
+import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
-import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
-import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
 import {
   contractApprovalStatusOptions,
   contractCategoryOptions,
@@ -1144,6 +1136,8 @@ export default {
         rule: null,
       },
       adjustDialog: { visible: false, loading: false, submitting: false, row: null },
+      // 表头 + 最多 3 行费用 + 横向滚动条，超出后表体上下滚动
+      adjustTableMaxHeight: 40 + 49 * 3 + 16,
       adjustRows: [],
       adjustDynamicFeeColumns: [],
       adjustTextProps: ['specification', 'model', 'billingFactor', 'billingType'],
@@ -1221,28 +1215,18 @@ export default {
     };
   },
   computed: {
-    adjustTableMaxHeight() {
-      // 面板满高 min(60vh,560) 减去头部(49)、底部(58)、内边距(32)；费用行多时表体内部滚动，表头固定
-      if (!this.adjustDialog.visible) return 40 + 49 * 3 + 16;
-      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 138;
-    },
-    detailTableMaxHeight() {
-      // 同上，另减 body 下内边距(16) 和 tabs 头(55)
-      if (!this.detailDialog.visible) return 40 + 49 * 3 + 16;
-      return Math.round(Math.min(window.innerHeight * 0.6, 560)) - 178;
-    },
     generateContractName() {
       const contract = this.contractOptions.find(
         item => String(item.id) === String(this.generateQuery.contractId)
       );
-      return contract?.contractName || '';
+      return formatContractOptionLabel(contract);
     },
     updateContractName() {
       const contractId = this.updateFeeForm.contractId;
       const contract = [...this.updateContractOptions, ...this.contractOptions].find(
         item => String(item.id) === String(contractId)
       );
-      return contract?.contractName || '';
+      return formatContractOptionLabel(contract);
     },
     updateBillingPlanName() {
       const billingPlanId = this.updateFeeForm.billingPlanId;
@@ -1929,9 +1913,8 @@ export default {
         this.openSettlementDetail('/settlement/pre-settlement', row.preSettlementNo);
         return;
       }
-      // 正式结算单号：跳转付款/收款结算单表单页并打开详情（与开票申请等入口一致）
-      if (column.prop === 'formalSettlementNo') {
-        this.openFormalSettlementDetail(row.formalSettlementNo);
+      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
+        this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
         return;
       }
       this.openDetailDialog(row);
@@ -1943,42 +1926,6 @@ export default {
       }
       this.$router.push({ path, query: { detailNo } });
     },
-    async openFormalSettlementDetail(formalSettlementNo) {
-      const normalizedNo = String(formalSettlementNo || '')
-        .split(/[、,，]/)
-        .map(item => item.trim())
-        .find(Boolean);
-      if (!normalizedNo) {
-        this.$message.info('当前记录未关联结算单详情');
-        return;
-      }
-      try {
-        const data = this.unwrapPage(
-          await getFormalSettlementList(1, 10, { formalSettlementNo: normalizedNo })
-        );
-        const row = (data.records || []).find(
-          item => String(item.formalSettlementNo || '').trim() === normalizedNo
-        );
-        if (!row?.id) {
-          this.$message.warning('未找到对应的正式结算单');
-          return;
-        }
-        const settlementType = row.settlementType || this.settlementType || 'payable';
-        const listPath = settlementListPath(settlementType);
-        await this.$router.push({
-          path: `${listPath}/form`,
-          query: {
-            mode: 'view',
-            id: row.id,
-            settlementType,
-            listPath,
-            name: `查看${settlementBillLabel(settlementType)}`,
-          },
-        });
-      } catch (error) {
-        this.$message.error('正式结算单详情加载失败');
-      }
-    },
     async openRouteDetail(detailId = this.$route.query.detailId) {
       // 结算明细点「单据号」会带 detailId 跳到本页；只有当前停在应收/应付明细页时才自动展开详情
       const routePath =
@@ -2712,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,
@@ -2958,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 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;
-        }
-      }
+      const plans = this.parseJson(contract?.billingPlanJson);
       this.billingPlanOptions = plans.map((item, index) => ({
         id:
           item.id ||
@@ -2993,16 +2916,11 @@ export default {
           item.planName ||
           item.billingPlanName ||
           `plan-${index}`,
-        name: [
-          item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
-          item.customerName ? `（${item.customerName}）` : '',
-        ].join(''),
+        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
         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"
@@ -93,7 +86,6 @@
 <script>
 import { getList, getDetail, submit, remove } from '@/api/system/business-dept-config';
 import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
-import { normalizeBusinessDeptOptions } from '@/utils/dept';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -125,7 +117,7 @@ export default {
         editBtn: false,
         delBtn: false,
         viewBtn: false,
-        menuWidth: 220,
+        menuWidth: 140,
         dialogWidth: 900,
         dialogClickModal: false,
         labelPosition: 'right',
@@ -155,9 +147,8 @@ export default {
           {
             label: '业务部门',
             prop: 'businessDeptName',
-            minWidth: 260,
+            minWidth: 160,
             display: false,
-            formatter: row => this.formatBusinessDeptLabel(row),
           },
           {
             label: '平台公司',
@@ -197,8 +188,7 @@ export default {
             formslot: true,
             addDisplay: true,
             editDisplay: true,
-            // 列表展示，维护入口在组织管理的平台公司
-            hide: false,
+            hide: true,
           },
           {
             label: '初始流水号',
@@ -209,7 +199,6 @@ export default {
             minRows: 1,
             maxRows: 999,
             controls: false,
-            clearable: true,
             slot: true,
             placeholder: '如果系统已有相同流水号，则跳过这个流水号',
           },
@@ -263,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();
   },
@@ -279,16 +260,11 @@ export default {
       Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
         ([platformRes, businessRes]) => {
           this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
-          // 业务部门配置页始终展示「部门（所属公司）」，便于与平台公司配对
-          this.businessDeptOptions = normalizeBusinessDeptOptions(businessRes?.data?.data, {
-            alwaysShowCompany: true,
-          });
+          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;
-          // 下拉选项就绪后刷新列表展示名（避免列表先于选项返回时只显示裸部门名）
-          this.refreshBusinessDeptLabels();
         }
       );
     },
@@ -299,106 +275,63 @@ export default {
         kingdeeDeptCode: item.kingdeeDeptCode || '',
       }));
     },
-    /** 列表业务部门列：部门名（所属公司） */
-    formatBusinessDeptLabel(row) {
-      if (!row) return '-';
-      const matched = this.businessDeptOptions.find(
-        item => String(item.value) === String(row.businessDeptId)
-      );
-      if (matched?.label) return matched.label;
-      return row.businessDeptName || '-';
-    },
-    refreshBusinessDeptLabels() {
-      if (!this.data?.length) return;
-      this.data = this.data.map(row => ({ ...row }));
-    },
     formatSerial(value) {
-      // Avue number 空值常落成 -1，历史脏数据也按空展示
-      if (value === null || value === undefined || value === '' || value === -1 || value === '-1') {
-        return '';
-      }
+      if (value === null || value === undefined || value === '') 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) {
       const matched = this.businessDeptOptions.find(item => String(item.value) === String(value));
-      this.form.businessDeptName = matched ? matched.rawLabel || matched.label : '';
+      this.form.businessDeptName = matched ? matched.label : '';
     },
     beforeOpen(done, type) {
-      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
-        ([platformRes, businessRes]) => {
-          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
-          this.businessDeptOptions = normalizeBusinessDeptOptions(businessRes?.data?.data, {
-            alwaysShowCompany: true,
-          });
-          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;
-        }
-      );
+      this.loadSelectOptions();
       if (['edit', 'view'].includes(type) && this.form.id) {
-        Promise.all([loadOptions, getDetail(this.form.id)]).then(([, detailRes]) => {
-          const detail = detailRes.data?.data || {};
-          const platformCompanyId = detail.platformCompanyId ? String(detail.platformCompanyId) : '';
-          const platformMatched = this.platformCompanyOptions.find(
-            item => String(item.value) === platformCompanyId
-          );
+        getDetail(this.form.id).then(res => {
+          const detail = res.data?.data || {};
           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') {
-          this.form = {
-            platformCompanyId: '',
-            platformCompanyName: '',
-            businessDeptId: '',
-            businessDeptName: '',
-            contractCodePrefix: '',
-            initialSerial: undefined,
-            kingdeeCompanyCode: '',
-            kingdeeDeptCode: '',
-            remark: '',
-          };
-        }
-        done();
-      });
+      if (type === 'add') {
+        this.form = {
+          platformCompanyId: '',
+          platformCompanyName: '',
+          businessDeptId: '',
+          businessDeptName: '',
+          contractCodePrefix: '',
+          initialSerial: undefined,
+          kingdeeCompanyCode: '',
+          kingdeeDeptCode: '',
+          remark: '',
+        };
+      }
+      done();
     },
     normalizeSubmitRow(row) {
+      const initialSerial =
+        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
+          ? null
+          : Number(row.initialSerial);
       return {
         ...row,
         platformCompanyId: row.platformCompanyId || null,
         businessDeptId: row.businessDeptId || null,
         contractCodePrefix: String(row.contractCodePrefix || '').trim(),
-        // 金蝶公司代码由后端按平台公司组织配置覆盖，前端仅展示
         kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
         remark: String(row.remark || '').trim(),
-        initialSerial: 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) => {
-                  if (value === undefined || value === null || value === '') {
-                    callback(new Error('请选择是否平台公司'));
-                    return;
-                  }
-                  callback();
-                },
+                required: true,
+                message: '请选择是否平台公司',
                 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：值为 0（否）时会被当成空
-                  if (value === undefined || value === null || value === '') {
-                    callback(new Error('请选择是否业务部门'));
-                    return;
-                  }
-                  callback();
-                },
+                required: true,
+                message: '请选择是否业务部门',
                 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);
-        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
-        this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
+        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
+          this.form.isPlatformCompany = 0;
+        }
+        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 => {
-            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();
+        getDept(this.form.id).then(res => {
+          this.form = Object.assign(res.data.data, {
+            hasChildren: this.form.hasChildren,
           });
-        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/mp-user.vue

@@ -66,21 +66,17 @@
         />
       </template>
       <template #dataScopeDeptIds-form>
-        <!-- 与用户管理「数据管理权限」一致：组织多选级联，数据源同左侧组织树 -->
-        <el-cascader
+        <el-tree
           v-if="Number(form.dataScopeRange) === 3"
-          v-model="dataScopeCascaderValue"
-          :options="permissionDeptTree"
-          :props="deptCascaderProps"
-          :disabled="isViewMode"
-          clearable
-          filterable
-          collapse-tags
-          collapse-tags-tooltip
-          placeholder="请选择数据权限组织（可多选）"
-          style="width: 100%"
+          ref="dataScopeTree"
+          :data="permissionDeptTree"
+          show-checkbox
+          node-key="id"
+          :default-checked-keys="form.dataScopeDeptIds || []"
+          :props="{ label: 'title', children: 'children' }"
+          @check="handleDataScopeCheck"
         />
-        <span v-else class="form-tip">选择「自定义」后可选择数据权限组织</span>
+        <span v-else class="form-tip">选择「自定义」后可勾选数据权限组织</span>
       </template>
       <template #menu="{ row, index }">
         <el-link
@@ -197,26 +193,6 @@ export default {
             : [];
       },
     },
-    // 自定义数据权限组织：与用户管理数据管理权限相同的多选级联
-    dataScopeCascaderValue: {
-      get() {
-        const ids = Array.isArray(this.form.dataScopeDeptIds)
-          ? this.form.dataScopeDeptIds
-          : this.form.dataScopeDeptIds
-            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
-            : [];
-        return ids
-          .filter(item => item !== undefined && item !== null && item !== '')
-          .map(item => (typeof item === 'number' ? item : String(item)));
-      },
-      set(value) {
-        this.form.dataScopeDeptIds = Array.isArray(value)
-          ? value.filter(item => item !== undefined && item !== null && item !== '')
-          : value
-            ? [value]
-            : [];
-      },
-    },
   },
   created() {
     this.sensitiveManager = sensitive.create({
@@ -252,6 +228,12 @@ export default {
         this.permissionDeptTree = res.data.data || [];
       });
     },
+    handleDataScopeCheck(_, checked) {
+      if (this.isViewMode) {
+        return;
+      }
+      this.form.dataScopeDeptIds = checked.checkedKeys || [];
+    },
     normalizeSubmitRow(row = {}, isUpdate = false) {
       let payload = { ...row };
       // 编辑时剔除未改动的脱敏字段，避免把 138****8000 写回库
@@ -296,19 +278,17 @@ export default {
             detail.identities = detail.identities.split(',').filter(Boolean);
           }
           const deptIds = func.split(detail.deptId || '');
-          const dataScopeDeptIds = Array.isArray(detail.dataScopeDeptIds)
-            ? detail.dataScopeDeptIds.map(item => String(item))
-            : detail.dataScopeDeptIds
-              ? String(detail.dataScopeDeptIds).split(',').filter(Boolean)
-              : [];
           this.form = {
             ...detail,
             deptId: Array.isArray(deptIds) ? deptIds : [],
             dataScopeRange: detail.dataScopeRange || 1,
             dataLevelRange: detail.dataLevelRange || 1,
-            dataScopeDeptIds,
+            dataScopeDeptIds: detail.dataScopeDeptIds || [],
           };
           this.sensitiveManager?.saveInitialData(this.form);
+          this.$nextTick(() => {
+            this.$refs.dataScopeTree?.setCheckedKeys?.(this.form.dataScopeDeptIds || []);
+          });
           done();
         });
         return;

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';
     },
@@ -713,12 +678,6 @@ export default {
       }
       this.selectDeptOnTree(deptId);
     },
-    startDeptTreeFromSecondLevel(tree) {
-      if (!Array.isArray(tree) || !tree.length) {
-        return [];
-      }
-      return tree.flatMap(node => (Array.isArray(node.children) ? node.children : []));
-    },
     findDeptIdByName(name, tree = this.permissionDeptTree) {
       if (!name) return null;
       for (const node of tree || []) {
@@ -739,7 +698,7 @@ export default {
         const tenantId = this.userInfo.tenantId || this.website.tenantId;
         try {
           const res = await getDeptTree(tenantId);
-          this.permissionDeptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
+          this.permissionDeptTree = res.data.data || [];
         } catch (error) {
           this.$message.error('组织树加载失败');
           return;
@@ -827,7 +786,7 @@ export default {
     },
     handleOaPersonFullSync() {
       this.$confirm(
-        '全量同步将按 OA 对齐人员：账号名统一用工号（无工号不同步），已有账号不修改密码，部门按 OA 当前部门重绑，OA 中已不存在或已离职的删除。是否继续？',
+        '全量同步将按 OA 对齐人员：有登录名的按登录名更新且不修改密码，没有登录名但有工号的也会入库且不回填登录名，部门按 OA 当前部门重绑，OA 中已不存在或已离职的删除。是否继续？',
         '全量同步',
         {
           confirmButtonText: '确定',
@@ -840,7 +799,7 @@ export default {
     },
     handleOaPersonIncrementalSync() {
       this.$confirm(
-        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员：账号名统一用工号（无工号不同步），已有的更新且不修改密码，没有的新增，部门按 OA 当前部门重绑，离职人员直接删除。是否继续？',
+        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员：已有的更新且不修改密码，没有的新增，部门按 OA 当前部门重绑，离职人员直接删除。是否继续？',
         '增量同步',
         {
           confirmButtonText: '确定',
@@ -969,11 +928,9 @@ export default {
         column.dicData = res.data.data;
       });
       getDeptTree(tenantId).then(res => {
-        // 用户管理组织从第二级开始展示：去掉一级根节点，保留其子节点
-        const deptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
-        this.permissionDeptTree = deptTree;
+        this.permissionDeptTree = res.data.data;
         const column = this.findColumn(this.userOption.group, 'deptId');
-        column.dicData = deptTree;
+        column.dicData = res.data.data;
       });
       getPostList(tenantId).then(res => {
         this.postList = res.data.data;
@@ -1077,7 +1034,6 @@ export default {
           sex: undefined,
           postId: '',
           deptId: [],
-          dataScopeDeptIds: [],
           code: '',
           personCategory: 1,
           remark: '',
@@ -1090,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,
@@ -1112,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/cert-audit-driver-public-view.vue

@@ -1,20 +0,0 @@
-<template>
-  <mk-public-shell biz-type="cert-audit-driver" :get-form="getForm">
-    <cert-audit-public-content ref="page" biz-type="driver" />
-  </mk-public-shell>
-</template>
-
-<script>
-import MkPublicShell from '@/views/mk/mk-public-shell.vue';
-import CertAuditPublicContent from './components/cert-audit-public-content/main.vue';
-
-export default {
-  name: 'CertAuditDriverPublicView',
-  components: { MkPublicShell, CertAuditPublicContent },
-  methods: {
-    getForm() {
-      return this.$refs.page?.getForm?.() || {};
-    },
-  },
-};
-</script>

src/views/transportCapacity/cert-audit-vehicle-public-view.vue

@@ -1,20 +0,0 @@
-<template>
-  <mk-public-shell biz-type="cert-audit-vehicle" :get-form="getForm">
-    <cert-audit-public-content ref="page" biz-type="vehicle" />
-  </mk-public-shell>
-</template>
-
-<script>
-import MkPublicShell from '@/views/mk/mk-public-shell.vue';
-import CertAuditPublicContent from './components/cert-audit-public-content/main.vue';
-
-export default {
-  name: 'CertAuditVehiclePublicView',
-  components: { MkPublicShell, CertAuditPublicContent },
-  methods: {
-    getForm() {
-      return this.$refs.page?.getForm?.() || {};
-    },
-  },
-};
-</script>

src/views/transportCapacity/components/cert-audit-detail/main.vue

@@ -61,14 +61,6 @@
       </section-card>
 
       <section-card title="审核意见">
-        <el-alert
-          v-if="mkEnabled && auditable"
-          type="info"
-          :closable="false"
-          show-icon
-          title="已开启 MK 审核流：请在列表点击「提交 / 流程」完成审批，此处仅可查看"
-          class="cert-audit-detail__notice"
-        />
         <el-form label-position="right" label-width="90px" class="cert-audit-detail__form">
           <el-form-item label="驳回原因">
             <el-input
@@ -77,7 +69,7 @@
               :rows="3"
               maxlength="200"
               show-word-limit
-              :disabled="!localAuditable"
+              :disabled="!auditable"
               placeholder="驳回时必填，不超过 200 字；通过时无需填写"
             />
           </el-form-item>
@@ -86,20 +78,18 @@
     </div>
 
     <template #footer>
-      <el-button @click="visible = false">{{ mkEnabled ? '关闭' : '取消' }}</el-button>
+      <el-button @click="visible = false">取消</el-button>
       <el-button
-        v-if="!mkEnabled"
         type="danger"
-        :disabled="!localAuditable || loadFailed"
+        :disabled="!auditable || loadFailed"
         :loading="rejectLoading"
         @click="handleReject"
       >
         驳回
       </el-button>
       <el-button
-        v-if="!mkEnabled"
         type="primary"
-        :disabled="!localAuditable || loadFailed"
+        :disabled="!auditable || loadFailed"
         :loading="approveLoading"
         @click="handleApprove"
       >
@@ -134,11 +124,6 @@ export default {
       type: String,
       default: 'driver',
     },
-    // 开启 MK 后详情页仅查看，本地通过/驳回隐藏
-    mkEnabled: {
-      type: Boolean,
-      default: false,
-    },
   },
   emits: ['update:modelValue', 'success'],
   data() {
@@ -181,9 +166,6 @@ export default {
     auditable() {
       return String(this.detail.status) === String(CERT_RECORD_STATUS.PENDING);
     },
-    localAuditable() {
-      return this.auditable && !this.mkEnabled;
-    },
     diffKey() {
       return `${this.detail.id || this.recordId || ''}-${this.detail.submitTime || ''}`;
     },

src/views/transportCapacity/components/cert-audit-list/main.vue

@@ -39,21 +39,7 @@
       <template #menu="{ row }">
         <!-- 只有审核中的记录能审；已通过/已驳回只能查看，弹窗内也会禁用审核按钮 -->
         <el-link type="primary" v-if="canAudit" @click="openDetail(row)">
-          {{ isPending(row) ? (mkEnabled ? '查看' : '审核') : '查看' }}
-        </el-link>
-        <el-link
-          v-if="canAudit && mkEnabled && isPending(row)"
-          type="primary"
-          @click="handleMkSubmit(row)"
-        >
-          提交
-        </el-link>
-        <el-link
-          v-if="canAudit && mkEnabled && isPending(row)"
-          type="primary"
-          @click="handleMkAudit(row)"
-        >
-          流程
+          {{ isPending(row) ? '审核' : '查看' }}
         </el-link>
       </template>
     </avue-crud>
@@ -62,7 +48,6 @@
       v-model="detailVisible"
       :record-id="detailRecordId"
       :biz-type="bizType"
-      :mk-enabled="mkEnabled"
       @success="handleAuditSuccess"
     />
   </basic-container>
@@ -71,14 +56,8 @@
 <script>
 import { mapGetters } from 'vuex';
 import { getPendingPage } from '@/api/transportCapacity/certification-audit';
-import { getMKApprovalUrl } from '@/api/system/business-process';
 import { CERT_RECORD_STATUS, certStatusTag, formatCertDateTime } from '@/utils/cert-audit';
 import { isAdministrator } from '@/utils/auth';
-import {
-  loadMkEnabled,
-  resolveCertAuditMkBizType,
-  submitMkApprovalFlow,
-} from '@/utils/mk-approval';
 import CertAuditDetail from '../cert-audit-detail/main.vue';
 
 /**
@@ -132,7 +111,6 @@ export default {
       ],
       detailVisible: false,
       detailRecordId: '',
-      mkEnabled: false,
     };
   },
   computed: {
@@ -144,65 +122,12 @@ export default {
       return this.isAdmin || this.permission?.[this.auditPermissionCode] === true;
     },
   },
-  created() {
-    loadMkEnabled()
-      .then(enabled => {
-        this.mkEnabled = !!enabled;
-      })
-      .catch(() => {
-        this.mkEnabled = false;
-      });
-  },
   methods: {
     certStatusTag,
     formatCertDateTime,
     isPending(row) {
       return String(row.status) === String(CERT_RECORD_STATUS.PENDING);
     },
-    handleMkSubmit(row) {
-      if (!row?.id) {
-        this.$message.warning('认证记录ID为空，无法提交审核流');
-        return;
-      }
-      this.$confirm('确定提交该认证记录到 MK 审核流？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() =>
-        submitMkApprovalFlow({
-          bizType: resolveCertAuditMkBizType(this.bizType),
-          bizId: row.id,
-          subjectName: row.bizKey || row.driverName || '',
-          approvalStatus: String(row.status ?? ''),
-          mkEnabled: this.mkEnabled,
-          tempVarData: {
-            bizType: this.bizType,
-            bizKey: row.bizKey || '',
-          },
-        }).then(() => {
-          this.$message.success('提交成功');
-          this.onLoad(this.page, this.query);
-        })
-      );
-    },
-    handleMkAudit(row) {
-      if (!row?.id) {
-        this.$message.warning('认证记录ID为空，无法打开审核页');
-        return;
-      }
-      getMKApprovalUrl({ bizId: String(row.id) })
-        .then(res => {
-          const url = res?.data?.data;
-          if (!url) {
-            this.$message.error('获取审核跳转地址失败，请先提交审核流');
-            return;
-          }
-          window.open(url, '_blank');
-        })
-        .catch(() => {
-          this.$message.error('获取审核跳转地址失败');
-        });
-    },
     onLoad(page, params = {}) {
       this.loading = true;
       getPendingPage(this.bizType, page.currentPage, page.pageSize, {

src/views/transportCapacity/components/cert-audit-public-content/main.vue

@@ -1,124 +0,0 @@
-<template>
-  <div class="cert-audit-public-content">
-    <div class="cert-audit-public-content__title">{{ pageTitle }}</div>
-    <template v-if="detail">
-      <el-descriptions :column="2" border>
-        <el-descriptions-item label="认证对象">{{ detail.bizKey || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="审核状态">
-          {{ detail.statusText || certStatusTag(detail.status).label }}
-        </el-descriptions-item>
-        <el-descriptions-item label="提交人">{{ detail.submitUserName || '-' }}</el-descriptions-item>
-        <el-descriptions-item label="提交时间">
-          {{ formatCertDateTime(detail.submitTime) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="认证类型">{{ bizTypeLabel }}</el-descriptions-item>
-        <el-descriptions-item label="是否已认证">
-          {{ detail.certified ? '已认证' : '未认证' }}
-        </el-descriptions-item>
-        <el-descriptions-item v-if="detail.rejectReason" label="驳回原因" :span="2">
-          {{ detail.rejectReason }}
-        </el-descriptions-item>
-      </el-descriptions>
-
-      <div class="cert-audit-public-content__section-title">待审内容 vs 当前生效值</div>
-      <cert-audit-diff
-        :key="diffKey"
-        :biz-type="bizType"
-        :pending-json="detail.pendingSnapshotJson"
-        :effective-json="detail.effectiveSnapshotJson"
-      />
-    </template>
-    <el-empty v-else description="暂无数据" />
-  </div>
-</template>
-
-<script>
-import { getMkPublicDetail } from '@/api/mk-process';
-import { certStatusTag, formatCertDateTime } from '@/utils/cert-audit';
-import CertAuditDiff from '../cert-audit-diff/main.vue';
-
-export default {
-  name: 'CertAuditPublicContent',
-  components: { CertAuditDiff },
-  props: {
-    bizType: {
-      type: String,
-      default: 'driver',
-    },
-  },
-  data() {
-    return {
-      detail: null,
-    };
-  },
-  computed: {
-    bizTypeLabel() {
-      return this.bizType === 'vehicle' ? '车辆认证' : '司机认证';
-    },
-    pageTitle() {
-      const key = this.detail?.bizKey ? `：${this.detail.bizKey}` : '';
-      return `${this.bizTypeLabel}审核${key}`;
-    },
-    mkBizType() {
-      return this.bizType === 'vehicle' ? 'cert-audit-vehicle' : 'cert-audit-driver';
-    },
-    diffKey() {
-      return `${this.detail?.id || ''}-${this.detail?.submitTime || ''}`;
-    },
-  },
-  mounted() {
-    this.loadDetail();
-  },
-  methods: {
-    certStatusTag,
-    formatCertDateTime,
-    loadDetail() {
-      const id = this.$route.query.id;
-      if (!id) return;
-      getMkPublicDetail(this.mkBizType, id).then(res => {
-        this.detail = res.data?.data || null;
-      });
-    },
-    getForm() {
-      const detail = this.detail || {};
-      return {
-        ...detail,
-        subject: detail.bizKey || '',
-      };
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.cert-audit-public-content {
-  padding: 16px 20px 24px;
-
-  &__title {
-    margin-bottom: 16px;
-    font-size: 18px;
-    font-weight: 600;
-    color: #303133;
-  }
-
-  &__section-title {
-    position: relative;
-    margin: 16px 0 12px;
-    padding-left: 12px;
-    font-size: 15px;
-    font-weight: 600;
-    color: #303133;
-
-    &::before {
-      content: '';
-      position: absolute;
-      left: 0;
-      top: 50%;
-      width: 4px;
-      height: 14px;
-      margin-top: -7px;
-      background: #409eff;
-    }
-  }
-}
-</style>

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 = name;
-        this.syncFormOrganizationLegacy(name);
+        this.driverForm.organizationName = this.resolveOrgName(path);
       },
     },
     isAdmin() {
@@ -973,8 +964,8 @@ export default {
     },
   },
   created() {
-    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
     this.initDeptTree();
+    this.loadOrganizationOptions();
     this.initRegionOptions();
     this.initQualificationTypeOptions();
   },
@@ -992,7 +983,9 @@ export default {
           'organizationName'
         );
         vehicleColumn.dicData = this.organizationOptions;
-        return this.loadOrganizationOptions();
+        if (this.driverBox && !this.driverForm.id && !this.driverForm.organizationName) {
+          this.driverForm.organizationName = this.getCurrentOrganizationName();
+        }
       });
     },
     initQualificationTypeOptions() {
@@ -1022,11 +1015,6 @@ export default {
       });
       return result;
     },
-    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空，
-    // 不能让默认值带出一个在表单里选不中的组织名
-    getDefaultOrganizationName() {
-      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
-    },
     getCurrentOrganizationName() {
       const currentDeptId = this.userInfo.deptId || this.userInfo.dept_id;
       const currentDept = this.organizationOptions.find(
@@ -1214,16 +1202,8 @@ export default {
       this.submitAttempted = false;
       if (!row?.id) {
         this.driverForm = emptyForm();
-        // 组织树与平台公司列表异步加载，默认值要等两者都到位才能判定，这里先留空
-        this.driverForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.driverForm.organizationName = this.getCurrentOrganizationName();
         this.driverBox = true;
-        this.whenOrganizationOptionsReady(() => {
-          if (!this.driverBox || this.driverForm.id || this.driverForm.organizationName) return;
-          const name = this.getDefaultOrganizationName();
-          this.driverForm.organizationName = name;
-          this.syncFormOrganizationLegacy(name);
-        });
         return;
       }
       getDetail(row.id).then(res => {
@@ -1237,13 +1217,11 @@ export default {
           postList: detail.posts ? detail.posts.split(',').filter(Boolean) : [],
         };
         this.syncAddressRegionPath();
-        this.syncFormOrganizationLegacy(this.driverForm.organizationName);
         this.driverBox = true;
       });
     },
     resetDriver() {
       this.driverForm = emptyForm();
-      this.formOrganizationLegacyName = '';
       this.drivingLicenseUploads = {};
       this.readonly = false;
       this.submitAttempted = false;
@@ -1344,29 +1322,9 @@ export default {
     },
     handleQualificationUploadSuccess(prop, url) {
       this.setImage(prop, url);
-      this.recognizeQualificationCertificate(url);
-    },
-    recognizeQualificationCertificate(url) {
-      if (!url) {
-        this.$message.warning('从业资格证图片上传成功，未获取到图片地址，无法自动识别');
-        return;
-      }
-      const loading = ElLoading.service({
-        lock: true,
-        text: '从业资格证识别中',
-        background: 'rgba(255, 255, 255, 0.7)',
+      this.recognizeBaiduOcr(url, 'general', '', '从业资格证', data => {
+        this.applyQualificationRecognition(data);
       });
-      recognizeQualificationCertificateOcr(url)
-        .then(res => {
-          this.applyQualificationRecognition(res?.data?.data || {});
-          this.$message.success('从业资格证识别完成');
-        })
-        .catch(() => {
-          this.$message.warning('从业资格证图片上传成功，自动识别失败，请手动填写相关信息');
-        })
-        .finally(() => {
-          loading.close();
-        });
     },
     recognizeBaiduOcr(url, type, side, documentName, applyRecognition) {
       if (!url) {
@@ -1656,43 +1614,25 @@ export default {
       return typeof value === 'object' ? value.words || value.value || '' : value || '';
     },
     applyQualificationRecognition(data = {}) {
-      const fields = this.normalizeQualificationOcrFields(data);
-      const qualificationType = this.getQualificationOcrValue(fields, [
-        'qualification_category',
-        '从业资格类别',
-        '从业资格类型',
-      ]).replace(/[，,；;]+$/, '');
-      const qualificationNo = this.getQualificationOcrValue(fields, [
-        'certificate_no',
-        '证号',
-        '从业资格证号',
-        '资格证号',
-        '证书编号',
-      ]);
-      const validFrom = this.getQualificationOcrValue(fields, ['valid_from', '有效起始日期']);
-      const validUntil = this.getQualificationOcrValue(fields, ['valid_until', '有效期限', '有效期']);
+      const qualificationType = this.getQualificationType(data);
+      const qualificationNo = this.getQualificationNo(data);
       const matchedType = this.matchQualificationType(qualificationType);
       if (matchedType) {
         this.driverForm.qualificationType = matchedType;
       } else if (qualificationType && !this.qualificationTypeOptions.length) {
         this.driverForm.qualificationType = qualificationType;
       }
-      if (qualificationNo) {
+      if (qualificationNo && !this.driverForm.qualificationNo) {
         this.driverForm.qualificationNo = String(qualificationNo).replace(/\s/g, '');
       }
-      const startDate = this.normalizeBirthday(validFrom);
-      if (startDate) {
-        this.driverForm.qualificationStartDate = startDate;
-      }
-      if (/(长期|永久)/.test(validUntil)) {
+      const words = this.getBaiduOcrWords(data).join(' ');
+      const dateList = words.match(/\d{4}[-/.年]\d{1,2}[-/.月]\d{1,2}日?/g) || [];
+      if (/(长期|永久有效)/.test(words)) {
         this.driverForm.qualificationLongTerm = 1;
         this.driverForm.qualificationEndDate = '';
-      } else {
-        const endDate = this.normalizeBirthday(validUntil);
-        if (endDate) {
-          this.driverForm.qualificationEndDate = endDate;
-          this.driverForm.qualificationLongTerm = 0;
-        }
+      } else if (dateList.length) {
+        this.driverForm.qualificationEndDate = this.normalizeBirthday(dateList[dateList.length - 1]);
+        this.driverForm.qualificationLongTerm = 0;
       }
       this.$nextTick(() => {
         ['qualificationType', 'qualificationNo', 'qualificationEndDate'].forEach(prop => {
@@ -1700,25 +1640,22 @@ export default {
         });
       });
     },
-    normalizeQualificationOcrFields(result = {}) {
-      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
-        return result.fields;
+    getQualificationType(data = {}) {
+      const fieldValue = this.getOcrValue(data, ['从业资格类别', '从业资格类型']);
+      if (fieldValue) return String(fieldValue).trim();
+      const words = this.getBaiduOcrWords(data);
+      const labelIndex = words.findIndex(word => /从业资格类别|从业资格类型/.test(word));
+      if (labelIndex < 0) return '';
+      const firstValue = words[labelIndex].replace(/^.*?(?:从业资格类别|从业资格类型)\s*[:：]?/, '').trim();
+      const values = firstValue ? [firstValue] : [];
+      for (let index = labelIndex + 1; index < words.length; index += 1) {
+        const word = String(words[index] || '').trim();
+        if (!word || /^(有效起始日期|有效期限|核发机关|继续教育信息|诚信考核信息)/.test(word)) {
+          break;
+        }
+        values.push(word);
       }
-      const keyInfos = result.key_info || result.keyInfo || result.keyInfos || [];
-      if (!Array.isArray(keyInfos)) return {};
-      return Object.fromEntries(
-        keyInfos
-          .filter(item => item && item.key)
-          .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
-          .filter(([, value]) => value)
-      );
-    },
-    getQualificationOcrValue(fields = {}, keys = []) {
-      const normalizedKeys = keys.map(key => String(key).toLowerCase());
-      const entry = Object.entries(fields).find(([key]) =>
-        normalizedKeys.includes(String(key).toLowerCase())
-      );
-      return entry ? String(entry[1] || '').trim() : '';
+      return values.join('').replace(/[，,；;]+$/, '').trim();
     },
     matchQualificationType(value = '') {
       const text = String(value || '').replace(/\s/g, '');
@@ -1736,6 +1673,27 @@ export default {
       );
       return matched?.value || '';
     },
+    getQualificationNo(data = {}) {
+      const fieldValue = this.getOcrValue(data, ['从业资格证号', '资格证号', '证书编号']);
+      if (fieldValue) return fieldValue;
+      const words = this.getBaiduOcrWords(data);
+      const labelIndex = words.findIndex(word => /^(?:(?:从业)?资格证号?|证书编号)[:：]?$/.test(word));
+      if (labelIndex >= 0 && words[labelIndex + 1]) {
+        return words[labelIndex + 1];
+      }
+      const certificateLine = words.find(word => /(?:从业)?资格证号?|证书编号/.test(word));
+      const match = certificateLine?.match(/(?:(?:从业)?资格证号?|证书编号)\s*[:：]?\s*([A-Z0-9-]{6,})/i);
+      return match?.[1] || '';
+    },
+    getBaiduOcrWords(data = {}) {
+      const wordsResult = data.words_result || data.wordsResult || {};
+      if (Array.isArray(wordsResult)) {
+        return wordsResult.map(item => item.words || item.value || '').filter(Boolean);
+      }
+      return Object.values(wordsResult)
+        .map(item => (typeof item === 'object' ? item.words || item.value || '' : item || ''))
+        .filter(Boolean);
+    },
     normalizeNation(value = '') {
       const nation = String(value || '').trim();
       if (!nation) return '';

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 = name;
-        this.syncFormOrganizationLegacy(name);
+        this.shipForm.organizationName = this.resolveOrgName(path);
       },
     },
     isAdmin() {
@@ -752,8 +744,8 @@ export default {
     },
   },
   created() {
-    // initDeptTree 末尾会拉组织树（含平台公司 id），这里不再重复请求
     this.initDeptTree();
+    this.loadOrganizationOptions();
   },
   methods: {
     hasPermission(code) {
@@ -764,7 +756,9 @@ export default {
         this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
         const column = this.findColumn(this.option.column, 'organizationName');
         column.dicData = this.organizationOptions;
-        return this.loadOrganizationOptions();
+        if (this.shipBox && !this.shipForm.id && !this.shipForm.organizationName) {
+          this.shipForm.organizationName = this.getCurrentOrganizationName();
+        }
       });
     },
     flattenDeptOptions(tree = [], level = 0) {
@@ -790,10 +784,6 @@ export default {
       );
       return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
     },
-    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
-    getDefaultOrganizationName() {
-      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
-    },
     validateField(prop) {
       this.$refs.shipForm?.validateField(prop);
     },
@@ -885,19 +875,12 @@ export default {
       this.readonly = readonly;
       if (!row?.id) {
         this.shipForm = emptyForm();
-        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
-        this.shipForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.shipForm.organizationName = this.getCurrentOrganizationName();
         this.shipBox = true;
-        this.whenOrganizationOptionsReady(() => {
-          if (!this.shipBox || this.shipForm.id || this.shipForm.organizationName) return;
-          this.shipForm.organizationName = this.getDefaultOrganizationName();
-        });
         return;
       }
       getDetail(row.id).then(res => {
         this.shipForm = { ...emptyForm(), ...(res.data.data || {}) };
-        this.syncFormOrganizationLegacy(this.shipForm.organizationName);
         this.shipBox = true;
       });
     },
@@ -907,7 +890,6 @@ export default {
     },
     resetShip() {
       this.shipForm = emptyForm();
-      this.formOrganizationLegacyName = '';
       this.readonly = false;
       this.submitLoading = false;
       this.$refs.shipForm?.clearValidate();

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 = name;
-        this.syncFormOrganizationLegacy(name);
+        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
       },
     },
     // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
@@ -820,6 +810,7 @@ export default {
   },
   created() {
     this.initDeptTree();
+    this.loadOrganizationOptions();
   },
   watch: {
     organizationTreeOptions() {
@@ -861,15 +852,17 @@ export default {
       }));
     },
     syncOrgCascaderPaths() {
-      this.organizationCascaderPath = this.resolveFormOrgPath(this.vehicleForm.organizationName);
+      this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
       this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
     },
     initDeptTree() {
-      this.loadOrganizationOptions();
       getDeptTree(this.userInfo.tenantId).then(res => {
         this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
         const column = this.findColumn(this.option.column, 'organizationName');
         column.dicData = this.organizationOptions;
+        if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
+          this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        }
         if (this.vehicleBox && !this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
@@ -901,10 +894,6 @@ export default {
       );
       return currentDept?.rawLabel || this.userInfo.deptName || this.userInfo.dept_name || '';
     },
-    // 新增时的默认组织：当前登录人组织是平台公司才预填，否则留空
-    getDefaultOrganizationName() {
-      return this.defaultFormOrganizationName(this.getCurrentOrganizationName());
-    },
     digitsOnly(value = '') {
       return String(value).replace(/\D/g, '');
     },
@@ -972,18 +961,11 @@ export default {
       this.readonly = readonly;
       if (!row?.id) {
         this.vehicleForm = emptyForm();
-        // 默认组织要先有组织树和平台公司列表才能判定，先留空、数据到位再补
-        this.vehicleForm.organizationName = '';
-        this.formOrganizationLegacyName = '';
+        this.vehicleForm.organizationName = this.getCurrentOrganizationName();
         this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         this.syncOrgCascaderPaths();
         this.syncPlateNo(false);
         this.vehicleBox = true;
-        this.whenOrganizationOptionsReady(() => {
-          if (!this.vehicleBox || this.vehicleForm.id || this.vehicleForm.organizationName) return;
-          this.vehicleForm.organizationName = this.getDefaultOrganizationName();
-          this.syncOrgCascaderPaths();
-        });
         return;
       }
       getDetail(row.id).then(res => {
@@ -995,7 +977,6 @@ export default {
         if (!this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
-        this.syncFormOrganizationLegacy(this.vehicleForm.organizationName);
         this.syncOrgCascaderPaths();
         this.splitPlateNo();
         this.syncPlateNo(false);
@@ -1008,7 +989,6 @@ export default {
     },
     resetVehicle() {
       this.vehicleForm = emptyForm();
-      this.formOrganizationLegacyName = '';
       this.organizationCascaderPath = [];
       this.useDepartmentCascaderPath = [];
       this.vehicleCertificateUploads = {};
@@ -1630,16 +1610,6 @@ export default {
   }
 }
 
-// 列表组织列超长时单行省略
-.org-cell-text {
-  display: inline-block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  vertical-align: bottom;
-}
-
 // 编辑弹窗：灰底 + section-card 白卡分组
 .vehicle-form {
   :deep(.el-form-item__label) {
@@ -1671,7 +1641,18 @@ export default {
     flex: 0 0 calc(4em + 24px) !important;
     width: calc(4em + 24px) !important;
   }
+}
 
+.org-cell-text {
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
+.vehicle-form {
   .org-cascader-tooltip {
     width: 100%;
   }

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 (
-          !this.isZeroCreditLimitRange(standard) &&
-          Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)
-        ) {
+        if (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>
@@ -310,7 +290,6 @@
                   v-model="archiveForm.customerCode"
                   maxlength="20"
                   show-word-limit
-                  :disabled="Boolean(archiveForm.id)"
                   placeholder="请输入，留空则自动生成"
                 />
               </el-form-item>
@@ -379,7 +358,7 @@
                   placeholder="请输入"
                   maxlength="18"
                   show-word-limit
-                  :disabled="Boolean(archiveForm.id)"
+                  :disabled="kingdeeLocked && Boolean(archiveForm.id)"
                   @input="
                     archiveForm.unifiedCreditCode = String(
                       archiveForm.unifiedCreditCode || ''
@@ -395,7 +374,7 @@
                   placeholder="请输入"
                   maxlength="100"
                   show-word-limit
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                   @blur="checkArchiveNameRisk"
                 />
                 <el-tooltip
@@ -435,7 +414,7 @@
                   v-model="archiveForm.legalPerson"
                   maxlength="10"
                   show-word-limit
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                 />
               </el-form-item>
             </el-col>
@@ -536,7 +515,7 @@
                 <el-input
                   v-model="archiveForm.registeredCapital"
                   maxlength="18"
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                   @input="value => handleDecimalInput('registeredCapital', value)"
                 />
               </el-form-item>
@@ -546,7 +525,7 @@
                 <el-input
                   v-model="archiveForm.paidInCapital"
                   maxlength="18"
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                   @input="value => handleDecimalInput('paidInCapital', value)"
                 />
               </el-form-item>
@@ -1322,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
@@ -1345,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>
@@ -1373,109 +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"
-                  :model-value="formatScoreValue(currentScore.selfScore)"
-                  maxlength="10"
-                  :disabled="readonly"
-                  placeholder="请输入自评得分"
-                  @input="handleOfflineSelfScoreInput"
-                  @blur="recalculateOfflineScore"
-                >
-                  <template #suffix>分</template>
-                </el-input>
-                <el-input v-else :model-value="formatScoreValue(currentScore.selfScore)" disabled>
-                  <template #suffix>分</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最终得分">
-                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="拟申请总资金使用额度" required>
-                <el-input
-                  v-model="currentScore.applyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最大资金使用额度">
-                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度">
-                <el-input
-                  v-model="currentScore.tempApplyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度有效期起">
-                <el-date-picker
-                  v-model="currentScore.tempCreditStartDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isOfflineScore" :span="6">
-              <el-form-item label="临时申请额度有效期止">
-                <el-date-picker
-                  v-model="currentScore.tempCreditEndDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="currentScore.remark" maxlength="200" :rows="2" type="textarea" />
@@ -1485,7 +1395,7 @@
         </el-form>
 
         <el-table
-          v-if="!isOfflineScore && currentScore.quantificationId"
+          v-if="currentScore.quantificationId"
           ref="scoreCategoryTable"
           :data="scoreCategoryRows"
           border
@@ -1707,8 +1617,6 @@ import {
   changeStatus,
   remove,
   getScoreTemplate,
-  downloadScoreExcelTemplate,
-  importScoreExcel,
   recognizeBusinessLicenseOcr,
   queryKingdeeBank,
   queryKingdeeBankByNumber,
@@ -1729,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';
@@ -1821,10 +1723,9 @@ export default {
     };
     return {
       form: {},
-      query: { expireStatus: 'all' },
+      query: {},
       deptSearchInitialized: false,
       loading: true,
-      scoreImporting: false,
       data: [],
       archiveNameRisky: false,
       archiveNameRiskTip: '',
@@ -2168,12 +2069,6 @@ export default {
             slot: true,
             minWidth: 140,
           },
-          {
-            label: '下次评定日期',
-            prop: 'nextEvaluateDate',
-            slot: true,
-            minWidth: 130,
-          },
           {
             label: '资金使用情况',
             prop: 'fundUseRate',
@@ -2491,15 +2386,9 @@ export default {
       ];
       const rows = categoryMap.map((category, index) => {
         const details = this.getScoreCategoryDetails(category.categoryCode);
-        const sumCategoryScore = prop =>
-          details.reduce((sum, item) => {
-            if (this.isBlankScore(item[prop])) return sum;
-            const value = Number(item[prop]);
-            return sum + (Number.isFinite(value) ? value : 0);
-          }, 0);
-        let selfScore = sumCategoryScore('selfScore');
-        let reviewScore = sumCategoryScore('reviewScore');
-        // 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
+        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 分计
         if (category.categoryCode === 'plus') {
           selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
           reviewScore = Math.min(reviewScore, HARDCODED_MAX_PLUS_SCORE);
@@ -2517,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) {
@@ -2665,9 +2544,7 @@ export default {
         const res = await querySupplierCode(code);
         // 防止响应返回时用户已修改代码
         if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
-        // 后端查不到时 data 为 {}（R 对 null 的空承载兜底），非字符串一律按空处理，避免显示 [object Object]
-        const supplierCode = res?.data?.data;
-        this.archiveForm.supplierCode = typeof supplierCode === 'string' ? supplierCode : '';
+        this.archiveForm.supplierCode = res?.data?.data || '';
       } catch (error) {
         // 忽略查询异常，编码留空
       }
@@ -3639,22 +3516,13 @@ export default {
       return Number.isFinite(rate) ? `${rate.toFixed(2)}%` : '-';
     },
     isBusinessLicenseExpiringSoon(row = {}) {
-      return this.isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期');
-    },
-    /** 日期是否在 30 天内到期（含当天）；skip=true 时不提示（如营业执照长期） */
-    isDateExpiringSoon(dateValue, skip = false) {
-      if (skip || !dateValue) return false;
-      const endDate = this.$dayjs(dateValue);
+      if (row.businessTermType === '长期' || !row.businessEndDate) return false;
+      const endDate = this.$dayjs(row.businessEndDate);
       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 = '固定期限';
@@ -4246,9 +4114,7 @@ export default {
         '核准日期',
       ]);
       const scope = this.getBusinessLicenseOcrValue(fields, ['经营范围']);
-      if (code && !this.archiveForm.id) {
-        this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
-      }
+      if (code) this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
       if (name) this.archiveForm.fullName = name;
       if (name) this.checkArchiveNameRisk();
       if (legalPerson) this.archiveForm.legalPerson = legalPerson;
@@ -4540,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,
@@ -4560,11 +4424,6 @@ export default {
         details: [],
         ...score,
         quantificationId: score.quantificationId ? String(score.quantificationId) : '',
-        evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
-        nextEvaluateDate: score.nextEvaluateDate || '',
-        selfScore: this.normalizeScoreInputValue(score.selfScore),
-        reviewScore: this.normalizeScoreInputValue(score.reviewScore),
-        finalScore: this.normalizeScoreInputValue(score.finalScore),
         applyCreditLimit: this.normalizeOptionalAmount(
           score.applyCreditLimit === undefined
             ? this.archiveForm.applyCreditLimit
@@ -4578,8 +4437,6 @@ export default {
         details: (score.details || []).map(detail => ({
           ...detail,
           scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
-          selfScore: this.normalizeScoreInputValue(detail.selfScore),
-          reviewScore: this.normalizeScoreInputValue(detail.reviewScore),
         })),
       };
     },
@@ -4729,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('客户提交审批前必须完成评分自评');
-        return false;
-      }
-      if (!scores[0].nextEvaluateDate) {
-        this.$message.warning('请填写下次评定日期');
+        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();
@@ -5051,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: '',
@@ -5307,8 +5143,7 @@ export default {
         .replace(/^\./, '')
         .replace(/(\..*)\./g, '$1')
         .replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2');
-      // 减分项复评得分存正数扣分，允许填 0（不扣分）；不做项目满分截断
-      if (prop === 'reviewScore' && normalized !== '' && !this.isMinusScoreDetail(detail)) {
+      if (prop === 'reviewScore' && normalized !== '') {
         const maxScore = this.getScoreItemFullScore(detail);
         if (Number(normalized) > maxScore) {
           detail[prop] = String(maxScore);
@@ -5360,9 +5195,7 @@ export default {
       return this.getScoreDetailCategoryCode(detail) === 'basic';
     },
     getSignedScore(detail, prop) {
-      if (this.isBlankScore(detail[prop])) return '';
-      const score = Number(detail[prop]);
-      if (!Number.isFinite(score)) return '';
+      const score = Number(detail[prop] || 0);
       return this.isMinusScoreDetail(detail) && score > 0 ? -score : score;
     },
     getScoreItemFullScore(detail = {}) {
@@ -5371,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;
-      // 减分项选项分常为负（如 -5），项目满分按绝对值取最大可扣分；避免 0 分被误判为高于“最高得分-5”
-      if (this.isMinusScoreDetail(detail)) {
-        return Math.max(...optionScores.map(score => Math.abs(score)));
-      }
-      return Math.max(...optionScores);
+      return optionScores.length ? Math.max(...optionScores) : 0;
     },
     getScoreFullMark(details = []) {
       return details.reduce((sum, item) => {
@@ -5394,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));
@@ -5402,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) {
@@ -5436,71 +5260,41 @@ export default {
       const basicDetails = this.getScoreCategoryDetailsByList(details, 'basic');
       const plusDetails = this.getScoreCategoryDetailsByList(details, 'plus');
       const minusDetails = this.getScoreCategoryDetailsByList(details, 'minus');
-      const sumScore = (list, prop) =>
-        list.reduce((sum, item) => {
-          if (this.isBlankScore(item[prop])) return sum;
-          const value = Number(item[prop]);
-          return sum + (Number.isFinite(value) ? value : 0);
-        }, 0);
+      const sumScore = (list, prop) => list.reduce((sum, item) => sum + Number(item[prop] || 0), 0);
       const rawPlusSelf = sumScore(plusDetails, 'selfScore');
       const rawPlusReview = sumScore(plusDetails, 'reviewScore');
       const rawMinusSelf = sumScore(minusDetails, 'selfScore');
       const rawMinusReview = sumScore(minusDetails, 'reviewScore');
-      // 暂定：加分/减分合计最高按 15 分计（未超按实际，超 15 按 15/-15）
+      // 暂定：加分/减分合计最高按 15 分计
       const plusSelf = Math.min(rawPlusSelf, HARDCODED_MAX_PLUS_SCORE);
       const plusReview = Math.min(rawPlusReview, HARDCODED_MAX_PLUS_SCORE);
       const minusSelf = Math.min(rawMinusSelf, HARDCODED_MAX_MINUS_SCORE);
       const minusReview = Math.min(rawMinusReview, HARDCODED_MAX_MINUS_SCORE);
-      const 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)
       );
-      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计；-1 视为未填
-      const isOffline = String(score.evaluateMode || '') === 'offline';
-      const hasManualSelfScore = isOffline && !this.isBlankScore(score.selfScore);
-      const hasFilledDetail = details.some(item => {
-        if (this.isScoreTypeDetail(item)) {
-          const input = String(item.scoreInput ?? '').trim();
-          return input !== '' && input !== '-' && input !== '.';
-        }
-        return !this.isBlankScore(item.selectedOption);
-      });
-      const manualSelfScore = Number(score.selfScore);
-      const selfScore =
-        hasManualSelfScore && Number.isFinite(manualSelfScore) ? manualSelfScore : computedSelfScore;
       const finalScore = hasReviewScore ? reviewScore : selfScore;
       const fullMark = this.getScoreFullMark(details);
       const scoreRate =
         fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
       const standard = this.matchCreditStandard(score, scoreRate);
       const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
-      // 线下未手工填写且明细未实际填报时保留空，避免默认写出 -1/0
-      const keepOfflineScoreBlank = isOffline && !hasManualSelfScore && !hasFilledDetail;
-      score.selfScore = keepOfflineScoreBlank ? '' : Number(Number(selfScore).toFixed(2));
+      score.selfScore = Number(selfScore.toFixed(2));
       score.reviewScore = Number(reviewScore.toFixed(2));
-      score.finalScore =
-        keepOfflineScoreBlank && !hasReviewScore ? '' : Number(Number(finalScore).toFixed(2));
-      score.scoreRate = keepOfflineScoreBlank && !hasReviewScore ? '' : Number(scoreRate.toFixed(2));
+      score.finalScore = Number(finalScore.toFixed(2));
+      score.scoreRate = Number(scoreRate.toFixed(2));
       if (hasStandards) {
-        score.creditLevel = keepOfflineScoreBlank && !hasReviewScore ? '' : standard?.creditLevel || '';
-        score.maxCreditLimit =
-          keepOfflineScoreBlank && !hasReviewScore
-            ? ''
-            : standard
-              ? this.calculateCreditLimitByStandard(standard, scoreRate)
-              : '';
+        score.creditLevel = standard?.creditLevel || '';
+        score.maxCreditLimit = standard
+          ? this.calculateCreditLimitByStandard(standard, scoreRate)
+          : '';
       }
       return score;
     },
     isBlankScore(value) {
-      return (
-        value === undefined ||
-        value === null ||
-        value === -1 ||
-        value === '-1' ||
-        String(value).trim() === ''
-      );
+      return value === undefined || value === null || String(value).trim() === '';
     },
     hasIncompleteBasicScoreDetail(details = []) {
       return this.getScoreCategoryDetailsByList(details, 'basic').some(item => {
@@ -5617,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;
@@ -5634,11 +5424,7 @@ export default {
         return false;
       }
       if (!this.currentScore.details || !this.currentScore.details.length) {
-        this.$message.warning(
-          this.isOfflineScore
-            ? '请先上传评分表 Excel 解析回填明细'
-            : '当前评分量化表未配置评分项目'
-        );
+        this.$message.warning('当前评分量化表未配置评分项目');
         return false;
       }
       const invalidScoreInput = this.currentScore.details.find(item => {
@@ -5652,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 ||
@@ -5849,15 +5633,13 @@ export default {
         });
     },
     searchReset() {
-      this.query = { expireStatus: this.query.expireStatus || 'all' };
-      this.onLoad(this.page, this.query);
+      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();
@@ -5996,179 +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 = [];
-        // 切到线下且明细尚未实际填报时清空自评，避免沿用线上合计或 -1 哨兵值
-        const hasFilledDetail = (this.currentScore.details || []).some(item => {
-          if (this.isScoreTypeDetail(item)) {
-            const input = String(item.scoreInput ?? '').trim();
-            return input !== '' && input !== '-' && input !== '.';
-          }
-          return !this.isBlankScore(item.selectedOption);
-        });
-        if (!hasFilledDetail || this.isBlankScore(this.currentScore.selfScore)) {
-          this.currentScore.selfScore = '';
-        }
-        if (!hasFilledDetail || this.isBlankScore(this.currentScore.finalScore)) {
-          this.currentScore.finalScore = '';
-        }
-        if (!hasFilledDetail) {
-          this.currentScore.scoreRate = '';
-          this.currentScore.creditLevel = '';
-          this.currentScore.maxCreditLimit = '';
-        }
-      } else {
-        this.calculateScore(this.currentScore);
-      }
-    },
-    handleOfflineSelfScoreInput(value) {
-      const normalized = String(value || '')
-        .replace(/[^\d.-]/g, '')
-        .replace(/(?!^)-/g, '')
-        .replace(/^\./, '')
-        .replace(/(\..*)\./g, '$1')
-        .replace(/^(-?\d+)(\.\d{0,2})?.*$/, '$1$2');
-      this.currentScore.selfScore = normalized;
-    },
-    recalculateOfflineScore() {
-      if (!this.isOfflineScore) return;
-      if (this.isBlankScore(this.currentScore.selfScore)) {
-        this.currentScore.selfScore = '';
-        const hasReviewScore = (this.currentScore.details || []).some(
-          item => !this.isBlankScore(item.reviewScore)
-        );
-        if (!hasReviewScore) {
-          this.currentScore.finalScore = '';
-        }
-        this.currentScore.scoreRate = '';
-        this.currentScore.creditLevel = '';
-        this.currentScore.maxCreditLimit = '';
-        return;
-      }
-      const selfScore = Number(this.currentScore.selfScore);
-      if (!Number.isFinite(selfScore)) return;
-      this.currentScore.selfScore = Number(selfScore.toFixed(2));
-      const hasReviewScore = (this.currentScore.details || []).some(
-        item => !this.isBlankScore(item.reviewScore)
-      );
-      if (!hasReviewScore) {
-        this.currentScore.finalScore = this.currentScore.selfScore;
-      }
-      const fullMark = this.getScoreFullMark(this.currentScore.details || []);
-      const scoreRate =
-        fullMark > 0
-          ? Math.max(0, Math.min(100, (Number(this.currentScore.finalScore) / fullMark) * 100))
-          : 0;
-      this.currentScore.scoreRate = Number(scoreRate.toFixed(2));
-      const standard = this.matchCreditStandard(this.currentScore, scoreRate);
-      const hasStandards = (this.currentScore.standards || []).some(item => item && item.creditLevel);
-      if (hasStandards) {
-        this.currentScore.creditLevel = standard?.creditLevel || '';
-        this.currentScore.maxCreditLimit = standard
-          ? this.calculateCreditLimitByStandard(standard, scoreRate)
-          : '';
-      }
-    },
-    downloadScoreTemplate() {
-      if (!this.currentScore.quantificationId) {
-        this.$message.warning('请先选择评分量化表');
-        return;
-      }
-      NProgress.start();
-      const loading = ElLoading.service({
-        lock: true,
-        text: '模板下载中',
-        background: 'rgba(255, 255, 255, 0.7)',
-      });
-      downloadScoreExcelTemplate(this.currentScore.quantificationId)
-        .then(res => {
-          downloadXls(
-            res.data,
-            `客商评分明细模板${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-          );
-        })
-        .finally(() => {
-          loading.close();
-          NProgress.done();
-        });
-    },
-    async uploadScoreExcel(option) {
-      const file = option?.file;
-      if (!file) return;
-      if (!this.currentScore.quantificationId) {
-        this.$message.warning('请先选择评分量化表');
-        return;
-      }
-      const fileName = String(file.name || '').toLowerCase();
-      if (!/\.(xls|xlsx)$/.test(fileName)) {
-        this.$message.error('请上传 .xls,.xlsx 标准格式文件');
-        return;
-      }
-      this.scoreImporting = true;
-      NProgress.start();
-      const loading = ElLoading.service({
-        lock: true,
-        text: '导入中',
-        background: 'rgba(255, 255, 255, 0.7)',
-      });
-      try {
-        const res = await importScoreExcel(this.currentScore.quantificationId, file);
-        if (isExcelResponse(res)) {
-          downloadXls(
-            res.data,
-            `客商评分导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
-          );
-          this.$message.warning('部分数据导入失败，已下载失败明细');
-          return;
-        }
-        const result = isBusinessJson(res?.data) ? res.data : await parseBlobJson(res?.data);
-        if (Number(result?.code) !== 200) {
-          this.$message.error(result?.msg || '导入失败');
-          return;
-        }
-        const imported = result?.data || {};
-        const keepFields = {
-          evaluateMode: 'offline',
-          scoreDate: this.currentScore.scoreDate,
-          nextEvaluateDate: this.currentScore.nextEvaluateDate,
-          applyCreditLimit: this.currentScore.applyCreditLimit,
-          tempApplyCreditLimit: this.currentScore.tempApplyCreditLimit,
-          tempCreditStartDate: this.currentScore.tempCreditStartDate,
-          tempCreditEndDate: this.currentScore.tempCreditEndDate,
-          remark: this.currentScore.remark,
-          attachments: this.scoreAttachmentFiles,
-          quantificationId: this.currentScore.quantificationId,
-        };
-        this.currentScore = this.normalizeScore({
-          ...imported,
-          ...keepFields,
-          standards: imported.standards || this.currentScore.standards || [],
-          details: (imported.details || []).map(detail => ({
-            ...detail,
-            scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
-          })),
-        });
-        this.calculateScore(this.currentScore);
-        this.$message.success('评分表解析成功，请在证明材料中上传评分表原件');
-      } catch (error) {
-        const message = await resolveImportErrorMessage(error);
-        this.$message.error(message);
-      } finally {
-        this.scoreImporting = false;
-        loading.close();
-        NProgress.done();
-      }
-    },
   },
 };
 </script>
@@ -6203,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;