🔀 合并主干 master 到 dev

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

src/api/business/contract-manage.js

@@ -93,10 +93,10 @@ export const expireStats = params =>
     params,
   });
 
-/** 按合同负责部门预览下一合同编号 */
+/** 按平台公司 + 业务部门预览下一合同编号 */
-export const nextContractNo = organizationId =>
+export const nextContractNo = (organizationId, platformCompanyId) =>
   request({
     url: `${baseUrl}/next-contract-no`,
     method: 'get',
-    params: { organizationId },
+    params: { organizationId, platformCompanyId },
   });

src/api/common.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';
 
 /** 审核按钮统一超时：审批通过后可能同步推送金蝶等耗时操作，覆盖全局 10s */
-export const APPROVE_TIMEOUT = 30000;
+export const APPROVE_TIMEOUT = 60 * 1000;
 
 /**
  * 文件流返回

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 sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });
-export const pushKingdee = flowId =>
-  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
 
 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/business-dept-config.js

@@ -0,0 +1,42 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-system/business-dept-config';
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+
+export const getDetail = id =>
+  request({
+    url: `${baseUrl}/detail`,
+    method: 'get',
+    params: { id },
+  });
+
+export const submit = row =>
+  request({
+    url: `${baseUrl}/submit`,
+    method: 'post',
+    data: row,
+  });
+
+export const remove = ids =>
+  request({
+    url: `${baseUrl}/remove`,
+    method: 'post',
+    params: { ids },
+  });
+
+export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
+  request({
+    url: `${baseUrl}/by-platform-dept`,
+    method: 'get',
+    params: { platformCompanyId, businessDeptId },
+  });

src/api/system/business-process.js

@@ -12,6 +12,7 @@ export const MK_SUBMIT_TIMEOUT = 30000;
  * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
  * @param {string} [data.subject] 流程标题
  * @param {string} [data.bizType] 业务类型
+ * @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
  */
 export const processSubmit = data => {
   return request({

src/api/vehicle/customer-archive.js

@@ -175,6 +175,30 @@ export const querySupplierCode = creditCode => {
   });
 };
 
+// 金蝶开户行查询（A905-3）：收款信息填写开户行失焦后精确匹配带出联行号
+export const queryKingdeeBank = bankName => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      bankName,
+    },
+  });
+};
+
+// 金蝶联行号校验（A905-3）：收款信息保存前按联行号精确匹配，查不到不允许保存
+export const queryKingdeeBankByNumber = cnapsCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-bank-by-number',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      cnapsCode,
+    },
+  });
+};
+
 export const syncKingdee = id => {
   return request({
     url: '/blade-transport/customer-archive/sync-kingdee',
@@ -188,12 +212,11 @@ export const syncKingdee = id => {
 
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
-    url: '/blade-transport/baidu-ocr/recognize-url',
+    url: '/blade-transport/baidu-ocr/business-license',
     method: 'post',
     timeout: 60000,
     params: {
       imageUrl,
-      type: 'business_license',
     },
   });
 };

src/option/base/measurement-unit.js

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

src/option/business/contract-manage.js

@@ -65,10 +65,12 @@ export const config = {
         ['contractName', '合同名称'],
         ['projectName', '所属项目'],
         ['organizationName', '合同负责部门'],
+        ['platformCompanyName', '平台公司'],
         ['contractCategory', '合同类别'],
         ['signType', '签约类型'],
         ['partyA', '甲方'],
         ['partyB', '乙方'],
+        ['partyC', '丙方'],
         ['handlerUserName', '经办人'],
         ['signDate', '签订日期'],
         ['applyDate', '申请日期'],
@@ -247,11 +249,22 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '合同编号',
     prop: 'contractNo',
     search: true,
-    searchOrder: 6,
+    searchOrder: 8,
     searchPlaceholder: '请输入',
     order: 185,
     maxlength: 100,
@@ -264,7 +277,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 7,
+    searchOrder: 1,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -276,7 +289,7 @@ export const option = createCrudOption([
     label: '所属项目',
     prop: 'projectName',
     search: true,
-    searchOrder: 8,
+    searchOrder: 11,
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
@@ -311,12 +324,19 @@ export const option = createCrudOption([
     minWidth: 150,
     rules: selectRule('合同负责部门'),
   },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
+  },
   {
     label: '合同类别',
     prop: 'contractCategory',
     type: 'select',
     search: true,
-    searchOrder: 9,
+    searchOrder: 12,
     searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
@@ -328,7 +348,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: true,
-    searchOrder: 10,
+    searchOrder: 13,
     searchPlaceholder: '请选择',
     span: 8,
     order: 190,
@@ -337,11 +357,11 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '生效类型',
+    label: '合同状态',
     prop: 'effectiveType',
     type: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 6,
     searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
@@ -350,24 +370,23 @@ export const option = createCrudOption([
   {
     label: '甲方',
     prop: 'partyA',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 160,
-    filterable: true,
     minWidth: 160,
-    rules: selectRule('甲方'),
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '乙方',
     prop: 'partyB',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 150,
-    filterable: true,
     minWidth: 160,
-    rules: selectRule('乙方'),
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '丙方',
+    prop: 'partyC',
+    minWidth: 160,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '合同期限',
@@ -613,7 +632,7 @@ export const option = createCrudOption([
     prop: 'hcsSyncStatus',
     type: 'select',
     search: true,
-    searchOrder: 6,
+    searchOrder: 7,
     searchPlaceholder: '请选择',
     slot: true,
     dicData: hcsSyncStatusOptions,
@@ -643,7 +662,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,
@@ -655,7 +674,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,

src/option/business/transport-plan.js

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

src/option/payment/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: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
-  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
+  { prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
-  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
+  //{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
-  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  //{ 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/utils/mk-approval.js

@@ -154,6 +154,7 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
  * @param {string} [options.subjectName] 标题后缀
  * @param {string} [options.approvalStatus] 提交前的审批状态
  * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
+ * @param {Object} [options.tempVarData] 传给 MK 的临时变量（如项目类型 projectType）
  * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
  */
 export async function submitMkApprovalFlow({
@@ -162,6 +163,7 @@ export async function submitMkApprovalFlow({
   subjectName = '',
   approvalStatus = '',
   mkEnabled,
+  tempVarData,
 } = {}) {
   const conf = MK_BIZ[bizType];
   if (!conf) {
@@ -202,12 +204,16 @@ export async function submitMkApprovalFlow({
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${bizIdText}`;
-  await processSubmit({
+  const submitPayload = {
     templateCode,
     bizId: bizIdText,
     subject,
     bizType,
     forceNewFormInstance,
-  });
+  };
+  if (tempVarData != null && typeof tempVarData === 'object') {
+    submitPayload.tempVarData = tempVarData;
+  }
+  await processSubmit(submitPayload);
   return true;
 }

src/views/base/airport-master.vue

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

src/views/base/currency.vue

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

src/views/base/customer-type.vue

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

src/views/base/fee-item.vue

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

src/views/base/measurement-unit.vue

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

src/views/base/port-terminal.vue

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

src/views/base/railway-station.vue

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

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

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

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

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

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

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

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

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

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

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

src/views/business/loading-manage.vue

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

src/views/business/process-config.vue

@@ -489,6 +489,12 @@ const NODE_TEMPLATES = [
   },
 ];
 
+// 过程配置必须覆盖装货端与卸货端各一个节点；货量下限只看装货端——
+// 到场没有货量开关，不能拿它顶替货量采集
+const PICKUP_NODE_KEYS = ['arrive_scene', 'load', 'dispatch'];
+const DELIVERY_NODE_KEYS = ['unload', 'arrival', 'sign', 'return'];
+const CARGO_NODE_KEYS = ['load', 'dispatch'];
+
 export default {
   data() {
     return {
@@ -535,7 +541,6 @@ export default {
   created() {
     this.resetNodeRows();
     this.loadProjectOptions('');
-    this.applyDefaultDeptSearch();
     this.initDeptOptions();
   },
   methods: {
@@ -566,27 +571,6 @@ export default {
         }
       });
     },
-    defaultDeptId() {
-      const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
-      return (
-        String(raw)
-          .split(',')
-          .map(item => item.trim())
-          .filter(Boolean)[0] || ''
-      );
-    },
-    applyDefaultDeptSearch() {
-      const deptId = this.defaultDeptId();
-      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
-      if (!deptId || !deptColumn) return;
-      deptColumn.searchValue = deptId;
-      this.query = { ...this.query, deptId };
-      this.$nextTick(() => {
-        if (this.$refs.crud?.searchForm) {
-          this.$refs.crud.searchForm.searchDeptId = deptId;
-        }
-      });
-    },
     flattenDept(tree, level = 0) {
       return tree.flatMap(item => {
         const id =
@@ -938,8 +922,24 @@ export default {
         this.$message.warning('备注不能超过500个字符');
         return false;
       }
-      if (!this.enabledNodes.length) {
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
-        this.$message.warning('请至少选择一个过程节点');
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
         return false;
       }
       const transit = this.nodeRows.find(item => item.key === 'transit');
@@ -1113,7 +1113,6 @@ export default {
     },
     searchReset() {
       this.query = {};
-      this.applyDefaultDeptSearch();
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
     },

src/views/business/project-apply.vue

@@ -258,15 +258,21 @@
                 <div class="project-apply-form__field-tooltip">{{ businessDeptTooltipText }}</div>
               </template>
               <span class="project-apply-form__field-tooltip-trigger">
-                <el-cascader
+                <el-select
-                  v-model="businessDeptCascaderValue"
+                  v-model="form.businessDeptId"
-                  :options="businessDeptTreeOptions"
-                  :props="deptCascaderProps"
                   placeholder="请选择"
                   filterable
                   clearable
                   :disabled="dialogReadonly"
-                />
+                  @change="handleBusinessDeptChange"
+                >
+                  <el-option
+                    v-for="item in deptOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
               </span>
             </el-tooltip>
           </el-form-item>
@@ -755,6 +761,96 @@
           />
         </div>
 
+        <template v-if="showProjectContractSection">
+          <div class="dialog-section-title project-apply-form__table-title">项目合同</div>
+          <el-table
+            v-loading="projectContractLoading"
+            :data="projectContractRows"
+            border
+            class="project-apply-form__table"
+          >
+            <el-table-column type="index" label="序号" width="80" align="center" />
+            <el-table-column
+              prop="contractCategory"
+              label="合同类型"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractNo"
+              label="合同编号"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                <el-link
+                  v-if="row.id && row.contractNo"
+                  type="primary"
+                  @click.stop="openProjectContractDetail(row)"
+                >
+                  {{ row.contractNo }}
+                </el-link>
+                <span v-else>{{ row.contractNo || '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="contractName"
+              label="合同名称"
+              min-width="160"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyA"
+              label="甲方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyB"
+              label="乙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyC"
+              label="丙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="startDate"
+              label="开始日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="endDate"
+              label="结束日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractAmount"
+              label="合同金额"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                {{ formatAmount(row.contractAmount) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+
         <div
           v-if="!isChangeDialog && !isNewProjectDialog"
           class="dialog-section-title project-apply-form__table-title"
@@ -984,6 +1080,7 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
+import { getList as getContractManageList } from '@/api/business/contract-manage';
 import {
   loadHcsImmediateEnabled,
   repush as hcsRepush,
@@ -995,7 +1092,7 @@ import {
   getList as getCustomerArchiveList,
   getDetail as getCustomerArchiveDetail,
 } from '@/api/vehicle/customer-archive';
-import { getBusinessDeptSelect, getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { getList as getUserList } from '@/api/system/user';
@@ -1339,7 +1436,6 @@ export default {
         ],
       },
       deptOptions: [],
-      businessDeptTreeOptions: [],
       platformCompanyOptions: [],
       cargoTypeOptions: [],
       selectedCustomerId: [],
@@ -1382,6 +1478,8 @@ export default {
         'zip',
       ],
       changeRows: [],
+      projectContractRows: [],
+      projectContractLoading: false,
       changeRecordDetailVisible: false,
       changeRecordDetail: null,
       changeRecordDetailRows: [],
@@ -1404,44 +1502,14 @@ export default {
   },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
-    // 部门级联配置：checkStrictly 允许选中任意层级，不必选到末级
+    // 查看态禁用控件无 hover，用业务部门名称做 tooltip
-    deptCascaderProps() {
-      return {
-        label: 'label',
-        value: 'value',
-        children: 'children',
-        emitPath: true,
-        checkStrictly: true,
-        expandTrigger: 'click',
-      };
-    },
-    // 业务部门：form 存部门 id，级联控件用根到节点的 id 路径，两者在此双向转换
-    businessDeptCascaderValue: {
-      get() {
-        const id = this.form.businessDeptId;
-        return id ? this.findDeptPath(id, this.businessDeptTreeOptions) || [id] : [];
-      },
-      set(path) {
-        const value = Array.isArray(path)
-          ? path.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
-        this.form.businessDeptId = value.length ? value.at(-1) : '';
-        this.handleBusinessDeptChange(this.form.businessDeptId);
-      },
-    },
-    // 查看态禁用控件无 hover，用完整路径/名称做 tooltip
     businessDeptTooltipText() {
-      const pathIds = this.businessDeptCascaderValue || [];
+      const id = this.form.businessDeptId;
-      if (pathIds.length && this.businessDeptTreeOptions?.length) {
+      if (id) {
-        const labels = [];
+        const matched = this.deptOptions.find(item => String(item.value) === String(id));
-        let nodes = this.businessDeptTreeOptions;
+        if (matched?.rawLabel || matched?.label) {
-        for (const id of pathIds) {
+          return matched.rawLabel || matched.label;
-          const node = (nodes || []).find(item => String(item.value) === String(id));
-          if (!node) break;
-          labels.push(node.label);
-          nodes = node.children;
         }
-        if (labels.length) return labels.join(' / ');
       }
       return String(this.form.businessDeptName || '').trim();
     },
@@ -1488,6 +1556,9 @@ export default {
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
+    showProjectContractSection() {
+      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
+    },
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
@@ -1673,9 +1744,10 @@ export default {
         detail.settlementMode
       );
       if (detail.businessDeptId) {
-        const label = detail.businessDeptName || String(detail.businessDeptId);
+        const id = String(detail.businessDeptId);
-        this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
+        const label = detail.businessDeptName || id;
-        this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
+        this.form.businessDeptId = id;
+        this.deptOptions = [{ label, rawLabel: label, value: id }];
       }
       const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
       const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
@@ -2012,15 +2084,20 @@ export default {
       const run = value => {
         const args = operation.prompt ? [row.id, value] : [row.id];
         const request = () => this.api[operation.action](...args);
+        // 先本地提交再调 MK：MK 成功后会把状态同步成 reviewing，
+        // 若先 MK 再本地，已撤回/已驳回单据会被「当前状态不允许编辑」拦住。
         const afterMk =
           operation.action === 'submitApproval'
-            ? submitMkApprovalFlow({
+            ? request().then(() =>
-                bizType: 'project-apply',
+                submitMkApprovalFlow({
-                bizId: row.id,
+                  bizType: 'project-apply',
-                subjectName: row.projectName || '',
+                  bizId: row.id,
-                approvalStatus: row.approvalStatus || '',
+                  subjectName: row.projectName || '',
-                mkEnabled: this.mkEnabled,
+                  approvalStatus: row.approvalStatus || '',
-              }).then(() => request())
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
             : request();
         // 项目通过会同步等待合规推送，加遮罩防重复点击
         const loading =
@@ -2130,6 +2207,8 @@ export default {
       this.attachmentRows = [];
       this.selectedAttachmentRows = [];
       this.changeRows = [];
+      this.projectContractRows = [];
+      this.projectContractLoading = false;
       this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
@@ -2178,6 +2257,40 @@ export default {
       this.syncSelectedCustomerOptions();
       this.ensureCurrentPlatformOption();
       this.ensureCurrentBusinessDeptOption();
+      this.loadProjectContracts(row?.id);
+    },
+    loadProjectContracts(projectId) {
+      if (!this.showProjectContractSection || !projectId) {
+        this.projectContractRows = [];
+        this.projectContractLoading = false;
+        return;
+      }
+      this.projectContractLoading = true;
+      getContractManageList(1, 1000, { projectId })
+        .then(res => {
+          const data = res.data?.data;
+          const records = Array.isArray(data) ? data : data?.records || [];
+          this.projectContractRows = records.filter(
+            item => String(item.projectId) === String(projectId)
+          );
+        })
+        .catch(() => {
+          this.projectContractRows = [];
+          this.$message.error('项目合同加载失败');
+        })
+        .finally(() => {
+          this.projectContractLoading = false;
+        });
+    },
+    openProjectContractDetail(row) {
+      if (!row?.id) {
+        this.$message.warning('合同信息不完整，无法跳转');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: row.id, name: '合同详情' },
+      });
     },
     fillDefaultUsers() {
       const userId = this.userInfo?.userId || this.userInfo?.id || '';
@@ -2264,6 +2377,9 @@ export default {
                 subjectName: name,
                 approvalStatus: status,
                 mkEnabled: this.mkEnabled,
+                tempVarData: {
+                  projectType: this.form.projectType || data.projectType || '',
+                },
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2384,6 +2500,7 @@ export default {
                 subjectName: this.form.projectName || '',
                 approvalStatus,
                 mkEnabled: this.mkEnabled,
+                tempVarData: { projectType: this.form.projectType || '' },
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2409,6 +2526,7 @@ export default {
               subjectName: this.form.projectName || '',
               approvalStatus: this.form.approvalStatus || 'change_rejected',
               mkEnabled: this.mkEnabled,
+              tempVarData: { projectType: this.form.projectType || '' },
             }).then(() => {
               this.$message.success('提交成功!');
               this.closeProjectForm();
@@ -2812,10 +2930,10 @@ export default {
       return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
     },
     handleBusinessDeptChange(value) {
-      // 兼容级联路径数组（取末级）与单个部门 id
+      const id = value == null || value === '' ? '' : String(value);
-      const id = Array.isArray(value) ? value.at(-1) : value;
+      this.form.businessDeptId = id;
-      const dept = this.deptOptions.find(item => String(item.value) === String(id));
+      const dept = this.deptOptions.find(item => String(item.value) === id);
-      this.form.businessDeptName = dept ? dept.rawLabel : '';
+      this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
       this.$refs.projectForm?.validateField('businessDeptId');
     },
     handleUndertakeDeptChange(value) {
@@ -2853,77 +2971,44 @@ export default {
     firstUndertakeDeptId(value) {
       return this.parseUndertakeDeptIds(value)[0] || '';
     },
-    // 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
-    findDeptPath(id, tree = [], parents = []) {
-      const target = Array.isArray(id) ? id.at(-1) : id;
-      if (target === undefined || target === null || target === '') return null;
-      for (const node of tree || []) {
-        const path = [...parents, node.value];
-        if (String(node.value) === String(target)) return path;
-        const matched = this.findDeptPath(target, node.children, path);
-        if (matched) return matched;
-      }
-      return null;
-    },
     handleProjectTypeChange() {
       this.normalizeAttachmentFileTypes();
       this.$refs.projectForm?.validateField('projectType');
     },
     loadDeptOptions() {
-      Promise.all([getDeptTree(), getBusinessDeptSelect()])
+      getBusinessDeptSelect()
-        .then(([treeRes, bizRes]) => {
+        .then(res => {
-          const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
+          const bizList = res.data.data || [];
-          const bizList = bizRes.data.data || [];
+          // 仅展示「是否业务部门=是」的本级部门，扁平下拉
-          const bizIds = new Set(
+          this.deptOptions = bizList
-            bizList
+            .map(item => {
-              .map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
+              const value = item.id == null || item.id === '' ? '' : String(item.id);
-              .filter(Boolean)
+              const label = item.deptName || item.fullName || item.title || item.name || value;
-          );
+              return {
-          // 仅保留「是否业务部门=是」的节点及其祖先，祖先不可选
+                label,
-          const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
+                rawLabel: label,
-          this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
+                value,
-            bizIds.has(String(item.value))
+              };
-          );
+            })
-          this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
+            .filter(item => item.value);
           this.fillDefaultBusinessDept();
           this.ensureCurrentBusinessDeptOption();
         })
         .catch(() => {
           this.deptOptions = [];
-          this.businessDeptTreeOptions = [];
         });
       this.loadPlatformCompanyOptions();
     },
-    /**
-     * 剪枝组织树：只保留业务部门节点及其祖先路径。
-     */
-    filterBusinessDeptTree(list = [], bizIds = new Set()) {
-      return (list || []).reduce((result, item) => {
-        const children = item.children?.length
-          ? this.filterBusinessDeptTree(item.children, bizIds)
-          : [];
-        const isBiz = bizIds.has(String(item.id));
-        if (!isBiz && !children.length) {
-          return result;
-        }
-        result.push({
-          ...item,
-          children: children.length ? children : undefined,
-        });
-        return result;
-      }, []);
-    },
     ensureCurrentBusinessDeptOption() {
-      const id = this.form.businessDeptId;
+      const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
+        ? ''
+        : String(this.form.businessDeptId);
       if (!id) return;
-      const exists = this.deptOptions.some(item => String(item.value) === String(id));
+      this.form.businessDeptId = id;
+      const exists = this.deptOptions.some(item => String(item.value) === id);
       if (exists) return;
-      const label = this.form.businessDeptName || String(id);
+      const label = this.form.businessDeptName || id;
       this.deptOptions.unshift({ label, rawLabel: label, value: id });
-      const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
-      if (!pathExists) {
-        this.businessDeptTreeOptions.unshift({ label, value: id });
-      }
     },
     loadPlatformCompanyOptions() {
       getPlatformCompanySelect().then(res => {
@@ -2955,50 +3040,6 @@ export default {
         return matched ? matched.value : id;
       });
     },
-    excludeExternalOrganization(list = []) {
-      return list.reduce((result, item) => {
-        const deptName = item.title || item.deptName || item.name;
-        if (String(deptName || '').trim() === '外部组织') return result;
-        result.push({
-          ...item,
-          children: item.children?.length
-            ? this.excludeExternalOrganization(item.children)
-            : item.children,
-        });
-        return result;
-      }, []);
-    },
-    toDeptCascaderOptions(list = [], bizIds = null) {
-      return list.map(item => {
-        const value = item.id == null || item.id === '' ? item.value : item.id;
-        const option = {
-          label: item.title || item.deptName || item.name || item.label,
-          value: value == null || value === '' ? '' : String(value),
-          children: item.children?.length
-            ? this.toDeptCascaderOptions(item.children, bizIds)
-            : undefined,
-        };
-        // 仅业务部门可选；祖先节点保留路径但禁用
-        if (bizIds && !bizIds.has(String(option.value))) {
-          option.disabled = true;
-        }
-        return option;
-      });
-    },
-    flattenDept(list = [], level = 0) {
-      return list.reduce((result, item) => {
-        const label = item.title || item.deptName || item.name;
-        result.push({
-          label: `${'　'.repeat(level)}${label}`,
-          rawLabel: label,
-          value: item.id,
-        });
-        if (item.children && item.children.length) {
-          result.push(...this.flattenDept(item.children, level + 1));
-        }
-        return result;
-      }, []);
-    },
     loadCargoTypeOptions() {
       getSystemDictionary({ code: 'type_of_goods' }).then(res => {
         this.cargoTypeOptions = (res.data.data || []).map(item => ({

src/views/business/project-change.vue

@@ -214,15 +214,19 @@ export default {
       }
       const run = () => {
         const request = () => this.api[operation.action](row.id);
+        // 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
         const afterMk =
           operation.action === 'submitApproval'
-            ? submitMkApprovalFlow({
+            ? request().then(() =>
-                bizType: 'project-change',
+                submitMkApprovalFlow({
-                bizId: row.id,
+                  bizType: 'project-change',
-                subjectName: row.projectName || '',
+                  bizId: row.id,
-                approvalStatus: row.approvalStatus || '',
+                  subjectName: row.projectName || '',
-                mkEnabled: this.mkEnabled,
+                  approvalStatus: row.approvalStatus || '',
-              }).then(() => request())
+                  mkEnabled: this.mkEnabled,
+                  tempVarData: { projectType: row.projectType || '' },
+                })
+              )
             : request();
         const loading =
           operation.action === 'approve'

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="
+              v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
-                hasPermission('receipt_claim_record_void') &&
-                  row.claimStatus === 'claimed' &&
-                  row.pushStatus !== 'pushed'
-              "
               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">
+          <el-table-column label="未匹配金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
+            <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);
+      return Math.max(Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0), 0);
-      const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
-      return Math.max(ceiling - 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(
+        if (total > this.flowRemaining(flow) + 0.001) {
-          Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
+          this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过剩余可认领金额`);
-          0
-        );
-        if (total > remaining + 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-form-item label="未匹配金额"
-              ><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
+              ><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 =
+      const claimed = Number(this.form.claimedAmount || 0);
-        unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
+      return Math.max(receipt - claimed, 0);
-      return Math.max(ceiling - Number(this.form.claimedAmount || 0), 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
+            <el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
-              v-if="canClaim(row)"
+            <span v-else>-</span>
-              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>
           </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="金蝶未认领金额">
+          <el-descriptions-item label="未匹配金额">
-            {{ formatMoney(detailDialog.data.unclaimedAmount) }}
+            {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="推送状态">
-            <el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
-              {{ displayValue(detailDialog.data.pushStatusName) }}
-            </el-tag>
           </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 }">
+            <template #default="{ row }">{{ claimStatusChange(row) }}</template>
-              {{ row.actionType === 'push' ? row.actionName : 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"
           />

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

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

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

@@ -2904,10 +2904,33 @@ export default {
     buildRequestParams(params = {}) {
       return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
     },
-    syncBillingPlanOptions(contractId) {
+    syncBillingPlanOptions(contractId, counterpartyName = '') {
       const contracts = [...this.updateContractOptions, ...this.contractOptions];
       const contract = contracts.find(item => String(item.id) === String(contractId));
-      const plans = this.parseJson(contract?.billingPlanJson);
+      let plans = this.parseJson(contract?.billingPlanJson);
+      const targetName = String(
+        counterpartyName ||
+          this.updateFeeForm?.counterpartyName ||
+          this.generateQuery?.counterpartyName ||
+          this.currentDetail?.counterpartyName ||
+          this.currentDetail?.carrierName ||
+          this.currentDetail?.customerName ||
+          ''
+      ).trim();
+      if (targetName) {
+        const matched = plans.filter(
+          item =>
+            String(item.customerName || '').trim() === targetName ||
+            String(item.partyRowId || '') ===
+              String(this.updateFeeForm?.carrierPartyId || this.generateQuery?.carrierPartyId || '')
+        );
+        const hasBinding = plans.some(
+          item => item.customerName || item.customerId || item.partyRowId
+        );
+        if (matched.length || hasBinding) {
+          plans = matched;
+        }
+      }
       this.billingPlanOptions = plans.map((item, index) => ({
         id:
           item.id ||
@@ -2916,11 +2939,16 @@ export default {
           item.planName ||
           item.billingPlanName ||
           `plan-${index}`,
-        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+        name: [
+          item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
+          item.customerName ? `（${item.customerName}）` : '',
+        ].join(''),
         defaultPlan:
           item.defaultPlan === true ||
           item.defaultPlan === 1 ||
           ['true', '1'].includes(String(item.defaultPlan).toLowerCase()),
+        customerName: item.customerName || '',
+        partyRowId: item.partyRowId || '',
       }));
       return this.billingPlanOptions;
     },

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

@@ -0,0 +1,414 @@
+<template>
+  <basic-container class="business-dept-config-page">
+    <avue-crud
+      ref="crud"
+      v-model="form"
+      v-model:page="page"
+      :option="option"
+      :data="data"
+      :table-loading="loading"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu="{ row, index }">
+        <el-link
+          v-if="permission.business_dept_config_view"
+          type="primary"
+          @click="$refs.crud.rowView(row, index)"
+        >
+          查看
+        </el-link>
+        <el-link
+          v-if="permission.business_dept_config_edit"
+          type="primary"
+          @click="$refs.crud.rowEdit(row, index)"
+        >
+          编辑
+        </el-link>
+        <el-link
+          v-if="permission.business_dept_config_delete"
+          type="danger"
+          @click="rowDel(row)"
+        >
+          删除
+        </el-link>
+      </template>
+      <template #initialSerial="{ row }">
+        {{ formatSerial(row.initialSerial) }}
+      </template>
+      <template #platformCompanyId-form>
+        <el-select
+          v-model="form.platformCompanyId"
+          filterable
+          clearable
+          placeholder="请选择平台公司"
+          style="width: 100%"
+          @change="handlePlatformCompanyChange"
+        >
+          <el-option
+            v-for="item in platformCompanyOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #businessDeptId-form>
+        <el-select
+          v-model="form.businessDeptId"
+          filterable
+          clearable
+          placeholder="请选择业务部门"
+          style="width: 100%"
+          @change="handleBusinessDeptChange"
+        >
+          <el-option
+            v-for="item in businessDeptOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template>
+      <template #kingdeeCompanyCode-form>
+        <el-input
+          v-model="form.kingdeeCompanyCode"
+          disabled
+          placeholder="关联组织中配置的平台公司金蝶代码"
+        />
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, submit, remove } from '@/api/system/business-dept-config';
+import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
+import { mapGetters } from 'vuex';
+
+export default {
+  data() {
+    return {
+      form: {},
+      data: [],
+      loading: true,
+      query: {},
+      page: {
+        pageSize: 10,
+        pageSizes: [10, 30, 50, 100, 200],
+        currentPage: 1,
+        total: 0,
+      },
+      platformCompanyOptions: [],
+      businessDeptOptions: [],
+      option: {
+        height: 'auto',
+        calcHeight: 32,
+        tip: false,
+        border: true,
+        stripe: true,
+        index: true,
+        indexLabel: '序号',
+        indexWidth: 70,
+        selection: false,
+        addBtn: true,
+        editBtn: false,
+        delBtn: false,
+        viewBtn: false,
+        menuWidth: 220,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        labelPosition: 'right',
+        labelWidth: 'auto',
+        searchShow: true,
+        searchIcon: true,
+        searchIndex: 4,
+        searchMenuSpan: 24,
+        searchMenuPosition: 'right',
+        column: [
+          {
+            label: '业务部门',
+            prop: 'businessDeptId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 2,
+            searchFilterable: true,
+            minWidth: 160,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择业务部门', trigger: 'change' }],
+          },
+          {
+            label: '业务部门',
+            prop: 'businessDeptName',
+            minWidth: 160,
+            display: false,
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyId',
+            type: 'select',
+            filterable: true,
+            search: true,
+            searchOrder: 1,
+            searchFilterable: true,
+            minWidth: 220,
+            span: 12,
+            formslot: true,
+            hide: true,
+            props: { label: 'label', value: 'value' },
+            dicData: [],
+            rules: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
+          },
+          {
+            label: '平台公司',
+            prop: 'platformCompanyName',
+            minWidth: 220,
+            display: false,
+          },
+          {
+            label: '合同编码前缀',
+            prop: 'contractCodePrefix',
+            minWidth: 140,
+            span: 12,
+            maxlength: 64,
+            rules: [{ required: true, message: '请输入合同编码前缀', trigger: 'blur' }],
+          },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeCompanyCode',
+            minWidth: 140,
+            span: 12,
+            formslot: true,
+            addDisplay: true,
+            editDisplay: true,
+            hide: true,
+          },
+          {
+            label: '初始流水号',
+            prop: 'initialSerial',
+            type: 'number',
+            minWidth: 120,
+            span: 12,
+            minRows: 1,
+            maxRows: 999,
+            controls: false,
+            slot: true,
+            placeholder: '如果系统已有相同流水号，则跳过这个流水号',
+          },
+          {
+            label: '金蝶部门代码',
+            prop: 'kingdeeDeptCode',
+            minWidth: 140,
+            span: 12,
+            maxlength: 64,
+          },
+          {
+            label: '备注',
+            prop: 'remark',
+            type: 'textarea',
+            minWidth: 160,
+            span: 24,
+            maxlength: 200,
+            showWordLimit: true,
+            hide: true,
+            overHidden: true,
+          },
+          {
+            label: '创建时间',
+            prop: 'createTime',
+            type: 'datetime',
+            format: 'YYYY-MM-DD HH:mm:ss',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+          {
+            label: '更新人',
+            prop: 'updateUserName',
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.business_dept_config_add, false),
+        editBtn: false,
+        delBtn: false,
+      };
+    },
+  },
+  created() {
+    this.loadSelectOptions();
+  },
+  methods: {
+    loadSelectOptions() {
+      Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
+    },
+    normalizeDeptOptions(list) {
+      return (list || []).map(item => ({
+        label: item.deptName || item.fullName || String(item.id),
+        value: String(item.id),
+        kingdeeDeptCode: item.kingdeeDeptCode || '',
+      }));
+    },
+    formatSerial(value) {
+      if (value === null || value === undefined || value === '') return '-';
+      const number = Number(value);
+      if (!Number.isInteger(number) || number < 1) return String(value);
+      return String(number).padStart(3, '0');
+    },
+    handlePlatformCompanyChange(value) {
+      const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
+      this.form.platformCompanyName = matched ? matched.label : '';
+      this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
+    },
+    handleBusinessDeptChange(value) {
+      const matched = this.businessDeptOptions.find(item => String(item.value) === String(value));
+      this.form.businessDeptName = matched ? matched.label : '';
+    },
+    beforeOpen(done, type) {
+      this.loadSelectOptions();
+      if (['edit', 'view'].includes(type) && this.form.id) {
+        getDetail(this.form.id).then(res => {
+          const detail = res.data?.data || {};
+          this.form = {
+            ...detail,
+            platformCompanyId: detail.platformCompanyId ? String(detail.platformCompanyId) : '',
+            businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
+          };
+          done();
+        });
+        return;
+      }
+      if (type === 'add') {
+        this.form = {
+          platformCompanyId: '',
+          platformCompanyName: '',
+          businessDeptId: '',
+          businessDeptName: '',
+          contractCodePrefix: '',
+          initialSerial: undefined,
+          kingdeeCompanyCode: '',
+          kingdeeDeptCode: '',
+          remark: '',
+        };
+      }
+      done();
+    },
+    normalizeSubmitRow(row) {
+      const initialSerial =
+        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
+          ? null
+          : Number(row.initialSerial);
+      return {
+        ...row,
+        platformCompanyId: row.platformCompanyId || null,
+        businessDeptId: row.businessDeptId || null,
+        contractCodePrefix: String(row.contractCodePrefix || '').trim(),
+        kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
+        remark: String(row.remark || '').trim(),
+        initialSerial: Number.isFinite(initialSerial) ? initialSerial : null,
+      };
+    },
+    rowSave(row, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.$message.success('新增成功');
+          done();
+          this.onLoad(this.page);
+        },
+        () => loading()
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      submit(this.normalizeSubmitRow(row)).then(
+        () => {
+          this.$message.success('修改成功');
+          done();
+          this.onLoad(this.page);
+        },
+        () => loading()
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定删除该业务部门配置？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(row.id))
+        .then(() => {
+          this.$message.success('删除成功');
+          this.onLoad(this.page);
+        })
+        .catch(() => {});
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const query = {
+        ...this.query,
+        ...params,
+      };
+      getList(page.currentPage, page.pageSize, query)
+        .then(res => {
+          const result = res.data?.data || {};
+          this.page.total = result.total || 0;
+          this.data = result.records || [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>

src/views/system/dept.vue

@@ -203,7 +203,6 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';
 
-const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
  * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -303,7 +302,7 @@ export default {
             headerAlign: 'left',
             order: 80,
             search: true,
-            searchOrder: 2,
+            searchOrder: 3,
             rules: [
               {
                 required: true,
@@ -323,7 +322,7 @@ export default {
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过
+                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
                   if (!deptCode) {
                     callback();
                     return;
@@ -332,126 +331,6 @@ export default {
                     callback(new Error('组织编码不能超过30个字符'));
                     return;
                   }
-                  const parentId = this.normalizeParentId(this.form?.parentId);
-                  // 顶级组织不选择上级时，编码不依赖上级编码
-                  if (!parentId) {
-                    callback();
-                    return;
-                  }
-                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
-                    this.loadParentDeptCode(parentId);
-                    callback(new Error('正在加载上级组织编码，请稍后重试'));
-                    return;
-                  }
-                  if (!this.parentDeptCode) {
-                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
-                    return;
-                  }
-                  // 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
-                  let expectedPrefix = this.parentDeptCode;
-                  const category = Number(this.form?.deptCategory);
-                  if (category === 2) {
-                    expectedPrefix = 'GWWL';
-                  } else if (category === 3 && this.form?.belongCompanyCode) {
-                    expectedPrefix = String(this.form.belongCompanyCode).trim();
-                  }
-                  const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
-                  if (!pattern.test(deptCode)) {
-                    callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '金蝶部门代码',
-            prop: 'kingdeeDeptCode',
-            minWidth: 140,
-            order: 65,
-            maxlength: 64,
-            showWordLimit: true,
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  const code = String(value || '').trim();
-                  if (!code) {
-                    callback();
-                    return;
-                  }
-                  if (code.length > 64) {
-                    callback(new Error('金蝶部门代码不能超过64个字符'));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '合同编码前缀',
-            prop: 'contractCodePrefix',
-            minWidth: 160,
-            order: 62,
-            maxlength: 64,
-            showWordLimit: true,
-            placeholder: '如 GWZH成都',
-            tip: '合同编号规则：前缀（年份）三位流水号，流水按本部门独立编号',
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  const prefix = String(value || '').trim();
-                  if (!prefix) {
-                    callback();
-                    return;
-                  }
-                  if (prefix.length > 64) {
-                    callback(new Error('合同编码前缀不能超过64个字符'));
-                    return;
-                  }
-                  callback();
-                },
-                trigger: 'blur',
-              },
-            ],
-          },
-          {
-            label: '合同初始流水号',
-            prop: 'contractInitialSerial',
-            type: 'input',
-            minWidth: 140,
-            order: 61,
-            placeholder: '如 1',
-            // -1 为空占位，列表展示为空
-            formatter: row =>
-              Number(row.contractInitialSerial) === -1 ? '' : row.contractInitialSerial,
-            tip: '该部门当年首个合同时从此流水号起编，后续递增；范围1-999，不填默认从1开始',
-            rules: [
-              {
-                validator: (rule, value, callback) => {
-                  // -1 为空占位，不填时按空处理
-                  if (
-                    value === undefined ||
-                    value === null ||
-                    value === '' ||
-                    Number(value) === -1
-                  ) {
-                    callback();
-                    return;
-                  }
-                  const text = String(value).trim();
-                  if (!/^\d+$/.test(text)) {
-                    callback(new Error('合同初始流水号只能输入正整数'));
-                    return;
-                  }
-                  const serial = Number(text);
-                  if (serial < 1 || serial > 999) {
-                    callback(new Error('合同初始流水号范围为1到999'));
-                    return;
-                  }
                   callback();
                 },
                 trigger: 'blur',
@@ -464,7 +343,7 @@ export default {
             minWidth: 140,
             order: 60,
             search: true,
-            searchOrder: 1,
+            searchOrder: 4,
           },
           {
             label: '助记码',
@@ -523,14 +402,21 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
-            order: 35,
+            order: 36,
+            search: true,
+            searchOrder: 2,
+            searchPlaceholder: '请选择是否平台公司',
             formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
             rules: [
               {
-                required: true,
+                validator: (rule, value, callback) => {
-                message: '请选择是否平台公司',
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否平台公司'));
+                    return;
+                  }
+                  callback();
+                },
                 trigger: 'change',
               },
             ],
@@ -544,14 +430,22 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
             order: 34,
+            search: true,
+            searchOrder: 1,
+            searchPlaceholder: '请选择是否业务部门',
             formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
             rules: [
               {
-                required: true,
+                validator: (rule, value, callback) => {
-                message: '请选择是否业务部门',
+                  // 不能用 required:true：值为 0（否）时会被当成空
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否业务部门'));
+                    return;
+                  }
+                  callback();
+                },
                 trigger: 'change',
               },
             ],
@@ -1042,6 +936,7 @@ export default {
     /**
      * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
      * 排序为空时由后端默认填充 1。
+     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
      */
     prepareDeptSubmitRow(row) {
       const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -1049,6 +944,8 @@ export default {
         return false;
       }
       row.deptCategory = category;
+      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
+      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
       if (row.status === '' || row.status === null || row.status === undefined) {
         delete row.status;
       } else {
@@ -1061,6 +958,9 @@ export default {
       }
       return true;
     },
+    normalizeYesNoFlag(value) {
+      return Number(value) === 1 ? 1 : 0;
+    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1217,29 +1117,6 @@ export default {
         row.parentId = 0;
       }
     },
-    normalizeContractInitialSerial(value) {
-      // -1 为空占位，不填时不落库、不回显
-      if (
-        value === undefined ||
-        value === null ||
-        value === '' ||
-        Number(value) === -1
-      ) {
-        return null;
-      }
-      const text = String(value).trim();
-      if (!text) {
-        return null;
-      }
-      const serial = Number(text);
-      return Number.isInteger(serial) ? serial : value;
-    },
-    clearEmptyContractInitialSerial(form = this.form) {
-      if (!form) return;
-      if (Number(form.contractInitialSerial) === -1) {
-        form.contractInitialSerial = '';
-      }
-    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -1384,9 +1261,6 @@ export default {
     rowSave(row, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
-      row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
-      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1432,9 +1306,6 @@ export default {
     rowUpdate(row, index, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
-      row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
-      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1541,34 +1412,40 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
+        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
-          this.form.isPlatformCompany = 0;
+        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
-        }
-        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
-          this.form.isBusinessDept = 0;
-        }
-        this.clearEmptyContractInitialSerial(this.form);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
+        done();
+        return;
       }
       if (type === 'edit') {
         this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
       }
       if (['edit', 'view'].includes(type)) {
-        getDept(this.form.id).then(res => {
+        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
-          this.form = Object.assign(res.data.data, {
+        getDept(this.form.id)
-            hasChildren: this.form.hasChildren,
+          .then(res => {
+            const detail = res.data.data || {};
+            Object.assign(this.form, detail, {
+              hasChildren: this.form.hasChildren,
+              isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
+              isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
+            });
+            if (this.form.parentId === '0') {
+              this.form.parentId = '';
+            }
+            this.loadParentDeptCode(this.form.parentId);
+            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
+              const splitResult = func.split(this.form.leaderId);
+              this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
+            }
+            done();
+          })
+          .catch(() => {
+            done();
           });
-          if (this.form.parentId === '0') {
+        return;
-            this.form.parentId = '';
-          }
-          this.clearEmptyContractInitialSerial(this.form);
-          this.loadParentDeptCode(this.form.parentId);
-          if (this.form.hasOwnProperty('leaderId')) {
-            const splitResult = func.split(this.form.leaderId);
-            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-          }
-        });
       }
       done();
     },

src/views/system/user.vue

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

src/views/vehicle/customer-archive.vue

@@ -49,21 +49,24 @@
       </template>
       <template #customerRisk="{ row }">
         <el-tooltip
-          v-if="customerRowRisky(row)"
+          v-if="customerRowRiskName(row) && customerRowRiskName(row) !== '无风险'"
           placement="top"
           effect="dark"
           popper-class="customer-risk-popper"
         >
           <template #content>
-            <div>{{ row.hcsRiskDetail || '该客商为高风险/黑名单客商' }}</div>
+            <div>{{ row.hcsRiskDetail || customerRowRiskName(row) }}</div>
           </template>
-          <el-tag type="danger" class="status-text">
+          <el-tag
+            :type="customerRowRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+            class="status-text"
+          >
             {{ customerRowRiskName(row) }}
           </el-tag>
         </el-tooltip>
         <el-tag
           v-else-if="customerRowRiskName(row)"
-          :type="row.hcsRiskLevel === '1' ? 'warning' : 'success'"
+          type="success"
           class="status-text"
         >
           {{ customerRowRiskName(row) }}
@@ -1097,8 +1100,18 @@
           <el-form-item label="开户人姓名" prop="accountHolderName">
             <el-input v-model="receiptForm.accountHolderName" maxlength="50" />
           </el-form-item>
-          <el-form-item label="开户行" prop="bankName">
+          <el-form-item prop="bankName">
-            <el-input v-model="receiptForm.bankName" maxlength="100" />
+            <template #label>
+              <span class="receipt-bank-label">
+                开户行
+                <el-tooltip placement="top" effect="dark" content="请填写银行全称，系统将自动匹配金蝶档案带出联行号">
+                  <el-icon class="receipt-bank-help">
+                    <el-icon-question-filled />
+                  </el-icon>
+                </el-tooltip>
+              </span>
+            </template>
+            <el-input v-model="receiptForm.bankName" maxlength="100" @blur="fetchReceiptCnapsCode" />
           </el-form-item>
           <el-form-item label="联行号" prop="cnapsCode">
             <el-input v-model="receiptForm.cnapsCode" maxlength="32" />
@@ -1605,6 +1618,8 @@ import {
   remove,
   getScoreTemplate,
   recognizeBusinessLicenseOcr,
+  queryKingdeeBank,
+  queryKingdeeBankByNumber,
   queryKingdeeCustomer,
   querySupplierCode,
   syncKingdee,
@@ -3654,18 +3669,50 @@ export default {
       this.receiptForm = this.emptyReceiptAccount();
       this.$refs.receiptForm?.clearValidate();
     },
-    saveReceipt() {
+    // 开户行失焦后按行名精确匹配金蝶行名行号档案（A905-3），命中自动带出联行号，未命中提示检查
-      this.$refs.receiptForm.validate(valid => {
+    async fetchReceiptCnapsCode() {
-        if (!valid) return;
+      const bankName = String(this.receiptForm.bankName || '').trim();
-        const receipt = this.normalizeReceipt(this.receiptForm);
+      if (!bankName) return;
-        if (this.receiptIndex > -1) {
+      try {
-          this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+        const res = await queryKingdeeBank(bankName);
+        // 防止响应返回时用户已修改开户行
+        if (String(this.receiptForm.bankName || '').trim() !== bankName) return;
+        const bank = res?.data?.data || null;
+        if (bank && bank.unionNumber) {
+          this.receiptForm.cnapsCode = bank.unionNumber;
+          this.$refs.receiptForm?.clearValidate('cnapsCode');
         } else {
-          this.archiveForm.receiptAccounts.push(receipt);
+          this.$message.warning('未查询到金蝶开户行信息，请检查开户行名称');
-          this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
         }
-        this.receiptBox = false;
+      } catch (error) {
-      });
+        // 忽略查询异常，联行号留空由用户手填
+      }
+    },
+    async saveReceipt() {
+      const valid = await this.$refs.receiptForm.validate().catch(() => false);
+      if (!valid) return;
+      // 保存前按联行号精确校验金蝶行名行号档案（A905-3），查不到不允许保存
+      const cnapsCode = String(this.receiptForm.cnapsCode || '').trim();
+      let bank = null;
+      try {
+        const res = await queryKingdeeBankByNumber(cnapsCode);
+        bank = res?.data?.data || null;
+      } catch (error) {
+        this.$message.warning('金蝶联行号校验失败，请稍后重试');
+        return;
+      }
+      if (!bank || !bank.unionNumber) {
+        this.$message.warning('未查询到金蝶联行号信息，不能保存，请检查联行号');
+        return;
+      }
+      const receipt = this.normalizeReceipt(this.receiptForm);
+      if (this.receiptIndex > -1) {
+        this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
+      } else {
+        this.archiveForm.receiptAccounts.push(receipt);
+        this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
+      }
+      this.receiptBox = false;
     },
     deleteReceipt(index) {
       this.$confirm('确定删除该收款信息?', '提示', {
@@ -3994,7 +4041,7 @@ export default {
       });
       recognizeBusinessLicenseOcr(url)
         .then(res => {
-          this.applyBusinessLicenseRecognition(res?.data?.data?.result || {});
+          this.applyBusinessLicenseRecognition(res?.data?.data || {});
           this.$message.success('营业执照识别完成');
         })
         .catch(() => {
@@ -4002,8 +4049,31 @@ export default {
         })
         .finally(() => loading.close());
     },
+    normalizeBusinessLicenseOcrFields(result = {}) {
+      if (Array.isArray(result)) {
+        return Object.fromEntries(
+          result
+            .filter(item => item && item.key)
+            .map(item => [String(item.key).trim(), String(item.value ?? '').trim()])
+            .filter(([, value]) => value)
+        );
+      }
+      if (result.fields && typeof result.fields === 'object' && !Array.isArray(result.fields)) {
+        return result.fields;
+      }
+      if (Array.isArray(result.data)) {
+        return this.normalizeBusinessLicenseOcrFields(result.data);
+      }
+      return result;
+    },
     getBusinessLicenseOcrValue(result, labels) {
-      const words = result?.words_result || result?.wordsResult || result || {};
+      const fields = this.normalizeBusinessLicenseOcrFields(result);
+      for (const label of labels) {
+        const value = fields[label];
+        const text = value && typeof value === 'object' ? value.words : value;
+        if (text !== undefined && text !== null && String(text).trim()) return String(text).trim();
+      }
+      const words = result?.words_result || result?.wordsResult || {};
       for (const label of labels) {
         const value = words[label];
         const text = value && typeof value === 'object' ? value.words : value;
@@ -4015,23 +4085,35 @@ export default {
       return String(value || '').replace(/\s/g, '') === '无';
     },
     applyBusinessLicenseRecognition(result = {}) {
-      const code = this.getBusinessLicenseOcrValue(result, [
+      const fields = this.normalizeBusinessLicenseOcrFields(result);
+      const code = this.getBusinessLicenseOcrValue(fields, [
+        'uscc',
         '统一社会信用代码',
         '社会信用代码',
         '注册号',
       ]);
-      const name = this.getBusinessLicenseOcrValue(result, ['单位名称', '企业名称', '名称']);
+      const name = this.getBusinessLicenseOcrValue(fields, [
-      const legalPerson = this.getBusinessLicenseOcrValue(result, ['法定代表人', '法人']);
+        'company_name',
-      const address = this.getBusinessLicenseOcrValue(result, ['地址', '住所']);
+        '单位名称',
-      const capital = this.getBusinessLicenseOcrValue(result, ['注册资本']);
+        '企业名称',
-      const paidInCapital = this.getBusinessLicenseOcrValue(result, ['实缴资本', '实收资本']);
+        '名称',
-      const term = this.getBusinessLicenseOcrValue(result, ['营业期限', '有效期']);
+      ]);
-      const termStartDate = this.getBusinessLicenseOcrValue(result, [
+      const legalPerson = this.getBusinessLicenseOcrValue(fields, [
+        'legal_name',
+        '法定代表人',
+        '法人',
+      ]);
+      const address = this.getBusinessLicenseOcrValue(fields, ['add', '地址', '住所']);
+      const capital = this.getBusinessLicenseOcrValue(fields, ['capital', '注册资本']);
+      const paidInCapital = this.getBusinessLicenseOcrValue(fields, ['实缴资本', '实收资本']);
+      const term = this.getBusinessLicenseOcrValue(fields, ['period', '营业期限', '有效期']);
+      const termStartDate = this.getBusinessLicenseOcrValue(fields, [
+        'establishment_date',
         '有效期起始日期',
         '成立日期',
         '核准日期',
       ]);
-      const scope = this.getBusinessLicenseOcrValue(result, ['经营范围']);
+      const scope = this.getBusinessLicenseOcrValue(fields, ['经营范围']);
       if (code) this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
       if (name) this.archiveForm.fullName = name;
       if (name) this.checkArchiveNameRisk();
@@ -6124,6 +6206,19 @@ export default {
   :deep(.el-select) {
     width: 60%;
   }
+
+  .receipt-bank-label {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+  }
+
+  .receipt-bank-help {
+    color: #a8abb2;
+    cursor: help;
+    font-size: 14px;
+    flex: none;
+  }
 }
 
 .receipt-dialog__footer-actions {