Merge remote-tracking branch 'refs/remotes/origin/master' into feature/20261030-kingdee-writeoff-status-web

# Conflicts:
#	src/views/business/contract-manage.vue

src/api/business/contract-change.js

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

src/api/business/contract-manage.js

@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/contract-manage';
@@ -36,8 +37,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
-    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
-    timeout: 120000,
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>
@@ -93,10 +93,10 @@ export const expireStats = params =>
     params,
   });
 
-/** 按平台公司 + 业务部门预览下一合同编号 */
-export const nextContractNo = (organizationId, platformCompanyId) =>
+/** 按合同负责部门预览下一合同编号 */
+export const nextContractNo = organizationId =>
   request({
     url: `${baseUrl}/next-contract-no`,
     method: 'get',
-    params: { organizationId, platformCompanyId },
+    params: { organizationId },
   });

src/api/business/hcs.js

@@ -69,11 +69,11 @@ export const refreshMasterData = () =>
     timeout: 60000,
   });
 
-export const getRisk = customerCode =>
+export const getRisk = (customerCode, creditCode, customerName) =>
   request({
     url: `${baseUrl}/risk`,
     method: 'get',
-    params: { customerCode },
+    params: { customerCode, creditCode, customerName },
     timeout: 30000,
   });
 

src/api/business/project-change.js

@@ -1,4 +1,5 @@
 import { createCrudApi } from './common';
+import { APPROVE_TIMEOUT } from '@/api/common';
 import request from '@/axios';
 
 const baseUrl = '/blade-transport/project-change';
@@ -35,6 +36,7 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
+    timeout: APPROVE_TIMEOUT,
   });
 
 export const reject = id =>

src/api/system/business-dept-config.js

@@ -1,42 +0,0 @@
-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,7 +12,6 @@ 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

@@ -163,6 +163,18 @@ export const queryKingdeeCustomer = creditCode => {
   });
 };
 
