🐛 收款流水认领额度改用收款金额并新增剩余可认领金额列

认领只登记本地，额度由本地累计认领控制，金蝶未匹配金额不再作为上限；批量认领校验复用剩余可认领金额口径。

.gitignore

@@ -2,6 +2,7 @@
 node_modules
 pnpm-lock.yaml
 /dist
+/dist.zip
 
 /tests/e2e/videos/
 /tests/e2e/screenshots/

package.json

@@ -4,8 +4,9 @@
   "scripts": {
     "dev": "vite --host",
     "prod": "vite --mode production",
-    "build": "vite build",
-    "build:prod": "vite build --mode production",
+    "build": "vite build && node scripts/zip-dist.mjs",
+    "build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
+    "zip:dist": "node scripts/zip-dist.mjs",
     "serve": "vite preview --host",
     "typecheck": "vue-tsc --noEmit"
   },

scripts/zip-dist.mjs

@@ -0,0 +1,25 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, rmSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const root = process.cwd();
+const distDir = resolve(root, 'dist');
+const zipPath = resolve(root, 'dist.zip');
+
+if (!existsSync(distDir) || !statSync(distDir).isDirectory()) {
+  console.error('[zip-dist] dist 目录不存在，请先完成构建');
+  process.exit(1);
+}
+
+if (existsSync(zipPath)) {
+  rmSync(zipPath);
+}
+
+// 压缩 dist 内文件到根级（解压即 index.html / assets，便于直接上传部署）
+execFileSync('zip', ['-qr', zipPath, '.', '-x', '*.DS_Store', '-x', '__MACOSX/*'], {
+  cwd: distDir,
+  stdio: 'inherit',
+});
+
+const sizeMb = (statSync(zipPath).size / (1024 * 1024)).toFixed(2);
+console.log(`[zip-dist] 已生成 ${zipPath}（${sizeMb} MB）`);

src/api/business/contract-change.js

@@ -0,0 +1,61 @@
+import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/contract-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromContract = (contractId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-contract`,
+    method: 'post',
+    params: { contractId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    timeout: APPROVE_TIMEOUT,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });
+
+export const markSyncStatus = (ids, syncStatus) =>
+  request({
+    url: `${baseUrl}/mark-sync-status`,
+    method: 'post',
+    params: { ids, syncStatus },
+  });

src/api/business/contract-manage.js

@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/contract-manage';
@@ -36,8 +37,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
-    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
-    timeout: 120000,
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>

src/api/business/loading-manage.js

@@ -24,11 +24,16 @@ export const getDetail = id =>
     },
   });
 
-export const getCarrierContracts = projectIds =>
+export const getCarrierContracts = (projectIds, waybillIds = []) =>
   request({
     url: `${baseUrl}/carrier-contracts`,
     method: 'get',
-    params: { projectIds: (projectIds || []).join(',') },
+    params: {
+      projectIds: (projectIds || []).join(','),
+      ...(waybillIds || []).filter(Boolean).length
+        ? { waybillIds: (waybillIds || []).filter(Boolean).join(',') }
+        : {},
+    },
   });
 
 export const saveDraft = row =>

src/api/business/project-change.js

@@ -0,0 +1,54 @@
+import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/project-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromProject = (projectId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-project`,
+    method: 'post',
+    params: { projectId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    timeout: APPROVE_TIMEOUT,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });

src/api/business/waybill-manage.js

@@ -14,7 +14,7 @@ export const cancel = api.cancel;
 export const reassign = api.reassign;
 export const complete = api.complete;
 export const batchComplete = api.batchComplete;
-/** 确认回单：待确认回单运单完成后转为已完成 */
+/** 确认回单：回单节点配成「需业务员确认」时用；后端校验司机打卡节点齐全且无未了结异常后才置完成 */
 export const confirmReturn = id =>
   request({
     url: `${baseUrl}/confirm-return`,

src/api/payment/receiptClaimRecord.js

@@ -8,20 +8,12 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
   request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
-export const queryKingdeeResult = () =>
-  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '已认领', value: 'claimed' },
   { label: '已作废', value: 'voided' },
 ];
 
-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
   { label: '已推送', value: 'pushed' },

src/api/payment/receiptFlow.js

@@ -2,6 +2,9 @@ import request from '@/axios';
 
 const baseUrl = '/blade-transport/receipt-flow';
 
+/** 收款流水同步需远程拉取金蝶收款单并逐条落库，覆盖全局 10s 超时 */
+export const SYNC_TIMEOUT = 30000;
+
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
@@ -12,9 +15,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
     params: { keyword, flowId },
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
-export const pushKingdee = flowId =>
-  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },
@@ -22,12 +23,6 @@ export const claimStatusOptions = [
   { label: '认领完成', value: 'claimed' },
 ];
 
-export const pushStatusOptions = [
-  { label: '未推送', value: 'none' },
-  { label: '已推送', value: 'pushed' },
-  { label: '推送失败', value: 'failed' },
-];
-
 export const kingdeeBillStatusOptions = [
   { label: '已推送', value: 'pushed' },
   { label: '审核通过', value: 'approved' },

src/api/system/roleDataScope.js

@@ -0,0 +1,19 @@
+import request from '@/axios';
+
+export const getRoleMenuDataScopeTree = roleId => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/tree',
+    method: 'get',
+    params: {
+      roleId,
+    },
+  });
+};
+
+export const submitRoleMenuDataScope = data => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/submit',
+    method: 'post',
+    data,
+  });
+};

src/mixins/organization-search.js

@@ -12,6 +12,8 @@ import { h } from 'vue';
  *   1. 混入本 mixin：mixins: [organizationSearch]
  *   2. option 中「所属组织」列加上 searchslot: true（prop 为 organizationName 或 deptName 均可）
  *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
+ *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
+ *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
  *
  * 说明：
  *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -26,6 +28,12 @@ import { h } from 'vue';
  */
 const ORG_PROPS = ['organizationName', 'deptName'];
 
