fix: 结算单同步金蝶前端超时30s放宽至60s，避免后端推送成功前端假报失败

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/settlement/formalSettlement.js

@@ -32,13 +32,14 @@ export const approve = data =>
   request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-// 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
+// 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存 + 附件补传），实测可达 35s+，
+// 低于后端实际耗时会导致前端先超时报错而后端推送成功（如 FJS2026111000001 实测 34.6s），覆盖全局 10s 超时
 // config.meta.suppressErrorMessage=true 时由页面弹框汇总结果，避免拦截器重复 toast
 export const syncKingdee = (id, config = {}) =>
   request({
     url: `${baseUrl}/sync-kingdee`,
     method: 'post',
-    timeout: 30000,
+    timeout: 60000,
     params: { id },
     ...config,
   });

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/components/bottom-detail-panel/main.vue

@@ -0,0 +1,123 @@
+<template>
+  <teleport to="body">
+    <transition name="el-fade-in-linear">
+      <section v-if="modelValue" class="bottom-detail-panel" aria-label="详情面板">
+        <header class="bottom-detail-panel__header">
+          <h3>{{ title }}</h3>
+          <el-tooltip content="关闭" placement="top">
+            <el-button :icon="Close" text aria-label="关闭详情面板" @click="close" />
+          </el-tooltip>
+        </header>
+        <div class="bottom-detail-panel__body">
+          <slot />
+        </div>
+        <footer class="bottom-detail-panel__footer">
+          <el-button @click="close">关闭</el-button>
+        </footer>
+      </section>
+    </transition>
+  </teleport>
+</template>
+
+<script>
+import { Close } from '@element-plus/icons-vue';
+
+/**
+ * 底部弹出详情面板（表单页通用）
+ * 固定于视口底部并避让侧边栏，交互对齐应收/应付明细页点「单据号」弹出的单据详情面板
+ */
+export default {
+  name: 'BottomDetailPanel',
+  props: {
+    modelValue: { type: Boolean, default: false },
+    title: { type: String, default: '详情' },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return { Close };
+  },
+  watch: {
+    // 表单页多被 keep-alive 缓存，切换菜单时组件不销毁，需监听路由收起 teleport 到 body 的面板
+    $route() {
+      this.close();
+    },
+  },
+  methods: {
+    close() {
+      this.$emit('update:modelValue', false);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bottom-detail-panel {
+  position: fixed;
+  z-index: 100;
+  bottom: 0;
+  left: $sidebar_width;
+  width: calc(100% - #{$sidebar_width});
+  max-height: min(60vh, 560px);
+  border-top: 1px solid #eff1f7;
+  background: #fff;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.04);
+}
+
+:global(.avue--collapse) .bottom-detail-panel {
+  left: $sidebar_collapse;
+  width: calc(100% - #{$sidebar_collapse});
+}
+
+:global(.avue-layout--horizontal) .bottom-detail-panel {
+  left: 0;
+  width: 100%;
+}
+
+.bottom-detail-panel__header {
+  display: flex;
+  min-height: 48px;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20px;
+  border-bottom: 1px solid #eff1f7;
+
+  h3 {
+    margin: 0;
+    padding-left: 12px;
+    border-left: 4px solid #409eff;
+    font-size: 16px;
+    font-weight: 600;
+  }
+}
+
+.bottom-detail-panel__body {
+  max-height: calc(min(60vh, 560px) - 106px);
+  padding: 16px 20px;
+  overflow: auto;
+
+  :deep(.el-table) {
+    --el-table-border-color: #eff1f7;
+  }
+
+  :deep(.el-table__row:nth-child(even) td.el-table__cell) {
+    background: #fafafa;
+  }
+}
+
+.bottom-detail-panel__footer {
+  display: flex;
+  min-height: 57px;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 8px;
+  padding: 0 20px;
+  border-top: 1px solid #eff1f7;
+}
+
+@media screen and (max-width: 992px) {
+  .bottom-detail-panel {
+    left: 0;
+    width: 100%;
+  }
+}
+</style>

src/components/invoice-write-off-table/main.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="invoice-write-off-table">
+    <el-table v-loading="loading" :data="rows" border>
+      <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+      <el-table-column prop="arrivalAddress" label="到货地址" min-width="150" align="center" show-overflow-tooltip>
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.arrivalAddress) }}</template>
+      </el-table-column>
+      <el-table-column prop="actualDepartureTime" label="实际发货时间" width="150" align="center">
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : formatDateTime(row.actualDepartureTime) }}</template>
+      </el-table-column>
+      <el-table-column prop="completionTime" label="实际完成时间" width="150" align="center">
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : formatDateTime(row.completionTime) }}</template>
+      </el-table-column>
+      <el-table-column prop="transportType" label="运输类型" width="100" align="center">
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : transportTypeLabel(row.transportType) }}</template>
+      </el-table-column>
+      <el-table-column prop="cargoName" label="货物名称" min-width="110" align="center" show-overflow-tooltip>
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.cargoName) }}</template>
+      </el-table-column>
+      <el-table-column prop="cargoType" label="货物类型" min-width="110" align="center" show-overflow-tooltip>
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.cargoType) }}</template>
+      </el-table-column>
+      <el-table-column prop="transportQuantity" label="运输总量" width="110" align="center">
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.transportQuantity) }}</template>
+      </el-table-column>
+      <el-table-column prop="mileage" label="里程 (KM)" width="100" align="center">
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.mileage) }}</template>
+      </el-table-column>
+      <el-table-column prop="batchNo" label="批次号" width="100" align="center" show-overflow-tooltip>
+        <template #default="{ row }">{{ row.manualFlag === 1 ? '-' : displayValue(row.batchNo) }}</template>
+      </el-table-column>
+      <el-table-column prop="invoiceNo" label="发票号" min-width="220" align="center" show-overflow-tooltip />
+      <!-- 按费用项目动态分组列头，每组三列：结算金额/未开票(收票)金额/本次开票(收票)金额，文案随业务类型切换 -->
+      <el-table-column v-for="group in feeItemGroups" :key="group.name" :label="group.name" align="center">
+        <el-table-column label="结算金额" width="110" align="center">
+          <template #default="{ row }">{{ formatMoney(row.settlementAmounts[group.name]) }}</template>
+        </el-table-column>
+        <el-table-column :label="remainLabel" width="110" align="center">
+          <template #default="{ row }">{{ formatMoney(row.beforeRemainAmounts[group.name]) }}</template>
+        </el-table-column>
+        <el-table-column :label="currentLabel" width="120" align="center">
+          <template #default="{ row }">{{ formatMoney(row.writeOffAmounts[group.name]) }}</template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import request from '@/axios';
+import { getDictionary } from '@/api/system/dictbiz';
+
+/**
+ * 发票冲销明细公共表格（开票申请/收票登记/付款申请通用）
+ * 数据源：/blade-transport/invoice-write-off/list?bizType=&bizId=
+ * 行按运单完成时间升序（先完成的运单先冲销），手动添加费用无运输信息显示"—"
+ */
+export default {
+  name: 'InvoiceWriteOffTable',
+  props: {
+    // invoice_apply-开票申请 receipt-收票登记 payment_receipt-付款申请生成的收票单
+    bizType: { type: String, required: true },
+    bizId: { type: [String, Number], default: null },
+  },
+  data() {
+    return {
+      loading: false,
+      rows: [],
+      transportTypeOptions: [],
+    };
+  },
+  computed: {
+    // 费用项目分组子列文案随业务切换：开票为"未开票金额/本次开票金额"，收票/付款为"未收票金额/本次收票金额"
+    remainLabel() {
+      return this.bizType === 'invoice_apply' ? '未开票金额' : '未收票金额';
+    },
+    currentLabel() {
+      return this.bizType === 'invoice_apply' ? '本次开票金额' : '本次收票金额';
+    },
+    feeItemGroups() {
+      const names = [];
+      this.rows.forEach(row => {
+        if (row.feeItemName && !names.includes(row.feeItemName)) names.push(row.feeItemName);
+      });
+      return names.map(name => ({ name }));
+    },
+  },
+  created() {
+    this.loadTransportTypeOptions();
+  },
+  watch: {
+    bizId: {
+      immediate: true,
+      handler(value) {
+        if (value) this.load();
+      },
+    },
+  },
+  methods: {
+    // 运输类型字典翻译（与开票申请明细表同口径 transport_type）
+    async loadTransportTypeOptions() {
+      const res = await getDictionary({ code: 'transport_type' });
+      const records = Array.isArray(res?.data?.data) ? res.data.data : res?.data?.data?.records || [];
+      this.transportTypeOptions = records.map(item => ({
+        label: item.dictValue || item.label || item.name,
+        value: item.dictKey || item.value || item.dictValue || item.name,
+      }));
+    },
+    transportTypeLabel(value) {
+      if (!value) return '-';
+      return this.transportTypeOptions.find(item => String(item.value) === String(value))?.label || value;
+    },
+    load() {
+      this.loading = true;
+      request({
+        url: '/blade-transport/invoice-write-off/list',
+        method: 'get',
+        params: { bizType: this.bizType, bizId: this.bizId },
+      })
+        .then(res => {
+          const list = res.data.data || [];
+          // 同一运单同一费用项目可能被多张发票分段冲抵（跨发票拆分），按运单+费用项目归并展示
+          const merged = new Map();
+          list.forEach(row => {
+            const key = `${row.waybillId || row.summaryFeeId || ''}|${row.feeItemName}`;
+            if (!merged.has(key)) {
+              merged.set(key, {
+                ...row,
+                settlementAmounts: { [row.feeItemName]: row.settlementAmount },
+                beforeRemainAmounts: { [row.feeItemName]: row.beforeRemainAmount },
+                writeOffAmounts: { [row.feeItemName]: row.writeOffAmount },
+              });
+              return;
+            }
+            const target = merged.get(key);
+            target.writeOffAmounts[row.feeItemName] = Number(target.writeOffAmounts[row.feeItemName] || 0) + Number(row.writeOffAmount || 0);
+            // 未开票费用取首段冲抵前余额，发票号追加展示
+            if (!String(target.invoiceNo).includes(row.invoiceNo)) {
+              target.invoiceNo = `${target.invoiceNo},${row.invoiceNo}`;
+            }
+          });
+          this.rows = [...merged.values()];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    displayValue(value) {
+      return value === null || value === undefined || value === '' ? '-' : value;
+    },
+    formatDateTime(value) {
+      if (!value) return '-';
+      return this.$dayjs(value).format('YYYY-MM-DD HH:mm:ss');
+    },
+    formatMoney(value) {
+      return Number(value || 0).toFixed(2);
+    },
+  },
+};
+</script>

src/mixins/organization-search.js

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

src/option/business/contract-manage.js

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

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

src/option/payment/invoiceApplication.js

@@ -6,6 +6,7 @@ export const invoiceApplicationTableColumns = [
   { prop: 'issuerName', label: '开票方', minWidth: 150 },
   { prop: 'receiverName', label: '受票方', minWidth: 150 },
   { prop: 'invoiceAmount', label: '开票金额', minWidth: 130, money: true },
+  { prop: 'estimatedCost', label: '暂估成本', minWidth: 130, money: true },
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
   { prop: 'approvalStatusName', label: '状态', minWidth: 110, status: true },

src/option/payment/paymentApplication.js

@@ -1,11 +1,14 @@
 /**
  * 付款申请列表（avue-crud）配置
  * ------------------------------------------------------------------
- * 列表页与其它模块统一使用 avue-crud，头部按钮（刷新 / 列显隐 / 表格卡片切换）
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
- * 由 avue-crud 自带，不做二次封装。
+ * 表格卡片切换）由 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，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
- * 由 avue-crud 自带，不做二次封装。
+ * 显示方式）由 avue-crud 自带，不做二次封装。
- *
- * 搜索栏与应收/应付明细页统一为页面级手写搜索区（见 formal-settlement.vue），
- * 此处只保留表格列配置。
  *
  * 表格列复用 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,37 +31,74 @@ 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 },
+  formalSettlementNo: {
-  sealTypes: { formatter: sealTypesFormatter },
+    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: '收款状态' },
-};
-
 // 已指定应付仅付款结算单（先票后款 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';
@@ -77,6 +114,15 @@ export const formalSettlementOption = (settlementType = '') => ({
   height: 'auto',
   calcHeight: 32,
   tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 100,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
   border: true,
   index: true,
   indexLabel: '序号',
@@ -91,10 +137,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(settlementType),
+  ],
 });
 
 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
 export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
-export const paymentStatusName = (value, settlementType) =>
+export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);
-  pickLabel(paymentStatusOptions(settlementType), 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 = [
-export const invoiceStatusOptions = (settlementType = '') => {
+  { label: '未开/收票', value: 'unreceived' },
-  const received = settlementType === 'payable';
+  { label: '部分开/收票', value: 'partial' },
-  return [
+  { label: '已开/收票', value: 'completed' },
-    { label: received ? '未收票' : '未开票', value: 'unreceived' },
-    { label: received ? '部分收票' : '部分开票', value: 'partial' },
-    { label: received ? '已收票' : '已开票', 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) =>
+export const paymentStatusOptions = [
-  invoiceStatusOptions(settlementType).find(item => item.value === value)?.label || value || '-';
+  { label: '未收/付款', value: 'unpaid' },
-
+  { label: '部分收/付款', value: 'partial' },
-/** 收付款状态选项按结算类型区分：付款结算单=付款方向，收款结算单=收款方向 */
+  { label: '已收/付款', value: 'paid' },
-export const paymentStatusOptions = (settlementType = '') => {
-  const suffix = settlementType === 'payable' ? '付款' : '收款';
-  return [
-    { label: `未${suffix}`, value: 'unpaid' },
-    { label: `部分${suffix}`, value: 'partial' },
-    { label: `已${suffix}`, 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

@@ -26,12 +26,6 @@ export const preSettlementFormFields = [
   { 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 },
@@ -88,7 +82,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 => ({
+    const parentId = node.level === 0 ? 0 : node.data.id;
+    getDeptLazyTree(parentId).then(res => {
+      resolve(
+        res.data.data.map(item => {
+          return {
             ...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);
-          });
         })
-        .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

@@ -77,6 +77,19 @@ export default [
       },
     ],
   },
+  {
+    // 发票冲销明细独立页（不挂菜单，供开票申请/收票登记/付款申请页面跳转引用）
+    path: '/payment/invoice-write-off',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '发票冲销明细',
+        meta: { keepAlive: false, activeMenu: '/payment/invoice-application' },
+        component: loadView(() => import('@/views/payment/invoice-write-off.vue')),
+      },
+    ],
+  },
   {
     path: '/payment/payment-application/form',
     component: Layout,

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/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,
       };
+      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 = res.data.data;
-        this.data = data.records || [];
-        this.page.total = data.total || 0;
         this.loading = false;
         this.selectionClear();
       });

src/views/base/invoice-item.vue

@@ -8,9 +8,6 @@
       :data="data"
       :table-loading="loading"
       :permission="permissionList"
-      :before-open="beforeOpen"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
       @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
@@ -20,11 +17,21 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
     >
+      <template #menu-left>
+        <el-button
+          v-if="permission.invoice_item_add"
+          type="primary"
+          icon="el-icon-plus"
+          @click="openDialog()"
+        >
+          新增
+        </el-button>
+      </template>
       <template #menu="scope">
         <el-link
           v-if="permission.invoice_item_edit"
           type="primary"
-          @click="$refs.crud.rowEdit(scope.row, scope.index)"
+          @click="openDialog(scope.row)"
         >
           修改
         </el-link>
@@ -37,9 +44,36 @@
         </el-link>
       </template>
       <template #defaultTaxRate="scope">{{ scope.row.defaultTaxRate }}%</template>
-      <template #defaultTaxRate-form>
+    </avue-crud>
+
+    <el-dialog
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="900px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="dialogForm" :model="dialog.form" label-width="130px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="货物或服务简称" required prop="shortName">
+              <el-input v-model="dialog.form.shortName" maxlength="100" clearable placeholder="请输入货物或服务简称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="税收分类编码" required prop="taxClassificationCode">
+              <el-input v-model="dialog.form.taxClassificationCode" maxlength="30" clearable placeholder="请输入税收分类编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商品和服务分类名称" required prop="categoryName">
+              <el-input v-model="dialog.form.categoryName" maxlength="200" clearable placeholder="请输入商品和服务分类名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="默认税率" required prop="defaultTaxRate">
               <el-input
-          v-model="form.defaultTaxRate"
+                v-model="dialog.form.defaultTaxRate"
                 inputmode="decimal"
                 maxlength="6"
                 clearable
@@ -48,13 +82,87 @@
               >
                 <template #append>%</template>
               </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="关联费用项目">
+          <div class="fee-item-box">
+            <span class="fee-item-tip">可拖动排序，发票冲抵费用项目时，按设置的顺序冲抵费用</span>
+            <el-button type="primary" size="small" @click="addFeeItem">添加</el-button>
+            <table class="fee-item-table">
+              <thead>
+                <tr>
+                  <th width="36"></th>
+                  <th width="60">序号</th>
+                  <th>费用类型</th>
+                  <th>费用项目</th>
+                  <th width="60">操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr
+                  v-for="(item, index) in dialog.form.feeItems"
+                  :key="index"
+                  draggable="true"
+                  @dragstart="onFeeDragStart(index, $event)"
+                  @dragover.prevent
+                  @drop="onFeeDrop(index, $event)"
+                  @dragend="onFeeDragEnd"
+                >
+                  <td class="fee-item-drag" :class="{ 'is-dragging': feeDragIndex === index }">≡</td>
+                  <td>{{ index + 1 }}</td>
+                  <td>
+                    <el-select v-model="item.feeCategory" placeholder="请选择" clearable filterable @change="() => onFeeCategoryChange(item)">
+                      <el-option
+                        v-for="category in feeCategoryOptions"
+                        :key="category.value"
+                        :label="category.label"
+                        :value="category.value"
+                      />
+                    </el-select>
+                  </td>
+                  <td>
+                    <el-select
+                      v-model="item.feeItemId"
+                      placeholder="请先选择费用类型"
+                      :disabled="!item.feeCategory"
+                      clearable
+                      filterable
+                      @change="onFeeItemChange(item)"
+                    >
+                      <el-option
+                        v-for="fee in feeItemsOfCategory(item.feeCategory)"
+                        :key="fee.id"
+                        :label="fee.name"
+                        :value="fee.id"
+                      />
+                    </el-select>
+                  </td>
+                  <td>
+                    <el-link type="danger" @click="removeFeeItem(index)">删除</el-link>
+                  </td>
+                </tr>
+                <tr v-if="!dialog.form.feeItems.length">
+                  <td colspan="5" class="fee-item-empty">暂无数据</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="dialog.visible = false">取消</el-button>
+        <el-button type="primary" :loading="dialog.saving" @click="saveDialog">保存</el-button>
       </template>
-    </avue-crud>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
 import { getList, getDetail, submit, remove } from '@/api/base/invoice-item';
+import { getList as getFeeItemList } from '@/api/base/fee-item';
+import { getDictionaryAll } from '@/api/system/dictbiz';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -65,6 +173,16 @@ export default {
       loading: true,
       query: {},
       selectionList: [],
+      feeItemOptions: [],
+      // 费用类型字典选项（fee_category 字典：dictKey-编码A01，dictValue-名称运输）
+      feeCategoryDictOptions: [],
+      feeDragIndex: null,
+      dialog: {
+        visible: false,
+        title: '新增',
+        saving: false,
+        form: this.emptyForm(),
+      },
       page: {
         pageSize: 10,
         pageSizes: [10, 30, 50, 100, 200],
@@ -81,13 +199,11 @@ export default {
         indexLabel: '序号',
         indexWidth: 70,
         selection: false,
-        addBtn: true,
+        addBtn: false,
         editBtn: false,
         delBtn: false,
         viewBtn: false,
         menuWidth: 140,
-        dialogWidth: 900,
-        dialogClickModal: false,
         labelPosition: 'right',
         labelWidth: 'auto',
         searchShow: true,
@@ -100,49 +216,22 @@ export default {
             label: '货物或服务简称',
             prop: 'shortName',
             minWidth: 160,
-            span: 12,
-            maxlength: 100,
-            rules: [{ required: true, message: '请输入货物或服务简称', trigger: 'blur' }],
           },
           {
             label: '税收分类编码',
             prop: 'taxClassificationCode',
             minWidth: 190,
-            span: 12,
-            maxlength: 30,
-            rules: [{ required: true, message: '请输入税收分类编码', trigger: 'blur' }],
           },
           {
             label: '商品和服务分类名称',
             prop: 'categoryName',
             minWidth: 220,
-            span: 12,
-            maxlength: 200,
-            rules: [{ required: true, message: '请输入商品和服务分类名称', trigger: 'blur' }],
           },
           {
             label: '默认税率',
             prop: 'defaultTaxRate',
-            type: 'input',
-            formslot: true,
-            slot: true,
             minWidth: 120,
-            span: 12,
+            slot: true,
-            rules: [
-              { required: true, message: '请输入默认税率', trigger: 'blur' },
-              {
-                validator: (rule, value, callback) => {
-                  const text = String(value ?? '');
-                  const rate = Number(text);
-                  if (!/^\d+(\.\d+)?$/.test(text) || rate < 0 || rate > 100) {
-                    callback(new Error('默认税率必须是0到100之间的数字'));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
           },
           {
             label: '税收项目',
@@ -193,27 +282,131 @@ export default {
         delBtn: false,
       };
     },
+    // 费用类型下拉选项：优先字典（显示"名称/编码"），无字典数据时兜底费用项目库提取
+    feeCategoryOptions() {
+      if (this.feeCategoryDictOptions.length) return this.feeCategoryDictOptions;
+      return [...new Set(this.feeItemOptions.map(fee => fee.feeCategory).filter(Boolean))]
+        .map(category => ({ label: category, value: category }));
+    },
   },
   methods: {
-    rowSave(row, done, loading) {
+    emptyForm() {
-      submit(this.normalizeTaxRateRow(row)).then(
+      return {
-        () => {
+        id: null,
-          this.onLoad(this.page);
+        shortName: '',
+        taxClassificationCode: '',
+        categoryName: '',
+        defaultTaxRate: 0,
+        feeItems: [],
+      };
+    },
+    openDialog(row) {
+      this.dialog.form = this.emptyForm();
+      this.dialog.title = row ? '编辑' : '新增';
+      this.dialog.visible = true;
+      this.loadFeeItemOptions();
+      this.initFeeCategoryOptions();
+      if (row) {
+        // 编辑回填：后端 detail 返回关联费用项目（按排序号升序）
+        getDetail(row.id).then(res => {
+          const detail = res.data.data || {};
+          this.dialog.form = {
+            ...this.emptyForm(),
+            ...detail,
+            defaultTaxRate: detail.defaultTaxRate ?? 0,
+            feeItems: (detail.feeItems || []).map(item => ({
+              feeItemId: item.feeItemId,
+              feeItemName: item.feeItemName,
+              feeCategory: item.feeCategory,
+            })),
+          };
+        });
+      }
+    },
+    loadFeeItemOptions() {
+      if (this.feeItemOptions.length) return;
+      getFeeItemList(1, 1000, { status: 1 }).then(res => {
+        this.feeItemOptions = (res.data.data?.records) || [];
+      });
+    },
+    // 费用类型字典：code=fee_category（dictKey-编码如A01，dictValue-名称如运输），label 显示"名称/编码"与费用项目页一致
+    initFeeCategoryOptions() {
+      if (this.feeCategoryDictOptions.length) return;
+      getDictionaryAll().then(res => {
+        this.feeCategoryDictOptions = (res.data.data || [])
+          .filter(item => item.code === 'fee_category' && Number(item.parentId) > 0)
+          .sort((first, second) => Number(first.sort || 0) - Number(second.sort || 0))
+          .map(item => ({
+            label: `${item.dictValue}/${item.dictKey}`,
+            value: String(item.dictKey),
+          }));
+      });
+    },
+    // 级联：该费用类型下的费用项目选项
+    feeItemsOfCategory(feeCategory) {
+      if (!feeCategory) return [];
+      return this.feeItemOptions.filter(fee => fee.feeCategory === feeCategory);
+    },
+    // 先选费用类型：清空原费用项目（原项目可能不属于新类型）
+    onFeeCategoryChange(item) {
+      item.feeItemId = null;
+      item.feeItemName = '';
+    },
+    // 后选费用项目：带出名称（费用类型已由上级确定）
+    onFeeItemChange(item) {
+      const fee = this.feeItemsOfCategory(item.feeCategory).find(option => option.id === item.feeItemId);
+      item.feeItemName = fee ? fee.name : '';
+    },
+    addFeeItem() {
+      this.dialog.form.feeItems.push({ feeItemId: null, feeItemName: '', feeCategory: '' });
+    },
+    removeFeeItem(index) {
+      this.dialog.form.feeItems.splice(index, 1);
+    },
+    onFeeDragStart(index, event) {
+      this.feeDragIndex = index;
+      event.dataTransfer.effectAllowed = 'move';
+    },
+    onFeeDrop(index) {
+      const from = this.feeDragIndex;
+      if (from === null || from === index) return;
+      const items = this.dialog.form.feeItems;
+      items.splice(index, 0, items.splice(from, 1)[0]);
+      this.feeDragIndex = null;
+    },
+    onFeeDragEnd() {
+      this.feeDragIndex = null;
+    },
+    saveDialog() {
+      const formItem = this.dialog.form;
+      if (!formItem.shortName) return this.$message.warning('请输入货物或服务简称');
+      if (!formItem.taxClassificationCode) return this.$message.warning('请输入税收分类编码');
+      if (!formItem.categoryName) return this.$message.warning('请输入商品和服务分类名称');
+      const rate = Number(formItem.defaultTaxRate);
+      if (!/^\d+(\.\d+)?$/.test(String(formItem.defaultTaxRate ?? '')) || rate < 0 || rate > 100) {
+        return this.$message.warning('默认税率必须是0到100之间的数字');
+      }
+      if (formItem.feeItems.some(item => !item.feeItemId)) {
+        return this.$message.warning('请选择关联费用项目');
+      }
+      this.dialog.saving = true;
+      submit({
+        ...formItem,
+        defaultTaxRate: rate,
+        feeItems: formItem.feeItems.map(item => ({
+          feeItemId: item.feeItemId,
+          feeItemName: item.feeItemName,
+          feeCategory: item.feeCategory,
+        })),
+      })
+        .then(() => {
           this.$message.success('操作成功');
-          done();
+          this.dialog.visible = false;
-        },
-        () => loading()
-      );
-    },
-    rowUpdate(row, index, done, loading) {
-      submit(this.normalizeTaxRateRow(row)).then(
-        () => {
           this.onLoad(this.page);
-          this.$message.success('操作成功');
+        })
-          done();
+        .finally(() => {
-        },
+          this.dialog.saving = false;
-        () => loading()
+        });
-      );
     },
     rowDel(row) {
       this.$confirm('确定将选择数据删除?', '提示', { type: 'warning' })
@@ -223,27 +416,11 @@ export default {
           this.$message.success('操作成功');
         });
     },
-    beforeOpen(done, type) {
-      if (['edit', 'view'].includes(type)) {
-        getDetail(this.form.id).then(res => {
-          this.form = res.data.data || {};
-          done();
-        });
-        return;
-      }
-      this.form = { defaultTaxRate: 0 };
-      done();
-    },
     handleTaxRateInput(value) {
       let normalized = String(value || '').replace(/[^\d.]/g, '');
       normalized = normalized.replace(/(\..*)\./g, '$1');
       if (normalized.startsWith('.')) normalized = `0${normalized}`;
-      this.form.defaultTaxRate = normalized;
+      this.dialog.form.defaultTaxRate = normalized;
-    },
-    normalizeTaxRateRow(row) {
-      const values = { ...row };
-      values.defaultTaxRate = Number(values.defaultTaxRate);
-      return values;
     },
     searchChange(params, done) {
       this.query = {
@@ -292,17 +469,53 @@ export default {
   margin-bottom: 8px;
 }
 
-.invoice-item-page :deep(.avue-crud__dialog .el-form-item) {
-  margin-bottom: 28px;
-}
-
-.invoice-item-page :deep(.avue-crud__dialog .el-form-item__error) {
-  position: relative;
-  line-height: 20px;
-  white-space: normal;
-}
-
 .invoice-item-page :deep(.avue-crud__menu .el-link) {
   margin-right: 8px;
 }
+
+.fee-item-box {
+  width: 100%;
+}
+
+.fee-item-tip {
+  display: inline-block;
+  margin-right: 12px;
+  color: #f56c6c;
+  font-size: 12px;
+}
+
+.fee-item-table {
+  width: 100%;
+  margin-top: 8px;
+  border-collapse: collapse;
+}
+
+.fee-item-table th,
+.fee-item-table td {
+  padding: 8px;
+  border: 1px solid #ebeef5;
+  text-align: center;
+  font-size: 13px;
+}
+
+.fee-item-table th {
+  background: #f8f8f9;
+  color: #515a6e;
+  font-weight: 500;
+}
+
+.fee-item-drag {
+  cursor: move;
+  color: #909399;
+  font-size: 16px;
+  user-select: none;
+}
+
+.fee-item-drag.is-dragging {
+  color: #409eff;
+}
+
+.fee-item-empty {
+  color: #909399;
+}
 </style>

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

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

@@ -1337,7 +1337,7 @@
               <el-form-item label="规格">
                 <el-input
                   v-model="form.specification"
-                  placeholder="请填写规格"
+                  placeholder="选择货物自动回填"
                   clearable
                   :disabled="dialogReadonly"
                 />
@@ -1345,7 +1345,7 @@
               <el-form-item label="型号">
                 <el-input
                   v-model="form.model"
-                  placeholder="请填写型号"
+                  placeholder="选择货物自动回填"
                   clearable
                   :disabled="dialogReadonly"
                 />
@@ -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)">
@@ -5011,9 +5018,9 @@ export default {
       return Object.values(groups)
         .map(group => {
           const quantity = this.formatQuantity(group.quantity);
-          const typeName =
+          return `${group.typeName}等${group.count}种货物 | ${quantity}${
-            group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+            group.unit ? ` ${group.unit}` : ''
-          return `${typeName} | ${quantity}${group.unit ? ` ${group.unit}` : ''}`;
+          }`;
         })
         .join('； ');
     },
@@ -5171,9 +5178,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 (
@@ -8443,6 +8453,7 @@ export default {
       }
       if (!this.isTaskFullMode) {
         requiredFields.push(['cargoName', '货物名称']);
+        requiredFields.push(['model', '型号']);
         requiredFields.push(['quantity', '数量']);
       }
       const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
@@ -10242,14 +10253,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 +10266,11 @@ export default {
         reassign: '重新派单',
         confirmReturn: '完成',
       }[action];
-      // 回单确认与「完成」都是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
-      let confirmText = `确定${actionName}该${this.config.title}?`;
+      const confirmText =
-      if (action === 'confirmReturn') {
+        action === 'confirmReturn'
-        confirmText = '回单确认后该运单将置为已完成，且不可撤销。是否继续?';
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
-      } else if (action === 'complete') {
+          : `确定${actionName}该${this.config.title}?`;
-        confirmText = `确定完成该${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 = this.$refs.page?.form || {};
-      const row = page?.form || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
-      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 || '',
-      };
     },
   },
 };

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

@@ -69,8 +69,11 @@
           <el-form-item label="合同负责部门">
             <el-input v-model="form.organizationName" disabled />
           </el-form-item>
-          <el-form-item label="平台公司">
+          <el-form-item label="甲方">
-            <el-input v-model="form.platformCompanyName" disabled />
+            <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
@@ -269,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
@@ -819,13 +799,6 @@ 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 === '结算规则变更';
     },
@@ -1280,16 +1253,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 = this.$refs.page?.detailRow || {};
-      const row = page?.detailRow || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
-      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 || '',
-      };
     },
   },
 };

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 { getBusinessDeptSelect, getDeptTree } 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 { 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,13 +1707,6 @@ 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 个甲方时编辑器自动选中）
@@ -2709,12 +2678,13 @@ export default {
     applyProjectPlatformCompanies(project, autoSelect = false) {
       const ids = this.parseUndertakeDeptIds(project?.undertakeDeptId);
       const names = this.parseUndertakeDeptNames(project?.undertakeDeptName);
-      // 项目可能仍挂旧组织 ID（已删/非平台公司），按名称映射到现行「是否平台公司=是」的组织
+      this.platformCompanyOptions = ids.map((id, index) => ({
-      return this.resolveProjectPlatformCompanyOptions(ids, names).then(options => {
+        id: String(id),
-        this.platformCompanyOptions = options;
+        label: names[index] || String(id),
+      }));
       if (!autoSelect) {
         this.syncCurrentPlatformCompanyOption();
-          return options;
+        return;
       }
       if (this.platformCompanyOptions.length === 1) {
         this.form.platformCompanyId = this.platformCompanyOptions[0].id;
@@ -2730,34 +2700,6 @@ export default {
         this.handlePlatformCompanyChange(this.form.platformCompanyId);
       }
       if (this.formMode === 'add') this.refreshPreviewContractNo();
-        return options;
-      });
-    },
-    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);
     },
     handlePlatformCompanyChange(value) {
       const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
@@ -3151,8 +3093,11 @@ export default {
       this.businessDeptLoading = true;
       getBusinessDeptSelect()
         .then(res => {
-          // 同名业务部门（不同上级公司）展示「部门（上级）」；落库仍用 rawLabel 原始部门名
+          this.businessDeptOptions = (res.data?.data || []).map(item => ({
-          this.businessDeptOptions = normalizeBusinessDeptOptions(res.data?.data || []);
+            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 +3113,6 @@ export default {
       }
       this.businessDeptOptions.unshift({
         id: String(this.form.organizationId),
-        value: String(this.form.organizationId),
         label: this.form.organizationName,
         rawLabel: this.form.organizationName,
       });
@@ -3512,9 +3456,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);

src/views/business/loading-manage.vue

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

src/views/business/process-config.vue

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

src/views/business/project-apply.vue

@@ -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
+                <el-select v-model="row.fileType" placeholder="请选择" :disabled="dialogReadonly">
-                  v-model="row.fileType"
-                  placeholder="请选择"
-                  :disabled="dialogReadonly || isChangeDialog"
-                >
                   <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 }">
+              <template #default="{ $index }">
-                <el-link
+                <el-link v-if="!dialogReadonly" type="danger" @click="removeAttachment($index)"
-                  v-if="isChangeDialog && !dialogReadonly"
+                  >删除</el-link
-                  type="primary"
-                  @click="openAdjustAttachmentDialog(row, $index)"
                 >
-                  调整
-                </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,57 +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
@@ -1078,86 +1011,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="选择用户"
@@ -1241,18 +1094,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 {
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
-  loadMkEnabled,
-  resolveProjectChangeMkBizType,
-  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 +1165,6 @@ const emptyForm = () => ({
   customerJson: '',
   carrierJson: '',
   attachmentsJson: '',
-  adjustAttachmentsJson: '',
   situationRemark: '',
   projectIntro: '',
   profitRemark: '',
@@ -1327,24 +1174,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 +1186,7 @@ const optionalSentinelFields = [
 
 const changeTypeOptions = [
   { label: '项目变更', value: '项目变更' },
-  { label: '项目备案流程（本部流程）', value: '项目备案流程（本部流程）' },
+  { label: '项目备案调整', value: '项目备案调整' },
-  { label: '项目备案流程（运输部流程）', value: '项目备案流程（运输部流程）' },
 ];
 
 const attachmentViewerPlugins = [
@@ -1620,29 +1448,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: [],
@@ -1761,16 +1566,12 @@ export default {
     isPublicViewPage() {
       return (
         this.$route.path === '/business/project-apply/public-view' ||
-        this.$route.path === '/business/project-change/public-view' ||
+        this.$route.path === '/business/project-change/public-view'
-        this.$route.path === '/business/project-record-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 +1710,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,9 +2206,6 @@ export default {
       this.customerRows = [];
       this.carrierRows = [];
       this.attachmentRows = [];
-      this.adjustAttachmentRows = [];
-      this.adjustAttachmentBox = false;
-      this.resetAdjustAttachmentForm();
       this.selectedAttachmentRows = [];
       this.changeRows = [];
       this.projectContractRows = [];
@@ -2449,7 +2247,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
@@ -2544,20 +2341,10 @@ export default {
     },
     resolveChangeType(row = {}) {
       if (row.changeType) return row.changeType;
-      const node = String(row.currentNode || '');
+      const node = row.currentNode || '';
-      if (node.includes('运输部')) return '项目备案流程（运输部流程）';
+      if (String(node).includes('备案')) return '项目备案调整';
-      if (node.includes('本部') || 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 +2487,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 +2496,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({
+                tempVarData: { projectType: this.form.projectType || '' },
-                  ...this.form,
-                  changeType,
-                }),
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2738,17 +2521,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({
+              tempVarData: { projectType: this.form.projectType || '' },
-                ...this.form,
-                changeType,
-              }),
             }).then(() => {
               this.$message.success('提交成功!');
               this.closeProjectForm();
@@ -2776,9 +2555,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 +2570,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 +2979,19 @@ export default {
     loadDeptOptions() {
       getBusinessDeptSelect()
         .then(res => {
-          // 仅展示「是否业务部门=是」；同名部门追加上级组织名区分
+          const bizList = res.data.data || [];
-          this.deptOptions = normalizeBusinessDeptOptions(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 +3201,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 +3718,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 {
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
-  loadMkEnabled,
-  resolveProjectChangeMkBizType,
-  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(() => {
+            ? request().then(() =>
-                const changeType = row.changeType || '项目变更';
+                submitMkApprovalFlow({
-                return submitMkApprovalFlow({
+                  bizType: 'project-change',
-                  bizType: resolveProjectChangeMkBizType(changeType),
                   bizId: row.id,
                   subjectName: row.projectName || '',
                   approvalStatus: row.approvalStatus || '',
                   mkEnabled: this.mkEnabled,
-                  tempVarData: {
+                  tempVarData: { projectType: row.projectType || '' },
-                    projectType: row.projectType || '',
-                    changeType,
-                    变更类型: changeType,
-                  },
-                });
                 })
+              )
             : 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,
       })
-              )
+        .then(() => this.api[operation.action](row.id))
-            : request();
+        .then(() => {
-        return afterMk.then(res => {
-          if (res?.data?.success === false) {
-            this.$message.error(res.data?.msg || `${operation.label}失败，请联系管理员`);
-            return;
-          }
           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({
+const batchQuery = reactive({ batchNo: '', createUser: '', waybillCount: undefined });
-  batchNo: '',
-  projectId: '',
-  createUser: '',
-  waybillCount: undefined,
-});
 const batchPage = reactive({ current: 1, size: 10, total: 0 });
 const progressQuery = reactive({ businessId: '', attachmentName: '', status: '' });
 const progressPage = reactive({ current: 1, size: 10, total: 0 });
@@ -1044,12 +1023,7 @@ const openBatchDialog = async row => {
   batchDialogMode.value = voucher?.id ? 'change' : 'upload';
   batchTarget.value = voucher?.id ? voucher : undefined;
   batchSelection.value = [];
-  // 弹窗内的搜索条件是模块级状态，不重置就会带着上一次的筛选条件打开。
-  resetBatchSearch();
-  batchRows.value = [];
-  batchPage.total = 0;
   batchVisible.value = true;
-  if (!projectOptions.value.length) await loadProjects();
   await loadBatches();
   if (voucher?.waybillBatchNo) {
     const currentBatch = batchRows.value.find(item => item.batchNo === voucher.waybillBatchNo);
@@ -1059,7 +1033,6 @@ const openBatchDialog = async row => {
 const loadBatches = async () => {
   const res = await api.getWaybillBatches(batchPage.current, batchPage.size, {
     batchNo: batchQuery.batchNo,
-    projectId: batchQuery.projectId,
     createUser: batchQuery.createUser,
     waybillCount: batchQuery.waybillCount,
     createTimeStart: batchCreateRange.value?.[0] ? `${batchCreateRange.value[0]} 00:00:00` : '',
@@ -1080,18 +1053,10 @@ const handleWaybillCountInput = value => {
     batchQuery.waybillCount = filtered.replace(/^0+/, '');
   }
 };
-const resetBatchSearch = () => {
+const resetBatchQuery = () => {
-  Object.assign(batchQuery, {
+  Object.assign(batchQuery, { batchNo: '', createUser: '', waybillCount: undefined });
-    batchNo: '',
-    projectId: '',
-    createUser: '',
-    waybillCount: undefined,
-  });
   batchCreateRange.value = [];
   batchPage.current = 1;
-};
-const resetBatchQuery = () => {
-  resetBatchSearch();
   loadBatches();
 };
 const updateWaybillBatch = async (target, selected) => {

src/views/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 v-if="detail" :column="2" border>
-        <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]) }}
+          {{ displayValue(detail[item.prop]) }}
         </el-descriptions-item>
       </el-descriptions>
-        <section
-          v-for="party in partySections"
-          :key="party.role"
-          class="mk-public-biz-view__party"
-        >
-          <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>
       <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

@@ -86,6 +86,27 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目利润率">
+              <el-input
+                :model-value="profitRatePercent"
+                :disabled="readonly"
+                placeholder="选结算单带出，可修改"
+                @input="handleProfitRateInput"
+              >
+                <template #append>%</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="暂估成本（不含税）">
+              <el-input
+                :model-value="estimatedCost > 0 ? formatMoney(estimatedCost) : ''"
+                disabled
+                placeholder="开票不含税金额合计×项目利润率"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="部门邮箱" prop="departmentEmails">
               <el-select
@@ -326,16 +347,27 @@
           <el-table-column label="结算总金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
           </el-table-column>
+          <el-table-column label="历史累计开票金额" min-width="150" align="right">
+            <template #default="{ row }">{{ formatMoney(row.historyInvoicedAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="本次开票金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="剩余未开票金额" min-width="150" align="right">
+            <template #default="{ row }">{{ formatMoney(row.remainingUninvoicedAmount) }}</template>
+          </el-table-column>
           <el-table-column label="可开票金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
           </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
-          </el-table-column>
         </el-table>
       </section-card>
 
       <section-card title="开票明细">
+        <template #extra>
+          <el-button v-if="recordId" type="primary" @click="writeOffPanelVisible = true"
+            >发票冲销</el-button
+          >
+        </template>
         <el-table
           ref="detailTable"
           :data="detailRows"
@@ -385,6 +417,10 @@
         </el-table>
       </section-card>
 
+      <bottom-detail-panel v-model="writeOffPanelVisible" title="发票冲销明细">
+        <invoice-write-off-table biz-type="invoice_apply" :biz-id="recordId" />
+      </bottom-detail-panel>
+
       <section-card title="附件信息">
         <vehicle-attachment-table v-model="form.attachments" :readonly="readonly" />
       </section-card>
@@ -488,9 +524,12 @@ import * as api from '@/api/payment/invoiceApplication';
 import { getAll as getInvoiceItems } from '@/api/base/invoice-item';
 import { getList as getWaybillList } from '@/api/business/waybill-manage';
 import { getList as getReceivablePayableDetailList } from '@/api/settlement/receivable-payable-detail';
+import { getDetail as getProjectApplyDetail } from '@/api/business/project-apply';
 import { getDictionary } from '@/api/system/dictbiz';
 import { invoiceApplicationDetailColumns } from '@/option/payment/invoiceApplication';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
+import InvoiceWriteOffTable from '@/components/invoice-write-off-table/main.vue';
+import BottomDetailPanel from '@/components/bottom-detail-panel/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
@@ -538,18 +577,23 @@ const emptyForm = () => ({
   sheets: [emptySheet()],
   attachments: [],
   remark: '',
+  // 项目利润率（小数，如0.04表示4%；保存时后端快照并重算暂估成本）
+  profitRate: null,
 });
 
 export default {
   name: 'InvoiceApplicationForm',
   components: {
     VehicleAttachmentTable,
+    InvoiceWriteOffTable,
+    BottomDetailPanel,
   },
   data() {
     return {
       form: emptyForm(),
       detailRows: [],
       selectedDetailIds: [],
+      writeOffPanelVisible: false,
       receiverInvoiceOptions: [],
       contactOptions: [],
       departmentEmailOptions: [],
@@ -621,6 +665,24 @@ export default {
         0
       );
     },
+    // 项目利润率百分数展示/输入（后端存小数：0.04 ↔ 4）
+    profitRatePercent() {
+      const rate = Number(this.form.profitRate);
+      if (!Number.isFinite(rate) || rate <= 0) return '';
+      return String(Math.round(rate * 10000) / 100);
+    },
+    // 暂估成本 = 开票不含税金额合计 × 项目利润率（实时计算，后端保存时重算覆盖）
+    estimatedCost() {
+      const rate = Number(this.form.profitRate);
+      if (!Number.isFinite(rate) || rate <= 0) return 0;
+      const amountNoTaxTotal = this.form.sheets.reduce(
+        (sheetTotal, sheet) =>
+          sheetTotal +
+          sheet.lines.reduce((lineTotal, line) => lineTotal + Number(line.amountNoTax || 0), 0),
+        0
+      );
+      return amountNoTaxTotal * rate;
+    },
     detailColumns() {
       return [...this.detailBaseColumns, ...this.feeItemColumns];
     },
@@ -732,6 +794,13 @@ export default {
         this.transportTypeOptions.find(item => String(item.value) === String(value))?.label || value
       );
     },
+    // 项目利润率输入（百分数），转小数存储：4 → 0.04
+    handleProfitRateInput(value) {
+      let normalized = String(value || '').replace(/[^\d.]/g, '');
+      normalized = normalized.replace(/(\..*)\./g, '$1');
+      const percent = Number(normalized);
+      this.form.profitRate = Number.isFinite(percent) && percent > 0 ? percent / 100 : null;
+    },
     invoiceItemNames(categoryName) {
       return this.invoiceItems.filter(item => item.categoryName === categoryName);
     },
@@ -918,11 +987,27 @@ export default {
         allocatedInvoiceAmount: 0,
       }));
       this.form.projectName = first.projectName;
+      this.form.projectId = first.projectId;
       this.form.deptName = first.deptName;
       this.form.issuerName = first.issuerName;
       this.form.undertakingDeptName = first.deptName;
       this.settlementDialog.visible = false;
-      await Promise.all([this.loadSettlementDetails(), this.loadReceiverInformation()]);
+      await Promise.all([
+        this.loadSettlementDetails(),
+        this.loadReceiverInformation(),
+        this.loadProjectProfitRate(),
+      ]);
+    },
+    // 项目利润率：选结算单后带出项目立项利润率（百分数转小数存 form），已手填时不覆盖
+    async loadProjectProfitRate() {
+      if (!this.form.projectId || Number(this.form.profitRate) > 0) return;
+      try {
+        const data = this.unwrapData(await getProjectApplyDetail(this.form.projectId));
+        const rate = Number(data?.profitRate);
+        if (Number.isFinite(rate) && rate > 0) this.form.profitRate = rate / 100;
+      } catch {
+        // 带出失败不阻断选单，保存时后端仍会兜底取项目立项利润率
+      }
     },
     async loadSettlementDetails(resetSelection = true) {
       this.detailRows =
@@ -1173,6 +1258,7 @@ export default {
         contactName: this.form.contactName,
         contactPhone: this.form.contactPhone,
         email: this.form.email,
+        profitRate: Number(this.form.profitRate) > 0 ? Number(this.form.profitRate) : null,
         attachmentsJson: JSON.stringify(this.form.attachments || []),
         remark: this.form.remark,
         settlements: this.form.settlements.map(item => ({

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

@@ -128,7 +128,12 @@
       </section-card>
 
       <section-card title="发票明细">
-        <el-table :data="invoiceItems" border empty-text="选择金蝶票据池发票后带出发票明细行">
+        <template #extra>
+          <el-button size="small" type="primary" :loading="invoiceDetailLoading" :disabled="!form.invoiceNo" @click="openInvoiceDetailPanel">
+            查询明细
+          </el-button>
+        </template>
+        <el-table v-loading="invoiceDetailLoading" :data="invoiceItems" border empty-text="选择金蝶票据池发票后带出发票明细行">
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column prop="goodsName" label="货物名称" min-width="160" show-overflow-tooltip />
           <el-table-column prop="specModel" label="规格型号" min-width="120" show-overflow-tooltip />
@@ -152,6 +157,84 @@
         </el-table>
       </section-card>
 
+      <bottom-detail-panel v-model="invoiceDetailPanelVisible" title="发票信息">
+        <el-descriptions v-loading="invoiceDetailLoading" :column="3" border size="small">
+          <el-descriptions-item label="发票号码">{{
+            displayValue(invoicePoolDetail?.invoiceNo)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="开票日期">{{
+            displayValue(invoicePoolDetail?.invoiceDate)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="发票类型">{{
+            displayValue(invoicePoolDetail?.invoiceType)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="税率">
+            {{ invoicePoolDetail?.taxRate != null ? `${invoicePoolDetail.taxRate}%` : '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="发票金额（价税合计）">{{
+            formatMoney(invoicePoolDetail?.invoiceAmount)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="税额">{{
+            formatMoney(invoicePoolDetail?.taxAmount)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="受票单位（购方）">{{
+            displayValue(invoicePoolDetail?.receiverName)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="购方税号">{{
+            displayValue(invoicePoolDetail?.buyerTaxNo)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="开票单位（销方）">{{
+            displayValue(invoicePoolDetail?.issuerName)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="销方税号">{{
+            displayValue(invoicePoolDetail?.salerTaxNo)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="销方开户行">{{
+            displayValue(invoicePoolDetail?.bankName)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="销方银行账号">{{
+            displayValue(invoicePoolDetail?.bankAccount)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="销方电话">{{
+            displayValue(invoicePoolDetail?.phone)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="查验状态">{{
+            checkStatusText(invoicePoolDetail?.checkStatus)
+          }}</el-descriptions-item>
+          <el-descriptions-item label="金蝶单据号">{{
+            displayValue(invoicePoolDetail?.kingdeeBillNo)
+          }}</el-descriptions-item>
+        </el-descriptions>
+        <div class="receipt-form-page__invoice-items-title">发票明细行</div>
+        <el-table v-loading="invoiceDetailLoading" :data="invoiceItems" border empty-text="暂无发票明细行">
+          <el-table-column prop="seq" label="分录行号" width="90" align="center" />
+          <el-table-column prop="goodsName" label="货物名称" min-width="160" show-overflow-tooltip />
+          <el-table-column prop="specModel" label="规格型号" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="unit" label="单位" min-width="80" align="center" />
+          <el-table-column label="数量" min-width="100" align="right">
+            <template #default="{ row }">{{ formatQuantity(row.num) }}</template>
+          </el-table-column>
+          <el-table-column label="单价" min-width="110" align="right">
+            <template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
+          </el-table-column>
+          <el-table-column label="金额" min-width="120" align="right">
+            <template #default="{ row }">{{ formatMoney(row.detailAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="税率" min-width="90" align="center">
+            <template #default="{ row }">{{ formatRateText(row.taxRate) }}</template>
+          </el-table-column>
+          <el-table-column label="税额" min-width="110" align="right">
+            <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+          </el-table-column>
+          <el-table-column prop="goodsCode" label="税收分类编码" min-width="140" show-overflow-tooltip />
+          <el-table-column prop="discountType" label="折扣类型" min-width="100" align="center" />
+          <el-table-column prop="preferentialPolicy" label="优惠政策" min-width="120" show-overflow-tooltip />
+          <el-table-column prop="vatException" label="增值税特殊事项" min-width="130" show-overflow-tooltip />
+          <el-table-column prop="zeroTaxRateFlag" label="零税率标识" min-width="100" align="center" />
+          <el-table-column prop="versionNo" label="版本号" min-width="90" align="center" />
+        </el-table>
+      </bottom-detail-panel>
+
       <section-card title="结算信息">
         <el-table :data="form.settlements" border empty-text="暂无认领数据（认领关系由付款结算单侧维护）">
           <el-table-column type="index" label="序号" width="64" align="center" />
@@ -179,6 +262,10 @@
         </el-table>
       </section-card>
 
+      <section-card v-if="recordId" title="发票冲销明细">
+        <invoice-write-off-table biz-type="receipt" :biz-id="recordId" />
+      </section-card>
+
       <section-card title="附件信息">
         <!-- 金蝶票池认领的发票附件为 piaozone path 型，需带发票号走 A801-2 代理查看/下载 -->
         <vehicle-attachment-table
@@ -276,6 +363,8 @@ import * as api from '@/api/payment/invoiceReceipt';
 import { getList as getContractList } from '@/api/business/contract-manage';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
+import InvoiceWriteOffTable from '@/components/invoice-write-off-table/main.vue';
+import BottomDetailPanel from '@/components/bottom-detail-panel/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
@@ -315,6 +404,8 @@ export default {
   components: {
     KingdeeInvoicePoolDialog,
     VehicleAttachmentTable,
+    InvoiceWriteOffTable,
+    BottomDetailPanel,
   },
   data() {
     return {
@@ -323,6 +414,9 @@ export default {
       customerEmailOptions: [],
       departmentEmailOptions: [],
       invoiceItems: [],
+      invoiceDetailLoading: false,
+      invoiceDetailPanelVisible: false,
+      invoicePoolDetail: null,
       contractDialog: {
         visible: false,
         loading: false,
@@ -504,6 +598,37 @@ export default {
         this.invoiceItems = [];
       }
     },
+    // 查询明细：底部弹窗展示金蝶发票全量信息（头部票池镜像 + 全部明细行），历史单据无缓存时回源金蝶
+    async openInvoiceDetailPanel() {
+      if (!this.form.invoiceNo) return;
+      this.invoiceDetailPanelVisible = true;
+      this.invoiceDetailLoading = true;
+      try {
+        const [poolResult, itemsResult] = await Promise.allSettled([
+          api.queryInvoicePool({ current: 1, size: 1, invoiceNo: this.form.invoiceNo }),
+          api.invoiceDetailQuery(this.form.invoiceNo),
+        ]);
+        if (poolResult.status === 'fulfilled') {
+          const records = this.unwrapData(poolResult.value)?.records || [];
+          this.invoicePoolDetail =
+            records.find(item => item.invoiceNo === this.form.invoiceNo) || records[0] || null;
+        } else {
+          this.invoicePoolDetail = null;
+        }
+        if (itemsResult.status === 'fulfilled') {
+          this.invoiceItems = this.unwrapData(itemsResult.value) || [];
+          if (!this.invoiceItems.length) this.$message.info('未查询到该发票的明细行');
+        } else {
+          this.$message.error('查询金蝶发票明细失败');
+        }
+      } finally {
+        this.invoiceDetailLoading = false;
+      }
+    },
+    checkStatusText(value) {
+      const map = { 0: '未查验', 1: '查验通过', 2: '查验不通过' };
+      return map[value] ?? this.displayValue(value);
+    },
     // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
     openContractDialog() {
       this.contractDialog.visible = true;
@@ -625,6 +750,9 @@ export default {
     goBack() {
       this.$router.push('/payment/invoice-receipt');
     },
+    displayValue(value) {
+      return value === null || value === undefined || value === '' ? '-' : value;
+    },
     formatMoney(value) {
       return Number(value || 0).toFixed(2);
     },
@@ -660,6 +788,11 @@ export default {
   display: block;
   width: 100%;
 }
+.receipt-form-page__invoice-items-title {
+  margin: 16px 0 8px;
+  font-size: 14px;
+  font-weight: 600;
+}
 .receipt-form-page__remark :deep(.el-form-item__content) {
   margin-left: 0 !important;
 }

src/views/payment/invoice-write-off.vue

@@ -0,0 +1,28 @@
+<template>
+  <basic-container>
+    <section-card title="发票冲销明细">
+      <invoice-write-off-table :biz-type="bizType" :biz-id="bizId" />
+    </section-card>
+  </basic-container>
+</template>
+
+<script>
+import InvoiceWriteOffTable from '@/components/invoice-write-off-table/main.vue';
+
+/**
+ * 发票冲销明细独立页（不挂菜单，供其他页面 $router 跳转引用）
+ * 用法：$router.push({ path: '/payment/invoice-write-off', query: { bizType: 'invoice_apply', bizId: id } })
+ */
+export default {
+  name: 'InvoiceWriteOff',
+  components: { InvoiceWriteOffTable },
+  computed: {
+    bizType() {
+      return String(this.$route.query.bizType || 'invoice_apply');
+    },
+    bizId() {
+      return this.$route.query.bizId || null;
+    },
+  },
+};
+</script>

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>
@@ -290,6 +290,11 @@
         </el-table>
       </section-card>
       <section-card v-if="showInvoiceSection" title="发票信息">
+        <template #extra>
+          <el-button v-if="recordId" type="primary" @click="writeOffPanelVisible = true"
+            >发票冲销</el-button
+          >
+        </template>
         <el-table :data="form.invoices" border>
           <el-table-column type="index" label="序号" width="70" />
           <el-table-column prop="settlementNo" label="结算单号" min-width="120">
@@ -316,6 +321,13 @@
           <el-table-column label="匹配金额（含税）" min-width="150">
             <template #default="{ row }">{{ formatMoney(row.matchedAmount) }}</template>
           </el-table-column>
+          <el-table-column label="冲销状态" width="110" align="center">
+            <template #default="{ row }">
+              <el-tag v-if="row.writeOffStatus === 'finished'" type="success">已完成</el-tag>
+              <el-tag v-else-if="row.invoiceNo" type="warning">未完成</el-tag>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="220" fixed="right" align="center">
             <template #default="{ row, $index }">
               <div class="payment-form-page__invoice-actions">
@@ -343,6 +355,9 @@
           </el-table-column>
         </el-table>
       </section-card>
+      <bottom-detail-panel v-model="writeOffPanelVisible" title="发票冲销明细">
+        <invoice-write-off-table biz-type="payment_receipt" :biz-id="recordId" />
+      </bottom-detail-panel>
       <section-card title="付款记录">
         <el-table :data="paymentRecords" border
           ><el-table-column type="index" label="序号" width="70" /><el-table-column
@@ -427,8 +442,7 @@
               ><el-input
                 v-model="row.description"
                 :disabled="readonly"
-                maxlength="200"
+                maxlength="200" /></template></el-table-column
-                placeholder="请输入" /></template></el-table-column
           ><el-table-column label="文件大小" width="120"
             ><template #default="{ row }">{{
               formatAttachmentSize(row)
@@ -745,6 +759,7 @@ import {
   getList as getCustomerArchiveList,
 } from '@/api/vehicle/customer-archive';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
+import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadFile, downloadFileByUrl } from '@/utils/util';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
@@ -753,6 +768,8 @@ import {
   viewKingdeeFile,
 } from '@/utils/kingdee-attachment';
 import PdfPreview from '@/components/pdf-preview/main.vue';
+import InvoiceWriteOffTable from '@/components/invoice-write-off-table/main.vue';
+import BottomDetailPanel from '@/components/bottom-detail-panel/main.vue';
 
 const attachmentViewerPlugins = [
   imagePlugin(),
@@ -829,12 +846,15 @@ export default {
     ElImageViewer,
     OpenFileViewer,
     PdfPreview,
+    InvoiceWriteOffTable,
+    BottomDetailPanel,
   },
   data() {
     return {
       form: emptyForm(),
       amountSyncing: false,
       transferPayload: null,
+      writeOffPanelVisible: false,
       // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
       kingdeeAttachmentBusy: false,
       referenceRows: [],
@@ -1115,8 +1135,6 @@ export default {
       );
       this.$nextTick(() => {
         this.amountSyncing = false;
-        // 程序化赋值不触发校验，需手动重校验以清除/刷新残留错误
-        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
       });
     },
     'form.appliedAmount'(value) {
@@ -1146,7 +1164,6 @@ export default {
       );
       this.$nextTick(() => {
         this.amountSyncing = false;
-        this.$refs.formRef?.validateField?.('appliedAmount').catch(() => {});
       });
     },
   },
@@ -1155,6 +1172,7 @@ export default {
     this.initialize();
   },
   methods: {
+    formatContractOptionLabel,
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -2125,10 +2143,10 @@ export default {
     mergeAutomaticAttachments(
       files,
       materials,
+      sourceName,
       defaultMaterial = null,
       sourceKey = '',
-      keepUnmatched = false,
+      keepUnmatched = false
-      insertIndex = -1
     ) {
       const existingUrls = new Set(
         (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
@@ -2152,39 +2170,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) {
+      if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
-        // 回填到被替换附件的原起始位置，避免回显/切换时把用户新传附件顶到前面
-        const attachments = [...this.form.attachments];
-        const insertAt =
-          insertIndex >= 0 ? Math.min(insertIndex, attachments.length) : attachments.length;
-        attachments.splice(insertAt, 0, ...imported);
-        this.form.attachments = attachments;
-      }
       return imported;
     },
-    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换），返回首个被移除的位置 */
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
-    removeAutomaticAttachments(sourceKey) {
+    removeAutomaticAttachments(sourceKey, sourceName = '') {
       const previousUrls = new Set(
         sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
       );
-      let firstRemovedIndex = -1;
+      this.form.attachments = (this.form.attachments || []).filter(file => {
-      this.form.attachments = (this.form.attachments || []).filter((file, index) => {
         const url = this.attachmentFileUrl(file);
-        const keep =
+        if (sourceKey && file.sourceKey === sourceKey) return false;
-          !(sourceKey && file.sourceKey === sourceKey) &&
+        if (
-          !(previousUrls.size && url && previousUrls.has(url));
+          sourceName &&
-        if (!keep && firstRemovedIndex === -1) firstRemovedIndex = index;
+          file.sourceImported &&
-        return keep;
+          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 +2213,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,
+        true
-        removedAt
       );
       this.linkedSettlementAttachmentUrls = imported
         .map(file => this.attachmentFileUrl(file))
@@ -2257,7 +2271,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 +2283,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',
+            'contract'
-            false,
-            contractRemovedAt
           );
           return;
         }
@@ -2290,15 +2303,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',
+            'contract'
-            false,
-            contractRemovedAt
           );
         }
       } catch (error) {

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 同规则）
+    searchChange(params, done) {
-    buildSearchParams() {
+      // 所属组织级联返回 id 路径数组，转成部门名称给后端
-      const params = { ...this.searchForm };
       this.normalizeOrganizationSearch(params, 'deptName');
+      // 日期区间拆成后端需要的起止字段
       const range = params.applyDateRange || [];
       delete params.applyDateRange;
-      return { ...params, applyStartDate: range[0] || '', applyEndDate: range[1] || '' };
+      this.query = {
-    },
+        ...params,
-    handleSearch() {
+        applyStartDate: range[0] || '',
-      this.query = this.buildSearchParams();
+        applyEndDate: range[1] || '',
+      };
       this.page.currentPage = 1;
       this.onLoad(this.page);
+      done();
     },
-    handleReset() {
+    searchReset() {
-      this.searchForm = {};
       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">{{
+                <span v-else-if="field.money">{{ formatMoney(form[field.prop]) }}</span>
-                  formatMoney(
+                <span v-else-if="field.type === 'select'">{{
-                    form[field.prop],
-                    field.prop === 'settlementAmount' ? settlementCurrencyCode : 'RMB'
-                  )
-                }}</span>
-                <span v-else-if="field.type === 'select' || field.type === 'multi-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"
@@ -470,7 +450,7 @@
           >
           <el-button v-else type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
         </div>
-        <el-table :data="invoices" border>
+        <el-table :data="invoiceRows" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column prop="invoiceNo" label="发票号" min-width="150" align="center" />
           <el-table-column prop="invoiceDate" label="开票日期" min-width="130" align="center">
@@ -546,13 +526,13 @@
                 <el-link
                   type="primary"
                   :disabled="kingdeeAttachmentBusy"
-                  @click="viewInvoiceAttachment(row)"
+                  @click="viewInvoiceFile(row)"
                   >查看</el-link
                 >
                 <el-link
                   type="primary"
                   :disabled="kingdeeAttachmentBusy"
-                  @click="downloadInvoiceAttachment(row)"
+                  @click="downloadInvoiceFile(row)"
                   >下载</el-link
                 >
                 <!-- 查看页重推入口：付款结算单已同步金蝶且认领票未指定应付（failed/pushed） -->
@@ -563,35 +543,13 @@
                   @click="repushInvoice(row)"
                   >重新推送</el-link
                 >
-                <el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
+                <el-link v-if="editable && !row.issued" type="danger" @click="removeInvoice($index)"
+                  >删除</el-link
+                >
               </div>
             </template>
           </el-table-column>
         </el-table>
-
-        <div v-if="issuedInvoices.length" class="formal-editor__issued-invoices">
-          <div class="formal-editor__issued-title">
-            开票发票（本结算单开票申请经金蝶开票回写，文件由金蝶发票云直链提供）
-          </div>
-          <el-table :data="issuedInvoices" border>
-            <el-table-column type="index" label="序号" width="64" align="center" />
-            <el-table-column prop="invoiceNo" label="发票号" min-width="150" align="center" />
-            <el-table-column prop="invoiceDate" label="开票日期" min-width="130" align="center">
-              <template #default="{ row }">{{ displayValue(row.invoiceDate) }}</template>
-            </el-table-column>
-            <el-table-column prop="invoiceAmount" label="价税合计" min-width="130" align="center">
-              <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
-            </el-table-column>
-            <el-table-column label="操作" width="160" fixed="right" align="center">
-              <template #default="{ row }">
-                <div class="formal-editor__links">
-                  <el-link type="primary" @click="viewIssuedInvoice(row)">查看</el-link>
-                  <el-link type="primary" @click="downloadIssuedInvoice(row)">下载</el-link>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
       </section-card>
 
       <kingdee-invoice-pool-dialog
@@ -1143,6 +1101,7 @@ import {
   sourceColumns,
   summaryColumns,
 } from '@/option/settlement/formalSettlementTable';
+import { invoiceTypeOptions } from '@/api/payment/invoiceApplication';
 import { getDictionary } from '@/api/system/dictbiz';
 import { h } from 'vue';
 import { mapGetters } from 'vuex';
@@ -1160,11 +1119,6 @@ import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/m
 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 +1210,6 @@ export default {
       feeCategoryOptions: [],
       businessModelOptions: [],
       transportTypeOptions: [],
-      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
       fields: formalSettlementFormFields,
       sourceTableColumns: sourceColumns,
       summaryTableColumns: summaryColumns,
@@ -1350,6 +1303,24 @@ export default {
     editable() {
       return !this.readonly;
     },
+    // 发票信息合并展示：结算单发票行在前 + 金蝶回写开票发票行在后（issued 标记，只读不保存）；
+    // 回写行恒在尾部，保证下方 $index 删除操作与 this.invoices 索引一致；
+    // 回写行票种按开票申请字典翻译；可匹配金额=票面价税合计，匹配结算单金额=后端票级冲抵明细汇总
+    invoiceRows() {
+      return [
+        ...this.invoices,
+        ...this.issuedInvoices.map(row => ({
+          ...row,
+          issued: true,
+          invoiceType:
+            invoiceTypeOptions.find(item => item.value === row.invoiceType)?.label ||
+            row.invoiceType ||
+            '',
+          availableInvoiceAmount: Number(row.invoiceAmount || 0),
+          matchedAmount: Number(row.matchedAmount || 0),
+        })),
+      ];
+    },
     // 查看页面「同步」按钮：仅已审批且未同步金蝶（含推送失败）的单据显示，口径与后端推送闸门一致
     canSync() {
       return (
@@ -1396,10 +1367,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 +1491,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 +1523,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 +1695,6 @@ export default {
         contractId,
         settlementType,
         settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
-        sealTypes: parseSealTypes(first.sealTypes),
         sourcePreSettlementIds: this.form.sourcePreSettlementIds,
       });
       const responses = await Promise.all(
@@ -1971,17 +1937,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();
       }
-      // 来源预结算金额为本位币；外币结算时结算金额按汇率反算，本位币合计保留本位币汇总
+      this.form.settlementAmount = this.sources.reduce(
-      const sourceTotal = this.sources.reduce(
         (sum, item) => sum + Number(item.settlementAmount || 0),
         0
       );
-      this.form.settlementAmount = this.convertLocalToSettlementAmount(sourceTotal);
+      this.form.localSettlementAmount =
-      this.form.localSettlementAmount = Number(sourceTotal).toFixed(2);
+        this.form.settlementAmount * Number(this.form.exchangeRate || 1);
       this.candidate.visible = false;
       // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行，额度单份占用）
       const newIds = this.sources
@@ -2131,7 +2095,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);
         }
@@ -2735,9 +2699,10 @@ export default {
     openInvoiceReceiptDialog() {
       this.invoiceReceiptDialog.visible = true;
     },
-    // 查看页重推入口展示条件：只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付（failed/pushed）
+    // 查看页重推入口展示条件：只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付（failed/pushed）；金蝶回写行不参与
     canRepushInvoice(row) {
       return (
+        !row.issued &&
         !this.editable &&
         this.form.settlementType !== 'receivable' &&
         this.form.approvalStatus === 'approved' &&
@@ -2987,6 +2952,13 @@ export default {
         this.kingdeeAttachmentBusy = false;
       }
     },
+    // 发票文件入口分流：金蝶回写开票发票走发票云直链，其余走金蝶票池/登记附件
+    viewInvoiceFile(row) {
+      return row.issued ? this.viewIssuedInvoice(row) : this.viewInvoiceAttachment(row);
+    },
+    downloadInvoiceFile(row) {
+      return row.issued ? this.downloadIssuedInvoice(row) : this.downloadInvoiceAttachment(row);
+    },
     // 开票发票预览地址：数电PDF优先（OFD浏览器无法预览），退预览图、板式文件
     issuedInvoicePreviewUrl(row) {
       return row.invoicePdfFileUrl || row.invoiceImageUrl || row.invoiceFileUrl || '';
@@ -3029,7 +3001,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 +3177,16 @@ export default {
       const body = response?.data || response || {};
       return body?.data || body;
     },
-    formatMoney(value, currency = 'RMB') {
+    formatMoney(value) {
-      return `${Number(value || 0).toFixed(2)} ${currency}`;
+      return `${Number(value || 0).toFixed(2)} RMB`;
     },
-    formatDetailTransportQuantity(row) {
+    formatQuantity(value) {
-      const value = row.transportQuantity;
+      if (value === undefined || value === null || value === '') return '-';
-      if (this.readonly && Number(value) === -1) return '-';
       const quantity = Number(value);
-      if (!Number.isFinite(quantity)) return '-';
+      return Number.isFinite(quantity) ? quantity.toFixed(2) : '-';
-      // 与预结算编辑器 formatQuantity 保持一致，拼接计量单位
+    },
-      return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
+    formatDetailTransportQuantity(value) {
+      return this.readonly && Number(value) === -1 ? '-' : this.formatQuantity(value);
     },
     formatDetailMileage(value) {
       return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);
@@ -3242,9 +3213,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 +3243,7 @@ export default {
         label: item.dictValue,
         value: item.dictValue,
       }));
+      this.sortAttachments();
     },
     resolveAttachmentType(fileName) {
       const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3298,6 +3267,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 +3315,7 @@ export default {
         size: this.formatAttachmentSize(file.size),
         url: file.url || file.link || '',
       });
+      this.sortAttachments();
     },
     handleAttachmentSelectionChange(rows) {
       this.selectedAttachmentRows = rows || [];
@@ -3607,14 +3596,6 @@ export default {
   justify-content: flex-end;
   margin-bottom: 12px;
 }
-.formal-editor__issued-invoices {
-  margin-top: 16px;
-}
-.formal-editor__issued-title {
-  margin-bottom: 8px;
-  color: var(--el-text-color-secondary);
-  font-size: 13px;
-}
 .formal-editor__negative-amount {
   color: var(--el-color-danger);
 }

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 }">{{
+    <template #paymentStatusName="{ row }">{{ paymentName(row.paymentStatus) }}</template>
-      paymentName(row.paymentStatus, row.settlementType)
-    }}</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) {
+    paymentName(value) {
-      return paymentStatusName(value, settlementType);
+      return paymentStatusName(value);
     },
     kingdeeSyncName(value) {
       return kingdeeSyncName(value);

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

@@ -67,26 +67,7 @@
                     :value="item.dictKey"
                   />
                 </el-select>
-                <el-select
+                <span v-else-if="field.type === 'select'" class="form-readonly">
-                  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"
-                >
                   {{ 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"
@@ -1043,11 +1025,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'];
@@ -1140,7 +1117,6 @@ export default {
       feeCategoryOptions: [],
       businessModelOptions: [],
       transportTypeOptions: [],
-      sealTypeOptions: SETTLEMENT_SEAL_TYPE_OPTIONS,
       summaryFees: [],
       details: [],
       detailCollapsed: false,
@@ -1577,11 +1553,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 = {
+        this.form = { ...emptyPreSettlementForm(), ...detail };
-          ...emptyPreSettlementForm(),
-          ...detail,
-          sealTypes: parseSealTypes(detail.sealTypes),
-        };
         this.summaryFees = (detail.summaryFees || []).map(row => ({ ...row }));
         this.details = (detail.details || []).map(row => this.normalizeSourceDetail(row));
         this.detailPage.current = 1;
@@ -1601,6 +1573,7 @@ export default {
           row => !isApprovalSettlementChange(row.changeContent)
         );
         this.attachments = this.parseAttachments(detail.attachmentsJson);
+        this.sortAttachments();
         this.selectedAttachmentRows = [];
         if (detail.contractId) {
           await this.ensureContractPartyOptions(detail.contractId, {
@@ -1744,9 +1717,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(
@@ -1972,9 +1942,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 +1961,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 +3099,7 @@ export default {
           uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
         };
       });
+      this.sortAttachments();
       this.selectedAttachmentRows = [];
     },
     async loadAttachmentTypeOptions() {
@@ -3148,6 +3115,7 @@ export default {
       } catch (error) {
         this.attachmentTypeOptions = [];
       }
+      this.sortAttachments();
     },
     resolveAttachmentType(fileName) {
       const normalizedName = String(fileName || '').toLocaleLowerCase();
@@ -3175,6 +3143,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/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 {
+      return { ...form, subject: form.formalSettlementNo || form.contractName || '' };
-        ...form,
-        sealTypes: formatSealTypes(form.sealTypes) || '',
-        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"
     />
@@ -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,7 @@ export default {
   },
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
       query: {},
-      // 手写搜索区（与应收/应付明细同款）：模型与展开状态
-      searchForm: {},
-      searchExpanded: false,
-      // 发票状态/收付款状态下拉选项：来自数据字典（按结算类型区分收/付方向），
-      // 字典未配置时回退前端默认文案（见 loadStatusDicts）
-      invoiceStatusDict: [],
-      paymentStatusDict: [],
       activeSettlementType: 'payable',
       rows: [],
       selection: [],
@@ -359,47 +288,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);
@@ -441,6 +329,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 +352,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 +359,6 @@ export default {
   },
   created() {
     this.loadOrganizationOptions();
-    this.loadStatusDicts();
   },
   mounted() {
     this.isPageActive = true;
@@ -514,57 +401,25 @@ export default {
         this.loading = false;
       }
     },
-    /**
+    searchChange(params, done) {
-     * 发票状态/收付款状态下拉选项从字典加载（dictKey=后端状态值，dictValue=文案）。
+      // 所属组织级联返回 id 路径，转成组织名称传给后端
-     * 收/付两个方向文案不同，按结算类型区分字典编码：
-     *   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 };
       this.normalizeOrganizationSearch(params, 'deptName');
       const range = params.createDateRange || [];
       delete params.createDateRange;
-      return { ...params, createStartDate: range[0] || '', createEndDate: range[1] || '' };
+      this.query = {
-    },
+        ...params,
-    handleSearch() {
+        createStartDate: range[0] || '',
-      this.query = this.buildSearchParams();
+        createEndDate: range[1] || '',
+      };
       this.page.currentPage = 1;
       this.onLoad(this.page);
+      done();
     },
-    handleReset() {
+    searchReset() {
-      this.searchForm = {};
       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),
@@ -652,9 +507,6 @@ export default {
         subjectName: row.formalSettlementNo || '',
         approvalStatus: previousApprovalStatus,
         mkEnabled: this.mkEnabled,
-        tempVarData: {
-          sealTypes: formatSealTypes(row.sealTypes) || '',
-        },
       });
       this.$message.success('提交成功');
       this.onLoad(this.page);
@@ -1025,56 +877,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 {
+      return { ...form, subject: form.preSettlementNo || form.contractName || '' };
-        ...form,
-        sealTypes: formatSealTypes(form.sealTypes) || '',
-        subject: form.preSettlementNo || form.contractName || '',
-      };
     },
   },
 };

src/views/settlement/pre-settlement.vue

@@ -148,9 +148,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 +306,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 +401,6 @@ export default {
       });
   },
   methods: {
-    formatSealTypes,
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
@@ -675,9 +670,6 @@ export default {
         subjectName: row.preSettlementNo || '',
         approvalStatus: previousApprovalStatus,
         mkEnabled: this.mkEnabled,
-        tempVarData: {
-          sealTypes: formatSealTypes(row.sealTypes) || '',
-        },
       });
       this.$message.success('提交成功');
       this.loadTable();

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"
@@ -1063,11 +1063,11 @@ import { getContractOptions as getSettlementContractOptions } from '@/api/settle
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
+import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
-import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
+import { settlementListPath } from '@/utils/settlement-menu';
-import { getList as getFormalSettlementList } from '@/api/settlement/formalSettlement';
 import {
   contractApprovalStatusOptions,
   contractCategoryOptions,
@@ -1144,6 +1144,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 +1223,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 +1921,8 @@ export default {
         this.openSettlementDetail('/settlement/pre-settlement', row.preSettlementNo);
         return;
       }
-      // 正式结算单号：跳转付款/收款结算单表单页并打开详情（与开票申请等入口一致）
+      if (this.settlementType === 'payable' && column.prop === 'formalSettlementNo') {
-      if (column.prop === 'formalSettlementNo') {
+        this.openSettlementDetail('/settlement/payment-settlement', row.formalSettlementNo);
-        this.openFormalSettlementDetail(row.formalSettlementNo);
         return;
       }
       this.openDetailDialog(row);
@@ -1943,42 +1934,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 =

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

@@ -93,7 +93,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 {
@@ -155,9 +154,8 @@ export default {
           {
             label: '业务部门',
             prop: 'businessDeptName',
-            minWidth: 260,
+            minWidth: 160,
             display: false,
-            formatter: row => this.formatBusinessDeptLabel(row),
           },
           {
             label: '平台公司',
@@ -279,16 +277,11 @@ export default {
       Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
         ([platformRes, businessRes]) => {
           this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
-          // 业务部门配置页始终展示「部门（所属公司）」，便于与平台公司配对
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.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.refreshBusinessDeptLabels();
         }
       );
     },
@@ -299,19 +292,6 @@ 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') {
@@ -337,15 +317,13 @@ export default {
     },
     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, {
+          this.businessDeptOptions = this.normalizeDeptOptions(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');

src/views/system/mp-user.vue

@@ -66,21 +66,17 @@
         />
       </template>
       <template #dataScopeDeptIds-form>
-        <!-- 与用户管理「数据管理权限」一致：组织多选级联，数据源同左侧组织树 -->
+        <el-tree
-        <el-cascader
           v-if="Number(form.dataScopeRange) === 3"
-          v-model="dataScopeCascaderValue"
+          ref="dataScopeTree"
-          :options="permissionDeptTree"
+          :data="permissionDeptTree"
-          :props="deptCascaderProps"
+          show-checkbox
-          :disabled="isViewMode"
+          node-key="id"
-          clearable
+          :default-checked-keys="form.dataScopeDeptIds || []"
-          filterable
+          :props="{ label: 'title', children: 'children' }"
-          collapse-tags
+          @check="handleDataScopeCheck"
-          collapse-tags-tooltip
-          placeholder="请选择数据权限组织（可多选）"
-          style="width: 100%"
         />
-        <span v-else class="form-tip">选择「自定义」后可选择数据权限组织</span>
+        <span v-else class="form-tip">选择「自定义」后可勾选数据权限组织</span>
       </template>
       <template #menu="{ row, index }">
         <el-link
@@ -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

@@ -713,12 +713,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 +733,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;
@@ -969,11 +963,9 @@ export default {
         column.dicData = res.data.data;
       });
       getDeptTree(tenantId).then(res => {
-        // 用户管理组织从第二级开始展示：去掉一级根节点，保留其子节点
+        this.permissionDeptTree = res.data.data;
-        const deptTree = this.startDeptTreeFromSecondLevel(res.data.data || []);
-        this.permissionDeptTree = deptTree;
         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;

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

src/views/transportCapacity/ship.vue

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

src/views/transportCapacity/vehicle.vue

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

src/views/vehicle/customer-archive.vue

@@ -310,7 +310,6 @@
                   v-model="archiveForm.customerCode"
                   maxlength="20"
                   show-word-limit
-                  :disabled="Boolean(archiveForm.id)"
                   placeholder="请输入，留空则自动生成"
                 />
               </el-form-item>
@@ -379,7 +378,7 @@
                   placeholder="请输入"
                   maxlength="18"
                   show-word-limit
-                  :disabled="Boolean(archiveForm.id)"
+                  :disabled="kingdeeLocked && Boolean(archiveForm.id)"
                   @input="
                     archiveForm.unifiedCreditCode = String(
                       archiveForm.unifiedCreditCode || ''
@@ -395,7 +394,7 @@
                   placeholder="请输入"
                   maxlength="100"
                   show-word-limit
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                   @blur="checkArchiveNameRisk"
                 />
                 <el-tooltip
@@ -435,7 +434,7 @@
                   v-model="archiveForm.legalPerson"
                   maxlength="10"
                   show-word-limit
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                 />
               </el-form-item>
             </el-col>
@@ -536,7 +535,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 +545,7 @@
                 <el-input
                   v-model="archiveForm.paidInCapital"
                   maxlength="18"
-                  :disabled="kingdeeLocked && !archiveForm.id"
+                  :disabled="kingdeeLocked"
                   @input="value => handleDecimalInput('paidInCapital', value)"
                 />
               </el-form-item>
@@ -1410,10 +1409,9 @@
               <el-form-item label="自评得分" :required="isOfflineScore">
                 <el-input
                   v-if="isOfflineScore"
-                  :model-value="formatScoreValue(currentScore.selfScore)"
+                  v-model="currentScore.selfScore"
                   maxlength="10"
                   :disabled="readonly"
-                  placeholder="请输入自评得分"
                   @input="handleOfflineSelfScoreInput"
                   @blur="recalculateOfflineScore"
                 >
@@ -2491,14 +2489,8 @@ export default {
       ];
       const rows = categoryMap.map((category, index) => {
         const details = this.getScoreCategoryDetails(category.categoryCode);
-        const sumCategoryScore = prop =>
+        let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
-          details.reduce((sum, item) => {
+        let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
-            if (this.isBlankScore(item[prop])) return sum;
-            const value = Number(item[prop]);
-            return sum + (Number.isFinite(value) ? value : 0);
-          }, 0);
-        let selfScore = sumCategoryScore('selfScore');
-        let reviewScore = sumCategoryScore('reviewScore');
         // 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
         if (category.categoryCode === 'plus') {
           selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
@@ -4246,9 +4238,7 @@ export default {
         '核准日期',
       ]);
       const scope = this.getBusinessLicenseOcrValue(fields, ['经营范围']);
-      if (code && !this.archiveForm.id) {
+      if (code) this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
-        this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
-      }
       if (name) this.archiveForm.fullName = name;
       if (name) this.checkArchiveNameRisk();
       if (legalPerson) this.archiveForm.legalPerson = legalPerson;
@@ -4562,9 +4552,6 @@ export default {
         quantificationId: score.quantificationId ? String(score.quantificationId) : '',
         evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
         nextEvaluateDate: score.nextEvaluateDate || '',
-        selfScore: this.normalizeScoreInputValue(score.selfScore),
-        reviewScore: this.normalizeScoreInputValue(score.reviewScore),
-        finalScore: this.normalizeScoreInputValue(score.finalScore),
         applyCreditLimit: this.normalizeOptionalAmount(
           score.applyCreditLimit === undefined
             ? this.archiveForm.applyCreditLimit
@@ -4578,8 +4565,6 @@ export default {
         details: (score.details || []).map(detail => ({
           ...detail,
           scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
-          selfScore: this.normalizeScoreInputValue(detail.selfScore),
-          reviewScore: this.normalizeScoreInputValue(detail.reviewScore),
         })),
       };
     },
@@ -5360,9 +5345,7 @@ export default {
       return this.getScoreDetailCategoryCode(detail) === 'basic';
     },
     getSignedScore(detail, prop) {
-      if (this.isBlankScore(detail[prop])) return '';
+      const score = Number(detail[prop] || 0);
-      const score = Number(detail[prop]);
-      if (!Number.isFinite(score)) return '';
       return this.isMinusScoreDetail(detail) && score > 0 ? -score : score;
     },
     getScoreItemFullScore(detail = {}) {
@@ -5436,12 +5419,7 @@ export default {
       const basicDetails = this.getScoreCategoryDetailsByList(details, 'basic');
       const plusDetails = this.getScoreCategoryDetailsByList(details, 'plus');
       const minusDetails = this.getScoreCategoryDetailsByList(details, 'minus');
-      const sumScore = (list, prop) =>
+      const sumScore = (list, prop) => list.reduce((sum, item) => sum + Number(item[prop] || 0), 0);
-        list.reduce((sum, item) => {
-          if (this.isBlankScore(item[prop])) return sum;
-          const value = Number(item[prop]);
-          return sum + (Number.isFinite(value) ? value : 0);
-        }, 0);
       const rawPlusSelf = sumScore(plusDetails, 'selfScore');
       const rawPlusReview = sumScore(plusDetails, 'reviewScore');
       const rawMinusSelf = sumScore(minusDetails, 'selfScore');
@@ -5456,51 +5434,33 @@ export default {
       const hasReviewScore = details.some(
         item => !this.isBlankScore(item.reviewScore)
       );
-      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计；-1 视为未填
+      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计
       const isOffline = String(score.evaluateMode || '') === 'offline';
-      const hasManualSelfScore = isOffline && !this.isBlankScore(score.selfScore);
-      const hasFilledDetail = details.some(item => {
-        if (this.isScoreTypeDetail(item)) {
-          const input = String(item.scoreInput ?? '').trim();
-          return input !== '' && input !== '-' && input !== '.';
-        }
-        return !this.isBlankScore(item.selectedOption);
-      });
       const manualSelfScore = Number(score.selfScore);
       const selfScore =
-        hasManualSelfScore && Number.isFinite(manualSelfScore) ? manualSelfScore : computedSelfScore;
+        isOffline && Number.isFinite(manualSelfScore) && String(score.selfScore ?? '').trim() !== ''
+          ? manualSelfScore
+          : computedSelfScore;
       const finalScore = hasReviewScore ? reviewScore : selfScore;
       const fullMark = this.getScoreFullMark(details);
       const scoreRate =
         fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
       const standard = this.matchCreditStandard(score, scoreRate);
       const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
-      // 线下未手工填写且明细未实际填报时保留空，避免默认写出 -1/0
+      score.selfScore = Number(Number(selfScore).toFixed(2));
-      const keepOfflineScoreBlank = isOffline && !hasManualSelfScore && !hasFilledDetail;
-      score.selfScore = keepOfflineScoreBlank ? '' : Number(Number(selfScore).toFixed(2));
       score.reviewScore = Number(reviewScore.toFixed(2));
-      score.finalScore =
+      score.finalScore = Number(Number(finalScore).toFixed(2));
-        keepOfflineScoreBlank && !hasReviewScore ? '' : Number(Number(finalScore).toFixed(2));
+      score.scoreRate = Number(scoreRate.toFixed(2));
-      score.scoreRate = keepOfflineScoreBlank && !hasReviewScore ? '' : Number(scoreRate.toFixed(2));
       if (hasStandards) {
-        score.creditLevel = keepOfflineScoreBlank && !hasReviewScore ? '' : standard?.creditLevel || '';
+        score.creditLevel = standard?.creditLevel || '';
-        score.maxCreditLimit =
+        score.maxCreditLimit = standard
-          keepOfflineScoreBlank && !hasReviewScore
-            ? ''
-            : standard
           ? this.calculateCreditLimitByStandard(standard, scoreRate)
           : '';
       }
       return score;
     },
     isBlankScore(value) {
-      return (
+      return value === undefined || value === null || String(value).trim() === '';
-        value === undefined ||
-        value === null ||
-        value === -1 ||
-        value === '-1' ||
-        String(value).trim() === ''
-      );
     },
     hasIncompleteBasicScoreDetail(details = []) {
       return this.getScoreCategoryDetailsByList(details, 'basic').some(item => {
@@ -6008,27 +5968,6 @@ export default {
       this.currentScore.evaluateMode = mode === 'offline' ? 'offline' : 'online';
       if (this.isOfflineScore) {
         this.expandedScoreCategoryKeys = [];
-        // 切到线下且明细尚未实际填报时清空自评，避免沿用线上合计或 -1 哨兵值
-        const hasFilledDetail = (this.currentScore.details || []).some(item => {
-          if (this.isScoreTypeDetail(item)) {
-            const input = String(item.scoreInput ?? '').trim();
-            return input !== '' && input !== '-' && input !== '.';
-          }
-          return !this.isBlankScore(item.selectedOption);
-        });
-        if (!hasFilledDetail || this.isBlankScore(this.currentScore.selfScore)) {
-          this.currentScore.selfScore = '';
-        }
-        if (!hasFilledDetail || this.isBlankScore(this.currentScore.finalScore)) {
-          this.currentScore.finalScore = '';
-        }
-        if (!hasFilledDetail) {
-          this.currentScore.scoreRate = '';
-          this.currentScore.creditLevel = '';
-          this.currentScore.maxCreditLimit = '';
-        }
-      } else {
-        this.calculateScore(this.currentScore);
       }
     },
     handleOfflineSelfScoreInput(value) {
@@ -6042,19 +5981,6 @@ export default {
     },
     recalculateOfflineScore() {
       if (!this.isOfflineScore) return;
-      if (this.isBlankScore(this.currentScore.selfScore)) {
-        this.currentScore.selfScore = '';
-        const hasReviewScore = (this.currentScore.details || []).some(
-          item => !this.isBlankScore(item.reviewScore)
-        );
-        if (!hasReviewScore) {
-          this.currentScore.finalScore = '';
-        }
-        this.currentScore.scoreRate = '';
-        this.currentScore.creditLevel = '';
-        this.currentScore.maxCreditLimit = '';
-        return;
-      }
       const selfScore = Number(this.currentScore.selfScore);
       if (!Number.isFinite(selfScore)) return;
       this.currentScore.selfScore = Number(selfScore.toFixed(2));