+// 金蝶供应商编码查询（A901-1）：新增客商填写信用代码后即时回显
+export const querySupplierCode = creditCode => {
+  return request({
+    url: '/blade-transport/customer-archive/query-supplier-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
 export const syncKingdee = id => {
   return request({
     url: '/blade-transport/customer-archive/sync-kingdee',
@@ -176,11 +188,12 @@ export const syncKingdee = id => {
 
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
-    url: '/blade-transport/baidu-ocr/business-license',
+    url: '/blade-transport/baidu-ocr/recognize-url',
     method: 'post',
     timeout: 60000,
     params: {
       imageUrl,
+      type: 'business_license',
     },
   });
 };

src/option/base/measurement-unit.js

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

src/option/business/contract-manage.js

@@ -65,12 +65,10 @@ export const config = {
         ['contractName', '合同名称'],
         ['projectName', '所属项目'],
         ['organizationName', '合同负责部门'],
-        ['platformCompanyName', '平台公司'],
         ['contractCategory', '合同类别'],
         ['signType', '签约类型'],
         ['partyA', '甲方'],
         ['partyB', '乙方'],
-        ['partyC', '丙方'],
         ['handlerUserName', '经办人'],
         ['signDate', '签订日期'],
         ['applyDate', '申请日期'],
@@ -249,15 +247,6 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
-  {
-    label: '客商',
-    prop: 'partyName',
-    search: true,
-    searchOrder: 11,
-    searchPlaceholder: '请输入',
-    hide: true,
-    display: false,
-  },
   {
     label: '合同编号',
     prop: 'contractNo',
@@ -275,7 +264,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 1,
+    searchOrder: 7,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -322,13 +311,6 @@ export const option = createCrudOption([
     minWidth: 150,
     rules: selectRule('合同负责部门'),
   },
-  {
-    label: '平台公司',
-    prop: 'platformCompanyName',
-    minWidth: 180,
-    order: 115,
-    display: false,
-  },
   {
     label: '合同类别',
     prop: 'contractCategory',
@@ -355,7 +337,7 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '合同状态',
+    label: '生效类型',
     prop: 'effectiveType',
     type: 'select',
     search: true,
@@ -368,23 +350,24 @@ export const option = createCrudOption([
   {
     label: '甲方',
     prop: 'partyA',
+    type: 'select',
+    formslot: true,
+    disabled: true,
+    order: 160,
+    filterable: true,
     minWidth: 160,
-    addDisplay: false,
-    editDisplay: false,
+    rules: selectRule('甲方'),
   },
   {
     label: '乙方',
     prop: 'partyB',
+    type: 'select',
+    formslot: true,
+    disabled: true,
+    order: 150,
+    filterable: true,
     minWidth: 160,
-    addDisplay: false,
-    editDisplay: false,
-  },
-  {
-    label: '丙方',
-    prop: 'partyC',
-    minWidth: 160,
-    addDisplay: false,
-    editDisplay: false,
+    rules: selectRule('乙方'),
   },
   {
     label: '合同期限',
@@ -638,6 +621,15 @@ export const option = createCrudOption([
     addDisplay: false,
     editDisplay: false,
   },
+  {
+    label: '客商风险',
+    prop: 'customerRisk',
+    slot: true,
+    order: 189,
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '金蝶合同ID',
     prop: 'kingdeeId',

src/option/payment/paymentApplication.js

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

src/option/settlement/formalSettlement.js

@@ -16,6 +16,7 @@ import {
   approvalStatusOptions,
   invoiceStatusOptions,
   kingdeeSyncStatusOptions,
+  kingdeeWriteOffStatusOptions,
   paymentStatusOptions,
 } from './formalSettlementSearch';
 import { formalSettlementTableColumns } from './formalSettlementTable';
@@ -87,6 +88,7 @@ const COLUMN_EXTRA = {
     searchPlaceholder: '请选择',
   },
   kingdeeLockStatus: { slot: true },
+  kingdeeWriteOffStatus: { slot: true },
   createTime: { width: 180 },
 };
 
@@ -99,7 +101,8 @@ const buildTableColumns = () =>
     }
     // link / status 标记的列统一走单元格插槽
     if (column.link || column.status) extra.slot = true;
-    if (!extra.formatter) extra.formatter = textFormatter;
+    // 插槽列不挂兜底 formatter：avue 中 formatter 会覆盖单元格插槽渲染
+    if (!extra.slot && !extra.formatter) extra.formatter = textFormatter;
     return { ...column, ...extra };
   });
 
@@ -170,4 +173,5 @@ export const formalSettlementOption = () => ({
 });
 
 export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
+export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
 export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);

src/option/settlement/formalSettlementSearch.js

@@ -34,6 +34,11 @@ export const kingdeeSyncStatusOptions = [
   { label: '同步失败', value: 'failed' },
 ];
 
+export const kingdeeWriteOffStatusOptions = [
+  { label: '未冲销', value: 'unwrittenoff' },
+  { label: '已冲销', value: 'writtenoff' },
+];
+
 export const formalSettlementSearchFields = [
   { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
   { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },

src/option/settlement/formalSettlementTable.js

@@ -25,6 +25,7 @@ export const formalSettlementTableColumns = [
   { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
+  { label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
   { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },

src/utils/kingdee.js

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

src/utils/mk-approval.js

@@ -154,7 +154,6 @@ 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({
@@ -163,7 +162,6 @@ export async function submitMkApprovalFlow({
   subjectName = '',
   approvalStatus = '',
   mkEnabled,
-  tempVarData,
 } = {}) {
   const conf = MK_BIZ[bizType];
   if (!conf) {
@@ -204,16 +202,12 @@ export async function submitMkApprovalFlow({
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${bizIdText}`;
-  const submitPayload = {
+  await processSubmit({
     templateCode,
     bizId: bizIdText,
     subject,
     bizType,
     forceNewFormInstance,
-  };
-  if (tempVarData != null && typeof tempVarData === 'object') {
-    submitPayload.tempVarData = tempVarData;
-  }
-  await processSubmit(submitPayload);
+  });
   return true;
 }

src/utils/risk-display.js

@@ -0,0 +1,28 @@
+/**
+ * 客商/合同风险标签公共展示逻辑（黑名单=金蝶黑名单 A801-5 命中，与后端 HcsCreditCheckSupport 口径一致）：
+ * 等级与黑名单组合展示、等级在前；内部组织客商默认无风险
+ */
+
+/** 金蝶黑名单命中判定（客商档案行：失信类别/列入事由任一非空） */
+export function isKingdeeBlack(category, reason) {
+  return !!(category || reason);
+}
+
+/** 合同行黑名单判定（推送链路按金蝶命中口径落库 kingdeeBlackStatus=yes） */
+export function isContractBlack(blackStatus) {
+  return String(blackStatus || '').toLowerCase() === 'yes';
+}
+
+/** 风险标签文案：riskLevel=C101-1 等级（0/1/2）；isBlack=金蝶黑名单命中；customerKind=internal 显示"无风险" */
+export function resolveRiskTagName(riskLevel, isBlack, customerKind) {
+  const levelName = { 2: '高风险', 1: '中风险', 0: '低风险' }[riskLevel] || '';
+  if (isBlack) return levelName ? `${levelName}、黑名单` : '黑名单';
+  if (levelName) return levelName;
+  if (customerKind === 'internal') return '无风险';
+  return '';
+}
+
+/** 是否红色风险标签（黑名单命中或高风险） */
+export function isRiskyTag(riskLevel, isBlack) {
+  return isBlack || riskLevel === '2';
+}

src/views/base/airport-master.vue

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

src/views/base/currency.vue

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

src/views/base/customer-type.vue

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

src/views/base/fee-item.vue

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

src/views/base/measurement-unit.vue

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

src/views/base/port-terminal.vue

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

src/views/base/railway-station.vue

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

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

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

src/views/business/components/hcs-contract-panel.vue

@@ -38,7 +38,7 @@
         contract.hcsFdId || '-'
       }}</el-descriptions-item>
       <el-descriptions-item label="客商风险">
-        <template v-if="contract.hcsRiskLevel || contract.hcsBlackStatus">
+        <template v-if="contract.hcsRiskLevel || contract.kingdeeBlackStatus">
           <el-tag
             v-if="isBlacklist"
             type="danger"
@@ -130,7 +130,7 @@ export default {
   name: 'HcsContractPanel',
   components: { UploadFilled },
   props: {
-    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/hcsBlackStatus/hcsSpecStatus 等）
+    // 合同详情行（须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/kingdeeBlackStatus/hcsSpecStatus 等）
     contract: { type: Object, required: true },
   },
   emits: ['refresh'],
@@ -152,7 +152,7 @@ export default {
       return this.contract.hcsSyncMsg || '';
     },
     isBlacklist() {
-      return String(this.contract.hcsBlackStatus || '').toLowerCase() === 'yes';
+      return String(this.contract.kingdeeBlackStatus || '').toLowerCase() === 'yes';
     },
     specLabel() {
       return SPEC_STATUS_OPTIONS.find(item => item.value === this.contract.hcsSpecStatus)?.label || '';

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

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

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

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

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

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

src/views/business/loading-manage.vue

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

src/views/business/process-config.vue

@@ -535,6 +535,7 @@ export default {
   created() {
     this.resetNodeRows();
     this.loadProjectOptions('');
+    this.applyDefaultDeptSearch();
     this.initDeptOptions();
   },
   methods: {
@@ -565,6 +566,27 @@ 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 =
@@ -1091,6 +1113,7 @@ export default {
     },
     searchReset() {
       this.query = {};
+      this.applyDefaultDeptSearch();
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
     },

src/views/business/project-apply.vue

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

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

@@ -293,6 +293,12 @@
                 <el-input v-model="row.remark" :disabled="readonly" maxlength="200" />
               </template>
             </el-table-column>
+            <el-table-column v-if="readonly" label="开票状态" min-width="90" align="center">
+              <template #default="{ row }">{{ sheet.invoiceStatusName || '未开票' }}</template>
+            </el-table-column>
+            <el-table-column v-if="readonly" label="金蝶开票结果备注" min-width="200">
+              <template #default="{ row }">{{ sheet.kingdeeResultRemark }}</template>
+            </el-table-column>
             <el-table-column v-if="!readonly" label="操作" width="110" fixed="right" align="center">
               <template #default="{ $index }">
                 <div class="invoice-form-page__links">

src/views/payment/invoice-application.vue

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

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

@@ -883,8 +883,6 @@ export default {
       // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
       payeeRisky: false,
       payeeRiskTip: '',
-      payeeRiskLevel: '',
-      payeeBlackStatus: '',
       attachmentRuleLoading: false,
       // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
       linkedSettlementAttachmentUrls: [],
@@ -1065,14 +1063,12 @@ export default {
         .toUpperCase();
       return ['D', 'D级', 'E', 'E级', 'F', 'F级'].includes(level) || level.includes('高风险');
     },
-    // 高风险/黑名单收款方提示（C101-1，同合同新增页风险客商提示口径；强制拦截在后端提交校验与金蝶推送门禁）
+    // 高风险/黑名单收款方提示（C101-1，强制拦截在后端提交校验与金蝶推送门禁）：
+    // 等级/黑名单明细以后端 riskTip 为准（黑名单=金蝶命中、等级=C101-1，统一口径），前端不再重复拼接
     payeeRiskText() {
       if (!this.payeeRisky) return '';
-      const levelMap = { 0: '低风险', 1: '中风险', 2: '高风险' };
-      const level = levelMap[this.payeeRiskLevel] || '未知';
-      const blacklist = String(this.payeeBlackStatus || '').trim().toLowerCase() === 'yes' ? '是' : '否';
       const tip = this.payeeRiskTip || `收款方[${this.form.payeeName || ''}]为高风险/黑名单客商`;
-      return `风险等级：${level}｜黑名单：${blacklist}。${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
+      return `${tip}，按集团规定不可直接付款，提交前须上传「特批附件」类型附件，审批通过后将自动发起付款特批`;
     },
     requiredAttachmentMaterials() {
       if (this.form.paymentType === 'project_advance') {
@@ -2341,8 +2337,6 @@ export default {
       this.payeeCustomerLevel = '';
       this.payeeRisky = false;
       this.payeeRiskTip = '';
-      this.payeeRiskLevel = '';
-      this.payeeBlackStatus = '';
       if (!partyBName) {
         if (!preserveCurrentValue) this.clearReceiptAccount();
         return;
@@ -2381,8 +2375,6 @@ export default {
             const risk = this.unwrapData(await getCustomerRisk(detail.customerCode)) || {};
             this.payeeRisky = Boolean(risk.risky);
             this.payeeRiskTip = risk.riskTip || '';
-            this.payeeRiskLevel = risk.fdRiskLevel || '';
-            this.payeeBlackStatus = risk.fdBlackStatus || '';
           } catch (error) {
             // 忽略风险查询异常，提交时后端 C101-1 强校验兜底
           }
@@ -2702,7 +2694,8 @@ export default {
           this.referenceParams('formal')
         );
         const data = this.unwrapData(response) || {};
-        const records = data.records || [];
+        // 已调整的结算单为调整重推后的归档原单，金额已作废，不可再发起付款
+        const records = (data.records || []).filter(row => row.adjustStatus !== 'adjusted');
         this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
         this.formalPage.total = Number(data.total || 0);
       } finally {
@@ -3124,18 +3117,21 @@ export default {
       if (!target) return;
       target.paymentRatio = value;
       this.syncRowPayment(target, 'ratio');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
     handleRowAppliedAmountChange(row, value) {
       const target = this.findReferenceRow(row);
       if (!target) return;
       target.appliedAmount = value;
       this.syncRowPayment(target, 'amount');
-      this.syncHeaderSettlementTotalsFromRows();
+      this.syncHeaderSettlementTotalsFromRows(true);
     },
-    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
-    syncHeaderSettlementTotalsFromRows() {
-      if (this.referenceRows.length <= 1) return;
+    /**
+     * 结算信息行合计回填付款基本信息。
+     * @param {boolean} syncApplied 行内编辑时同步申请付款金额与比例；回显加载时保持原值，避免改写历史单据
+     */
+    syncHeaderSettlementTotalsFromRows(syncApplied = false) {
+      if (!this.referenceRows.length) return;
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -3144,9 +3140,21 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
+      const appliedAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
       this.amountSyncing = true;
       this.form.settlementAmount = Number(settlementAmount.toFixed(2));
       this.form.payableAmount = Number(payableAmount.toFixed(2));
+      if (syncApplied) {
+        this.form.appliedAmount = Number(appliedAmount.toFixed(2));
+        if (this.paymentAmountBase) {
+          this.form.paymentRatio = Number(
+            ((appliedAmount / this.paymentAmountBase) * 100).toFixed(2)
+          );
+        }
+      }
       this.$nextTick(() => {
         this.amountSyncing = false;
         this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
@@ -3320,6 +3328,18 @@ export default {
           ElMessage.warning(`${exceededRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
           return false;
         }
+        const rowAppliedTotal = this.referenceRows.reduce(
+          (total, item) => total + Number(item.appliedAmount || 0),
+          0
+        );
+        // 金蝶按付款基本信息申请金额推单，行合计不等时预付建档分摊会与金蝶金额不一致
+        if (Math.abs(rowAppliedTotal - appliedAmount) > 0.005) {
+          this.clearMessages();
+          ElMessage.warning(
+            `结算行付款金额合计${rowAppliedTotal.toFixed(2)}与申请付款金额${appliedAmount.toFixed(2)}不一致，请调整`
+          );
+          return false;
+        }
       }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
         this.clearMessages();

src/views/payment/payment-application.vue

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

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

@@ -708,7 +708,9 @@
       :rows="changeRecordDetailRows"
     />
     <template v-if="!pageMode" #footer>
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable"
@@ -724,7 +726,9 @@
       >
     </template>
     <div v-if="pageMode && !publicMode" class="formal-editor__page-actions">
-      <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
+      <el-button v-if="canSync" type="primary" plain :loading="syncLoading" @click="handleSync"
+        >同步</el-button
+      >
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable"
@@ -1051,6 +1055,7 @@ import {
   claimInvoices as claimInvoicesApi,
   queryInvoicePool,
   save,
+  syncKingdee,
 } from '@/api/settlement/formalSettlement';
 import {
   getDetail as getPreSettlementDetail,
@@ -1128,6 +1133,7 @@ export default {
       loading: false,
       draftSaving: false,
       saving: false,
+      syncLoading: false,
       form: createFormalSettlementForm(),
       sources: [],
       details: [],
@@ -1271,6 +1277,16 @@ export default {
     editable() {
       return !this.readonly;
     },
+    // 查看页面「同步」按钮：仅已审批且未同步金蝶（含推送失败）的单据显示，口径与后端推送闸门一致
+    canSync() {
+      return (
+        this.readonly &&
+        !this.publicMode &&
+        this.hasPermission('sync') &&
+        this.form.approvalStatus === 'approved' &&
+        this.form.kingdeeSyncStatus !== 'synced'
+      );
+    },
     isAdmin() {
       return isAdministrator(this.userInfo);
     },
@@ -2887,8 +2903,30 @@ export default {
         remark: this.form.remark,
       };
     },
-    handleSyncPlaceholder() {
-      this.$message.info('开发中');
+    // 查看页面单张推送金蝶（A102-2/A302-2）：结果与异常原因弹框展示，成败后均刷新详情与列表
+    async handleSync() {
+      if (this.syncLoading) return;
+      this.syncLoading = true;
+      try {
+        const res = await syncKingdee(this.form.id, { meta: { suppressErrorMessage: true } });
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        let message = `同步成功：${this.unwrapData(res) || '-'}`;
+        if (['pending', 'partial'].includes(this.form.attachmentSyncStatus)) {
+          message += '\n该单附件未全部上传，可重推补传';
+        }
+        await this.$alert(message, '同步结果', { type: 'success', confirmButtonText: '知道了' });
+      } catch (error) {
+        const reason = String(error?.message || error || '未知错误').trim() || '未知错误';
+        await this.loadFormalDetail(this.recordId);
+        this.$emit('success');
+        await this.$alert(`同步失败，${reason}`, '同步结果', {
+          type: 'error',
+          confirmButtonText: '知道了',
+        });
+      } finally {
+        this.syncLoading = false;
+      }
     },
     async handleDraftSave() {
       // 保存草稿：不做表单校验，直接落草稿并返回列表刷新

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

@@ -60,7 +60,26 @@
       }}</el-tag>
     </template>
 
-    <template #kingdeeSyncStatus="{ row }">{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</template>
+    <template #kingdeeSyncStatus="{ row }">
+      <el-tooltip
+        :disabled="row.kingdeeSyncStatus !== 'failed'"
+        :content="row.kingdeeFailReason || '推送金蝶失败，可点击「同步金蝶」重试'"
+        placement="top"
+      >
+        <el-tag :type="kingdeeStatusType(row.kingdeeSyncStatus)">{{
+          kingdeeSyncName(row.kingdeeSyncStatus)
+        }}</el-tag>
+      </el-tooltip>
+    </template>
+
+    <template #kingdeeWriteOffStatus="{ row }">
+      <el-tag
+        v-if="row.kingdeeSyncStatus === 'synced'"
+        :type="kingdeeWriteOffTagType(row.kingdeeWriteOffStatus)"
+        >{{ kingdeeWriteOffName(row.kingdeeWriteOffStatus) || '未校验' }}</el-tag
+      >
+      <span v-else>-</span>
+    </template>
 
     <template #kingdeeLockStatus="{ row }">
       <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
@@ -83,7 +102,8 @@
 
 <script>
 import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
-import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeSyncName, kingdeeWriteOffName, paymentStatusName } from '@/option/settlement/formalSettlement';
+import { kingdeeStatusType, kingdeeWriteOffTagType } from '@/utils/kingdee';
 
 export default {
   name: 'FormalSettlementTablePanel',
@@ -186,6 +206,7 @@ export default {
         ''
       );
     },
+    kingdeeStatusType,
     invoiceName(value, settlementType) {
       return invoiceStatusName(value, settlementType);
     },
@@ -195,6 +216,10 @@ export default {
     kingdeeSyncName(value) {
       return kingdeeSyncName(value);
     },
+    kingdeeWriteOffName(value) {
+      return kingdeeWriteOffName(value);
+    },
+    kingdeeWriteOffTagType,
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return {

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

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

src/views/settlement/formal-settlement.vue

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

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

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

src/views/settlement/settlement-adjustment.vue

@@ -93,11 +93,15 @@
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
-            ><el-tag
+            ><el-tooltip
               v-else-if="column.kingdee"
+              :disabled="row.kingdeeSyncStatus !== 'failed'"
+              :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+              placement="top"
+            ><el-tag
               :type="kingdeeStatusType(row.kingdeeSyncStatus)"
-              class="status-text"
               >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
+            ></el-tooltip
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
@@ -182,6 +186,7 @@ import { settlementAdjustmentSearchFields } from '@/option/settlement/settlement
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
 import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
+import { kingdeeStatusType } from '@/utils/kingdee';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -369,9 +374,7 @@ export default {
         'info'
       );
     },
-    kingdeeStatusType(status) {
-      return { synced: 'success', failed: 'danger' }[status] || 'info';
-    },
+    kingdeeStatusType,
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },

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

@@ -1,414 +0,0 @@
-<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,6 +203,7 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';
 
+const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
  * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -302,7 +303,7 @@ export default {
             headerAlign: 'left',
             order: 80,
             search: true,
-            searchOrder: 3,
+            searchOrder: 2,
             rules: [
               {
                 required: true,
@@ -322,7 +323,7 @@ export default {
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
+                  // 组织编码非必填，为空直接通过
                   if (!deptCode) {
                     callback();
                     return;
@@ -331,6 +332,126 @@ 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',
@@ -343,7 +464,7 @@ export default {
             minWidth: 140,
             order: 60,
             search: true,
-            searchOrder: 4,
+            searchOrder: 1,
           },
           {
             label: '助记码',
@@ -402,21 +523,14 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
+            value: 0,
             width: 120,
-            order: 36,
-            search: true,
-            searchOrder: 2,
-            searchPlaceholder: '请选择是否平台公司',
+            order: 35,
             formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
             rules: [
               {
-                validator: (rule, value, callback) => {
-                  if (value === undefined || value === null || value === '') {
-                    callback(new Error('请选择是否平台公司'));
-                    return;
-                  }
-                  callback();
-                },
+                required: true,
+                message: '请选择是否平台公司',
                 trigger: 'change',
               },
             ],
@@ -430,22 +544,14 @@ 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: [
               {
-                validator: (rule, value, callback) => {
-                  // 不能用 required:true：值为 0（否）时会被当成空
-                  if (value === undefined || value === null || value === '') {
-                    callback(new Error('请选择是否业务部门'));
-                    return;
-                  }
-                  callback();
-                },
+                required: true,
+                message: '请选择是否业务部门',
                 trigger: 'change',
               },
             ],
@@ -936,7 +1042,6 @@ export default {
     /**
      * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
      * 排序为空时由后端默认填充 1。
-     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
      */
     prepareDeptSubmitRow(row) {
       const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -944,8 +1049,6 @@ export default {
         return false;
       }
       row.deptCategory = category;
-      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
-      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
       if (row.status === '' || row.status === null || row.status === undefined) {
         delete row.status;
       } else {
@@ -958,9 +1061,6 @@ export default {
       }
       return true;
     },
-    normalizeYesNoFlag(value) {
-      return Number(value) === 1 ? 1 : 0;
-    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1117,6 +1217,29 @@ 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');
     },
@@ -1261,6 +1384,9 @@ 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)) {
@@ -1306,6 +1432,9 @@ 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)) {
@@ -1412,40 +1541,34 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
-        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
+        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
+          this.form.isPlatformCompany = 0;
+        }
+        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
+          this.form.isBusinessDept = 0;
+        }
+        this.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)) {
-        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 Avue 表单引用
-        getDept(this.form.id)
-          .then(res => {
-            const detail = res.data.data || {};
-            Object.assign(this.form, detail, {
-              hasChildren: this.form.hasChildren,
-              isPlatformCompany: this.normalizeYesNoFlag(detail.isPlatformCompany),
-              isBusinessDept: this.normalizeYesNoFlag(detail.isBusinessDept),
-            });
-            if (this.form.parentId === '0') {
-              this.form.parentId = '';
-            }
-            this.loadParentDeptCode(this.form.parentId);
-            if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
-              const splitResult = func.split(this.form.leaderId);
-              this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-            }
-            done();
-          })
-          .catch(() => {
-            done();
+        getDept(this.form.id).then(res => {
+          this.form = Object.assign(res.data.data, {
+            hasChildren: this.form.hasChildren,
           });
-        return;
+          if (this.form.parentId === '0') {
+            this.form.parentId = '';
+          }
+          this.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,21 +172,6 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                  <el-form-item label="数据管理权限" prop="dataScopeDeptIds">
-                    <el-cascader
-                      v-model="dataScopeCascaderValue"
-                      :options="permissionDeptTree"
-                      :props="deptCascaderProps"
-                      :disabled="isUserViewMode"
-                      clearable
-                      filterable
-                      collapse-tags
-                      collapse-tags-tooltip
-                      placeholder="请选择数据管理组织（可多选）"
-                    />
-                  </el-form-item>
-                </el-col>
                 <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
@@ -607,26 +592,6 @@ export default {
         this.$refs.userFormRef?.validateField('deptId');
       },
     },
-    // 数据管理权限多选级联：form.dataScopeDeptIds 为 id 数组
-    dataScopeCascaderValue: {
-      get() {
-        const ids = Array.isArray(this.form.dataScopeDeptIds)
-          ? this.form.dataScopeDeptIds
-          : this.form.dataScopeDeptIds
-            ? String(this.form.dataScopeDeptIds).split(',').filter(Boolean)
-            : [];
-        return ids
-          .filter(item => item !== undefined && item !== null && item !== '')
-          .map(item => (typeof item === 'number' ? item : String(item)));
-      },
-      set(value) {
-        this.form.dataScopeDeptIds = Array.isArray(value)
-          ? value.filter(item => item !== undefined && item !== null && item !== '')
-          : value
-            ? [value]
-            : [];
-      },
-    },
     isUserViewMode() {
       return this.userDialogMode === 'view';
     },
@@ -1069,7 +1034,6 @@ export default {
           sex: undefined,
           postId: '',
           deptId: [],
-          dataScopeDeptIds: [],
           code: '',
           personCategory: 1,
           remark: '',
@@ -1082,13 +1046,9 @@ export default {
       getUser(row.id).then(res => {
         const user = res.data.data;
         const deptIds = func.split(user.deptId || '');
-        const dataScopeDeptIds = Array.isArray(user.dataScopeDeptIds)
-          ? user.dataScopeDeptIds.map(item => String(item))
-          : [];
         this.form = {
           ...user,
           deptId: Array.isArray(deptIds) ? deptIds : [],
-          dataScopeDeptIds,
           postId: func.split(user.postId || '')[0] || '',
           roleId: func.join(user.roleId || ''),
           personCategory: user.personCategory || 1,
@@ -1104,13 +1064,9 @@ export default {
     submitUserForm() {
       this.$refs.userFormRef.validate(valid => {
         if (!valid) return;
-        const dataScopeDeptIds = Array.isArray(this.form.dataScopeDeptIds)
-          ? this.form.dataScopeDeptIds.filter(item => item !== undefined && item !== null && item !== '')
-          : [];
         const row = {
           ...this.form,
           deptId: func.join(this.form.deptId),
-          dataScopeDeptIds,
           postId: func.join(this.form.postId),
           roleId: func.join(this.form.roleId),
           leaderId: func.join(this.form.leaderId),

src/views/vehicle/customer-archive.vue

@@ -49,24 +49,24 @@
       </template>
       <template #customerRisk="{ row }">
         <el-tooltip
-          v-if="customerRiskMap[row.customerCode] && customerRiskMap[row.customerCode].risky"
+          v-if="customerRowRisky(row)"
           placement="top"
           effect="dark"
           popper-class="customer-risk-popper"
         >
           <template #content>
-            <div>{{ customerRiskMap[row.customerCode].riskTip || '该客商为高风险/黑名单客商' }}</div>
+            <div>{{ row.hcsRiskDetail || '该客商为高风险/黑名单客商' }}</div>
           </template>
           <el-tag type="danger" class="status-text">
-            {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+            {{ customerRowRiskName(row) }}
           </el-tag>
         </el-tooltip>
         <el-tag
-          v-else-if="customerRiskMap[row.customerCode]"
-          :type="customerRiskMap[row.customerCode].fdRiskLevel === '1' ? 'warning' : 'success'"
+          v-else-if="customerRowRiskName(row)"
+          :type="row.hcsRiskLevel === '1' ? 'warning' : 'success'"
           class="status-text"
         >
-          {{ customerRiskLabel(customerRiskMap[row.customerCode]) }}
+          {{ customerRowRiskName(row) }}
         </el-tag>
         <span v-else>-</span>
       </template>
@@ -135,7 +135,13 @@
       <template #kingdeeStatus="{ row }">
         <el-tag v-if="row.kingdeeStatus === 'synced'" type="success">已推送</el-tag>
         <el-tag v-else-if="row.kingdeeStatus === 'exist'" type="primary">金蝶已有</el-tag>
-        <el-tag v-else-if="row.kingdeeStatus === 'failed'" type="danger">推送失败</el-tag>
+        <el-tooltip
+          v-else-if="row.kingdeeStatus === 'failed'"
+          :content="row.kingdeeFailReason || '推送金蝶失败，请重试'"
+          placement="top"
+        >
+          <el-tag type="danger">推送失败</el-tag>
+        </el-tooltip>
         <el-tag v-else type="info">未推送</el-tag>
       </template>
       <template #menu="{ row }">
@@ -285,6 +291,17 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="供应商编码" prop="supplierCode">
+                <el-input
+                  v-model="archiveForm.supplierCode"
+                  maxlength="64"
+                  show-word-limit
+                  disabled
+                  placeholder="金蝶供应商编码，系统自动获取"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="客商类型" prop="customerKind">
                 <el-select
@@ -366,7 +383,7 @@
                   <template #content>
                     <div>{{ archiveNameRiskTip || '该客商为高风险/黑名单客商' }}</div>
                   </template>
-                  <div class="archive-name-risk">高风险/黑名单客商</div>
+                  <div class="archive-name-risk">{{ archiveNameRiskLabel }}</div>
                 </el-tooltip>
               </el-form-item>
             </el-col>
@@ -1589,9 +1606,11 @@ import {
   getScoreTemplate,
   recognizeBusinessLicenseOcr,
   queryKingdeeCustomer,
+  querySupplierCode,
   syncKingdee,
 } from '@/api/vehicle/customer-archive';
-import { getRiskBatch, getRiskByName } from '@/api/business/hcs';
+import { getRisk, getRiskByName } from '@/api/business/hcs';
+import { isKingdeeBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
 import {
   getList as getCreditScoreQuantificationList,
   getDetail as getCreditScoreQuantificationDetail,
@@ -1693,9 +1712,9 @@ export default {
       deptSearchInitialized: false,
       loading: true,
       data: [],
-      customerRiskMap: {},
       archiveNameRisky: false,
       archiveNameRiskTip: '',
+      archiveNameRiskLabel: '',
       page: {
         pageSize: 10,
         pageSizes: [10, 20, 50, 100],
@@ -1915,6 +1934,11 @@ export default {
             searchPlaceholder: '请输入',
             minWidth: 140,
           },
+          {
+            label: '供应商编码',
+            prop: 'supplierCode',
+            minWidth: 140,
+          },
           {
             label: '客商简称',
             prop: 'shortName',
@@ -1957,7 +1981,13 @@ export default {
             label: '客商风险',
             prop: 'customerRisk',
             slot: true,
-            minWidth: 100,
+            search: true,
+            searchType: 'select',
+            searchOrder: 4,
+            searchPlaceholder: '请选择',
+            minWidth: 150,
+            // 选项走业务字典 customer_risk（initBusinessDictionaries 加载：dictKey=筛选值，dictValue=名称），未配置时下拉为空
+            dicData: [],
           },
           {
             label: '客户性质',
@@ -2463,6 +2493,7 @@ export default {
       const form = this.archiveForm;
       form.kingdeeStatus = 'none';
       form.customerCode = '';
+      form.supplierCode = '';
       form.fullName = '';
       form.legalPerson = '';
       form.registeredCapital = '';
@@ -2478,6 +2509,7 @@ export default {
     handleKingdeeCreditCodeChange(val) {
       this.kingdeeBlocked = false;
       if (this.readonly || this.archiveForm.id) return;
+      this.clearArchiveNameRisk();
       if (this.archiveForm.kingdeeStatus === 'exist') {
         this.resetKingdeeBackfill();
       }
@@ -2486,7 +2518,21 @@ export default {
         .toUpperCase();
       if (code.length !== 18 || this.unifiedCreditCodeError(code)) return;
       clearTimeout(this.kingdeeQueryTimer);
-      this.kingdeeQueryTimer = setTimeout(() => this.fetchKingdeeCustomer(code), 500);
+      this.kingdeeQueryTimer = setTimeout(() => {
+        this.fetchKingdeeCustomer(code);
+        this.fetchSupplierCode(code);
+      }, 500);
+    },
+    // 新增态下信用代码录入后即时查询金蝶供应商编码（A901-1）回显，查询失败静默留空，保存/同步时后端兜底落库
+    async fetchSupplierCode(code) {
+      try {
+        const res = await querySupplierCode(code);
+        // 防止响应返回时用户已修改代码
+        if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
+        this.archiveForm.supplierCode = res?.data?.data || '';
+      } catch (error) {
+        // 忽略查询异常，编码留空
+      }
     },
     async fetchKingdeeCustomer(code) {
       let customer = null;
@@ -2694,6 +2740,7 @@ export default {
         currentNode: '当前节点',
         currentProcessor: '当前处理人',
         customerCode: '客商编号',
+        supplierCode: '供应商编码',
         shortName: '客商简称',
         fullName: '客商名称',
         customerType: '客商分类',
@@ -3151,6 +3198,15 @@ export default {
       });
     },
     initBusinessDictionaries() {
+      // 客商风险筛选项走业务字典 customer_risk（dictKey=筛选值 blacklist/high/middle/low，dictValue=名称），字典缺失保留固定兜底项
+      getDictionary({ code: 'customer_risk' }).then(res => {
+        const options = (res.data.data || [])
+          .filter(item => item.dictKey !== '-1')
+          .map(item => ({ label: item.dictValue, value: item.dictKey }));
+        if (options.length) {
+          this.findColumn(this.option.column, 'customerRisk').dicData = options;
+        }
+      });
       this.loadDictOptions('nature_of_client', 'customerNatureOptions', [], options => {
         const customerNatureColumn = this.findColumn(this.option.column, 'customerNature');
         customerNatureColumn.dicData = [{ label: '全部', value: '' }, ...options];
@@ -3938,7 +3994,7 @@ export default {
       });
       recognizeBusinessLicenseOcr(url)
         .then(res => {
-          this.applyBusinessLicenseRecognition(res?.data?.data || {});
+          this.applyBusinessLicenseRecognition(res?.data?.data?.result || {});
           this.$message.success('营业执照识别完成');
         })
         .catch(() => {
@@ -3946,31 +4002,8 @@ 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 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 || {};
+      const words = result?.words_result || result?.wordsResult || result || {};
       for (const label of labels) {
         const value = words[label];
         const text = value && typeof value === 'object' ? value.words : value;
@@ -3982,35 +4015,23 @@ export default {
       return String(value || '').replace(/\s/g, '') === '无';
     },
     applyBusinessLicenseRecognition(result = {}) {
-      const fields = this.normalizeBusinessLicenseOcrFields(result);
-      const code = this.getBusinessLicenseOcrValue(fields, [
-        'uscc',
+      const code = this.getBusinessLicenseOcrValue(result, [
         '统一社会信用代码',
         '社会信用代码',
         '注册号',
       ]);
-      const name = this.getBusinessLicenseOcrValue(fields, [
-        'company_name',
-        '单位名称',
-        '企业名称',
-        '名称',
-      ]);
-      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 name = this.getBusinessLicenseOcrValue(result, ['单位名称', '企业名称', '名称']);
+      const legalPerson = this.getBusinessLicenseOcrValue(result, ['法定代表人', '法人']);
+      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 scope = this.getBusinessLicenseOcrValue(fields, ['经营范围']);
+      const scope = this.getBusinessLicenseOcrValue(result, ['经营范围']);
       if (code) this.archiveForm.unifiedCreditCode = code.replace(/\s/g, '').toUpperCase();
       if (name) this.archiveForm.fullName = name;
       if (name) this.checkArchiveNameRisk();
@@ -5534,7 +5555,9 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      this.query = this.buildQuery(params);
+      // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
+      // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
+      this.query = this.buildQuery(params, true);
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
       done();
@@ -5563,52 +5586,56 @@ export default {
           const pageData = res.data.data;
           this.page.total = pageData.total;
           this.data = pageData.records;
-          this.loadCustomerRisk(this.data);
           this.selectionClear();
         })
         .finally(() => {
           this.loading = false;
         });
     },
-    // 客商风险标签文案：后端 riskLevelName 转义（黑名单/高风险/中风险/低风险），缺失时兜底
-    customerRiskLabel(risk) {
-      if (!risk) return '';
-      return risk.riskLevelName || (risk.risky ? '风险客商' : '正常');
+    // 黑名单判定：仅以金蝶黑名单（A801-5）命中为准（失信类别/列入事由任一非空）；C101-1 的 hcsBlackStatus 不作为黑名单依据
+    customerRowIsBlack(row) {
+      return isKingdeeBlack(row.kingdeeBlackCategory, row.kingdeeBlackReason);
+    },
+    // 客商风险名称（每日定时刷新落库字段）：等级与黑名单组合展示（如"低风险、黑名单"）；内部组织默认无风险；未查询显示"-"
+    customerRowRiskName(row) {
+      return resolveRiskTagName(row.hcsRiskLevel, this.customerRowIsBlack(row), row.customerKind);
+    },
+    // 高风险/黑名单判定（与列表筛选口径一致，命中显示红色标签）
+    customerRowRisky(row) {
+      return isRiskyTag(row.hcsRiskLevel, this.customerRowIsBlack(row));
     },
     // 客商名称风险校验（C101-1，仅展示不作为安全边界）：名称失焦/回显时查询，
     // risky 在名称框下展示红色提示，悬浮见风险项明细；查询失败静默不阻断填写，提交链路由后端强校验兜底
-    checkArchiveNameRisk() {
+    // 清空客商名称下风险提示（信用代码变化后原按旧编号+信用代码查询的结果失效）
+    clearArchiveNameRisk() {
       this.archiveNameRisky = false;
       this.archiveNameRiskTip = '';
+      this.archiveNameRiskLabel = '';
+    },
+    checkArchiveNameRisk() {
+      this.clearArchiveNameRisk();
       const customerName = String(this.archiveForm.fullName || '').trim();
       if (!customerName) return;
-      getRiskByName(customerName)
+      // 新增客商档案本地反查不到编号：金蝶带出后表单已有客商编号，优先按编号查 C101-1，
+      // 并传信用代码供金蝶黑名单（A801-5）兜底；无编号时按名称反查档案
+      const customerCode = String(this.archiveForm.customerCode || '').trim();
+      const request = customerCode
+        ? getRisk(customerCode, String(this.archiveForm.unifiedCreditCode || '').trim(), customerName)
+        : getRiskByName(customerName);
+      request
         .then(res => {
           const risk = (res.data && res.data.data) || {};
           this.archiveNameRisky = risk.risky === true;
           this.archiveNameRiskTip = risk.riskTip || '';
+          // 红字与列表标签同口径（risk-display）：等级按合同系统返回值翻译，黑名单按金蝶命中标记独立展示，组合不分家
+          this.archiveNameRiskLabel = this.archiveNameRisky
+            ? (resolveRiskTagName(risk.fdRiskLevel, risk.kingdeeBlackHit === true) || '高风险/黑名单') + '客商'
+            : '';
         })
         .catch(() => {
           // 忽略风险查询异常，表单正常填写
         });
     },
-    // 客商列表风险批量查询（C101-1，仅展示不作为安全边界）：失败静默，行内显示"-"，提交链路由后端强校验兜底
-    loadCustomerRisk(rows) {
-      this.customerRiskMap = {};
-      const customerCodes = [...new Set(rows.map(row => row.customerCode).filter(Boolean))];
-      if (!customerCodes.length) return;
-      getRiskBatch(customerCodes)
-        .then(res => {
-          const riskMap = {};
-          ((res.data && res.data.data) || []).forEach(risk => {
-            if (risk && risk.customerCode) riskMap[risk.customerCode] = risk;
-          });
-          this.customerRiskMap = riskMap;
-        })
-        .catch(() => {
-          // 忽略风险查询异常，列表正常展示
-        });
-    },
     handleExport() {
       this.$confirm('是否导出客商档案数据?', '提示', {
         confirmButtonText: '确定',
@@ -5636,9 +5663,10 @@ export default {
         [this.website.tokenHeader]: getToken(),
       };
     },
-    buildQuery(params = {}) {
-      // 新条件覆盖旧条件；本次显式清空的字段必须从查询里去掉，避免第二次搜索仍带着上一次的客商名称。
-      const merged = { ...this.query, ...params };
+    // replace=true 表示以本次搜索条件为准整体重建（清空字段不会回传，需丢弃旧条件）；
+    // 翻页、刷新等场景传 false，沿用上一次的查询条件
+    buildQuery(params = {}, replace = false) {
+      const merged = replace ? { ...params } : { ...this.query, ...params };
       Object.keys(params).forEach(key => {
         const value = params[key];
         if (