+// 「未分配组织」筛选项的哨兵值：不是真实组织名，选中后提交给后端的就是这串字面量。
+// 后端 TransportBusiConstant.UNASSIGNED_ORG_FILTER、DriverMapper.xml / TransportVehicleMapper.xml
+// 的 organizationName 分支以及司机、车辆导出查询都按它改判为 organization_name = ''；
+// 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
+const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
+
 export default {
   data() {
     return {
@@ -34,9 +42,18 @@ export default {
       organizationTreeOptions: [],
       organizationTreeFlatOptions: [],
       organizationLoading: false,
+      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
+      enableUnassignedOrgFilter: false,
     };
   },
   computed: {
+    // 搜索栏级联的选项：开关打开时在真实组织最前面追加「未分配组织」。
+    // 不能直接改 organizationTreeOptions——司机/车辆页的编辑表单也用这棵树选组织。
+    organizationSearchTreeOptions() {
+      return this.enableUnassignedOrgFilter
+        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
+        : this.organizationTreeOptions;
+    },
     // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
     organizationCascaderProps() {
       return {
@@ -61,7 +78,7 @@ export default {
             ? this.excludeExternalOrganization(source)
             : source;
           this.organizationTreeOptions = this.normalizeOrgTree(tree);
-          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationTreeOptions);
+          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationSearchTreeOptions);
           const option = this.tableOption || this.option;
           if (!option) return;
           ORG_PROPS.forEach(prop => {
@@ -100,12 +117,20 @@ export default {
         };
       });
     },
+    // 哨兵节点的 id 与 rawLabel 都取哨兵值，resolveOrgName 取到的仍是哨兵而不是某个真实组织名
+    unassignedOrgOption() {
+      return { id: UNASSIGNED_ORG_FILTER, label: '未分配组织', rawLabel: UNASSIGNED_ORG_FILTER };
+    },
     flattenOrgTree(tree = []) {
       return (tree || []).flatMap(item => [
         { id: String(item.id), label: item.label, rawLabel: item.rawLabel },
         ...this.flattenOrgTree(item.children || []),
       ]);
     },
+    // 组织列渲染用：空串或纯空白即「未分配组织」（组织列 NOT NULL，无组织存空串）
+    isBlankOrganizationName(value) {
+      return String(value ?? '').trim() === '';
+    },
     // 兼容两种入参：级联路径数组（取末级）或单个部门 id
     findOrgById(id) {
       const value = Array.isArray(id) ? id.at(-1) : id;
@@ -155,7 +180,7 @@ export default {
           // 级联单选：modelValue 必须是 id 路径数组，否则控件内部状态会错乱导致无法再次选中
           if (scope.row) scope.row[prop] = Array.isArray(value) ? value : [];
         },
-        options: this.organizationTreeOptions,
+        options: this.organizationSearchTreeOptions,
         props: {
           label: 'label',
           value: 'id',

src/option/business/common.js

@@ -42,7 +42,7 @@ export const waybillStatusOptions = [
   { label: '草稿', value: 'draft' },
   { label: '待执行', value: 'pending' },
   { label: '进行中', value: 'running' },
-  { label: '待确认回单', value: 'pending_return' },
+  { label: '待回单确认', value: 'pending_return_confirm' },
   { label: '已完成', value: 'completed' },
   { label: '已取消', value: 'cancelled' },
 ];

src/option/business/contract-change.js

@@ -0,0 +1,221 @@
+import {
+  approvalStatusOptions,
+  contractCategoryOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  signTypeOptions,
+} from './common';
+
+const listDicFormatter = res => {
+  const data = res?.data || res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
+export const changeTypeOptions = [
+  { label: '合同信息变更', value: '合同信息变更' },
+  { label: '结算规则变更', value: '结算规则变更' },
+];
+
+export const config = {
+  title: '合同变更',
+  permission: 'contract_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'contract_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'rejected', 'approved'],
+      permission: 'contract_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '合同编号',
+    prop: 'contractNo',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 20,
+    minWidth: 160,
+  },
+  {
+    label: '合同名称',
+    prop: 'contractName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 30,
+    minWidth: 180,
+  },
+  {
+    label: '所属项目',
+    prop: 'projectName',
+    search: true,
+    searchType: 'select',
+    searchPlaceholder: '请选择',
+    searchOrder: 60,
+    dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
+    dicFormatter: projectNameDicFormatter,
+    props: {
+      label: 'projectName',
+      value: 'projectName',
+    },
+    filterable: true,
+    minWidth: 160,
+  },
+  {
+    label: '所属组织',
+    prop: 'organizationName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 10,
+    minWidth: 150,
+  },
+  {
+    label: '合同类别',
+    prop: 'contractCategory',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 70,
+    dicData: contractCategoryOptions,
+    minWidth: 130,
+  },
+  {
+    label: '签约类型',
+    prop: 'signType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 50,
+    dicData: signTypeOptions,
+    minWidth: 120,
+  },
+  {
+    label: '甲方',
+    prop: 'partyA',
+    minWidth: 160,
+  },
+  {
+    label: '乙方',
+    prop: 'partyB',
+    minWidth: 160,
+  },
+  {
+    label: '开始日期',
+    prop: 'startDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '结束日期',
+    prop: 'endDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力起',
+    prop: 'temporaryStartDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力止',
+    prop: 'temporaryEndDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '经办人',
+    prop: 'handlerUserName',
+    minWidth: 120,
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '审核状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 40,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);

src/option/business/project-change.js

@@ -0,0 +1,161 @@
+import {
+  approvalStatusOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  projectTypeOptions,
+} from './common';
+
+export const changeTypeOptions = [
+  { label: '项目变更', value: '项目变更' },
+  { label: '项目备案调整', value: '项目备案调整' },
+];
+
+export const config = {
+  title: '项目变更',
+  permission: 'project_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved', 'rejected', 'withdrawn'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'project_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '项目编号',
+    prop: 'projectCode',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 70,
+    minWidth: 160,
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 60,
+    minWidth: 180,
+  },
+  {
+    label: '变更类型',
+    prop: 'changeType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 10,
+    dicData: changeTypeOptions,
+    minWidth: 130,
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 20,
+    dicData: projectTypeOptions,
+    minWidth: 110,
+  },
+  {
+    label: '客户名称',
+    prop: 'customerNames',
+    minWidth: 160,
+  },
+  {
+    label: '下游承运商',
+    prop: 'carrierNames',
+    minWidth: 160,
+  },
+  {
+    label: '承办部门',
+    prop: 'undertakeDeptName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 50,
+    minWidth: 140,
+  },
+  {
+    label: '项目负责人',
+    prop: 'principalUserName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 40,
+    minWidth: 120,
+  },
+  {
+    label: '审批状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 30,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '审核通过时间',
+    prop: 'approvedTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);

src/option/business/waybill-manage.js

@@ -471,26 +471,20 @@ export const config = {
     endDateRange: ['endDateStart', 'endDateEnd'],
     createTimeRange: ['createTimeStart', 'createTimeEnd'],
   },
-  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete'],
+  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete', 'confirmReturn'],
   detailButton: true,
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
   formatStatus(row, prop, defaultText) {
     if (prop !== 'businessStatus') return defaultText;
     const status = String(row.businessStatus || '');
-    const terminalStatuses = [
-      'draft',
-      'completed',
-      'cancelled',
-      'waiting_dispatch',
-      'dispatching',
-      'pending_return',
-    ];
-    if (status === 'pending_return') return '待确认回单';
+    const terminalStatuses = ['draft', 'completed', 'cancelled', 'waiting_dispatch', 'dispatching'];
     const needAccept =
       row.requireAccept === true ||
       row.requireAccept === 1 ||
       requiresDriverAcceptConfirmation(row);
+    // 待回单确认由末位打卡产生，司机必然已接单
+    if (status === 'pending_return_confirm') return '待回单确认';
     // 需司机接单且尚未接单 → 待执行（含库中仍为 running 的历史数据展示校正）
     if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) {
       return '待执行';
@@ -505,20 +499,14 @@ export const config = {
   getDriverRejectReason,
   isDriverRejectedWaybill,
   canEdit(row) {
-    // 进行中、待确认回单不允许编辑
+    // 进行中的运单不允许编辑
     if (isInProgressStatus(row, row.businessStatusName)) {
       return false;
     }
-    if (String(row.businessStatus || '') === 'pending_return') {
-      return false;
-    }
     return !isDriverRejectedWaybill(row);
   },
   canCancel(row) {
-    // 进行中、待确认回单不允许取消
-    if (String(row.businessStatus || '') === 'pending_return') {
-      return false;
-    }
+    // 进行中的运单不允许取消；待回单确认仍可取消（与页面 canCancel 一致）
     return !isInProgressStatus(row, row.businessStatusName);
   },
   deleteStatus: ['draft'],

src/option/payment/paymentApplication.js

@@ -169,7 +169,7 @@ export const paymentApplicationOption = ({
     { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter },
     { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
     { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
-    { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶单据状态', prop: 'kingdeeStatusName', slot: true, minWidth: 130 },
     { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
     { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
   ],

src/option/payment/receiptClaimRecord.js

@@ -1,7 +1,7 @@
 export const receiptClaimRecordTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
   { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
   { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },

src/option/payment/receiptFlow.js

@@ -1,18 +1,23 @@
 export const receiptFlowTableColumns = [
-  { prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
+  { prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
   { prop: 'payerName', label: '付款人', minWidth: 130 },
-  { prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
+  { prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
   { prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
   { prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
   { prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
+  { prop: 'payeeName', label: '收款人（公司）', minWidth: 150 },
+  //{ prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
+  //{ prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
-  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
-  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
-  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
-  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
-  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
+  { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
+  //{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
+  //{ prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
+  //{ prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
   { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];

src/option/settlement/formalSettlement.js

@@ -99,7 +99,8 @@ const buildTableColumns = () =>
     }
     // link / status 标记的列统一走单元格插槽
     if (column.link || column.status) extra.slot = true;
-    if (!extra.formatter) extra.formatter = textFormatter;
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
     return { ...column, ...extra };
   });
 

src/option/system/mpUser.js

@@ -133,7 +133,7 @@ export default {
       hide: true,
       span: 24,
       order: 55,
-      rules: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
+      // 所属组织可为空：为空表示未分配组织，账号的数据权限为空集
     },
     {
       label: '所属组织',
@@ -203,10 +203,9 @@ export default {
       overHidden: true,
       hide: true,
       addDisplay: false,
-      editDisplay: true,
+      editDisplay: false,
       viewDisplay: true,
       order: 40,
-      placeholder: '可清空以解绑微信',
     },
     {
       label: '状态',

src/option/system/user.js

@@ -315,29 +315,6 @@ export const userOption = safe => {
               { label: '承运商', value: 2 },
             ],
           },
-          {
-            label: '数据权限范围',
-            prop: 'dataScopeRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '仅所属组织', value: 1 },
-              { label: '全部组织', value: 2 },
-              { label: '自定义', value: 3 },
-            ],
-          },
-          {
-            label: '数据层级范围',
-            prop: 'dataLevelRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '包含下级', value: 1 },
-              { label: '仅本级', value: 2 },
-            ],
-          },
           {
             label: '备注',
             prop: 'remark',

src/option/transportCapacity/transport-vehicle.js

@@ -48,6 +48,7 @@ export const option = {
       searchOrder: 1,
       searchslot: true,
       slot: true,
+      overHidden: true,
       minWidth: 150,
     },
     {
@@ -55,6 +56,8 @@ export const option = {
       prop: 'useDepartment',
       search: true,
       searchOrder: 3,
+      slot: true,
+      overHidden: true,
       minWidth: 140,
     },
     {

src/router/page/index.js

@@ -95,6 +95,17 @@ export default [
       bizType: 'project-apply',
     },
   },
+  {
+    path: '/business/project-change/public-view',
+    name: '查看项目变更信息',
+    component: () => import('@/views/business/project-apply-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'project-change',
+    },
+  },
   {
     path: '/business/contract-manage/public-view',
     name: '查看合同信息',
@@ -106,6 +117,17 @@ export default [
       bizType: 'contract-manage',
     },
   },
+  {
+    path: '/business/contract-change/public-view',
+    name: '查看合同变更信息',
+    component: () => import('@/views/business/contract-change-public-view.vue'),
+    meta: {
+      keepAlive: false,
+      isTab: false,
+      isAuth: false,
+      bizType: 'contract-change',
+    },
+  },
   {
     path: '/settlement/pre-settlement/public-view',
     name: '查看预付结算单信息',

src/router/views/index.js

@@ -198,6 +198,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/project-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '项目变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/project-change' },
+        component: loadView(() => import('@/views/business/project-apply.vue')),
+      },
+    ],
+  },
   {
     path: '/business/waybill-manage/form',
     component: Layout,
@@ -342,6 +354,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/contract-change/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '合同变更表单',
+        meta: { keepAlive: false, activeMenu: '/business/contract-change' },
+        component: loadView(() => import('@/views/business/contract-manage-change.vue')),
+      },
+    ],
+  },
   {
     path: '/wel',
     component: () =>

src/styles/element-ui.scss

@@ -622,7 +622,7 @@
   background: #fff;
 }
 
-// 合同管理新增/编辑弹窗（business-crud-page 封装 → avue-crud，弹窗带 avue-crud__dialog class）
+// 合同管理新增/编辑弹窗（avue-crud，弹窗带 avue-crud__dialog class）
 // 复刻 waybill-manage 方案：接近全屏、压过库内置 .avue-dialog 的 calc(100% - 200px)，
 // 并解开 body 的 200px 上限、抵消全局 footer 的 -30px 上移
 .contract-manage-dialog.el-dialog {

src/utils/carrier-org-resource.js

@@ -26,6 +26,35 @@ const uniqueOrgNames = (values = []) => {
   return result;
 };
 
+// 候选司机取数上限：超出后只能靠关键字缩小范围
+const DRIVER_CANDIDATE_MAX_SIZE = 200;
+
+/**
+ * 派单候选司机：租户内的司机档案，按岗位等条件过滤。
+ *
+ * 与组织、承运商都无关——司机档案与组织树、承运商之间没有外键，`organization_name`
+ * 只是自由文本，用它做匹配会让小程序自动建档的司机永远进不了候选。
+ */
+export const fetchDriverCandidates = async (query = {}) => {
+  const params = { ...query };
+  const size = Math.min(Math.max(Number(params.size) || 50, 50), DRIVER_CANDIDATE_MAX_SIZE);
+  delete params.size;
+  const res = await getDriverList(1, size, params);
+  return extractRecords(res).slice(0, size);
+};
+
+/**
+ * 司机候选项的展示文本：姓名（手机尾号后 4 位）。
+ *
+ * 只用于下拉渲染。写回表单的仍是姓名本身，别把带尾号的文本当值用。
+ */
+export const driverOptionText = (item = {}) => {
+  const name = normalizeOrgName(item.driverName || item.name);
+  const mobile = String(item.mobile || item.phone || item.driverPhone || '').trim();
+  if (!name) return '';
+  return mobile.length >= 4 ? `${name}（${mobile.slice(-4)}）` : name;
+};
+
 /**
  * 解析承运商客商档案上联系人的所属组织（branchName），无联系人时回退客商所属组织。
  */
@@ -72,13 +101,6 @@ export const resolveCarrierOrganizationNames = async ({ carrierId, carrierName }
   return orgNames;
 };
 
-export const clearCarrierOrganizationCache = (carrier = {}) => {
-  const id = String(carrier.carrierId || '').trim();
-  const name = normalizeOrgName(carrier.carrierName);
-  if (id) orgNameCache.delete(id);
-  if (name) orgNameCache.delete(name);
-};
-
 export const matchOrganizationName = (value, orgNames = []) => {
   const text = normalizeOrgName(value);
   if (!text || !orgNames.length) return false;
@@ -90,34 +112,9 @@ const filterByOrganizations = (records = [], orgNames = []) => {
   return records.filter(item => matchOrganizationName(item.organizationName, orgNames));
 };
 
-/**
- * 按承运商联系人所属组织筛选司机。
- * 未选择承运商时返回空列表（需先选承运商）。
- */
-export const fetchDriversByCarrierOrganizations = async (
-  query = {},
-  { carrierId, carrierName } = {}
-) => {
-  if (!String(carrierId || '').trim() && !normalizeOrgName(carrierName)) {
-    return [];
-  }
-  const orgNames = await resolveCarrierOrganizationNames({ carrierId, carrierName });
-  if (!orgNames.length) return [];
-
-  const size = Math.max(Number(query.size) || 50, 50);
-  const params = { ...query };
-  delete params.size;
-  // 单组织时用后端模糊条件缩小范围；多组织再前端精确过滤
-  if (orgNames.length === 1) {
-    params.organizationName = orgNames[0];
-  }
-  const res = await getDriverList(1, Math.min(size * 5, 200), params);
-  return filterByOrganizations(extractRecords(res), orgNames).slice(0, size);
-};
-
 /**
  * 按承运商联系人所属组织筛选车辆。
- * 未选择承运商时返回空列表。
+ * 未选择承运商时返回空列表（需先选承运商）。
  */
 export const fetchVehiclesByCarrierOrganizations = async (
   query = {},

src/utils/cert-audit.js

@@ -106,6 +106,9 @@ const CERT_SNAPSHOT_GROUPS = {
       fields: [
         { key: 'realName', label: '真实姓名' },
         { key: 'idCardNo', label: '身份证号' },
+        { key: 'birthday', label: '出生年月', type: TYPE_DATE },
+        { key: 'addressRegion', label: '住址' },
+        { key: 'address', label: '详细地址' },
         { key: 'idCardFrontUrl', label: '身份证正面照', type: TYPE_IMAGE },
         { key: 'idCardBackUrl', label: '身份证反面照', type: TYPE_IMAGE },
         { key: 'idCardValidStart', label: '身份证有效期起', type: TYPE_DATE },

src/utils/kingdee.js

@@ -0,0 +1,15 @@
+/**
+ * 金蝶单据状态公共映射
+ */
+
+/** 金蝶单据状态 → el-tag 颜色类型（failed 状态列表页悬浮展示失败原因） */
+export const KINGDEE_STATUS_TAG_TYPES = {
+  synced: 'success',
+  paid: 'success',
+  invoiced: 'success',
+  paying: 'warning',
+  failed: 'danger',
+};
+
+/** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';

src/utils/mk-approval.js

@@ -15,12 +15,24 @@ export const MK_BIZ = {
     rejected: ['rejected', 'change_rejected', 'withdrawn'],
     approved: ['approved', 'change_approved'],
   },
+  'project-change': {
+    dictName: '提交项目变更审核流',
+    subjectPrefix: '项目变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
   'contract-manage': {
     dictName: '提交合同审核流',
     subjectPrefix: '合同审批',
     rejected: ['rejected', 'change_rejected', 'withdrawn'],
     approved: ['approved', 'change_approved'],
   },
+  'contract-change': {
+    dictName: '提交合同变更审核流',
+    subjectPrefix: '合同变更审批',
+    rejected: ['rejected', 'withdrawn'],
+    approved: ['approved'],
+  },
   'pre-settlement': {
     dictName: '提交预结算审核流',
     subjectPrefix: '预付结算审批',

src/views/authority/role.vue

@@ -50,7 +50,7 @@
       title="角色权限配置"
       append-to-body
       v-model="box"
-      width="345px"
+      width="960px"
       @close="handleDialogClose"
     >
       <el-tabs type="border-card">
@@ -100,41 +100,26 @@
             align="middle"
             style="margin-bottom: 12px; background: #f5f7fa; padding: 6px 10px; border-radius: 4px"
           >
-            <span style="display: inline-flex; align-items: center">
-              <el-switch
-                v-model="dataScopeLinked"
-                active-text="节点联动"
-                size="small"
-                @change="handleLinkedChange('treeDataScope')"
-              />
-              <el-tooltip content="开启后勾选父节点会自动勾选所有子节点，关闭则可独立勾选任意节点" placement="top">
-                <el-icon style="margin-left: 4px; color: #909399; cursor: pointer"><el-icon-question-filled /></el-icon>
-              </el-tooltip>
-            </span>
-            <el-button-group>
-              <el-button
-                size="small"
-                plain
-                @click="handleSelectAll('treeDataScope', dataScopeGrantList)"
-                >全选</el-button
-              >
-              <el-button
-                size="small"
-                plain
-                @click="handleInvertSelect('treeDataScope', dataScopeGrantList, dataScopeLinked)"
-                >反选</el-button
-              >
-            </el-button-group>
+            <span style="color: #606266; font-size: 13px"
+              >勾选多个菜单后点击「设置」，可批量配置数据权限；设置后菜单旁展示当前范围</span
+            >
+            <el-button type="primary" size="small" @click="openDataScopeSetting">设置</el-button>
           </el-row>
           <el-tree
-            :data="dataScopeGrantList"
+            :data="roleDataScopeMenuTree"
             show-checkbox
-            :check-strictly="!dataScopeLinked"
             node-key="id"
-            ref="treeDataScope"
-            :default-checked-keys="dataScopeTreeObj"
+            ref="treeRoleDataScope"
             :props="props"
           >
+            <template #default="{ data }">
+              <span class="role-data-scope-node">
+                <span>{{ data.title }}</span>
+                <span v-if="getMenuScopeLabel(data.id)" class="role-data-scope-tag"
+                  >【{{ getMenuScopeLabel(data.id) }}】</span
+                >
+              </span>
+            </template>
           </el-tree>
         </el-tab-pane>
         <el-tab-pane label="接口权限">
@@ -188,6 +173,45 @@
         </span>
       </template>
     </el-dialog>
+
+    <el-dialog
+      title="数据权限设置"
+      append-to-body
+      v-model="dataScopeSettingBox"
+      width="560px"
+      class="role-data-scope-setting-dialog"
+    >
+      <el-form label-position="right" label-width="auto">
+        <el-form-item label="角色名称">
+          <el-input v-model="dataScopeSetting.roleName" disabled />
+        </el-form-item>
+        <el-form-item label="数据权限">
+          <el-radio-group v-model="dataScopeSetting.scopeType">
+            <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">
+          <el-button @click="dataScopeSettingBox = false">取消</el-button>
+          <el-button type="primary" @click="submitDataScopeSetting">保存</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -196,37 +220,44 @@ import {
   add,
   getList,
   getRole,
-  getRoleAlias,
   getRoleTreeById,
   grant,
   grantTree,
   remove,
   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';
-import { validatenull } from '@/utils/validate';
 
 export default {
   data() {
     return {
       form: {},
       box: false,
+      dataScopeSettingBox: false,
       props: {
         label: 'title',
         value: 'key',
       },
       menuGrantList: [],
-      dataScopeGrantList: [],
       apiScopeGrantList: [],
       apiGrantList: [],
       menuTreeObj: [],
-      dataScopeTreeObj: [],
       apiScopeTreeObj: [],
       menuLinked: false,
-      dataScopeLinked: false,
       apiScopeLinked: false,
       currentRoleIds: [],
+      currentRoleName: '',
+      roleDataScopeMenuTree: [],
+      roleDataScopeMap: {},
+      deptTree: [],
+      dataScopeSetting: {
+        roleName: '',
+        scopeType: 2,
+        menuIds: [],
+      },
       selectionList: [],
       query: {},
       loading: true,
@@ -309,32 +340,19 @@ export default {
             ],
           },
           {
-            label: '角色别名',
-            labelTip: '用于权限校验与标注的属性,可手动录入也可点击现有别名快速录入',
+            label: '角色标识',
+            labelTip: '用于权限校验与标注的属性',
             prop: 'roleAlias',
             search: true,
             span: 24,
             rules: [
               {
                 required: true,
-                message: '请输入角色别名',
+                message: '请输入角色标识',
                 trigger: 'blur',
               },
             ],
           },
-          {
-            label: '现有别名',
-            labelTip: '当前系统已存在的角色别名,点击可快速录入',
-            prop: 'currentAlias',
-            type: 'radio',
-            dicData: [],
-            props: {
-              label: 'roleName',
-              value: 'roleAlias',
-            },
-            hide: true,
-            span: 24,
-          },
           {
             label: '角色排序',
             prop: 'sort',
@@ -378,14 +396,6 @@ export default {
       return ids;
     },
   },
-  watch: {
-    'form.currentAlias'() {
-      const alias = this.form.currentAlias;
-      if (!validatenull(alias)) {
-        this.form.roleAlias = alias;
-      }
-    },
-  },
   methods: {
     initData(roleId) {
       getRoleTreeById(roleId).then(res => {
@@ -452,9 +462,9 @@ export default {
     },
     submit() {
       const menuList = this.$refs.treeMenu.getCheckedKeys();
-      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
       const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-      grant(this.currentRoleIds, menuList, dataScopeList, apiScopeList).then(() => {
+      // 数据权限已改为角色菜单配置；传 null 跳过原生 dataScope 更新，避免误清历史配置
+      grant(this.currentRoleIds, menuList, null, apiScopeList).then(() => {
         this.box = false;
         this.$message({
           type: 'success',
@@ -465,6 +475,84 @@ export default {
         this.onLoad(this.page);
       });
     },
+    getMenuScopeLabel(menuId) {
+      const scope = this.roleDataScopeMap[String(menuId)];
+      return scope ? scope.scopeTypeName : '';
+    },
+    loadRoleDataScopeTree(roleId) {
+      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;
+        });
+        this.roleDataScopeMap = scopeMap;
+      });
+    },
+    openDataScopeSetting() {
+      const tree = this.$refs.treeRoleDataScope;
+      if (!tree) {
+        return;
+      }
+      const menuIds = tree.getCheckedKeys();
+      if (!menuIds || menuIds.length === 0) {
+        this.$message.warning('请先勾选要设置的菜单');
+        return;
+      }
+      this.dataScopeSetting = {
+        roleName: this.currentRoleName,
+        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];
+      if (!roleId) {
+        this.$message.warning('角色信息异常，请重新打开权限配置');
+        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,
+      }).then(() => {
+        this.$message.success('数据权限设置成功');
+        this.dataScopeSettingBox = false;
+        this.loadRoleDataScopeTree(roleId).then(() => {
+          this.$nextTick(() => {
+            if (this.$refs.treeRoleDataScope) {
+              this.$refs.treeRoleDataScope.setCheckedKeys([]);
+            }
+          });
+        });
+      });
+    },
     rowSave(row, done, loading) {
       add(this.withTenantId(row)).then(
         () => {
@@ -547,10 +635,6 @@ export default {
           this.form.parentId = '';
         }
       }
-      getRoleAlias().then(res => {
-        const column = this.findColumn(this.option.column, 'currentAlias');
-        column.dicData = res.data.data;
-      });
       done();
     },
     handleRole() {
@@ -563,58 +647,52 @@ export default {
         return;
       }
       this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
       this.apiScopeTreeObj = [];
-      // 保存当前要配置权限的角色ID
       this.currentRoleIds = this.idsArray;
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(this.ids).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.box = true;
-          this.$nextTick(() => {
-            this.applyCheckedKeys('treeMenu', this.menuTreeObj);
-            this.applyCheckedKeys('treeDataScope', this.dataScopeTreeObj);
-            this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          });
+      this.currentRoleName = (this.selectionList[0] && this.selectionList[0].roleName) || '';
+      const roleId = this.currentRoleIds[0];
+      Promise.all([grantTree(), getRole(this.ids), this.loadRoleDataScopeTree(roleId)]).then(results => {
+        const grantRes = results[0];
+        const roleRes = results[1];
+        this.menuGrantList = grantRes.data.data.menu;
+        this.apiScopeGrantList = grantRes.data.data.apiScope;
+        this.menuTreeObj = roleRes.data.data.menu;
+        this.apiScopeTreeObj = roleRes.data.data.apiScope;
+        this.box = true;
+        this.$nextTick(() => {
+          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
+          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
         });
       });
     },
     handleRowRole(row) {
       this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
       this.apiScopeTreeObj = [];
-      // 保存当前要配置权限的角色ID（单个行操作）
       this.currentRoleIds = [row.id];
-      grantTree().then(res => {
-        this.menuGrantList = res.data.data.menu;
-        this.dataScopeGrantList = res.data.data.dataScope;
-        this.apiScopeGrantList = res.data.data.apiScope;
-        getRole(row.id).then(res => {
-          this.menuTreeObj = res.data.data.menu;
-          this.dataScopeTreeObj = res.data.data.dataScope;
-          this.apiScopeTreeObj = res.data.data.apiScope;
-          this.box = true;
-          this.$nextTick(() => {
-            this.applyCheckedKeys('treeMenu', this.menuTreeObj);
-            this.applyCheckedKeys('treeDataScope', this.dataScopeTreeObj);
-            this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
-          });
+      this.currentRoleName = row.roleName || '';
+      Promise.all([grantTree(), getRole(row.id), this.loadRoleDataScopeTree(row.id)]).then(results => {
+        const grantRes = results[0];
+        const roleRes = results[1];
+        this.menuGrantList = grantRes.data.data.menu;
+        this.apiScopeGrantList = grantRes.data.data.apiScope;
+        this.menuTreeObj = roleRes.data.data.menu;
+        this.apiScopeTreeObj = roleRes.data.data.apiScope;
+        this.box = true;
+        this.$nextTick(() => {
+          this.applyCheckedKeys('treeMenu', this.menuTreeObj);
+          this.applyCheckedKeys('treeApiScope', this.apiScopeTreeObj);
         });
       });
     },
     handleDialogClose() {
-      // 对话框关闭时清空选择状态和权限树数据
       this.menuTreeObj = [];
-      this.dataScopeTreeObj = [];
       this.apiScopeTreeObj = [];
       this.menuLinked = false;
-      this.dataScopeLinked = false;
       this.apiScopeLinked = false;
+      this.roleDataScopeMenuTree = [];
+      this.roleDataScopeMap = {};
+      this.currentRoleName = '';
+      this.dataScopeSettingBox = false;
       this.selectionClear();
     },
     handleDelete() {
@@ -659,3 +737,15 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.role-data-scope-node {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+.role-data-scope-tag {
+  color: #409eff;
+  font-size: 12px;
+}
+</style>

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

@@ -294,8 +294,8 @@ export default {
         query: { id: String(customerId), name: '查看客商档案', view: '1' },
       });
     },
-    waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
-    waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
+    waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', pending_return_confirm: '待回单确认', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
+    waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', pending_return_confirm: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
     statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
     statusType(value) { return ({ waiting_dispatch: 'warning', dispatching: 'success', completed: 'primary', closed: 'danger' })[value] || 'info'; },
   },

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

@@ -210,7 +210,11 @@
                       @mousedown="() => handleDriverFocus(route)"
                       @focus="() => handleDriverFocus(route)"
                       @select="handleDriverSuggestionSelect"
-                  /></el-form-item
+                    >
+                      <template #default="{ item }">
+                        <span>{{ driverOptionText(item) }}</span>
+                      </template>
+                    </el-autocomplete></el-form-item
                 ></el-col>
                 <el-col :span="6"
                   ><el-form-item
@@ -239,7 +243,11 @@
                       @mousedown="() => handleDriverFocus(route)"
                       @focus="() => handleDriverFocus(route)"
                       @select="handleEscortSuggestionSelect"
-                  /></el-form-item
+                    >
+                      <template #default="{ item }">
+                        <span>{{ driverOptionText(item) }}</span>
+                      </template>
+                    </el-autocomplete></el-form-item
                 ></el-col>
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"
                   ><el-form-item label="押运人手机号"
@@ -316,7 +324,7 @@
 
 <script>
 import * as api from '@/api/business/master-order';
-import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } from '@/utils/carrier-org-resource';
 import { formatContractOptionLabel } from '@/utils/contract';
 import {
   currencyUnit,
@@ -403,6 +411,7 @@ export default {
     this.applySelfOperatedCarrierDefaults();
   },
   methods: {
+    driverOptionText,
     loadQuantityUnitOptions() {
       if (this.quantityUnitLoading) return this.quantityUnitLoadPromise;
       this.quantityUnitLoading = true;
@@ -944,12 +953,6 @@ export default {
       route.escortPhone = '';
       this.driverOptions = [];
     },
-    getRouteCarrierFilter(route = {}) {
-      return {
-        carrierId: route.carrierId || '',
-        carrierName: route.carrierName || '',
-      };
-    },
     carrierOptionValue(item = {}) {
       return item.contractId || item.id || item.value || item.carrierName || '';
     },
@@ -1026,36 +1029,22 @@ export default {
       this.activeSuggestRoute = route;
     },
     async loadDriverOptions(route = {}, keyword = '') {
-      const carrier = this.getRouteCarrierFilter(route);
-      if (!carrier.carrierId && !carrier.carrierName) {
-        this.driverOptions = [];
-        return [];
-      }
       this.driverLoading = true;
       try {
-        this.driverOptions = await fetchDriversByCarrierOrganizations(
-          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-          carrier
-        );
+        this.driverOptions = await fetchDriverCandidates({
+          size: 20,
+          ...(keyword ? { driverName: keyword } : {}),
+          posts: '司机',
+        });
         return this.driverOptions;
       } finally {
         this.driverLoading = false;
       }
     },
     fetchDriverSuggestions(queryString, callback) {
-      const route = this.activeSuggestRoute || {};
-      const carrier = this.getRouteCarrierFilter(route);
       const keyword = String(queryString || '').trim();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        if (!keyword) this.$message.warning('请先选择承运商');
-        return;
-      }
       this.driverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         .then(records => {
           this.driverOptions = records;
           callback(
@@ -1080,19 +1069,13 @@ export default {
       if (drivingVehicle) route.vehicleNo = drivingVehicle;
     },
     fetchEscortSuggestions(queryString, callback) {
-      const route = this.activeSuggestRoute || {};
       const keyword = String(queryString || '').trim();
-      const carrier = this.getRouteCarrierFilter(route);
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        if (!keyword) this.$message.warning('请先选择承运商');
-        return;
-      }
       this.escortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
         .then(records => {
           callback(
             records.map(item => ({

src/views/business/components/punch-record-photos.vue

@@ -10,7 +10,7 @@
         :class="{ 'punch-record-photos__grid--edit': editable }"
       >
         <div
-          v-for="(item, groupIndex) in group.items"
+          v-for="item in group.items"
           :key="`${item.photo.url}-${item.index}`"
           class="punch-record-photos__item"
           @click="handlePreview(item.index)"
@@ -23,8 +23,6 @@
             :lazy="lazy"
             fit="cover"
           />
-          <!-- 主图 = 该类型的第一张，按上传顺序取；没有独立字段，也不可切换 -->
-          <div v-if="groupIndex === 0" class="punch-record-photos__badge">主图</div>
           <el-link
             v-if="editable"
             class="punch-record-photos__remove"
@@ -59,7 +57,7 @@
 import { computed } from 'vue';
 
 // 打卡照片是每个打卡节点必有的一个照片类型，不由过程配置的凭证类型决定；
-// 它与各凭证类型各自最多 9 张，同一类型下第一张即界面上的「主图」。
+// 它与各凭证类型各自最多 9 张。
 const PUNCH_PHOTO_TYPE = '打卡照片';
 // 照片没带类型时的兜底名称，与后端落库时的兜底口径一致
 const PHOTO_TYPE_FALLBACK = '凭证';
@@ -252,18 +250,6 @@ const countText = group =>
     }
   }
 
-  &__badge {
-    position: absolute;
-    top: 0;
-    left: 0;
-    padding: 0 6px;
-    border-radius: 4px 0 4px 0;
-    background: rgba(64, 158, 255, 0.9);
-    font-size: 12px;
-    line-height: 18px;
-    color: #fff;
-  }
-
   &__remove {
     align-self: center;
     font-size: 12px;

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

@@ -1870,7 +1870,11 @@
                 :fetch-suggestions="fetchTaskDriverSuggestions"
                 :loading="taskDriverLoading"
                 @select="item => handleTaskDriverSelect('dispatch', item)"
-              />
+              >
+                <template #default="{ item }">
+                  <span>{{ driverOptionText(item) }}</span>
+                </template>
+              </el-autocomplete>
             </el-form-item>
             <el-form-item
               :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
@@ -1893,7 +1897,11 @@
                 :fetch-suggestions="fetchTaskEscortSuggestions"
                 :loading="taskEscortLoading"
                 @select="handleTaskEscortSelect"
-              />
+              >
+                <template #default="{ item }">
+                  <span>{{ driverOptionText(item) }}</span>
+                </template>
+              </el-autocomplete>
             </el-form-item>
             <el-form-item v-if="dispatchItemForm.carrierType !== '承运商'" label="押运人手机号">
               <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
@@ -2760,7 +2768,7 @@ import {
   getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
-import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -3809,6 +3817,7 @@ export default {
   },
   methods: {
     formatContractOptionLabel,
+    driverOptionText,
     initStandaloneFormPage() {
       if (!this.isStandaloneFormPage) return;
       const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -4178,6 +4187,7 @@ export default {
         waiting: ['待执行', 'is-pending'],
         processing: ['进行中', 'is-processing'],
         running: ['进行中', 'is-processing'],
+        pending_return_confirm: ['待回单确认', 'is-pending'],
         completed: ['已完成', 'is-completed'],
         cancelled: ['已取消', 'is-cancelled'],
       };
@@ -4988,16 +4998,8 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const carrier = this.getDispatchCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.taskDriverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         .then(records => {
           this.taskDriverOptions = records;
           callback(
@@ -5017,16 +5019,12 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const carrier = this.getDispatchCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.taskEscortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
         .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
@@ -8044,12 +8042,6 @@ export default {
       this.taskDriverOptions = [];
       this.taskEscortOptions = [];
     },
-    getDispatchCarrierFilter() {
-      return {
-        carrierId: this.dispatchItemForm.carrierId || '',
-        carrierName: this.dispatchItemForm.carrierName || '',
-      };
-    },
     handleDispatchCargoQuantityInput(row, value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
       const parts = text.split('.');

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

@@ -1381,11 +1381,23 @@ const formatOptionalNumber = value => {
   const normalized = normalizeOptionalImportNumber(value);
   return normalized === null || normalized === undefined ? '' : normalized;
 };
+// 明细接口返回运单实体字段 startDate/endDate/estimatedStartTime/estimatedEndTime，
+// 而明细表与编辑回填按导入列字段名 actualStartDate 等读取，重载后在此对齐，否则实际/预计时间列为空。
+const detailDateAliases = {
+  actualStartDate: 'startDate',
+  actualEndDate: 'endDate',
+  planStartDate: 'estimatedStartTime',
+  planEndDate: 'estimatedEndTime',
+};
 const normalizeDetailRow = row => {
   const next = { ...(row || {}) };
   OPTIONAL_NUMBER_PROPS.forEach(prop => {
     next[prop] = formatOptionalNumber(next[prop]);
   });
+  Object.entries(detailDateAliases).forEach(([prop, source]) => {
+    if (String(next[prop] ?? '').trim()) return;
+    if (String(next[source] ?? '').trim()) next[prop] = next[source];
+  });
   return next;
 };
 const normalizeImportRow = row => ({

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

@@ -1200,7 +1200,11 @@
                   :loading="taskDriverLoading"
                   :disabled="dialogReadonly"
                   @select="handleTaskDriverSelect"
-                />
+                >
+                  <template #default="{ item }">
+                    <span>{{ driverOptionText(item) }}</span>
+                  </template>
+                </el-autocomplete>
               </el-form-item>
               <el-form-item
                 v-if="isRoadTransport"
@@ -1279,7 +1283,11 @@
                   :loading="taskEscortLoading"
                   :disabled="dialogReadonly"
                   @select="handleTaskEscortSelect"
-                />
+                >
+                  <template #default="{ item }">
+                    <span>{{ driverOptionText(item) }}</span>
+                  </template>
+                </el-autocomplete>
               </el-form-item>
               <el-form-item v-if="showRoadEscortFields" label="押运人手机号">
                 <el-input
@@ -1591,8 +1599,15 @@
           <el-link type="primary" v-if="canCancel(row)" @click="handleAction('cancel', row)">
             取消
           </el-link>
-          <el-link type="primary" v-if="canComplete(row)" @click="handleCompleteAction(row)">
-            {{ completeActionLabelFor(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)">
             维护里程
@@ -1653,7 +1668,11 @@
               style="width: 100%"
               @select="handleReassignDriverSelect"
               @change="handleReassignDriverChange"
-            />
+            >
+              <template #default="{ item }">
+                <span>{{ driverOptionText(item) }}</span>
+              </template>
+            </el-autocomplete>
           </el-form-item>
           <el-form-item
             label="手机号"
@@ -2252,6 +2271,13 @@
                               <span v-if="record.volume">体积 {{ record.volume }}方</span>
                               <span v-if="record.quantity">数量 {{ record.quantity }}</span>
                             </div>
+                            <!-- 里程只挂在末位节点上（needMileage 由后端下发），显示的是运单里程 -->
+                            <div
+                              v-if="record.needMileage && Number(record.mileage) > 0"
+                              class="waybill-manage-page__punch-record-line"
+                            >
+                              里程 {{ record.mileage }} 公里
+                            </div>
                             <div
                               v-if="record.remark"
                               class="waybill-manage-page__punch-record-line"
@@ -2848,6 +2874,20 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- 里程只在末位打卡节点出现：后端按「末位 + 计费规则含里程」下发 needMileage，前端不自己推 -->
+            <el-col v-if="waybillPunchEditMileageVisible" :span="8">
+              <el-form-item label="里程">
+                <el-input
+                  v-model="waybillPunchEditForm.mileage"
+                  maxlength="10"
+                  :disabled="waybillPunchEditMileageLocked"
+                  placeholder="请输入"
+                  @input="handleWaybillPunchMileageInput"
+                >
+                  <template #append>公里</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input
@@ -3683,6 +3723,7 @@ import {
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import {
+  getList as getWaybillList,
   getPunchRecords as getWaybillPunchRecords,
   locateVehicle,
   savePunchRecord,
@@ -3692,9 +3733,7 @@ import VoucherExecutionDetail from './voucher-execution-detail.vue';
 import PunchRecordPhotos from './punch-record-photos.vue';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
-import {
-  fetchDriversByCarrierOrganizations,
-} from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -4011,6 +4050,7 @@ export default {
         weight: '',
         volume: '',
         quantity: '',
+        mileage: '',
         remark: '',
         photos: [],
       },
@@ -4370,9 +4410,15 @@ export default {
         addBtn: this.canCreate,
       };
     },
-    // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水
+    // 打卡记录编辑入口与运单编辑同权限：能改运单的人才能订正它的打卡流水。
+    // 时间轴的「编辑打卡 / 补卡」链接是本页唯一写入入口，提交固定 punched=true。
+    // 取消打卡不在本页；待回单确认的运单不显示该链接。
     canEditWaybillPunchRecord() {
-      return this.hasPermission(`${this.config.permission}_edit`) && !this.readonlyScope;
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !this.readonlyScope &&
+        this.statusValue(this.detailRow) !== 'pending_return_confirm'
+      );
     },
     waybillPunchEditNode() {
       return this.findWaybillPunchEditNodeConfig(this.waybillPunchEditRecord);
@@ -4407,6 +4453,15 @@ export default {
     waybillPunchEditPunchDisabled() {
       return this.waybillPunchEditNode?.punch === false;
     },
+    // 里程：后端下发 needMileage 才出现（末位打卡节点 + 计费规则含里程）；在途打卡不采集里程
+    waybillPunchEditMileageVisible() {
+      const record = this.waybillPunchEditRecord || {};
+      return record.needMileage === true && record.type !== 'enroute';
+    },
+    // 已生成结算单的运单里程冻结：输入框置灰，改动由后端拒绝
+    waybillPunchEditMileageLocked() {
+      return this.waybillPunchEditRecord?.mileageLocked === true;
+    },
     waybillPunchEditRules() {
       return { punchTime: [{ required: true, message: '请选择打卡时间', trigger: 'change' }] };
     },
@@ -4800,6 +4855,7 @@ export default {
   },
   methods: {
     formatContractOptionLabel,
+    driverOptionText,
     parseRouteChangeContent,
     // 页面被 keep-alive 缓存/卸载时调用，关闭本页所有 append-to-body 的弹窗，
     // 避免 Teleport 出去的 DOM 残留在 body 上盖住后续页面（详见 data 里的说明）。
@@ -5099,7 +5155,8 @@ export default {
         return false;
       }
       const status = this.statusValue(row);
-      return status === 'pending';
+      // 待回单确认可取消，取消不生成应收应付
+      return status === 'pending' || status === 'pending_return_confirm';
     },
     canComplete(row) {
       if (
@@ -5111,29 +5168,21 @@ export default {
         return false;
       }
       const status = this.statusValue(row);
-      return status === 'processing' || status === 'running' || status === 'pending_return';
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
+      return status === 'processing' || status === 'running';
     },
-    completeActionLabelFor(row) {
-      return this.statusValue(row) === 'pending_return' ? '确认回单' : this.completeActionLabel;
-    },
-    handleCompleteAction(row) {
-      const isPendingReturn = this.statusValue(row) === 'pending_return';
-      const actionName = this.completeActionLabelFor(row);
-      this.$confirm(`确定${actionName}该${this.config.title}?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          if (isPendingReturn && typeof this.api.confirmReturn === 'function') {
-            return this.api.confirmReturn(row.id);
-          }
-          return this.api.complete(row.id);
-        })
-        .then(() => {
-          this.$message.success(`${actionName}成功`);
-          this.onLoad(this.page, this.query);
-        });
+    canConfirmReturn(row) {
+      return (
+        this.hasAction('confirmReturn') &&
+        this.hasPermission(`${this.config.permission}_complete`) &&
+        !this.readonlyScope &&
+        !row.readonly &&
+        this.statusValue(row) === 'pending_return_confirm'
+      );
     },
     canMaintainMileage(row) {
       return (
@@ -5948,6 +5997,8 @@ export default {
         weight: record.weight || '',
         volume: record.volume || '',
         quantity: record.quantity || '',
+        // 里程只有正整数口径，后端若仍下发 "200.00" 会过不了提交时的正整数校验
+        mileage: Number(record.mileage) > 0 ? String(Number(record.mileage)) : '',
         remark: record.remark || '',
         photos: (record.photos || [])
           .filter(photo => photo?.url)
@@ -6023,10 +6074,22 @@ export default {
       photos.splice(index, 1);
       this.waybillPunchEditForm.photos = photos;
     },
+    // 里程只收整数：非数字直接丢掉，长度与「维护里程」一致（≤10 位）
+    handleWaybillPunchMileageInput(value) {
+      this.waybillPunchEditForm.mileage = String(value || '')
+        .replace(/\D/g, '')
+        .slice(0, 10);
+    },
     async submitWaybillPunchRecordEdit() {
       await this.$refs.waybillPunchRecordEditFormRef.validate();
       const record = this.waybillPunchEditRecord;
       const form = this.waybillPunchEditForm;
+      // 管理端里程选填：留空表示不改动运单里程，所以只校验填了值的情况
+      const mileageText = String(form.mileage || '').trim();
+      if (this.waybillPunchEditMileageVisible && mileageText && !/^[1-9]\d{0,9}$/.test(mileageText)) {
+        this.$message.warning('里程必须为不超过10位的正整数');
+        return;
+      }
       const submit =
         typeof this.api?.savePunchRecord === 'function' ? this.api.savePunchRecord : savePunchRecord;
       this.waybillPunchRecordEditDialog.submitting = true;
@@ -6045,6 +6108,8 @@ export default {
           weight: form.weight,
           volume: form.volume,
           quantity: form.quantity,
+          // 不传代表不改；后端按 null 处理
+          mileage: mileageText ? Number(mileageText) : undefined,
           remark: form.remark,
           photos: form.photos.map(photo => ({ url: photo.url, type: photo.type })),
         });
@@ -6565,7 +6630,7 @@ export default {
       if (status === 'completed') {
         return 'primary';
       }
-      if (status === 'pending_return') {
+      if (status === 'pending_return_confirm') {
         return 'warning';
       }
       return 'warning';
@@ -7967,19 +8032,10 @@ export default {
       this.taskDriverOptions = [];
       this.taskEscortOptions = [];
     },
-    getTaskCarrierFilter() {
-      return {
-        carrierId: this.form.carrierId || '',
-        carrierName: this.form.carrierName || '',
-      };
-    },
     loadTaskDriverOptions() {
       if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
       this.taskDriverLoading = true;
-      return fetchDriversByCarrierOrganizations(
-        { size: 9999, posts: '司机' },
-        this.getTaskCarrierFilter()
-      )
+      return fetchDriverCandidates({ size: 9999, posts: '司机' })
         .then(records => {
           this.taskDriverOptions = records;
           return this.taskDriverOptions;
@@ -7990,16 +8046,8 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const carrier = this.getTaskCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.taskDriverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         .then(records => {
           this.taskDriverOptions = records;
           callback(
@@ -8019,16 +8067,12 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const carrier = this.getTaskCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.taskEscortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
         .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
@@ -10175,8 +10219,14 @@ export default {
         cancel: '取消',
         complete: this.completeActionLabel,
         reassign: '重新派单',
+        confirmReturn: '完成',
       }[action];
-      this.$confirm(`确定${actionName}该${this.config.title}?`, '提示', {
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      const confirmText =
+        action === 'confirmReturn'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
+          : `确定${actionName}该${this.config.title}?`;
+      this.$confirm(confirmText, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -10229,20 +10279,8 @@ export default {
     },
     fetchReassignDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const row = this.reassignDrawer.row || {};
-      const carrier = {
-        carrierId: row.carrierId || '',
-        carrierName: row.carrierName || '',
-      };
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.reassignDrawer.driverLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-        carrier
-      )
+      fetchDriverCandidates({ size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         .then(records => {
           this.reassignDriverOptions = records;
           callback(
@@ -10382,11 +10420,11 @@ export default {
         return;
       }
       const pendingReturnCount = this.selectionList.filter(
-        row => this.statusValue(row) === 'pending_return'
+        row => this.statusValue(row) === 'pending_return_confirm'
       ).length;
       const tip =
         pendingReturnCount > 0
-          ? `确定完成选中的运单？其中 ${pendingReturnCount} 条为待确认回单，确认后将转为已完成。`
+          ? `确定完成选中的运单？其中 ${pendingReturnCount} 条为待回单确认，确认后将转为已完成。`
           : '确定完成选中的运单?';
       this.$confirm(tip, '提示', {
         confirmButtonText: '确定',
@@ -10402,25 +10440,38 @@ export default {
           this.onLoad(this.page, this.query);
         });
     },
-    handleRoadLoading() {
+    async handleRoadLoading() {
       if (!this.selectionList.length) {
         this.$message.warning('请选择至少一条数据');
         return;
       }
-      const nonRoadWaybills = this.selectionList.filter(row => !this.waybillIsRoadTransport(row));
-      if (nonRoadWaybills.length) {
-        this.$message.warning('公路配载仅支持运输方式为“公路运输”的运单');
+      const selectedIds = this.selectionList.map(row => row.id).filter(Boolean);
+      if (!selectedIds.length) {
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      const unavailableWaybills = this.selectionList.filter(
-        row =>
-          !['pending', 'processing', 'running'].includes(this.statusValue(row)) ||
-          row.loadingId ||
-          row.loadingManageId ||
-          row.loadingNo
-      );
-      if (unavailableWaybills.length) {
-        this.$message.warning('公路配载仅支持待执行/进行中且未关联有效配载单的运单');
+      // 可配载与否只看后端查询结果
+      let loadableIds;
+      try {
+        const res = await getWaybillList(1, selectedIds.length, {
+          loadableOnly: 1,
+          ids: selectedIds.join(','),
+        });
+        loadableIds = new Set(extractRecords(res).map(row => String(row.id)));
+      } catch (error) {
+        this.$message.error('校验运单可配载状态失败，请重试');
+        return;
+      }
+      const rejectedRows = this.selectionList.filter(row => !loadableIds.has(String(row.id)));
+      if (rejectedRows.length) {
+        const rejectedText = rejectedRows
+          .map(row => {
+            const reason = this.roadLoadingRejectReasonText(row);
+            const no = row.waybillNo || row.id || '';
+            return `${no}（${reason}）`;
+          })
+          .join('、');
+        this.$message.warning(`${rejectedText}；公路配载仅支持公路、待执行且未配载的运单`);
         return;
       }
       try {
@@ -10443,6 +10494,13 @@ export default {
         },
       });
     },
+    // 只给后端判定为不可配载的运单生成可读原因，本身不参与准入判定
+    roadLoadingRejectReasonText(row = {}) {
+      if (!this.waybillIsRoadTransport(row)) return '非公路运输';
+      if (String(row.businessStatus || '') !== 'pending') return '状态不是待执行';
+      if (row.loadingNo) return '已关联配载单';
+      return '运单数据可能已变化，请刷新后重试';
+    },
   },
 };
 </script>

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

@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="contract-change" :get-form="getForm">
+    <contract-manage-change ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import ContractManageChange from '@/views/business/contract-manage-change.vue';
+
+export default {
+  name: 'ContractChangePublicView',
+  components: { MkPublicShell, ContractManageChange },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.form || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
+    },
+  },
+};
+</script>

src/views/business/contract-change.vue

@@ -0,0 +1,407 @@
+<template>
+  <basic-container class="contract-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button type="primary" plain :loading="hcsRepushingId === 'batch'" @click="handleHcsBatchRepush">
+          批量同步
+        </el-button>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link type="primary" v-if="canView(row)" @click="openForm('view', row)"> 查看 </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)"> 编辑 </el-link>
+        <el-link type="danger" v-if="canDelete(row)" @click="rowDel(row)"> 删除 </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="
+            operation.type === 'warning'
+              ? 'warning'
+              : operation.type === 'success'
+                ? 'success'
+                : 'primary'
+          "
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/contract-change';
+import { repushBatch as hcsRepushBatch } from '@/api/business/hcs';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/contract-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const contractChangeFormRoute = '/business/contract-change/form';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
+
+export default {
+  name: 'ContractChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+      hcsRepushingId: null,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(contractChangeListRefreshKey)) {
+      sessionStorage.removeItem(contractChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    canHcsRepush(row) {
+      return row.approvalStatus === 'approved' && row.contractId && row.syncStatus !== 'synced';
+    },
+    handleHcsBatchRepush() {
+      if (this.hcsRepushingId) return;
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      const rows = this.selectionList.filter(item => this.canHcsRepush(item));
+      if (!rows.length) {
+        this.$message.warning('请选择审批通过且未同步成功的变更单');
+        return;
+      }
+      this.$confirm(`确定同步选中的${rows.length}条合同变更到合规系统?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在推送合规，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
+        this.hcsRepushingId = 'batch';
+        const contractIds = [...new Set(rows.map(item => item.contractId))];
+        const changeIds = rows.map(item => item.id).join(',');
+        hcsRepushBatch('contract', contractIds)
+          .then(res => {
+            if (res.data?.success === false) {
+              this.$message.error(res.data?.msg || '批量同步失败');
+              return api.markSyncStatus(changeIds, 'failed');
+            }
+            return api.markSyncStatus(changeIds, 'synced').then(() => {
+              this.$message.success(res.data?.data || '批量同步成功');
+              this.onLoad(this.page, this.query);
+            });
+          })
+          .catch(() => api.markSyncStatus(changeIds, 'failed'))
+          .finally(() => {
+            this.hcsRepushingId = null;
+            loading.close();
+          });
+      });
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (
+        row.readonly &&
+        ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)
+      ) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑合同变更';
+      else if (mode === 'view') query.name = '查看合同变更';
+      this.$router.push({ path: contractChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? submitMkApprovalFlow({
+                bizType: 'contract-change',
+                bizId: row.id,
+                subjectName: row.contractName || '',
+                approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
+              }).then(() => request())
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            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);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    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('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.contract-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>

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

@@ -1,12 +1,20 @@
 <template>
   <basic-container class="contract-change-page">
     <div class="archive-page-form__title">{{ pageTitle }}</div>
-    <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="contract-change-form">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :disabled="pageReadonly"
+      label-position="right"
+      label-width="auto"
+      class="contract-change-form"
+    >
       <section class="change-section contract-basic-section">
         <div class="dialog-section-title">基本信息</div>
         <div class="contract-basic-section__grid">
           <el-form-item label="变更类型" class="contract-basic-section__change-type">
-            <el-radio-group v-model="form.changeType">
+            <el-radio-group v-model="form.changeType" :disabled="pageReadonly">
               <el-radio label="合同信息变更" />
               <el-radio label="结算规则变更" />
               <el-radio label="终止合同" />
@@ -27,8 +35,14 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="合同编号">
-            <el-input v-model="form.contractNo" disabled />
+          <el-form-item label="合同编号" prop="contractNo">
+            <el-input
+              v-model="form.contractNo"
+              maxlength="100"
+              clearable
+              placeholder="请输入合同编号"
+              :disabled="isSettlementRuleChange"
+            />
           </el-form-item>
           <el-form-item label="合同名称" prop="contractName">
             <el-input
@@ -274,7 +288,7 @@
         <div class="section-head">
           <div class="dialog-section-title">计费信息</div>
           <el-button
-            v-if="feeGenerationMode !== 'manual'"
+            v-if="!pageReadonly && feeGenerationMode !== 'manual'"
             type="primary"
             plain
             @click="addPlan"
@@ -295,6 +309,7 @@
               row.defaultPlan ? '是' : '否'
             }}</template></el-table-column
           ><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
+            v-if="!pageReadonly"
             label="操作"
             width="180"
             ><template #default="{ row, $index }"
@@ -410,7 +425,7 @@
                   :value="item.value"
               /></el-select></template
           ></el-table-column>
-          <el-table-column label="操作" width="100"
+          <el-table-column v-if="!pageReadonly" label="操作" width="100"
             ><template #default="{ $index }"
               ><el-link v-if="$index === 0" type="primary" @click="addCustomPeriodRow">添加</el-link
               ><el-link v-else type="danger" @click="removeCustomPeriodRow($index)"
@@ -419,7 +434,7 @@
             ></el-table-column
           >
           <template #empty
-            ><el-link type="primary" @click="addCustomPeriodRow">添加</el-link></template
+            ><el-link v-if="!pageReadonly" type="primary" @click="addCustomPeriodRow">添加</el-link></template
           >
         </el-table>
       </section>
@@ -455,7 +470,7 @@
                 :disabled="isSettlementRuleChange"
             /></template
           ></el-table-column>
-          <el-table-column v-if="!isSettlementRuleChange" label="操作" width="100"
+          <el-table-column v-if="!pageReadonly && !isSettlementRuleChange" label="操作" width="100"
             ><template #default="{ $index }"
               ><el-link type="danger" @click="paymentRatioRows.splice($index, 1)"
                 >删除</el-link
@@ -464,7 +479,7 @@
           >
         </el-table>
         <el-button
-          v-if="!isSettlementRuleChange"
+          v-if="!pageReadonly && !isSettlementRuleChange"
           type="primary"
           plain
           @click="addPaymentRatioRow"
@@ -519,8 +534,9 @@
         @update:rows="changeMaterials = $event"
         @upload-to-location="handleAttachmentUploadToLocation"
       />
-      <div class="page-footer">
-        <el-button @click="$router.back()">取消</el-button>
+      <div v-if="!pageReadonly" class="page-footer">
+        <el-button @click="goBack">取消</el-button>
+        <el-button v-if="isContractChangeModule" @click="saveDraft">保存草稿</el-button>
         <el-button type="primary" @click="submit">提交</el-button>
       </div>
     </el-form>
@@ -533,7 +549,9 @@
 </template>
 
 <script>
-import * as api from '@/api/business/contract-manage';
+import * as contractApi from '@/api/business/contract-manage';
+import * as changeApi from '@/api/business/contract-change';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
@@ -571,6 +589,8 @@ const defaultContractFormatOptions = [
   { label: '电子合同', value: '电子合同' },
   { label: '纸质合同', value: '纸质合同' },
 ];
+const contractChangeListRoute = '/business/contract-change';
+const contractChangeListRefreshKey = 'contract-change-list-refresh';
 const normalizeOptionalPositiveInteger = value => {
   if (value === undefined || value === null || value === '') return null;
   const number = Number(value);
@@ -667,6 +687,24 @@ export default {
         '按数量',
       ],
       rules: {
+        contractNo: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.isSettlementRuleChange) {
+                return callback();
+              }
+              const contractNo = String(value || '').trim();
+              if (!contractNo) {
+                return callback(new Error('请输入合同编号'));
+              }
+              if (contractNo.length > 100) {
+                return callback(new Error('合同编号不能超过100个字符'));
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
         contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
         contractAmount: [
           { required: true, message: '请输入合同金额', trigger: 'blur' },
@@ -689,8 +727,21 @@ export default {
   },
   computed: {
     pageTitle() {
+      if (this.pageReadonly) return this.$route.query.name || '查看合同变更';
       return this.$route.query.name || '合同变更';
     },
+    isContractChangeModule() {
+      return (
+        this.$route.path === '/business/contract-change/form' ||
+        this.$route.path === '/business/contract-change/public-view'
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-change/public-view';
+    },
+    pageReadonly() {
+      return this.isPublicViewPage || this.$route.query.mode === 'view';
+    },
     // 高风险/黑名单客商提示：按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定（与合同详情口径一致）
     riskTipText() {
       const riskLevel = String(this.form.hcsRiskLevel || '').trim();
@@ -809,13 +860,25 @@ export default {
     async load() {
       const id = this.$route.query.id;
       if (!id) return;
-      const res = await api.getDetail(id);
-      const data = res.data?.data || res.data || {};
+      let data = {};
+      if (this.isPublicViewPage) {
+        const res = await getMkPublicDetail('contract-change', id);
+        data = res.data?.data || res.data || {};
+      } else if (this.isContractChangeModule) {
+        const res = await changeApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      } else {
+        const res = await contractApi.getDetail(id);
+        data = res.data?.data || res.data || {};
+      }
+      const isChangeRecord = this.isContractChangeModule || this.isPublicViewPage;
       this.form = {
         ...data,
-        changeContent: '',
-        changeReason: '',
-        changeAttachmentsJson: '',
+        // 独立变更单保留 contractId；旧路由以合同 id 作为主键
+        contractId: data.contractId || (isChangeRecord ? data.contractId : data.id),
+        changeContent: isChangeRecord ? data.changeContent || '' : '',
+        changeReason: isChangeRecord ? data.changeReason || '' : '',
+        changeAttachmentsJson: data.changeAttachmentsJson || '',
         copyCount: normalizeOptionalPositiveInteger(data.copyCount),
         invoiceCycle: normalizeOptionalPositiveInteger(data.invoiceCycle),
         paymentDays: normalizeOptionalPositiveInteger(data.paymentDays),
@@ -823,14 +886,14 @@ export default {
         templateFlag: data.templateFlag ?? 0,
         electronicSealFlag: data.electronicSealFlag ?? 0,
         archiveStatus: data.archiveStatus || '未归档',
-        changeType: '合同信息变更',
+        changeType: data.changeType || '合同信息变更',
       };
-      this.changeMaterials = [];
+      this.changeMaterials = this.parse(data.changeAttachmentsJson);
       this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
       this.plans = this.parse(data.billingPlanJson);
       this.attachments = this.mergeChangeAttachments(
         this.parse(data.attachmentsJson),
-        this.parse(data.changeAttachmentsJson)
+        isChangeRecord ? [] : this.parse(data.changeAttachmentsJson)
       );
       this.contractFileRows = normalizeContractFileRows(this.parse(data.contractFileJson));
       const rules = this.parseObject(data.settlementRuleJson);
@@ -872,6 +935,70 @@ export default {
         data.feeGenerationMode || (Number(data.billingEnabled) === 0 ? 'manual' : 'system');
       this.paymentRatioRows = this.parse(data.paymentRatioJson);
     },
+    goBack() {
+      if (this.isContractChangeModule) {
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      this.$router.back();
+    },
+    buildChangePayload() {
+      if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule };
+      else this.formalSettlementConfig = { ...this.settlementRule };
+      const settlementRule = {
+        preSettlementConfig: this.preSettlementConfig,
+        formalSettlementConfig: this.formalSettlementConfig,
+      };
+      if (this.isSettlementRuleChange) {
+        return {
+          id: this.form.id,
+          contractId: this.form.contractId,
+          changeType: this.form.changeType,
+          changeContent: this.form.changeContent,
+          changeReason: this.form.changeReason,
+          feeGenerationMode: this.feeGenerationMode,
+          billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
+          billingPlanJson: JSON.stringify(this.plans),
+          settlementRuleJson: JSON.stringify(settlementRule),
+          preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
+          formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
+          changeAttachmentsJson: JSON.stringify(this.changeMaterials),
+        };
+      }
+      return {
+        ...this.form,
+        contractId: this.form.contractId,
+        changeType: this.form.changeType || '合同信息变更',
+        settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
+        copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
+        invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
+        paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
+        contractAmount: normalizeOptionalAmount(this.form.contractAmount),
+        startDate: this.period[0],
+        endDate: this.period[1],
+        feeGenerationMode: this.feeGenerationMode,
+        billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
+        billingPlanJson: JSON.stringify(this.plans),
+        settlementRuleJson: JSON.stringify(settlementRule),
+        preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
+        formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
+        paymentRatioJson: JSON.stringify(this.paymentRatioRows),
+        contractFileJson: JSON.stringify(this.contractFileRows),
+        attachmentsJson: JSON.stringify(this.attachments),
+        changeContent: this.form.changeContent,
+        changeReason: this.form.changeReason,
+        changeAttachmentsJson: JSON.stringify(this.changeMaterials),
+      };
+    },
+    async saveDraft() {
+      if (this.form.changeType === '终止合同') {
+        this.$message.warning('终止合同无需保存草稿，请直接提交');
+        return;
+      }
+      const payload = this.buildChangePayload();
+      await changeApi.saveDraft(payload);
+      this.$message.success('草稿已保存');
+    },
     parse(value) {
       try {
         const result = JSON.parse(value || '[]');
@@ -965,13 +1092,24 @@ export default {
     validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
     async submit() {
       if (this.form.changeType === '终止合同') {
-        await api.terminate(this.form.id, this.form.changeReason);
+        const contractId = this.form.contractId || this.form.id;
+        await contractApi.terminate(contractId, this.form.changeReason);
         this.$message.success('合同已终止');
-        this.$router.back();
+        this.goBack();
         return;
       }
       await this.$refs.formRef.validate();
       if (!this.isSettlementRuleChange) {
+        const contractNo = String(this.form.contractNo || '').trim();
+        if (!contractNo) {
+          this.$message.warning('请输入合同编号');
+          return;
+        }
+        if (contractNo.length > 100) {
+          this.$message.warning('合同编号不能超过100个字符');
+          return;
+        }
+        this.form.contractNo = contractNo;
         const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0);
         if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) {
           this.$message.warning('付款比例上限合计必须等于100%');
@@ -986,48 +1124,22 @@ export default {
       ) {
         return;
       }
-      const settlementRule = {
-        preSettlementConfig: this.preSettlementConfig,
-        formalSettlementConfig: this.formalSettlementConfig,
-      };
-      const payload = this.isSettlementRuleChange
-        ? {
-            id: this.form.id,
-            changeType: this.form.changeType,
-            changeContent: this.form.changeContent,
-            changeReason: this.form.changeReason,
-            feeGenerationMode: this.feeGenerationMode,
-            billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
-            billingPlanJson: JSON.stringify(this.plans),
-            settlementRuleJson: JSON.stringify(settlementRule),
-            preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
-            formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
-            changeAttachmentsJson: JSON.stringify(this.changeMaterials),
-          }
-        : {
-            ...this.form,
-            changeType: this.form.changeType || '合同信息变更',
-            settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB',
-            copyCount: normalizeOptionalPositiveInteger(this.form.copyCount),
-            invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle),
-            paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays),
-            contractAmount: normalizeOptionalAmount(this.form.contractAmount),
-            startDate: this.period[0],
-            endDate: this.period[1],
-            feeGenerationMode: this.feeGenerationMode,
-            billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0,
-            billingPlanJson: JSON.stringify(this.plans),
-            settlementRuleJson: JSON.stringify(settlementRule),
-            preSettlementConfigJson: JSON.stringify(this.preSettlementConfig),
-            formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig),
-            paymentRatioJson: JSON.stringify(this.paymentRatioRows),
-            contractFileJson: JSON.stringify(this.contractFileRows),
-            attachmentsJson: JSON.stringify(this.attachments),
-            changeContent: this.form.changeContent,
-            changeReason: this.form.changeReason,
-            changeAttachmentsJson: JSON.stringify(this.changeMaterials),
-          };
-      await api.submitChange(payload);
+      const payload = this.buildChangePayload();
+      if (this.isContractChangeModule) {
+        await changeApi.submit(payload);
+        await submitMkApprovalFlow({
+          bizType: 'contract-change',
+          bizId: this.form.id,
+          subjectName: this.form.contractName || '',
+          approvalStatus: this.form.approvalStatus || '',
+          mkEnabled: await loadMkEnabled().catch(() => false),
+        });
+        sessionStorage.setItem(contractChangeListRefreshKey, '1');
+        this.$message.success('变更已提交');
+        this.$router.push(contractChangeListRoute);
+        return;
+      }
+      await contractApi.submitChange(payload);
       await submitMkApprovalFlow({
         bizType: 'contract-manage',
         bizId: this.form.id,

src/views/business/contract-manage.vue

@@ -1089,6 +1089,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { exportBlob } from '@/api/common';
 import * as api from '@/api/business/contract-manage';
+import { createFromContract } from '@/api/business/contract-change';
 import { repush as hcsRepush, repushBatch as hcsRepushBatch, getRisk } from '@/api/business/hcs';
 import { Position } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
@@ -3220,12 +3221,33 @@ export default {
       if (value === undefined || value === null || value === '') return '-';
       return options.find(item => String(item.value) === String(value))?.label || value;
     },
+    handleStartContractChange(row) {
+      if (!row?.id) {
+        this.$message.warning('合同ID为空，无法发起变更');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '正在创建变更单…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      createFromContract(row.id)
+        .then(res => {
+          const data = res?.data?.data || res?.data || {};
+          if (!data.id) {
+            this.$message.error(res?.data?.msg || '创建合同变更草稿失败');
+            return;
+          }
+          this.$router.push({
+            path: '/business/contract-change/form',
+            query: { mode: 'edit', id: data.id, name: '合同变更' },
+          });
+        })
+        .finally(() => loading.close());
+    },
     handleOperation(operation, row) {
       if (operation.action === 'startChange') {
-        this.$router.push({
-          path: '/business/contract-manage/change',
-          query: { id: row.id, name: '合同变更' },
-        });
+        this.handleStartContractChange(row);
         return;
       }
       if (operation.action === 'flow') {

src/views/business/loading-manage.vue

@@ -898,16 +898,6 @@
         >
           <div title="配载信息" class="loading-manage-dialog__load-info-card">
             <section-card>
-              <div class="loading-manage-dialog__admission-tip">
-                <div class="loading-manage-dialog__admission-title">可配载条件</div>
-                <div class="loading-manage-dialog__admission-text">
-                  同时满足以下条件的运单可被配载：运输方式为「公路」；运单状态为「待执行」或「进行中」；未关联其他有效配载单。
-                </div>
-                <div class="loading-manage-dialog__admission-title">配载后状态说明</div>
-                <div class="loading-manage-dialog__admission-text">
-                  子运单：按项目过程配置是否需司机接单，无需接单则为进行中，需接单则为待执行。配载单：按所选运单所属项目的过程配置，需接单则为待执行，无需接单则为进行中。
-                </div>
-              </div>
               <div class="loading-manage-dialog__candidate-search">
                 <el-row :gutter="16">
                   <el-col :span="6">
@@ -1079,31 +1069,12 @@
                           <el-option
                             v-for="item in driverOptions"
                             :key="item.id || item.driverName || item.name"
-                            :label="item.driverName || item.name"
+                            :label="driverOptionText(item)"
                             :value="item.driverName || item.name"
                           />
                         </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="运输方式">
-                        <el-select
-                          v-model="candidateQuery.transportType"
-                          clearable
-                          filterable
-                          placeholder="请选择"
-                          :disabled="dialogMode === 'add'"
-                          @visible-change="visible => visible && loadTransportTypeOptions()"
-                        >
-                          <el-option
-                            v-for="item in transportTypeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
                   </template>
                   <el-col
                     :span="candidateSearchVisible ? 24 : 6"
@@ -1212,6 +1183,16 @@
                   min-width="160"
                   show-overflow-tooltip
                 />
+                <el-table-column
+                  prop="carrierContractName"
+                  label="承运商合同"
+                  min-width="160"
+                  show-overflow-tooltip
+                >
+                  <template #default="{ row }">
+                    {{ row.carrierContractName || '-' }}
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="planName"
                   label="计划名称"
@@ -1511,7 +1492,11 @@
                     placeholder="请输入"
                     :disabled="dialogReadonly || isRunningSelfDriverLocked"
                     @select="item => handleDriverSuggestionSelect('dialog', item)"
-                  />
+                  >
+                    <template #default="{ item }">
+                      <span>{{ driverOptionText(item) }}</span>
+                    </template>
+                  </el-autocomplete>
                 </el-form-item>
                 <el-form-item
                   label="手机号"
@@ -1550,7 +1535,11 @@
                     placeholder="请输入"
                     :disabled="dialogReadonly"
                     @select="item => handleEscortSuggestionSelect('dialog', item)"
-                  />
+                  >
+                    <template #default="{ item }">
+                      <span>{{ driverOptionText(item) }}</span>
+                    </template>
+                  </el-autocomplete>
                 </el-form-item>
                 <el-form-item v-if="dialogForm.carrierType !== '承运商'" label="押运人手机号">
                   <el-input
@@ -1880,7 +1869,7 @@ import { getList as getContractList } from '@/api/business/contract-manage';
 import { getParentOptions as getCargoTypeOptions } from '@/api/base/cargo-type';
 import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
-import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
+import { fetchDriverCandidates, driverOptionText } from '@/utils/carrier-org-resource';
 import { formatContractOptionLabel } from '@/utils/contract';
 import {
   getList as getProcessConfigList,
@@ -1905,7 +1894,6 @@ import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-sear
 import { parseRouteChangeContent } from '@/utils/route-change';
 
 const defaultTransportType = '';
-const defaultCandidateTransportType = '';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 const loadingCreateWaybillsStorageKey = 'loading-manage-create-waybills';
@@ -1946,7 +1934,6 @@ const createCandidateSearchForm = () => ({
   vehicleNo: '',
   carrierName: '',
   driverName: '',
-  transportType: defaultCandidateTransportType,
 });
 
 const createDialogForm = () => ({
@@ -2401,6 +2388,7 @@ export default {
   },
   methods: {
     parseRouteChangeContent,
+    driverOptionText,
     formatTaskCarrierContractLabel(item = {}) {
       const carrierName = item.carrierName || item.partyB || '';
       const contractLabel = formatContractOptionLabel(item);
@@ -3104,7 +3092,6 @@ export default {
       this.dialogMode = mode;
       this.dialogLoading = true;
       this.resetDialogData();
-      if (mode === 'add') this.candidateQuery.transportType = 'road';
       try {
         if (row?.id) {
           const res = await loadingApi.getDetail(row.id);
@@ -3131,7 +3118,6 @@ export default {
         } else {
           this.dialogForm = createDialogForm();
           this.candidateQuery = createCandidateSearchForm();
-          this.candidateQuery.transportType = 'road';
           await this.loadCandidateWaybills();
         }
       } finally {
@@ -3910,18 +3896,24 @@ export default {
     async loadCandidateWaybills() {
       this.candidateLoading = true;
       try {
+        const selectedProjectId = this.selectedWaybillRows.map(row => row.projectId).find(Boolean);
         const query = {
           ...this.buildQueryParams(this.candidateQuery),
-          // 与后端 LoadableAdmissionSupport 一致：公路 + 待执行/进行中 + 未关联有效配载单
+          // 公路、待执行、未配载的判定都在后端可配载开关内
+          // 该开关已把候选限定为公路，再按精确运输方式取值筛会漏掉「公路运输」这类历史写法
           loadableOnly: 1,
-          // 仅查当前账户所属组织及子组织下的运单
+          // allDept=0 表示不指定组织：超管与「数据权限范围=全部组织」的账户后端不过滤组织，
+          // 其余账户限定本组织（不展开下级）
           allDept: 0,
         };
-        const transportType = this.getCandidateTransportTypeQuery(query.transportType);
+        // 已选运单后，候选列表优先限定同一项目，便于再按承运商合同乙方交集筛选
+        if (selectedProjectId && !query.projectId && !query.projectName) {
+          query.projectId = selectedProjectId;
+        }
         const res = await getWaybillList(
           this.candidatePage.currentPage,
           this.candidatePage.pageSize,
-          { ...query, transportType }
+          query
         );
         const page = unwrapPage(res);
         this.candidateRows = page.records;
@@ -3930,20 +3922,12 @@ export default {
         this.candidateLoading = false;
       }
     },
-    getCandidateTransportTypeQuery(value) {
-      const normalized = String(value || '')
-        .trim()
-        .toLowerCase();
-      if (['road', '公路运输'].includes(normalized)) return 'road,公路运输';
-      return value || '';
-    },
     handleCandidateSearch() {
       this.candidatePage.currentPage = 1;
       this.loadCandidateWaybills();
     },
     handleCandidateReset() {
       this.candidateQuery = createCandidateSearchForm();
-      if (this.dialogMode === 'add') this.candidateQuery.transportType = 'road';
       this.candidatePage.currentPage = 1;
       this.loadCandidateWaybills();
     },
@@ -3987,7 +3971,10 @@ export default {
             ];
             if (projectIds.length) {
               try {
-                const response = await loadingApi.getCarrierContracts(projectIds);
+                const waybillIds = [...this.selectedWaybillRows, ...selectedRows]
+                  .map(row => row.id)
+                  .filter(Boolean);
+                const response = await loadingApi.getCarrierContracts(projectIds, waybillIds);
                 const contracts = response?.data?.data || response?.data || [];
                 const stillAllowed = (Array.isArray(contracts) ? contracts : []).some(
                   item => String(item.id) === String(contractId)
@@ -4005,14 +3992,50 @@ export default {
         const exists = new Set(
           this.selectedWaybillRows.map(row => String(row.id || row.waybillNo))
         );
+        // 一张配载单的全部子运单必须同项目：以已选运单（无已选时以本批首张）的项目为准
+        const anchorRow = [...this.selectedWaybillRows, ...selectedRows].find(row =>
+          this.waybillProjectKey(row)
+        );
+        const anchorKey = anchorRow ? this.waybillProjectKey(anchorRow) : '';
+        const mismatchedRows = anchorKey
+          ? selectedRows.filter(
+              row => this.waybillProjectKey(row) && this.waybillProjectKey(row) !== anchorKey
+            )
+          : [];
+        if (mismatchedRows.length) {
+          const anchorName = anchorRow.projectName || anchorRow.projectId;
+          const mismatchedText = mismatchedRows
+            .map(
+              row =>
+                `${row.waybillNo || row.id}（项目：${row.projectName || row.projectId || '未知'}）`
+            )
+            .join('、');
+          this.$message.warning(
+            `运单 ${mismatchedText} 与已选运单项目「${anchorName}」不一致，不能加入同一配载单`
+          );
+        }
         const nextRows = [...this.selectedWaybillRows];
         selectedRows.forEach(row => {
+          if (mismatchedRows.includes(row)) return;
           const key = String(row.id || row.waybillNo);
           if (!exists.has(key)) {
             nextRows.push(row);
             exists.add(key);
           }
         });
+        // 承运商类型：新增后须仍存在共同的承运商合同乙方（按客户合同甲方匹配后取交集）
+        if (
+          String(this.dialogForm.carrierType || '').trim() === '承运商' &&
+          nextRows.length > this.selectedWaybillRows.length
+        ) {
+          const compatible = await this.hasCompatibleCarrierContracts(nextRows);
+          if (!compatible) {
+            this.$message.warning(
+              '所选运单在同一项目下没有共同的承运商合同乙方，不能加入同一配载单'
+            );
+            return;
+          }
+        }
         const prevRouteNodes = [...this.routeNodes];
         this.selectedWaybillRows = nextRows;
         if (this.isRunningEdit) {
@@ -4026,9 +4049,24 @@ export default {
         this.candidateAdding = false;
       }
     },
+    async hasCompatibleCarrierContracts(rows = []) {
+      const projectId = (rows || []).map(row => row.projectId).find(Boolean);
+      const waybillIds = (rows || []).map(row => row.id).filter(Boolean);
+      if (!projectId || waybillIds.length < 2) return true;
+      try {
+        const response = await loadingApi.getCarrierContracts([projectId], waybillIds);
+        const contracts = response?.data?.data || response?.data || [];
+        return (Array.isArray(contracts) ? contracts : []).length > 0;
+      } catch (error) {
+        return true;
+      }
+    },
     async addSelectedWaybills() {
       await this.addWaybillRows(this.candidateSelection);
     },
+    waybillProjectKey(row = {}) {
+      return String(row.projectId || row.projectName || '').trim();
+    },
     removeSelectedWaybill(index) {
       const row = this.selectedWaybillRows[index];
       if (this.isSelectedWaybillRemoveLocked(row)) {
@@ -4551,12 +4589,6 @@ export default {
       this.dialogForm.escortPhone = '';
       this.driverOptions = [];
     },
-    getDialogCarrierFilter() {
-      return {
-        carrierId: this.dialogForm.carrierId || '',
-        carrierName: this.dialogForm.carrierName || '',
-      };
-    },
     handleDriverChange(value) {
       const driver = this.driverOptions.find(item => (item.driverName || item.name) === value);
       if (driver && !this.dialogForm.driverPhone) {
@@ -4590,16 +4622,12 @@ export default {
     },
     fetchEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
-      const carrier = this.getDialogCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        callback([]);
-        return;
-      }
       this.escortLoading = true;
-      fetchDriversByCarrierOrganizations(
-        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
-        carrier
-      )
+      fetchDriverCandidates({
+        size: 20,
+        ...(keyword ? { driverName: keyword } : {}),
+        posts: '押运员',
+      })
         .then(records => {
           callback(
             records.map(item => ({
@@ -4679,17 +4707,13 @@ export default {
       }
     },
     async loadDialogDriverOptions(keyword = '') {
-      const carrier = this.getDialogCarrierFilter();
-      if (!carrier.carrierId && !carrier.carrierName) {
-        this.driverOptions = [];
-        return [];
-      }
       this.driverLoading = true;
       try {
-        this.driverOptions = await fetchDriversByCarrierOrganizations(
-          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
-          carrier
-        );
+        this.driverOptions = await fetchDriverCandidates({
+          size: 20,
+          ...(keyword ? { driverName: keyword } : {}),
+          posts: '司机',
+        });
         return this.driverOptions;
       } finally {
         this.driverLoading = false;
@@ -4720,10 +4744,13 @@ export default {
       }
       this.taskCarrierLoading = true;
       try {
-        const projectIds = [
-          ...new Set(this.selectedWaybillRows.map(row => row.projectId).filter(Boolean)),
-        ];
-        const response = await loadingApi.getCarrierContracts(projectIds);
+        // 配载单只有一个项目；传入子运单后按客户合同甲方匹配并取承运商合同乙方交集
+        const projectId = this.selectedWaybillRows.map(row => row.projectId).find(Boolean);
+        const waybillIds = this.selectedWaybillRows.map(row => row.id).filter(Boolean);
+        const response = await loadingApi.getCarrierContracts(
+          projectId ? [projectId] : [],
+          waybillIds
+        );
         if (requestId !== this.taskCarrierRequestId) return [];
         const contracts = response.data?.data || response.data || [];
         if (this.dialogForm.carrierType !== '自运') {
@@ -4993,30 +5020,6 @@ export default {
     justify-content: space-between;
   }
 
-  .loading-manage-dialog__admission-tip {
-    margin-bottom: 12px;
-    padding: 12px 14px;
-    background: #f5f9ff;
-    border: 1px solid #d9ecff;
-    border-radius: 4px;
-    line-height: 1.6;
-    color: #606266;
-  }
-
-  .loading-manage-dialog__admission-title {
-    margin-bottom: 4px;
-    color: #303133;
-    font-weight: 600;
-  }
-
-  .loading-manage-dialog__admission-title + .loading-manage-dialog__admission-text + .loading-manage-dialog__admission-title {
-    margin-top: 8px;
-  }
-
-  .loading-manage-dialog__admission-text {
-    font-size: 13px;
-  }
-
   .loading-manage-dialog__candidate-search {
     padding: 0;
     margin-bottom: 0;

src/views/business/process-config.vue

@@ -245,7 +245,7 @@
                       <el-radio-group
                         v-model="row.confirmMode"
                         :disabled="dialogReadonly || !row.enabled"
-                        @change="handleReturnConfirmChange(row)"
+                        @change="syncNodeFields"
                       >
                         <el-radio label="yes">是</el-radio>
                         <el-radio label="no_confirm_complete">无需确认完成</el-radio>
@@ -253,10 +253,7 @@
                     </div>
                     <div class="process-config-form__require-line">
                       <span class="process-config-form__require-label">确认完成</span>
-                      <el-checkbox
-                        v-model="row.confirmInternal"
-                        :disabled="dialogReadonly || !row.enabled || row.confirmMode !== 'yes'"
-                        @change="syncNodeFields"
+                      <el-checkbox v-model="row.confirmInternal" :disabled="true"
                         >内部人员</el-checkbox
                       >
                     </div>
@@ -549,15 +546,18 @@ export default {
       row.confirmDriver = row.confirmMode === 'yes';
       this.syncNodeFields();
     },
-    handleReturnConfirmChange(row) {
-      row.confirmInternal = row.confirmMode === 'yes';
-      this.syncNodeFields();
-    },
     enforceAcceptDriver(node) {
       if (!node || (node.key !== 'accept' && node.name !== '接单')) return node;
       node.confirmDriver = node.confirmMode === 'yes';
       return node;
     },
+    // 回单「确认完成」只有内部人员一种角色，是否确认为「是」时即由内部人员确认，
+    // 界面上只读展示，值始终由 confirmMode 推导
+    enforceReturnInternal(node) {
+      if (!node || (node.key !== 'return' && node.name !== '回单')) return node;
+      node.confirmInternal = node.confirmMode === 'yes';
+      return node;
+    },
     initDeptOptions() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
@@ -724,7 +724,7 @@ export default {
       this.projectLoading = true;
       return getProjectList(1, 50, {
         projectName: keyword,
-        approvalStatus: 'approved',
+        approvalStatuses: 'approved,change_approved',
         allDept: this.isAdmin ? 1 : 0,
       })
         .then(res => {
@@ -808,7 +808,10 @@ export default {
       this.syncNodeFields();
     },
     syncNodeFields() {
-      this.nodeRows.forEach(item => this.enforceAcceptDriver(item));
+      this.nodeRows.forEach(item => {
+        this.enforceAcceptDriver(item);
+        this.enforceReturnInternal(item);
+      });
       const enabledNodes = this.nodeRows.filter(item => item.enabled);
       this.form.includedNodes = enabledNodes.map(item => item.name).join(',');
       this.form.nodeConfigJson = JSON.stringify(

src/views/business/project-apply-public-view.vue

@@ -84,7 +84,8 @@ export default {
       this.postFormData('save', lbpmFormValues, this.buildFormData());
     },
     postFormData(status, formValues, formData) {
-      postMkPublicProcessMessage('project-apply', {
+      const bizType = this.$route.meta?.bizType || 'project-apply';
+      postMkPublicProcessMessage(bizType, {
         status,
         formValues: formValues || {},
         formData,

src/views/business/project-apply.vue

@@ -810,7 +810,21 @@
           <template v-if="isChangeDialog">
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
             <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
+            <el-button
+              v-if="isProjectChangeModule && !dialogReadonly"
+              type="primary"
+              plain
+              :loading="submitLoading"
+              @click="saveProjectChangeDraft"
+            >
+              保存
+            </el-button>
+            <el-button
+              v-if="!dialogReadonly"
+              type="primary"
+              :loading="submitLoading"
+              @click="submitChangeProject"
+            >
               提交
             </el-button>
           </template>
@@ -985,6 +999,7 @@ import {
   projectTypeOptions,
 } from '@/option/business/common';
 import { config, option } from '@/option/business/project-apply';
+import * as projectChangeApi from '@/api/business/project-change';
 
 const emptyForm = () => ({
   projectType: '',
@@ -1060,6 +1075,9 @@ const attachmentViewerPlugins = [
 const projectApplyListRoute = '/business/project-apply';
 const projectApplyFormRoute = '/business/project-apply/form';
 const projectApplyListRefreshKey = 'project-apply-list-refresh';
+const projectChangeListRoute = '/business/project-change';
+const projectChangeFormRoute = '/business/project-change/form';
+const projectChangeListRefreshKey = 'project-change-list-refresh';
 
 const otherAttachmentType = { label: '其他附件', value: '其他附件' };
 
@@ -1245,7 +1263,40 @@ export default {
           },
         ],
         changeReason: [
-          { max: 2000, message: '变更原因不能超过2000个字符', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value || !String(value).trim()) {
+                callback(new Error('请输入变更原因'));
+                return;
+              }
+              if (String(value).length > 2000) {
+                callback(new Error('变更原因不能超过2000个字符'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
+        changeType: [
+          {
+            validator: (rule, value, callback) => {
+              if (!this.isChangeDialog) {
+                callback();
+                return;
+              }
+              if (!value) {
+                callback(new Error('请选择变更类型'));
+                return;
+              }
+              callback();
+            },
+            trigger: 'change',
+          },
         ],
         projectIntro: [
           { max: 1000, message: '项目简介不能超过1000个字符', trigger: 'blur' },
@@ -1374,8 +1425,11 @@ export default {
     isMajorProjectSupplementDialog() {
       return this.dialogType === 'majorSupplement';
     },
+    isProjectChangeModule() {
+      return this.$route.path === projectChangeFormRoute;
+    },
     isChangeDialog() {
-      return this.dialogType === 'change';
+      return this.dialogType === 'change' || this.isProjectChangeModule;
     },
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
@@ -1384,7 +1438,13 @@ export default {
       return this.isFormPageInstance;
     },
     isPublicViewPage() {
-      return this.$route.path === '/business/project-apply/public-view';
+      return (
+        this.$route.path === '/business/project-apply/public-view' ||
+        this.$route.path === '/business/project-change/public-view'
+      );
+    },
+    publicBizType() {
+      return this.$route.meta?.bizType || 'project-apply';
     },
     projectFormContainer() {
       // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
@@ -1451,7 +1511,7 @@ export default {
     this.loadCargoTypeOptions();
     this.loadTransportTypeOptions();
     this.loadSettlementModeOptions();
-    if (this.$route.path === projectApplyFormRoute) {
+    if (this.$route.path === projectApplyFormRoute || this.$route.path === projectChangeFormRoute) {
       this.isFormPageInstance = true;
       this.openProjectFormPage();
     }
@@ -1517,14 +1577,14 @@ export default {
     },
     openPublicProjectForm() {
       const id = this.$route.query.id;
-      this.dialogType = 'view';
+      this.dialogType = this.publicBizType === 'project-change' ? 'change' : 'view';
       this.dialogReadonly = true;
       this.projectBox = true;
       if (!id) {
         this.$message.error('缺少项目ID');
         return;
       }
-      getMkPublicDetail('project-apply', id)
+      getMkPublicDetail(this.publicBizType, id)
         .then(res => {
           const detail = res.data?.data || {};
           this.applyPublicDictOptions(detail);
@@ -1587,9 +1647,25 @@ export default {
     openProjectFormPage() {
       const type = this.$route.query.mode || 'add';
       const id = this.$route.query.id;
-      this.dialogType = type;
+      this.dialogType = this.isProjectChangeModule ? (type === 'view' ? 'view' : 'change') : type;
       this.dialogReadonly = type === 'view';
       this.projectBox = true;
+      if (this.isProjectChangeModule) {
+        if (!id) {
+          this.$message.error('缺少项目变更ID');
+          return;
+        }
+        projectChangeApi.getDetail(id).then(res => {
+          const detail = res.data.data || {};
+          this.applyProjectDetail({
+            ...detail,
+            changeType: detail.changeType || '项目变更',
+            changeNo: detail.changeNo || '',
+            changeDate: detail.changeDate || this.$dayjs().format('YYYY-MM-DD'),
+          });
+        });
+        return;
+      }
       if (['add', 'majorSupplement'].includes(type)) {
         this.applyProjectDetail({
           ...emptyForm(),
@@ -1613,6 +1689,12 @@ export default {
     },
     closeProjectForm() {
       if (this.isProjectFormPage) {
+        if (this.isProjectChangeModule) {
+          sessionStorage.setItem(projectChangeListRefreshKey, '1');
+          this.$router.$avueRouter?.closeTag?.();
+          this.$router.push(projectChangeListRoute);
+          return;
+        }
         this.markProjectApplyListNeedRefresh();
         this.$router.$avueRouter?.closeTag?.();
         this.$router.push(projectApplyListRoute);
@@ -1858,7 +1940,7 @@ export default {
     },
     handleCustomOperation(operation, row) {
       if (operation.action === 'startChange') {
-        this.openProjectDialog('change', row);
+        this.startIndependentProjectChange(row);
         return;
       }
       if (operation.action === 'mkAudit') {
@@ -2169,6 +2251,52 @@ export default {
         this.closeProjectForm();
       });
     },
+    startIndependentProjectChange(row) {
+      if (!row?.id) {
+        this.$message.warning('项目ID为空，无法发起变更');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '正在创建项目变更单…',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      projectChangeApi
+        .createFromProject(row.id)
+        .then(res => {
+          if (res.data?.success === false) {
+            this.$message.error(res.data?.msg || '创建项目变更失败');
+            return;
+          }
+          const detail = res.data?.data || {};
+          if (!detail.id) {
+            this.$message.error('创建项目变更失败：未返回变更单ID');
+            return;
+          }
+          this.$router.push({
+            path: projectChangeFormRoute,
+            query: { mode: 'edit', id: detail.id, name: '项目变更' },
+          });
+        })
+        .finally(() => loading.close());
+    },
+    saveProjectChangeDraft() {
+      if (!this.isProjectChangeModule) return;
+      this.submitLoading = true;
+      projectChangeApi
+        .saveDraft(this.normalizeSubmitForm({ includeChangeType: true }))
+        .then(res => {
+          if (res.data?.success === false || res.data?.data === false) {
+            this.$message.error(res.data?.msg || '保存失败，请联系管理员');
+            return;
+          }
+          this.$message.success('保存成功!');
+          this.closeProjectForm();
+        })
+        .finally(() => {
+          this.submitLoading = false;
+        });
+    },
     submitChangeProject() {
       this.$refs.projectForm.validate(valid => {
         if (!valid) {
@@ -2177,7 +2305,34 @@ export default {
         }
         if (!this.validateAttachmentFileTypes()) return;
         this.submitLoading = true;
-        // 变更记录仅在提交时生成，保存草稿不落记录
+        if (this.isProjectChangeModule) {
+          const payload = this.normalizeSubmitForm({ includeChangeType: true });
+          const approvalStatus = this.form.approvalStatus || '';
+          projectChangeApi
+            .submit(payload)
+            .then(res => {
+              if (res.data?.success === false || res.data?.data === false) {
+                this.$message.error(res.data?.msg || '提交失败，请联系管理员');
+                return;
+              }
+              const id = this.form.id;
+              return submitMkApprovalFlow({
+                bizType: 'project-change',
+                bizId: id,
+                subjectName: this.form.projectName || '',
+                approvalStatus,
+                mkEnabled: this.mkEnabled,
+              }).then(() => {
+                this.$message.success('提交成功!');
+                this.closeProjectForm();
+              });
+            })
+            .finally(() => {
+              this.submitLoading = false;
+            });
+          return;
+        }
+        // 兼容旧入口：变更记录仅在提交时生成，保存草稿不落记录
         this.api
           .submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
           .then(res => {

src/views/business/project-change.vue

@@ -0,0 +1,362 @@
+<template>
+  <basic-container class="project-change-page">
+    <avue-crud
+      :option="tableOption"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model="tableForm"
+      ref="crud"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="hasPermission(`${config.permission}_delete`)"
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
+      </template>
+
+      <template #approvalStatus="{ row }">
+        {{ row.approvalStatusName || statusLabel(row.approvalStatus) }}
+      </template>
+
+      <template #syncStatus="{ row }">
+        <el-tag v-if="row.syncStatus" :type="syncTagType(row.syncStatus)" class="status-text">
+          {{ syncLabel(row.syncStatus) }}
+        </el-tag>
+        <span v-else>-</span>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link
+          type="primary"
+          v-if="canView(row)"
+          @click="openForm('view', row)"
+        >
+          查看
+        </el-link>
+        <el-link type="primary" v-if="canEdit(row)" @click="openForm('edit', row)">
+          编辑
+        </el-link>
+        <el-link
+          type="danger"
+          v-if="canDelete(row)"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+        <el-link
+          v-for="operation in customOperations(row)"
+          :key="operation.action"
+          :type="operation.type === 'warning' ? 'warning' : operation.type === 'success' ? 'success' : 'primary'"
+          @click="handleCustomOperation(operation, row)"
+        >
+          {{ operation.label }}
+        </el-link>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import * as api from '@/api/business/project-change';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { config, option } from '@/option/business/project-change';
+import { approvalStatusOptions } from '@/option/business/common';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { isAdministrator } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+
+const projectChangeFormRoute = '/business/project-change/form';
+const projectChangeListRefreshKey = 'project-change-list-refresh';
+
+export default {
+  name: 'ProjectChange',
+  data() {
+    return {
+      api,
+      config,
+      tableForm: {},
+      tableOption: this.buildTableOption(),
+      loading: true,
+      data: [],
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      query: {},
+      selectionList: [],
+      mkEnabled: false,
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo', 'website']),
+    permissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+      };
+    },
+    isAdmin() {
+      return isAdministrator(this.userInfo);
+    },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
+  },
+  created() {
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
+  },
+  activated() {
+    if (sessionStorage.getItem(projectChangeListRefreshKey)) {
+      sessionStorage.removeItem(projectChangeListRefreshKey);
+      this.onLoad(this.page, this.query);
+    }
+  },
+  methods: {
+    buildTableOption() {
+      return {
+        ...option,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        menuWidth: 320,
+        column: (option.column || []).map(column => ({
+          ...column,
+          display: false,
+          align: 'center',
+          headerAlign: 'center',
+        })),
+      };
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission && this.permission[code], false);
+    },
+    statusLabel(status) {
+      return approvalStatusOptions.find(item => item.value === status)?.label || status || '-';
+    },
+    syncLabel(value) {
+      return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
+    },
+    syncTagType(value) {
+      return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
+    },
+    inStatus(row, statusList) {
+      if (!statusList || !statusList.length) return true;
+      return statusList.includes(row.approvalStatus);
+    },
+    canEdit(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_edit`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.editStatus)
+      );
+    },
+    canDelete(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_delete`) &&
+        !row.readonly &&
+        this.inStatus(row, this.config.deleteStatus)
+      );
+    },
+    canView(row) {
+      return (
+        this.hasPermission(`${this.config.permission}_view`) &&
+        this.inStatus(row, this.config.viewStatus)
+      );
+    },
+    canOperation(operation, row) {
+      if (operation.permission && !this.hasPermission(operation.permission)) return false;
+      if (row.readonly && ['submitApproval', 'withdraw', 'approve', 'reject'].includes(operation.action)) {
+        return false;
+      }
+      return this.inStatus(row, operation.status);
+    },
+    customOperations(row) {
+      return (this.config.operations || []).filter(operation => {
+        if (operation.mkOnly && !this.mkEnabled) return false;
+        if (operation.localOnly && this.mkEnabled) return false;
+        return this.canOperation(operation, row);
+      });
+    },
+    openForm(mode, row = {}) {
+      const query = { mode, id: row.id };
+      if (mode === 'edit') query.name = '编辑项目变更';
+      else if (mode === 'view') query.name = '查看项目变更';
+      this.$router.push({ path: projectChangeFormRoute, query });
+    },
+    handleCustomOperation(operation, row) {
+      if (operation.action === 'mkAudit') {
+        this.handleMkAudit(row);
+        return;
+      }
+      const run = () => {
+        const request = () => this.api[operation.action](row.id);
+        const afterMk =
+          operation.action === 'submitApproval'
+            ? submitMkApprovalFlow({
+                bizType: 'project-change',
+                bizId: row.id,
+                subjectName: row.projectName || '',
+                approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
+              }).then(() => request())
+            : request();
+        const loading =
+          operation.action === 'approve'
+            ? this.$loading({
+                lock: true,
+                text: '正在推送合规，请稍候…',
+                background: 'rgba(255, 255, 255, 0.6)',
+              })
+            : null;
+        afterMk
+          .then(res => {
+            if (operation.action === 'approve' && res.data?.data === false) {
+              this.$message.warning(res.data?.msg);
+              this.onLoad(this.page, this.query);
+              return;
+            }
+            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);
+          })
+          .finally(() => loading && loading.close());
+      };
+      this.$confirm(operation.confirm || `确定${operation.label}该${this.config.title}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => run());
+    },
+    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('获取审核跳转地址失败');
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud?.toggleSelection?.();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(row.id).then(() => {
+          this.$message.success('删除成功!');
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    handleDelete() {
+      if (!this.selectionList.length) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.api.remove(this.ids).then(() => {
+          this.$message.success('删除成功!');
+          this.selectionClear();
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const values = {
+        ...this.query,
+        ...params,
+      };
+      this.api
+        .getList(page.currentPage, page.pageSize, values)
+        .then(res => {
+          const data = res.data.data || {};
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          this.loading = false;
+          this.selectionClear();
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.project-change-page {
+  :deep(.avue-crud__menu) {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>

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

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

src/views/payment/bill-payment.vue

@@ -156,9 +156,17 @@ export default {
         });
     },
     async handleApprove(row) {
-      await api.approve({ id: row.id });
-      this.$message.success('审批通过');
-      this.loadTable();
+      await this.$confirm('确认审批通过该汇票付款？', '提示', { type: 'warning' });
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        await api.approve({ id: row.id });
+        this.$message.success('审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回');

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

@@ -251,10 +251,10 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="不含税单价" min-width="130">
+            <el-table-column label="合计金额" min-width="140">
               <template #default="{ row }">
                 <el-input-number
-                  v-model="row.unitPriceNoTax"
+                  v-model="row.totalAmount"
                   :disabled="readonly"
                   :min="0"
                   :precision="2"
@@ -263,9 +263,6 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column label="不含税金额" min-width="130" align="right">
-              <template #default="{ row }">{{ formatMoney(row.amountNoTax) }}</template>
-            </el-table-column>
             <el-table-column label="税率" min-width="110">
               <template #default="{ row }">
                 <el-select
@@ -282,17 +279,26 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="税额" min-width="120">
-              <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+            <el-table-column label="不含税单价" min-width="140" align="right">
+              <template #default="{ row }">{{ formatUnitPrice(row.unitPriceNoTax) }}</template>
             </el-table-column>
-            <el-table-column label="合计" min-width="130" align="right">
-              <template #default="{ row }">{{ formatMoney(row.totalAmount) }}</template>
+            <el-table-column label="不含税金额" min-width="130" align="right">
+              <template #default="{ row }">{{ formatMoney(row.amountNoTax) }}</template>
+            </el-table-column>
+            <el-table-column label="税额" min-width="120" align="right">
+              <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
             </el-table-column>
             <el-table-column label="备注" min-width="170">
               <template #default="{ row }">
                 <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
               </template>
             </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
             <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
               <template #default="{ $index }">
                 <div class="invoice-form-page__links">
@@ -323,17 +329,8 @@
           <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="160">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.allocatedInvoiceAmount"
-                :disabled="readonly"
-                :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
-                :precision="2"
-                :controls="false"
-              />
-            </template>
+          <el-table-column label="分摊发票金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
           </el-table-column>
         </el-table>
       </section-card>
@@ -454,6 +451,9 @@
         <el-table-column label="结算金额" min-width="130" align="right">
           <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
         </el-table-column>
+        <el-table-column label="已申请开票金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.invoicedAmount) }}</template>
+        </el-table-column>
         <el-table-column label="可开票金额" min-width="140" align="right">
           <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
         </el-table-column>
@@ -861,7 +861,6 @@ export default {
               keyword: this.settlementDialog.keyword,
               contractCategory: '客户合同',
               settlementType: 'receivable',
-              invoiceStatus: 'unreceived',
             }
           )
         );
@@ -913,7 +912,7 @@ export default {
         ...item,
         formalSettlementId: item.id,
         settlementId: item.id,
-        allocatedInvoiceAmount: rows.length === 1 ? Number(item.availableInvoiceAmount || 0) : 0,
+        allocatedInvoiceAmount: 0,
       }));
       this.form.projectName = first.projectName;
       this.form.deptName = first.deptName;
@@ -1108,15 +1107,30 @@ export default {
     addLine(sheet) {
       sheet.lines.push(emptyLine());
     },
+    /**
+     * 填写合计金额 + 税率后反算：
+     * 合计金额 = 数量 × 不含税单价 × (1 + 税率)
+     * 不含税单价 = 合计金额 / 数量 / (1 + 税率)，保留 6 位小数
+     * 不含税金额 = 数量 × 不含税单价，保留 2 位小数
+     */
     recalculateLine(row) {
       const quantity = Number(row.quantity || 0);
-      const unitPrice = Number(row.unitPriceNoTax || 0);
-      const amountNoTax = Number((quantity * unitPrice).toFixed(2));
+      const totalAmount = Number(Number(row.totalAmount || 0).toFixed(2));
       const rate = Number(row.taxRate || 0) / 100;
+      row.totalAmount = totalAmount;
+      row.amountWithTax = totalAmount;
+      if (quantity <= 0 || totalAmount <= 0) {
+        row.unitPriceNoTax = 0;
+        row.amountNoTax = 0;
+        row.taxAmount = 0;
+        return;
+      }
+      const factor = 1 + rate;
+      const unitPriceNoTax = Number((totalAmount / quantity / factor).toFixed(6));
+      const amountNoTax = Number((quantity * unitPriceNoTax).toFixed(2));
+      row.unitPriceNoTax = unitPriceNoTax;
       row.amountNoTax = amountNoTax;
-      row.taxAmount = rate ? Number((amountNoTax * rate).toFixed(2)) : 0;
-      row.totalAmount = Number((amountNoTax + row.taxAmount).toFixed(2));
-      row.amountWithTax = row.totalAmount;
+      row.taxAmount = Number((totalAmount - amountNoTax).toFixed(2));
     },
     validateBusiness() {
       if (!this.selectedDetailIds.length) throw new Error('请至少选择一条开票明细');
@@ -1129,12 +1143,14 @@ export default {
         for (const line of sheet.lines) {
           if (!line.goodsCategory || !line.goodsName) throw new Error('请完整填写商品和服务信息');
           if (
-            [line.quantity, line.unitPriceNoTax, line.amountNoTax, line.taxRate].some(
+            [line.quantity, line.totalAmount, line.unitPriceNoTax, line.amountNoTax, line.taxRate].some(
               Number.isNaN
             )
           ) {
             throw new Error('开票商品行金额格式不正确');
           }
+          if (Number(line.quantity || 0) <= 0) throw new Error('开票商品行数量必须大于0');
+          if (Number(line.totalAmount || 0) <= 0) throw new Error('开票商品行合计金额必须大于0');
         }
       }
     },
@@ -1234,6 +1250,9 @@ export default {
     formatMoney(value) {
       return Number(value || 0).toFixed(2);
     },
+    formatUnitPrice(value) {
+      return Number(value || 0).toFixed(6);
+    },
   },
 };
 </script>

src/views/payment/invoice-application.vue

@@ -125,6 +125,17 @@
               {{ displayValue(row[column.prop]) }}
             </el-tag>
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
+            <template v-else-if="column.prop === 'kingdeeStatusName'">
+              <el-tooltip
+                :disabled="row.kingdeeStatus !== 'failed'"
+                :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+                placement="top"
+              >
+                <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
+                  row.kingdeeStatusName || '-'
+                }}</el-tag>
+              </el-tooltip>
+            </template>
             <template v-else-if="column.prop === 'kingdeeLockStatus'">
               <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
                 <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -238,6 +249,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 const emptyQuery = () => ({
   applicationNo: '',
@@ -500,6 +512,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };

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

@@ -2702,7 +2702,8 @@ export default {
           this.referenceParams('formal')
         );
         const data = this.unwrapData(response) || {};
-        const records = data.records || [];
+        // 已调整的结算单为调整重推后的归档原单，金额已作废，不可再发起付款
+        const records = (data.records || []).filter(row => row.adjustStatus !== 'adjusted');
         this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
         this.formalPage.total = Number(data.total || 0);
       } finally {
@@ -3124,18 +3125,21 @@ export default {
       if (!target) return;
       target.paymentRatio = value;
       this.syncRowPayment(target, 'ratio');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
     handleRowAppliedAmountChange(row, value) {
       const target = this.findReferenceRow(row);
       if (!target) return;
       target.appliedAmount = value;
       this.syncRowPayment(target, 'amount');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
-    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
-    syncHeaderSettlementTotalsFromRows() {
-      if (this.referenceRows.length <= 1) return;
+    /**
+     * 结算信息行合计回填付款基本信息。
+     * @param {boolean} syncApplied 行内编辑时同步申请付款金额与比例；回显加载时保持原值，避免改写历史单据
+     */
+    syncHeaderSettlementTotalsFromRows(syncApplied = false) {
+      if (!this.referenceRows.length) return;
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -3144,9 +3148,21 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
       this.amountSyncing = true;
       this.form.settlementAmount = Number(settlementAmount.toFixed(2));
       this.form.payableAmount = Number(payableAmount.toFixed(2));
+      if (syncApplied) {
+        this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+        if (this.paymentAmountBase) {
+          this.form.paymentRatio = Number(
+            ((appliedAmount / this.paymentAmountBase) * 100).toFixed(2)
+          );
+        }
+      }
       this.$nextTick(() => {
         this.amountSyncing = false;
         this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
@@ -3320,6 +3336,18 @@ export default {
           ElMessage.warning(`${exceededRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
           return false;
         }
+        const rowAppliedTotal = this.referenceRows.reduce(
+          (total, item) => total + Number(item.appliedAmount || 0),
+          0
+        );
+        // 金蝶按付款基本信息申请金额推单，行合计不等时预付建档分摊会与金蝶金额不一致
+        if (Math.abs(rowAppliedTotal - appliedAmount) > 0.005) {
+          this.clearMessages();
+          ElMessage.warning(
+            `结算行付款金额合计${rowAppliedTotal.toFixed(2)}与申请付款金额${appliedAmount.toFixed(2)}不一致，请调整`
+          );
+          return false;
+        }
       }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
         this.clearMessages();

src/views/payment/payment-application.vue

@@ -68,6 +68,18 @@
         <span v-else>-</span>
       </template>
 
+      <template #kingdeeStatusName="{ row }">
+        <el-tooltip
+          :disabled="row.kingdeeStatus !== 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+          placement="top"
+        >
+          <el-tag :type="kingdeeStatusType(row.kingdeeStatus)">{{
+            row.kingdeeStatusName || '-'
+          }}</el-tag>
+        </el-tooltip>
+      </template>
+
       <template #menu="{ row }">
         <el-link
           v-if="hasPermission('payment_application_view')"
@@ -151,6 +163,7 @@ import { paymentApplicationOption } from '@/option/payment/paymentApplication';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 const paymentApplicationListRoute = '/payment/payment-application';
 const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
@@ -328,15 +341,17 @@ export default {
       this.refreshChange();
     },
     async handleApprove(row) {
-      // 防止重复点击：请求进行中忽略后续点击
+      // 防止重复点击：请求进行中忽略后续点击，避免重复审批和重复提示
       if (this.approveLoading) return;
       this.approveLoading = true;
-      const loading = this.$loading({
-        lock: true,
-        text: '审批处理中，请稍候…',
-        background: 'rgba(255, 255, 255, 0.6)',
-      });
+      let loading = null;
       try {
+        await this.$confirm('确认审批通过该付款申请？', '提示', { type: 'warning' });
+        loading = this.$loading({
+          lock: true,
+          text: '审批处理中，请稍候…',
+          background: 'rgba(255, 255, 255, 0.6)',
+        });
         const res = await api.approve({ id: row.id });
         // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
         if (res.data.data === false) {
@@ -346,7 +361,7 @@ export default {
         }
         this.refreshChange();
       } finally {
-        loading.close();
+        loading?.close();
         this.approveLoading = false;
       }
     },
@@ -461,6 +476,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };

src/views/payment/receipt-claim-record-form.vue

@@ -4,7 +4,7 @@
       <section-card title="收款信息">
         <el-row :gutter="32">
           <el-col :span="6">
-            <el-form-item label="认领通知单">
+            <el-form-item label="收款单号">
               <el-input v-model="form.receiptNoticeNo" disabled />
             </el-form-item>
           </el-col>

src/views/payment/receipt-claim-record.vue

@@ -3,7 +3,7 @@
     <section-card v-if="searchVisible" class="claim-record-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="claim-record-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
             <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="对方户名">
@@ -56,16 +56,6 @@
           <el-form-item v-show="searchExpanded" label="所属组织">
             <el-input v-model="query.claimerDeptName" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item v-show="searchExpanded" label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item v-show="searchExpanded" label="金蝶单据状态">
             <el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
               <el-option
@@ -93,9 +83,6 @@
 
     <section class="claim-record-page__table-panel">
       <div class="claim-record-page__toolbar">
-        <el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
-          查询金蝶认领结果
-        </el-button>
         <table-header-tools
           :columns="columns"
           v-model:visible-column-keys="visibleColumnKeys"
@@ -131,11 +118,7 @@
         <el-table-column label="操作" width="120" fixed="right" align="center">
           <template #default="{ row }">
             <el-link
-              v-if="
-                hasPermission('receipt_claim_record_void') &&
-                  row.claimStatus === 'claimed' &&
-                  row.pushStatus !== 'pushed'
-              "
+              v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
               type="danger"
               @click="handleVoid(row)"
               >作废</el-link
@@ -181,7 +164,6 @@ const emptyQuery = () => ({
   claimDateRange: [],
   claimerDeptName: '',
   kingdeeBillStatus: '',
-  pushStatus: '',
 });
 
 export default {
@@ -195,17 +177,15 @@ export default {
       searchExpanded: false,
       // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
       searchIndex: 4,
-      searchItemCount: 11,
+      searchItemCount: 10,
       searchVisible: true,
       tableSize: 'default',
       claimStatusOptions: api.claimStatusOptions,
       kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
       columns: receiptClaimRecordTableColumns,
       visibleColumnKeys: receiptClaimRecordTableColumns.map(column => column.prop),
       rows: [],
       loading: false,
-      refreshing: false,
       page: { current: 1, size: 10, total: 0 },
     };
   },
@@ -272,7 +252,7 @@ export default {
     },
     async handleVoid(row) {
       await this.$confirm(
-        '作废后将回退本次认领金额，是否继续？',
+        '作废后将回退本次认领金额，并同步作废合同合规系统认领记录，是否继续？',
         '作废认领记录',
         { type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' }
       );
@@ -280,16 +260,6 @@ export default {
       this.$message.success('作废成功');
       await this.loadTable();
     },
-    async handleRefreshKingdeeResult() {
-      this.refreshing = true;
-      try {
-        const updated = Number(this.unwrapData(await api.queryKingdeeResult()) || 0);
-        this.$message.success(`金蝶认领结果回写完成，更新${updated}条`);
-        await this.loadTable();
-      } finally {
-        this.refreshing = false;
-      }
-    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },

src/views/payment/receipt-flow-batch-form.vue

@@ -7,7 +7,7 @@
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
             min-width="160"
             show-overflow-tooltip
           />
@@ -43,8 +43,8 @@
           <el-table-column label="已认领金额" min-width="130" align="right">
             <template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
           </el-table-column>
-          <el-table-column label="金蝶未认领金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
+          <el-table-column label="未匹配金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
           </el-table-column>
           <el-table-column label="剩余可认领金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
@@ -96,7 +96,7 @@
               formatMoney(row.settlement.claimedReceiptAmount)
             }}</template>
           </el-table-column>
-          <el-table-column label="认领通知单" min-width="180">
+          <el-table-column label="收款单号" min-width="180">
             <template #default="{ row }">{{ row.flow.receiptNoticeNo || '-' }}</template>
           </el-table-column>
           <el-table-column label="收款金额" min-width="140" align="right">
@@ -302,10 +302,8 @@ export default {
       );
     },
     flowRemaining(flow) {
-      const unclaimed = Number(flow.unclaimedAmount || 0);
-      const receipt = Number(flow.receiptAmount || 0);
-      const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
+      return Math.max(Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0), 0);
     },
     maxAllocation(row) {
       const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
@@ -355,12 +353,8 @@ export default {
       }
       for (const flow of this.flows) {
         const total = this.flowAllocatedTotal(flow.id);
-        const remaining = Math.max(
-          Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
-          0
-        );
-        if (total > remaining + 0.001) {
-          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
+        if (total > this.flowRemaining(flow) + 0.001) {
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过剩余可认领金额`);
           return;
         }
       }

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

@@ -12,7 +12,7 @@
       <section-card title="收款信息">
         <el-row :gutter="32">
           <el-col :span="6"
-            ><el-form-item label="认领通知单"
+            ><el-form-item label="收款单号"
               ><el-input v-model="form.receiptNoticeNo" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
@@ -48,8 +48,8 @@
               ><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
-            ><el-form-item label="金蝶未认领金额"
-              ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
+            ><el-form-item label="未匹配金额"
+              ><el-input :model-value="formatMoney(form.unmatchAmountRec)" disabled /></el-form-item
           ></el-col>
           <el-col :span="6"
             ><el-form-item label="剩余可认领金额"
@@ -205,7 +205,7 @@ const emptyForm = () => ({
   transactionTime: '',
   detailSerialNo: '',
   claimedAmount: 0,
-  unclaimedAmount: 0,
+  unmatchAmountRec: 0,
   claimerName: '',
   claimerDeptName: '',
   claimDate: '',
@@ -252,11 +252,10 @@ export default {
       );
     },
     claimableAmount() {
-      const unclaimed = Number(this.form.unclaimedAmount || 0);
+      // 认领只登记本地：剩余可认领 = 收款金额 − 已认领金额
       const receipt = Number(this.form.receiptAmount || 0);
-      const ceiling =
-        unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - Number(this.form.claimedAmount || 0), 0);
+      const claimed = Number(this.form.claimedAmount || 0);
+      return Math.max(receipt - claimed, 0);
     },
   },
   created() {

src/views/payment/receipt-flow.vue

@@ -3,7 +3,7 @@
     <section v-if="searchVisible" class="receipt-flow-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="receipt-flow-page__search-grid">
-          <el-form-item label="认领通知单">
+          <el-form-item label="收款单号">
             <el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="对方户名">
@@ -15,16 +15,6 @@
           <el-form-item label="对方账号">
             <el-input v-model="query.counterpartyAccount" clearable placeholder="请输入" />
           </el-form-item>
-          <el-form-item label="推送状态">
-            <el-select v-model="query.pushStatus" clearable placeholder="请选择">
-              <el-option
-                v-for="item in pushStatusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="认领状态">
             <el-select v-model="query.claimStatus" clearable placeholder="请选择">
               <el-option
@@ -159,23 +149,10 @@
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="170" fixed="right" align="center">
+        <el-table-column label="操作" width="100" fixed="right" align="center">
           <template #default="{ row }">
-            <el-link
-              v-if="canClaim(row)"
-              type="primary"
-              :disabled="pushingId === row.id"
-              @click="openClaim(row)"
-              >认领</el-link
-            >
-            <el-link
-              v-if="canPush(row)"
-              type="warning"
-              :disabled="pushingId === row.id"
-              @click="handlePush(row)"
-              >推送金蝶</el-link
-            >
-            <span v-if="!canClaim(row) && !canPush(row)">-</span>
+            <el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
+            <span v-else>-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -201,13 +178,13 @@
     >
       <div v-loading="detailDialog.loading">
         <el-descriptions :column="3" border>
-          <el-descriptions-item label="认领通知单">
+          <el-descriptions-item label="收款单号">
             {{ displayValue(detailDialog.data.receiptNoticeNo) }}
           </el-descriptions-item>
           <el-descriptions-item label="付款人">
             {{ displayValue(detailDialog.data.payerName) }}
           </el-descriptions-item>
-          <el-descriptions-item label="付款金额">
+          <el-descriptions-item label="收款金额">
             {{ formatMoney(detailDialog.data.receiptAmount) }}
           </el-descriptions-item>
           <el-descriptions-item label="交易时间">
@@ -236,13 +213,8 @@
           <el-descriptions-item label="剩余可认领金额">
             {{ formatMoney(detailDialog.data.remainingAmount) }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶未认领金额">
-            {{ formatMoney(detailDialog.data.unclaimedAmount) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="推送状态">
-            <el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
-              {{ displayValue(detailDialog.data.pushStatusName) }}
-            </el-tag>
+          <el-descriptions-item label="未匹配金额">
+            {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
           </el-descriptions-item>
           <el-descriptions-item label="金蝶收款单号">
             {{ displayValue(detailDialog.data.kingdeeBillNo) }}
@@ -250,9 +222,6 @@
           <el-descriptions-item label="金蝶状态">
             {{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
           </el-descriptions-item>
-          <el-descriptions-item label="推送失败原因">
-            {{ displayValue(detailDialog.data.pushFailReason) }}
-          </el-descriptions-item>
           <el-descriptions-item label="摘要">
             {{ displayValue(detailDialog.data.summary) }}
           </el-descriptions-item>
@@ -267,9 +236,7 @@
           </el-table-column>
           <el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
           <el-table-column label="状态变化" min-width="170" align="center">
-            <template #default="{ row }">
-              {{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
-            </template>
+            <template #default="{ row }">{{ claimStatusChange(row) }}</template>
           </el-table-column>
           <el-table-column prop="content" label="认领说明" min-width="220" />
         </el-table>
@@ -297,7 +264,6 @@ const emptyQuery = () => ({
   summary: '',
   detailSerialNo: '',
   claimStatus: '',
-  pushStatus: '',
   kingdeeBillStatus: '',
   receiptAmountStart: undefined,
   receiptAmountEnd: undefined,
@@ -314,7 +280,6 @@ export default {
       ArrowUp,
       query: emptyQuery(),
       claimStatusOptions: api.claimStatusOptions,
-      pushStatusOptions: api.pushStatusOptions,
       kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
       columns: receiptFlowTableColumns,
       visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop),
@@ -324,7 +289,6 @@ export default {
       selectedRows: [],
       loading: false,
       syncing: false,
-      pushingId: null,
       searchExpanded: false,
       // 与 avue-crud 一致：搜索项数量超过 searchIndex（默认一行 4 项）时才显示“展开/收起”
       searchIndex: 4,
@@ -389,7 +353,7 @@ export default {
       this.syncing = true;
       try {
         const syncedCount = Number(this.unwrapData(await api.sync()) || 0);
-        this.$message.success(`流水同步完成，共同步${syncedCount}条认领公告`);
+        this.$message.success(`流水同步完成，共同步${syncedCount}条收款流水`);
         await this.loadTable();
       } finally {
         this.syncing = false;
@@ -448,38 +412,7 @@ export default {
     canClaim(row) {
       return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
     },
-    canPush(row) {
-      return (
-        this.hasPermission('receipt_flow_push') &&
-        !!row.billId &&
-        row.claimStatus === 'claimed' &&
-        row.pushStatus !== 'pushed'
-      );
-    },
-    async handlePush(row) {
-      try {
-        await this.$confirm(
-          `确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单？`,
-          '推送金蝶',
-          { type: 'warning' }
-        );
-      } catch {
-        return;
-      }
-      this.pushingId = row.id;
-      try {
-        const data = this.unwrapData(await api.pushKingdee(row.id));
-        const billNo = data?.kingdeeBillNo;
-        this.$message.success(billNo ? `推送成功，金蝶收款单号：${billNo}` : '推送成功');
-        await this.loadTable();
-      } finally {
-        this.pushingId = null;
-      }
-    },
     statusType(row, column) {
-      if (column?.prop === 'pushStatusName') {
-        return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info';
-      }
       return (
         { claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || ''
       );

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

@@ -559,7 +559,7 @@
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             prop="receiptNoticeNo"
-            label="认领通知单"
+            label="收款单号"
             min-width="160"
             align="center"
           />
@@ -1388,16 +1388,12 @@ export default {
       },
       immediate: true,
     },
-    summaryTotal(value) {
-      this.form.settlementAmount = Number(value || 0).toFixed(2);
-      this.form.localSettlementAmount = (
-        Number(value || 0) * Number(this.form.exchangeRate || 1)
-      ).toFixed(2);
+    summaryTotal() {
+      this.syncSettlementAmountsFromSummary();
     },
-    'form.exchangeRate'(value) {
-      this.form.localSettlementAmount = (
-        Number(this.summaryTotal || 0) * Number(value || 1)
-      ).toFixed(2);
+    'form.exchangeRate'() {
+      if (this._skipExchangeRateRebuild) return;
+      this.buildSummaryFeesFromDetails();
     },
   },
   methods: {
@@ -1683,8 +1679,9 @@ export default {
           current.settlementAmount = current.originalAmount;
           summaryMap.set(key, current);
         });
+      // 先保留预结算手工费用行，再按明细本位币 + 结算汇率重算系统归集行
       this.summaryFees = [...summaryMap.values()];
-      if (!this.summaryFees.length) await this.refreshSummaryFees();
+      await this.refreshSummaryFees();
     },
     async loadAllContracts() {
       const response = await getContractOptions('');
@@ -1786,13 +1783,19 @@ export default {
     },
     async fetchBfiExchangeRate() {
       const currency = this.form.currency;
-      if (!currency || currency === 'RMB') return;
+      if (!currency || currency === 'RMB') {
+        this.buildSummaryFeesFromDetails();
+        return;
+      }
       if (!this.form.exchangeRateDate) return;
       try {
         const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
         const rateData = data?.data;
         if (rateData?.excval != null) {
+          this._skipExchangeRateRebuild = true;
           this.form.exchangeRate = Number(rateData.excval);
+          this._skipExchangeRateRebuild = false;
+          this.buildSummaryFeesFromDetails();
         } else {
           this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
         }
@@ -1800,6 +1803,37 @@ export default {
         this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
       }
     },
+    /**
+     * 明细金额按本位币理解；外币结算时结算合计原金额/结算金额 = 本位币金额 / 结算汇率。
+     */
+    convertLocalToSettlementAmount(localAmount) {
+      const amount = Number(localAmount || 0);
+      if (!Number.isFinite(amount)) return 0;
+      if (this.isLocalCurrencySettlement) {
+        return Number(amount.toFixed(2));
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      if (rate <= 0) return 0;
+      return Number((amount / rate).toFixed(2));
+    },
+    /**
+     * 结算金额取结算合计原币汇总值；本位币合计 = 结算金额 × 结算汇率。
+     */
+    syncSettlementAmountsFromSummary() {
+      const settlementTotal = this.summaryFees.reduce(
+        (total, row) => total + Number(row.settlementAmount || 0),
+        0
+      );
+      this.form.settlementAmount = Number(settlementTotal || 0).toFixed(2);
+      if (this.isLocalCurrencySettlement) {
+        this.form.localSettlementAmount = this.form.settlementAmount;
+        this.form.exchangeRate = 1;
+        return;
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      this.form.localSettlementAmount =
+        rate > 0 ? (Number(this.form.settlementAmount || 0) * rate).toFixed(2) : '0.00';
+    },
     openCandidateDialog() {
       this.candidate.visible = true;
       this.candidate.page.current = 1;
@@ -2021,8 +2055,9 @@ export default {
           .map(row => [`${row.feeType}\u0000${row.feeItem}`, row])
       );
       const append = (feeItem, originalValue, settlementValue, fallbackFeeType = '') => {
-        const originalAmount = Number(originalValue || 0);
-        const settlementAmount = Number(settlementValue || 0);
+        // 明细费用按本位币归集，外币结算时再按汇率换算成结算原币金额
+        const originalAmount = this.convertLocalToSettlementAmount(originalValue);
+        const settlementAmount = this.convertLocalToSettlementAmount(settlementValue);
         if (!feeItem || !Number.isFinite(originalAmount) || !Number.isFinite(settlementAmount)) {
           return;
         }
@@ -2060,6 +2095,7 @@ export default {
       });
       const manualRows = this.summaryFees.filter(row => Number(row.manualFlag) === 1);
       this.summaryFees = [...generatedMap.values(), ...manualRows];
+      this.syncSettlementAmountsFromSummary();
     },
     // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少费用快照时退化为明细自身的汇总行。
     resolveDetailFeePairs(detail) {

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

@@ -60,7 +60,17 @@
       }}</el-tag>
     </template>
 
-    <template #kingdeeSyncStatus="{ row }">{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</template>
+    <template #kingdeeSyncStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeSyncStatus !== 'failed'"
+        :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+        placement="top"
+      >
+        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)">{{
+          kingdeeSyncName(row.kingdeeSyncStatus)
+        }}</el-tag>
+      </el-tooltip>
+    </template>
 
     <template #kingdeeLockStatus="{ row }">
       <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
@@ -84,6 +94,7 @@
 <script>
 import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
 import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeStatusType } from '@/utils/kingdee';
 
 export default {
   name: 'FormalSettlementTablePanel',
@@ -186,6 +197,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     invoiceName(value, settlementType) {
       return invoiceStatusName(value, settlementType);
     },

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

@@ -1332,9 +1332,12 @@ export default {
         if (value) this.initialize();
       },
     },
-    summaryTotal(value) {
-      this.form.settlementAmount = Number(value || 0).toFixed(2);
-      this.recalculateLocalAmount();
+    summaryTotal() {
+      this.syncSettlementAmountsFromSummary();
+    },
+    'form.exchangeRate'() {
+      if (this._skipExchangeRateRebuild) return;
+      this.buildSummaryFeesFromDetails();
     },
     filteredDetails: {
       handler(list) {
@@ -1890,8 +1893,9 @@ export default {
           .map(row => [`${row.feeType}\u0000${row.feeItem}`, row])
       );
       const appendSummary = (feeItem, originalValue, settlementValue, fallbackFeeType = '') => {
-        const originalAmount = Number(originalValue || 0);
-        const settlementAmount = Number(settlementValue || 0);
+        // 明细费用按本位币归集，外币结算时再按汇率换算成结算原币金额
+        const originalAmount = this.convertLocalToSettlementAmount(originalValue);
+        const settlementAmount = this.convertLocalToSettlementAmount(settlementValue);
         if (!feeItem || !Number.isFinite(originalAmount) || !Number.isFinite(settlementAmount)) {
           return;
         }
@@ -1946,7 +1950,7 @@ export default {
       });
       nextFeeMap.forEach(row => orderedFees.push(row));
       this.summaryFees = orderedFees;
-      this.recalculateLocalAmount();
+      this.syncSettlementAmountsFromSummary();
     },
     // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少来源费用快照时退化为明细自身的汇总行。
     resolveDetailFeePairs(detail) {
@@ -2034,17 +2038,21 @@ export default {
     },
     handleExchangeRateDateChange() {
       this.fetchBfiExchangeRate();
-      this.recalculateLocalAmount();
     },
     async fetchBfiExchangeRate() {
-      if (!this.form.currency || this.form.currency === 'RMB') return;
+      if (!this.form.currency || this.form.currency === 'RMB') {
+        this.buildSummaryFeesFromDetails();
+        return;
+      }
       if (!this.form.exchangeRateDate) return;
       try {
         const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
         const rateData = data?.data;
         if (rateData?.excval != null) {
+          this._skipExchangeRateRebuild = true;
           this.form.exchangeRate = Number(rateData.excval);
-          this.recalculateLocalAmount();
+          this._skipExchangeRateRebuild = false;
+          this.buildSummaryFeesFromDetails();
         } else {
           this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
         }
@@ -2052,9 +2060,39 @@ export default {
         this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
       }
     },
+    /**
+     * 明细金额按本位币理解；外币结算时结算合计原金额/结算金额 = 本位币金额 / 结算汇率。
+     */
+    convertLocalToSettlementAmount(localAmount) {
+      const amount = Number(localAmount || 0);
+      if (!Number.isFinite(amount)) return 0;
+      if (this.isLocalCurrencySettlement) {
+        return Number(amount.toFixed(2));
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      if (rate <= 0) return 0;
+      return Number((amount / rate).toFixed(2));
+    },
+    /**
+     * 结算金额取结算合计原币汇总值；本位币合计 = 结算金额 × 结算汇率。
+     */
+    syncSettlementAmountsFromSummary() {
+      const settlementTotal = this.summaryFees.reduce(
+        (total, row) => total + Number(row.settlementAmount || 0),
+        0
+      );
+      this.form.settlementAmount = Number(settlementTotal || 0).toFixed(2);
+      if (this.isLocalCurrencySettlement) {
+        this.form.localSettlementAmount = this.form.settlementAmount;
+        this.form.exchangeRate = 1;
+        return;
+      }
+      const rate = Number(this.form.exchangeRate || 0);
+      this.form.localSettlementAmount =
+        rate > 0 ? (Number(this.form.settlementAmount || 0) * rate).toFixed(2) : '0.00';
+    },
     recalculateLocalAmount() {
-      const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
-      this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
+      this.buildSummaryFeesFromDetails();
     },
     openCandidateDialog() {
       if (!this.form.contractId) {

src/views/settlement/formal-settlement.vue

@@ -486,6 +486,8 @@ export default {
       const rows = this.selection;
       if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
         return this.$message.warning('仅审批通过的付款结算单允许发起付款申请');
+      if (rows.some(row => row.adjustStatus === 'adjusted'))
+        return this.$message.warning('已调整的结算单不可再发起付款，请使用调整后的新单');
       const contractIds = new Set(rows.map(row => String(row.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has(''))
         return this.$message.warning('付款申请必须选择同一个合同的付款结算单');

src/views/settlement/settlement-adjustment.vue

@@ -93,11 +93,15 @@
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
-            ><el-tag
+            ><el-tooltip
               v-else-if="column.kingdee"
+              :disabled="row.kingdeeSyncStatus !== 'failed'"
+              :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+              placement="top"
+            ><el-tag
               :type="kingdeeStatusType(row.kingdeeSyncStatus)"
-              class="status-text"
               >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
+            ></el-tooltip
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
@@ -182,6 +186,7 @@ import { settlementAdjustmentSearchFields } from '@/option/settlement/settlement
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
 import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
+import { kingdeeStatusType } from '@/utils/kingdee';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -317,11 +322,18 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      const res = await api.approve(row.id);
-      // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
-      if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
-      else this.$message.success(res.data.msg || '审批通过');
-      this.loadTable();
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        const res = await api.approve(row.id);
+        // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
+        if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
+        else this.$message.success(res.data.msg || '审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '驳回', {
@@ -358,9 +370,7 @@ export default {
         'info'
       );
     },
-    kingdeeStatusType(status) {
-      return { synced: 'success', failed: 'danger' }[status] || 'info';
-    },
+    kingdeeStatusType,
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },

src/views/system/mp-user.vue

@@ -26,9 +26,6 @@
         <el-button type="primary" plain v-if="permission.mp_user_reset" @click="handleReset">
           密码重置
         </el-button>
-        <el-button type="danger" plain v-if="permission.mp_user_delete" @click="handleDelete">
-          批量删除
-        </el-button>
       </template>
       <template #identities="{ row }">
         {{ row.identitiesName || formatIdentities(row.identities) }}
@@ -102,9 +99,6 @@
         <el-link type="primary" v-if="permission.mp_user_reset" @click="handleResetForRow(row)">
           重置密码
         </el-link>
-        <el-link type="danger" v-if="permission.mp_user_delete" @click="rowDel(row)">
-          删除
-        </el-link>
       </template>
       <template #menu-form="{ size }">
         <el-button
@@ -121,7 +115,7 @@
 
 <script>
 import { h } from 'vue';
-import { getList, getDetail, submit, remove, changeStatus, resetPassword } from '@/api/system/mpUser';
+import { getList, getDetail, submit, changeStatus, resetPassword } from '@/api/system/mpUser';
 import { getDeptTree } from '@/api/system/dept';
 import option from '@/option/system/mpUser';
 import { mapGetters } from 'vuex';
@@ -159,7 +153,6 @@ export default {
       return {
         addBtn: this.validData(this.permission.mp_user_add, false),
         viewBtn: this.validData(this.permission.mp_user_view, false),
-        delBtn: this.validData(this.permission.mp_user_delete, false),
         editBtn: this.validData(this.permission.mp_user_edit, false),
       };
     },
@@ -315,11 +308,6 @@ export default {
     },
     rowSave(row, done, loading) {
       const payload = this.normalizeSubmitRow(row, false);
-      if (!payload.deptId) {
-        this.$message.warning('请选择所属组织');
-        loading();
-        return;
-      }
       if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
         this.$message.warning('请选择自定义数据权限组织');
         loading();
@@ -336,11 +324,6 @@ export default {
     },
     rowUpdate(row, index, done, loading) {
       const payload = this.normalizeSubmitRow(row, true);
-      if (!payload.deptId) {
-        this.$message.warning('请选择所属组织');
-        loading();
-        return;
-      }
       if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
         this.$message.warning('请选择自定义数据权限组织');
         loading();
@@ -355,35 +338,6 @@ export default {
         () => loading()
       );
     },
-    rowDel(row) {
-      this.$confirm('确定删除该小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(row.id))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定删除选中的小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(this.ids))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-          this.$refs.crud.toggleSelection();
-        });
-    },
     handleStatus(row) {
       const status = row.status === 1 ? 0 : 1;
       const text = status === 1 ? '启用' : '停用';

src/views/system/user.vue

@@ -175,8 +175,6 @@
                 <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
-                <el-col :span="18"><el-form-item label="数据权限范围"><el-radio-group v-model="form.dataScopeRange" :disabled="isUserViewMode"><el-radio :value="1">仅所属组织</el-radio><el-radio :value="2">全部组织</el-radio><el-radio :value="3">自定义</el-radio></el-radio-group></el-form-item></el-col>
-                <el-col :span="18"><el-form-item label="数据层级范围"><el-radio-group v-model="form.dataLevelRange" :disabled="isUserViewMode"><el-radio :value="1">包含下级</el-radio><el-radio :value="2">仅本级</el-radio></el-radio-group></el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input
@@ -202,13 +200,6 @@
                 <el-table-column v-if="!isUserViewMode" label="操作" width="90"><template #default="{ row }"><el-link type="danger" @click="removeFormRole(row.id)">删除</el-link></template></el-table-column>
               </el-table>
             </el-tab-pane>
-            <el-tab-pane v-if="form.dataScopeRange === 3" label="数据权限">
-              <el-tree :data="permissionDeptTree" show-checkbox node-key="id" :default-checked-keys="form.dataScopeDeptIds || []" :props="{ label: 'title', children: 'children' }" @check="handleDataScopeCheck" />
-            </el-tab-pane>
-            <el-tab-pane label="客商权限">
-              <div class="permission-toolbar customer-toolbar"><el-checkbox v-model="form.includeNewCustomer" :true-value="1" :false-value="0" :disabled="isUserViewMode">包含新增的客商</el-checkbox></div>
-              <el-table ref="customerTable" :data="customerList" border @selection-change="handleCustomerSelection"><el-table-column type="selection" width="55" :selectable="isCustomerSelectable" /><el-table-column prop="customerCode" label="客商编码" /><el-table-column prop="fullName" label="客商名称" /></el-table>
-            </el-tab-pane>
           </el-tabs>
           <template #footer>
             <span v-if="isUserViewMode" class="dialog-footer">
@@ -407,7 +398,6 @@ import {
   auditRefuse,
   setLeader,
   getLeaderList,
-  getCustomerOptions,
 } from '@/api/system/user';
 import { exportBlob } from '@/api/common';
 import { getDeptTree } from '@/api/system/dept';
@@ -477,7 +467,6 @@ export default {
       treeData: [],
       permissionDeptTree: [],
       postList: [],
-      customerList: [],
       treeOption: treeOption,
       userOption: userOption(this),
       data: [],
@@ -952,9 +941,6 @@ export default {
         const column = this.findColumn(this.userOption.group, 'leaderId');
         column.dicData = res.data.data;
       });
-      getCustomerOptions().then(res => {
-        this.customerList = res.data.data || [];
-      });
     },
     // 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
     findDeptPath(id, tree = this.permissionDeptTree, parents = []) {
@@ -1000,21 +986,6 @@ export default {
         .split(this.form.roleId || '')
         .filter(id => String(id) !== String(roleId));
     },
-    handleDataScopeCheck(_, checked) {
-      if (this.isUserViewMode) {
-        return;
-      }
-      this.form.dataScopeDeptIds = checked.checkedKeys;
-    },
-    handleCustomerSelection(rows) {
-      if (this.isUserViewMode) {
-        return;
-      }
-      this.form.customerIds = rows.map(row => row.id);
-    },
-    isCustomerSelectable() {
-      return !this.isUserViewMode;
-    },
     normalizeSexDisplay(sex) {
       if (sex === -1 || sex === '-1' || sex === '' || sex === null || sex === undefined) {
         return undefined;
@@ -1065,13 +1036,8 @@ export default {
           deptId: [],
           code: '',
           personCategory: 1,
-          dataScopeRange: 1,
-          dataLevelRange: 1,
           remark: '',
           roleId: '',
-          dataScopeDeptIds: [],
-          customerIds: [],
-          includeNewCustomer: 0,
         };
         this.userDialog = true;
         this.$nextTick(() => this.$refs.userFormRef && this.$refs.userFormRef.clearValidate());
@@ -1085,22 +1051,13 @@ export default {
           deptId: Array.isArray(deptIds) ? deptIds : [],
           postId: func.split(user.postId || '')[0] || '',
           roleId: func.join(user.roleId || ''),
-          dataScopeDeptIds: user.dataScopeDeptIds || [],
-          customerIds: user.customerIds || [],
-          includeNewCustomer: user.includeNewCustomer || 0,
           personCategory: user.personCategory || 1,
-          dataScopeRange: user.dataScopeRange || 1,
-          dataLevelRange: user.dataLevelRange || 1,
           sex: this.normalizeSexDisplay(user.sex),
         };
         this.sensitiveManager.saveInitialData(this.form);
         this.userDialog = true;
         this.$nextTick(() => {
           this.$refs.userFormRef && this.$refs.userFormRef.clearValidate();
-          (this.form.customerIds || []).forEach(id => {
-            const customer = this.customerList.find(item => String(item.id) === String(id));
-            if (customer) this.$refs.customerTable && this.$refs.customerTable.toggleRowSelection(customer, true);
-          });
         });
       });
     },

src/views/transportCapacity/driver.vue

@@ -60,7 +60,11 @@
         <span>{{ row.idCardNo || '-' }}</span>
       </template>
       <template #organizationName="{ row }">
-        {{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
+        <span
+          v-if="isBlankOrganizationName(row.organizationName)"
+          class="organization-name--empty"
+        >未分配组织</span>
+        <span v-else>{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}</span>
       </template>
       <template #status="{ row }">
         <el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
@@ -143,7 +147,7 @@
                   maxlength="18"
                   show-word-limit
                   placeholder="请输入"
-                  @input="handleIdCardInput"
+                  @blur="handleIdCardBlur"
                 />
               </el-form-item>
             </el-col>
@@ -153,7 +157,7 @@
                   v-model="driverForm.birthday"
                   type="date"
                   value-format="YYYY-MM-DD"
-                  placeholder="请选择"
+                  placeholder="请选择出生年月"
                 />
               </el-form-item>
             </el-col>
@@ -201,12 +205,16 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="住址" prop="addressRegion">
+                <!-- 只读直接显示库里那串区划名称：级联要先按名称反解 path，区划改名后反解不出来，
+                     同一串文字就会在灰字 placeholder 与黑字标签之间摇摆 -->
+                <el-input v-if="readonly" :model-value="driverForm.addressRegion || '—'" readonly />
                 <el-cascader
+                  v-else
                   ref="addressRegionCascader"
                   v-model="driverForm.addressRegionPath"
                   :options="regionOptions"
                   :props="regionCascaderProps"
-                  :placeholder="driverForm.addressRegion || '请选择'"
+                  :placeholder="driverForm.addressRegion || '请选择省/市/区'"
                   clearable
                   filterable
                   @change="handleAddressRegionChange"
@@ -219,7 +227,7 @@
                   v-model="driverForm.address"
                   maxlength="200"
                   show-word-limit
-                  placeholder="请输入"
+                  placeholder="请输入详细地址（街道、门牌号）"
                 />
               </el-form-item>
             </el-col>
@@ -592,7 +600,11 @@
           <span>{{ row.plateNo || '-' }}</span>
         </template>
         <template #organizationName="{ row }">
-          {{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
+          <span
+            v-if="isBlankOrganizationName(row.organizationName)"
+            class="organization-name--empty"
+          >未分配组织</span>
+          <span v-else>{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}</span>
         </template>
         <template #boundDriver="{ row }">
           <span>{{ row.boundDriver || '-' }}</span>
@@ -743,6 +755,8 @@ export default {
         expired: 0,
       },
       driverBox: false,
+      // 搜索栏组织级联追加「未分配组织」一项（哨兵值见 organization-search mixin）
+      enableUnassignedOrgFilter: true,
       vehicleSelectorVisible: false,
       vehicleSelectorLoading: false,
       vehicleSelectorOption,
@@ -857,7 +871,7 @@ export default {
         emergencyContactMobile: [
           { required: true, message: '请输入紧急联系人手机号', trigger: 'blur' },
         ],
-        organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
+        // 后端已允许所属组织为空，这里不做必填校验
         idCardFront: [{ required: true, message: '请上传身份证正面照', trigger: 'change' }],
         idCardBack: [{ required: true, message: '请上传身份证反面照', trigger: 'change' }],
         drivingLicenseFront: [{ required: true, message: '请上传驾驶证主页', trigger: 'change' }],
@@ -1122,19 +1136,21 @@ export default {
     removeDigits(value = '') {
       return String(value).replace(/\d/g, '');
     },
-    handleIdCardInput(value) {
-      const idCardNo = String(value || '').toUpperCase();
+    /**
+     * 身份证号失焦后补出生年月与性别，与小程序 person.vue 的 onIdCardNoChange 同口径：
+     * 只在字段还空着时补——用户手改过的值不被他随后修改身份证号的动作冲掉。
+     * 不回写空值：18 位不合法时清空生日会把已选日期当垃圾丢掉。
+     * OCR 识别结果仍直接覆盖（见 applyIdCardRecognition），那是「重新采一次证件」，与手输联动不是一回事。
+     */
+    handleIdCardBlur() {
+      const idCardNo = String(this.driverForm.idCardNo || '').toUpperCase();
       this.driverForm.idCardNo = idCardNo;
       const idCardInfo = this.parseIdCardInfo(idCardNo);
-      if (idCardInfo.birthday) {
+      if (!this.driverForm.birthday && idCardInfo.birthday) {
         this.driverForm.birthday = idCardInfo.birthday;
-      } else {
-        this.driverForm.birthday = '';
       }
-      if (idCardInfo.gender) {
+      if (!this.driverForm.gender && idCardInfo.gender) {
         this.driverForm.gender = idCardInfo.gender;
-      } else {
-        this.driverForm.gender = '';
       }
       if (this.submitAttempted) {
         this.$nextTick(() => {
@@ -1952,6 +1968,11 @@ export default {
   }
 }
 
+// 空组织记录在列表里的占位文案
+.organization-name--empty {
+  color: #909399;
+}
+
 .driver-page__date-expiring {
   color: #d40000;
   font-weight: 600;

src/views/transportCapacity/vehicle.vue

@@ -59,7 +59,22 @@
         </el-button>
       </template>
       <template #organizationName="{ row }">
-        {{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
+        <el-tooltip
+          :content="formatOrgDisplayName(row.organizationName)"
+          placement="top"
+          :disabled="!formatOrgDisplayName(row.organizationName)"
+        >
+          <span class="org-cell-text">{{ formatOrgDisplayName(row.organizationName) }}</span>
+        </el-tooltip>
+      </template>
+      <template #useDepartment="{ row }">
+        <el-tooltip
+          :content="formatOrgDisplayName(row.useDepartment)"
+          placement="top"
+          :disabled="!formatOrgDisplayName(row.useDepartment)"
+        >
+          <span class="org-cell-text">{{ formatOrgDisplayName(row.useDepartment) }}</span>
+        </el-tooltip>
       </template>
       <template #status="{ row }">
         <el-tag :type="row.status === 1 ? 'primary' : 'info'" class="status-text">
@@ -315,26 +330,58 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所有组织" prop="organizationName">
-                <el-cascader
-                  v-model="organizationCascaderValue"
-                  :options="organizationTreeOptions"
-                  :props="organizationCascaderProps"
-                  filterable
-                  clearable
-                  placeholder="请选择"
-                />
+                <el-tooltip
+                  :content="
+                    formatOrgCascaderPath(organizationCascaderPath) ||
+                    formatOrgDisplayName(vehicleForm.organizationName)
+                  "
+                  placement="top"
+                  :disabled="
+                    !(
+                      formatOrgCascaderPath(organizationCascaderPath) ||
+                      formatOrgDisplayName(vehicleForm.organizationName)
+                    )
+                  "
+                >
+                  <div class="org-cascader-tooltip">
+                    <el-cascader
+                      v-model="organizationCascaderValue"
+                      :options="organizationFormTreeOptions"
+                      :props="formOrgCascaderProps"
+                      filterable
+                      clearable
+                      placeholder="请选择"
+                    />
+                  </div>
+                </el-tooltip>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="使用部门" prop="useDepartment">
-                <el-cascader
-                  v-model="useDepartmentCascaderValue"
-                  :options="organizationTreeOptions"
-                  :props="organizationCascaderProps"
-                  filterable
-                  clearable
-                  placeholder="请选择"
-                />
+                <el-tooltip
+                  :content="
+                    formatOrgCascaderPath(useDepartmentCascaderPath) ||
+                    formatOrgDisplayName(vehicleForm.useDepartment)
+                  "
+                  placement="top"
+                  :disabled="
+                    !(
+                      formatOrgCascaderPath(useDepartmentCascaderPath) ||
+                      formatOrgDisplayName(vehicleForm.useDepartment)
+                    )
+                  "
+                >
+                  <div class="org-cascader-tooltip">
+                    <el-cascader
+                      v-model="useDepartmentCascaderValue"
+                      :options="useDepartmentFormTreeOptions"
+                      :props="formOrgCascaderProps"
+                      filterable
+                      clearable
+                      placeholder="请选择"
+                    />
+                  </div>
+                </el-tooltip>
               </el-form-item>
             </el-col>
           </el-row>
@@ -652,6 +699,17 @@ export default {
       vehicleCertificateUploads: {},
       uploadHeaders: getUploadHeaders(),
       organizationOptions: [],
+      // 表单两个级联各自维护路径，避免名称回写互相覆盖；不要与搜索栏共用同一棵树节点
+      organizationCascaderPath: [],
+      useDepartmentCascaderPath: [],
+      formOrgCascaderProps: {
+        value: 'id',
+        label: 'label',
+        children: 'children',
+        emitPath: true,
+        checkStrictly: true,
+        expandTrigger: 'hover',
+      },
       vehicleTypeOptions: [
         { label: '高栏车', value: '高栏' },
         { label: '低栏车', value: '低栏' },
@@ -697,22 +755,31 @@ export default {
             : [{ required: true, message: '请选择行驶证有效期', trigger: 'change' }],
       };
     },
-    // 所属组织级联：表单存组织名称，级联控件用 id 路径，两者在此双向转换
+    // 两个级联必须使用克隆后的独立树，否则 checkStrictly 会在节点上互相抢选中态
+    organizationFormTreeOptions() {
+      return this.cloneOrgTree(this.organizationTreeOptions);
+    },
+    useDepartmentFormTreeOptions() {
+      return this.cloneOrgTree(this.organizationTreeOptions);
+    },
+    // 所属组织级联：本地保存 id 路径，名称同步到表单字段供后端使用
     organizationCascaderValue: {
       get() {
-        return this.resolveOrgPath(this.vehicleForm.organizationName);
+        return this.organizationCascaderPath;
       },
       set(path) {
-        this.vehicleForm.organizationName = this.resolveOrgName(path);
+        this.organizationCascaderPath = Array.isArray(path) ? [...path] : [];
+        this.vehicleForm.organizationName = this.resolveOrgName(this.organizationCascaderPath);
       },
     },
-    // 使用部门级联：与所属组织同一套部门树
+    // 使用部门级联：独立路径状态，避免与所属组织共用计算回写导致选不中
     useDepartmentCascaderValue: {
       get() {
-        return this.resolveOrgPath(this.vehicleForm.useDepartment);
+        return this.useDepartmentCascaderPath;
       },
       set(path) {
-        this.vehicleForm.useDepartment = this.resolveOrgName(path);
+        this.useDepartmentCascaderPath = Array.isArray(path) ? [...path] : [];
+        this.vehicleForm.useDepartment = this.resolveOrgName(this.useDepartmentCascaderPath);
       },
     },
     isAdmin() {
@@ -745,10 +812,49 @@ export default {
     this.initDeptTree();
     this.loadOrganizationOptions();
   },
+  watch: {
+    organizationTreeOptions() {
+      if (this.vehicleBox) {
+        this.syncOrgCascaderPaths();
+      }
+    },
+  },
   methods: {
     hasPermission(code) {
       return this.isAdmin || this.permission?.[code] === true;
     },
+    /** 去掉组织名称前导空白，供列表与提示展示 */
+    formatOrgDisplayName(name) {
+      return String(name || '').replace(/^[\s\u3000]+/, '');
+    },
+    /** 级联路径还原完整组织层级文案，悬停展示用 */
+    formatOrgCascaderPath(path) {
+      const ids = Array.isArray(path)
+        ? path.filter(item => item !== undefined && item !== null && item !== '')
+        : [];
+      if (!ids.length) return '';
+      const labels = [];
+      let nodes = this.organizationTreeOptions || [];
+      for (const id of ids) {
+        const node = nodes.find(item => String(item.id) === String(id));
+        if (!node) break;
+        labels.push(node.rawLabel || node.label || '');
+        nodes = node.children || [];
+      }
+      return labels.filter(Boolean).join(' / ');
+    },
+    cloneOrgTree(tree = []) {
+      return (tree || []).map(item => ({
+        id: String(item.id),
+        label: item.label,
+        rawLabel: item.rawLabel,
+        children: item.children?.length ? this.cloneOrgTree(item.children) : undefined,
+      }));
+    },
+    syncOrgCascaderPaths() {
+      this.organizationCascaderPath = this.resolveOrgPath(this.vehicleForm.organizationName);
+      this.useDepartmentCascaderPath = this.resolveOrgPath(this.vehicleForm.useDepartment);
+    },
     initDeptTree() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         this.organizationOptions = this.flattenDeptOptions(res.data.data || []);
@@ -760,6 +866,9 @@ export default {
         if (this.vehicleBox && !this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
+        if (this.vehicleBox) {
+          this.syncOrgCascaderPaths();
+        }
       });
     },
     flattenDeptOptions(tree = [], level = 0) {
@@ -854,6 +963,7 @@ export default {
         this.vehicleForm = emptyForm();
         this.vehicleForm.organizationName = this.getCurrentOrganizationName();
         this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
+        this.syncOrgCascaderPaths();
         this.syncPlateNo(false);
         this.vehicleBox = true;
         return;
@@ -867,6 +977,7 @@ export default {
         if (!this.vehicleForm.useDepartment) {
           this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         }
+        this.syncOrgCascaderPaths();
         this.splitPlateNo();
         this.syncPlateNo(false);
         this.vehicleBox = true;
@@ -878,6 +989,8 @@ export default {
     },
     resetVehicle() {
       this.vehicleForm = emptyForm();
+      this.organizationCascaderPath = [];
+      this.useDepartmentCascaderPath = [];
       this.vehicleCertificateUploads = {};
       this.readonly = false;
       this.submitLoading = false;
@@ -1530,7 +1643,20 @@ export default {
   }
 }
 
+.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%;
+  }
+
   :deep(.el-date-editor.el-input),
   :deep(.el-date-editor.el-input__wrapper),
   :deep(.el-select),

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

@@ -102,15 +102,10 @@
               />
             </el-form-item>
             <el-form-item label="减分最高扣分">
-              <el-input
-                :model-value="configForm.maxMinusScore"
-                placeholder="所有减分项合计不得超过该分值"
-                clearable
-                style="width: 500px"
-                @input="handleMaxMinusScoreInput"
-              >
+              <el-input :model-value="HARDCODED_MAX_MINUS_SCORE" disabled style="width: 500px">
                 <template #append>分</template>
               </el-input>
+              <div class="score-config__hint">暂定最高扣 15 分，加分合计同样最高按 15 分计</div>
             </el-form-item>
             <el-form-item label="备注">
               <el-input
@@ -500,9 +495,15 @@ const standardNumberFields = [
   'creditLimitIncrease',
 ];
 
+/** 暂定：加分/减分合计上限均为 15 分，超出按 15 分计 */
+const HARDCODED_MAX_PLUS_SCORE = 15;
+const HARDCODED_MAX_MINUS_SCORE = 15;
+
 export default {
   data() {
     return {
+      HARDCODED_MAX_PLUS_SCORE,
+      HARDCODED_MAX_MINUS_SCORE,
       form: {},
       query: {},
       loading: true,
@@ -639,7 +640,7 @@ export default {
         name: '',
         remark: '',
         standardDescription: '',
-        maxMinusScore: '',
+        maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
         status: 3,
         categories: this.defaultCategories(),
         standards: [],
@@ -696,7 +697,8 @@ export default {
       });
       return {
         ...detail,
-        maxMinusScore: this.normalizePlainDecimal(detail.maxMinusScore),
+        // 暂定写死最高扣分，不读取历史配置值
+        maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
         categories: categories.map(category => ({
           ...(map[category.categoryCode] || category),
           categoryName: category.categoryName,
@@ -704,14 +706,6 @@ export default {
         standards: (detail.standards || []).map(standard => this.normalizeStandard(standard)),
       };
     },
-    handleMaxMinusScoreInput(value) {
-      const raw = String(value ?? '')
-        .replace(/[^\d.]/g, '')
-        .replace(/^\./, '')
-        .replace(/(\..*)\./g, '$1')
-        .replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2');
-      this.configForm.maxMinusScore = raw;
-    },
     openConfig(row, readonly = false) {
       this.readonly = readonly;
       if (row && row.id) {
@@ -837,9 +831,7 @@ export default {
     },
     prepareSubmitConfig(config) {
       const payload = JSON.parse(JSON.stringify(config || {}));
-      const maxMinus = this.normalizePlainDecimal(payload.maxMinusScore);
-      payload.maxMinusScore =
-        maxMinus === '' || maxMinus == null ? null : this.toScoreValue(maxMinus);
+      payload.maxMinusScore = this.toScoreValue(HARDCODED_MAX_MINUS_SCORE);
       (payload.categories || []).forEach(category => {
         (category.items || []).forEach(item => {
           item.score = this.toScoreValue(item.score);
@@ -1096,14 +1088,8 @@ export default {
         this.$message.warning('请输入评定表名称');
         return false;
       }
-      if (
-        this.configForm.maxMinusScore !== '' &&
-        this.configForm.maxMinusScore != null &&
-        !this.isNonNegativeDecimal(this.configForm.maxMinusScore)
-      ) {
-        this.$message.warning('减分最高扣分须为不小于0的数字，最多两位小数');
-        return false;
-      }
+      // 减分最高扣分暂定写死为 15，提交前强制回填，避免历史脏数据触发校验
+      this.configForm.maxMinusScore = HARDCODED_MAX_MINUS_SCORE;
       const basic = this.configForm.categories.find(item => item.categoryCode === 'basic');
       if (!basic || basic.items.length === 0) {
         this.$message.warning('至少配置1个基础得分项目');
@@ -1586,6 +1572,13 @@ export default {
   overflow: auto;
 }
 
+.score-config__hint {
+  margin-top: 6px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.4;
+}
+
 :deep(.score-config__name-input) {
   width: 500px;
 }

src/views/vehicle/customer-archive.vue

@@ -135,7 +135,13 @@
       <template #kingdeeStatus="{ row }">
         <el-tag v-if="row.kingdeeStatus === 'synced'" type="success">已推送</el-tag>
         <el-tag v-else-if="row.kingdeeStatus === 'exist'" type="primary">金蝶已有</el-tag>
-        <el-tag v-else-if="row.kingdeeStatus === 'failed'" type="danger">推送失败</el-tag>
+        <el-tooltip
+          v-else-if="row.kingdeeStatus === 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+          placement="top"
+        >
+          <el-tag type="danger">推送失败</el-tag>
+        </el-tooltip>
         <el-tag v-else type="info">未推送</el-tag>
       </template>
       <template #menu="{ row }">
@@ -1624,6 +1630,9 @@ const customerArchiveFormRoute = '/vehicle/customer-archive/form';
 const customerArchiveListRefreshKey = 'customer-archive-list-refresh';
 /** 客商所属组织固定为顶层组织 */
 const FIXED_OWNER_DEPT_NAME = '广西现代物流集团有限公司';
+/** 暂定：加分/减分合计上限均为 15 分，超出按 15 分计 */
+const HARDCODED_MAX_PLUS_SCORE = 15;
+const HARDCODED_MAX_MINUS_SCORE = 15;
 
 const createTimeRangeMap = {
   createTimeRange: ['createTimeStart', 'createTimeEnd'],
@@ -2336,16 +2345,18 @@ export default {
         { categoryCode: 'plus', categoryName: '加分项目' },
         { categoryCode: 'minus', categoryName: '减分项目' },
       ];
-      const maxMinus = Number(this.currentScore?.maxMinusScore);
-      const hasMaxMinus = Number.isFinite(maxMinus) && maxMinus >= 0;
       const rows = categoryMap.map((category, index) => {
         const details = this.getScoreCategoryDetails(category.categoryCode);
         let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
         let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
-        // 减分项目合计受量化表「最高扣分」限制
-        if (category.categoryCode === 'minus' && hasMaxMinus) {
-          selfScore = Math.min(selfScore, maxMinus);
-          reviewScore = Math.min(reviewScore, maxMinus);
+        // 暂定：加分/减分合计最高按 15 分计
+        if (category.categoryCode === 'plus') {
+          selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
+          reviewScore = Math.min(reviewScore, HARDCODED_MAX_PLUS_SCORE);
+        }
+        if (category.categoryCode === 'minus') {
+          selfScore = Math.min(selfScore, HARDCODED_MAX_MINUS_SCORE);
+          reviewScore = Math.min(reviewScore, HARDCODED_MAX_MINUS_SCORE);
         }
         return {
           ...category,
@@ -2457,6 +2468,7 @@ export default {
     resetKingdeeBackfill() {
       const form = this.archiveForm;
       form.kingdeeStatus = 'none';
+      form.customerCode = '';
       form.fullName = '';
       form.legalPerson = '';
       form.registeredCapital = '';
@@ -2512,6 +2524,8 @@ export default {
     applyKingdeeCustomer(customer) {
       const form = this.archiveForm;
       form.kingdeeStatus = 'exist';
+      // 客商编号回显金蝶客商编码，与后端同步金蝶时的采纳口径保持一致
+      if (customer.number) form.customerCode = customer.number;
       // 工商信息以金蝶为准，直接覆盖（后续字段锁定）
       if (customer.name) form.fullName = customer.name;
       if (customer.name) this.checkArchiveNameRisk();
@@ -4263,7 +4277,8 @@ export default {
         scoreDate: this.$dayjs().format('YYYY-MM-DD'),
         applyCreditLimit: this.archiveForm.applyCreditLimit || '',
         maxCreditLimit: '',
-        maxMinusScore: '',
+        maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
+        maxPlusScore: HARDCODED_MAX_PLUS_SCORE,
         creditLevel: '',
         standards: [],
         tempApplyCreditLimit: '',
@@ -4283,10 +4298,8 @@ export default {
             : score.applyCreditLimit
         ),
         maxCreditLimit: this.normalizeOptionalAmount(score.maxCreditLimit),
-        maxMinusScore:
-          score.maxMinusScore === undefined || score.maxMinusScore === null
-            ? ''
-            : score.maxMinusScore,
+        maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
+        maxPlusScore: HARDCODED_MAX_PLUS_SCORE,
         tempApplyCreditLimit: this.normalizeOptionalAmount(score.tempApplyCreditLimit),
         attachments: score.attachments || this.parseAttachments(score.proofAttachments),
         details: (score.details || []).map(detail => ({
@@ -4748,11 +4761,8 @@ export default {
           applyCreditLimit: this.currentScore.applyCreditLimit,
           maxCreditLimit: '',
           creditLevel: '',
-          maxMinusScore:
-            quantificationData.maxMinusScore ??
-            scoreTemplate.maxMinusScore ??
-            this.currentScore.maxMinusScore ??
-            '',
+          maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
+          maxPlusScore: HARDCODED_MAX_PLUS_SCORE,
           tempApplyCreditLimit: this.currentScore.tempApplyCreditLimit,
           tempCreditStartDate: this.currentScore.tempCreditStartDate,
           tempCreditEndDate: this.currentScore.tempCreditEndDate,
@@ -4771,14 +4781,11 @@ export default {
     },
     applyMaxMinusScoreFromQuantification(quantificationId) {
       if (!quantificationId) return Promise.resolve();
-      return getCreditScoreQuantificationDetail(quantificationId).then(res => {
-        const data = res?.data?.data || {};
-        this.currentScore.maxMinusScore =
-          data.maxMinusScore === undefined || data.maxMinusScore === null
-            ? ''
-            : data.maxMinusScore;
-        this.calculateScore(this.currentScore);
-      });
+      // 暂定写死加分/减分上限，不再依赖量化表配置值
+      this.currentScore.maxMinusScore = HARDCODED_MAX_MINUS_SCORE;
+      this.currentScore.maxPlusScore = HARDCODED_MAX_PLUS_SCORE;
+      this.calculateScore(this.currentScore);
+      return Promise.resolve();
     },
     normalizeScoreTemplateDetails(template = {}) {
       const categoryDetails = (template.categories || []).flatMap(category =>
@@ -5122,17 +5129,17 @@ export default {
       const plusDetails = this.getScoreCategoryDetailsByList(details, 'plus');
       const minusDetails = this.getScoreCategoryDetailsByList(details, 'minus');
       const sumScore = (list, prop) => list.reduce((sum, item) => sum + Number(item[prop] || 0), 0);
+      const rawPlusSelf = sumScore(plusDetails, 'selfScore');
+      const rawPlusReview = sumScore(plusDetails, 'reviewScore');
       const rawMinusSelf = sumScore(minusDetails, 'selfScore');
       const rawMinusReview = sumScore(minusDetails, 'reviewScore');
-      // 量化表「减分最高扣分」：所有减分项合计不得超过该上限
-      const maxMinus = Number(score.maxMinusScore);
-      const hasMaxMinus = Number.isFinite(maxMinus) && maxMinus >= 0;
-      const minusSelf = hasMaxMinus ? Math.min(rawMinusSelf, maxMinus) : rawMinusSelf;
-      const minusReview = hasMaxMinus ? Math.min(rawMinusReview, maxMinus) : rawMinusReview;
-      const selfScore =
-        sumScore(basicDetails, 'selfScore') + sumScore(plusDetails, 'selfScore') - minusSelf;
-      const reviewScore =
-        sumScore(basicDetails, 'reviewScore') + sumScore(plusDetails, 'reviewScore') - minusReview;
+      // 暂定：加分/减分合计最高按 15 分计
+      const plusSelf = Math.min(rawPlusSelf, HARDCODED_MAX_PLUS_SCORE);
+      const plusReview = Math.min(rawPlusReview, HARDCODED_MAX_PLUS_SCORE);
+      const minusSelf = Math.min(rawMinusSelf, HARDCODED_MAX_MINUS_SCORE);
+      const minusReview = Math.min(rawMinusReview, HARDCODED_MAX_MINUS_SCORE);
+      const selfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
+      const reviewScore = sumScore(basicDetails, 'reviewScore') + plusReview - minusReview;
       const hasReviewScore = details.some(
         item => !this.isBlankScore(item.reviewScore)
       );

需求卡/过程配置需求卡.md

@@ -214,6 +214,7 @@
   - 到场、装货、发货、在途、到货、卸货、签收节点的操作要求包含是否打卡、打卡定位；装货、发货、到货、卸货、签收还包含上传货量和上传货量类型；附件要求包含上传凭证和凭证类型。
   - 在途节点额外包含打卡频次和打卡时段，打卡频次使用普通输入框，打卡时段使用时间选择器。
   - 回单节点的操作要求包含是否确认、确认完成，是否确认提供“是 / 无需确认完成”单选，确认完成使用“内部人员”复选框。
+  - 回单节点的“内部人员”复选框只读，不接受手工勾选：是否确认为“是”时自动勾选（即回单需内部人员确认），为“无需确认完成”时自动取消勾选。
   - 各节点中是否打卡、上传货量、上传凭证均使用单选或复选输入，控件类型与截图保持一致。
 
 - 异常与边界：
@@ -233,6 +234,7 @@
   - 不允许非在途节点配置打卡频次和打卡时段。
   - 不允许是否打卡为否时仍强制填写打卡定位或打卡时段。
   - 不允许上传凭证关闭后仍提交凭证类型。
+  - 不允许手工勾选或取消回单节点的“内部人员”复选框。
 
 ---