🔀 合并主干 master 到 dev

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

src/api/payment/invoiceReceipt.js

@@ -38,15 +38,6 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 export const pushKingdee = ids =>
   request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
-// 先票后款：发票明细查询（收票登记明细区块按票号带出发票明细行）
-export const invoiceDetailQuery = invoiceNo =>
-  request({ url: `${baseUrl}/invoice-detail-query`, method: 'get', params: { invoiceNo } });
-// 先票后款：结算单认领收票单候选分页（审批通过且未被有效应付结算单认领）
-export const claimCandidates = params =>
-  request({ url: `${baseUrl}/claim-candidates`, method: 'get', params });
-// 先票后款：结算单已认领收票登记列表（发票登记对话框回显已认领票）
-export const claimedReceipts = formalSettlementId =>
-  request({ url: `${baseUrl}/claimed-list`, method: 'get', params: { formalSettlementId } });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },

src/api/payment/paymentApplication.js

@@ -27,13 +27,13 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 // 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: APPROVE_TIMEOUT, params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 // 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: APPROVE_TIMEOUT, data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
 // 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
 export const syncKingdeeResult = () =>
-  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: APPROVE_TIMEOUT });
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },

src/api/settlement/formalSettlement.js

@@ -58,21 +58,5 @@ export const applyPayments = data =>
   request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
   request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
-// 先票后款：发票登记确认推送（认领收票单逐单 A302-6 指定应付），涉及多次金蝶远程调用，覆盖全局超时
-export const invoiceAssignKingdee = id =>
-  request({
-    url: `${baseUrl}/invoice-assign-kingdee`,
-    method: 'post',
-    timeout: 30000,
-    params: { id },
-  });
-// 先票后款：查看页重推认领收票单（收票单A303-2+指定应付A302-6 一步式），涉及多次金蝶远程调用，覆盖全局超时
-export const repushClaimedInvoice = (id, invoiceNo, matchedAmount) =>
-  request({
-    url: `${baseUrl}/repush-claimed-invoice`,
-    method: 'post',
-    timeout: 30000,
-    params: { id, invoiceNo, matchedAmount },
-  });
 export const queryInvoicePool = params =>
   request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/option/base/measurement-unit.js

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

src/option/business/contract-manage.js

@@ -249,11 +249,22 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '合同编号',
     prop: 'contractNo',
     search: true,
-    searchOrder: 6,
+    searchOrder: 8,
     searchPlaceholder: '请输入',
     order: 185,
     maxlength: 100,
@@ -266,7 +277,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 7,
+    searchOrder: 1,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -278,7 +289,7 @@ export const option = createCrudOption([
     label: '所属项目',
     prop: 'projectName',
     search: true,
-    searchOrder: 8,
+    searchOrder: 11,
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
@@ -325,7 +336,7 @@ export const option = createCrudOption([
     prop: 'contractCategory',
     type: 'select',
     search: true,
-    searchOrder: 9,
+    searchOrder: 12,
     searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
@@ -337,7 +348,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: true,
-    searchOrder: 10,
+    searchOrder: 13,
     searchPlaceholder: '请选择',
     span: 8,
     order: 190,
@@ -346,11 +357,11 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '生效类型',
+    label: '合同状态',
     prop: 'effectiveType',
     type: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 6,
     searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
@@ -621,7 +632,7 @@ export const option = createCrudOption([
     prop: 'hcsSyncStatus',
     type: 'select',
     search: true,
-    searchOrder: 6,
+    searchOrder: 7,
     searchPlaceholder: '请选择',
     slot: true,
     dicData: hcsSyncStatusOptions,
@@ -651,7 +662,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 7,
+    searchOrder: 9,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,
@@ -663,7 +674,7 @@ export const option = createCrudOption([
     type: 'select',
     search: true,
     searchPlaceholder: '请选择',
-    searchOrder: 8,
+    searchOrder: 10,
     dicData: yesNoOptions,
     hide: true,
     addDisplay: false,

src/option/business/transport-plan.js

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

src/option/payment/paymentApplication.js

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

src/option/settlement/formalSettlement.js

@@ -89,7 +89,6 @@ const COLUMN_EXTRA = {
   },
   kingdeeLockStatus: { slot: true },
   kingdeeWriteOffStatus: { slot: true },
-  kingdeeAssignStatus: { slot: true },
   createTime: { width: 180 },
 };
 

src/option/settlement/formalSettlementTable.js

@@ -27,7 +27,6 @@ export const formalSettlementTableColumns = [
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
   { label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
-  { label: '已指定应付', prop: 'kingdeeAssignStatus', minWidth: 120 },
   { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },

src/views/base/airport-master.vue

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

src/views/base/currency.vue

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

src/views/base/customer-type.vue

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

src/views/base/fee-item.vue

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

src/views/base/measurement-unit.vue

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

src/views/base/port-terminal.vue

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

src/views/base/railway-station.vue

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

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

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

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

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

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

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

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

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

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

@@ -299,25 +299,27 @@
           ><el-radio label="system">系统生成</el-radio
           ><el-radio label="manual">账单导入生成</el-radio></el-radio-group
         >
-        <el-table :data="plans" border class="change-table"
-          ><el-table-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
-        >
+        <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>
       </section>
 
       <section class="change-section">
@@ -491,7 +493,9 @@
         v-model="planDialogVisible"
         :value="planEditor"
         :index="planEditorIndex"
+        :readonly="pageReadonly"
         :settlement-currency="form.settlementCurrency"
+        :party-options="billingPartyOptions"
         @save="savePlan"
       />
 
@@ -630,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
     endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
   }));
 
+const createPartyRow = (row = {}) => ({
+  id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
+  customerId: row.customerId || '',
+  customerName: row.customerName || '',
+  creditCode: row.creditCode || row.unifiedCreditCode || '',
+  contactId: row.contactId || '',
+  contactName: row.contactName || '',
+  contactPhone: row.contactPhone || '',
+});
+
+const partyRoleLabel = role => {
+  if (role === 'A') return '甲方';
+  if (role === 'B') return '乙方';
+  if (role === 'C') return '丙方';
+  return role || '';
+};
+
+const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
+  const rows = (() => {
+    if (Array.isArray(partyJson)) return partyJson;
+    if (!partyJson) return [];
+    try {
+      const data = JSON.parse(partyJson);
+      return Array.isArray(data) ? data : [];
+    } catch (error) {
+      return [];
+    }
+  })().map(item => createPartyRow(item));
+  if (rows.length) return rows;
+  if (fallbackName) {
+    return String(fallbackName)
+      .split(/[、,]/)
+      .map(name => name.trim())
+      .filter(Boolean)
+      .map(name => createPartyRow({ customerName: name }));
+  }
+  return requireOne ? [createPartyRow()] : [];
+};
+
 export default {
   components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
   data() {
@@ -637,6 +680,9 @@ export default {
       form: {},
       period: [],
       plans: [],
+      partyARows: [],
+      partyBRows: [],
+      partyCRows: [],
       attachments: [],
       contractFiles: [],
       contractFileRows: [],
@@ -675,7 +721,7 @@ export default {
       settlementModeDictOptions: [],
       contractFormatDictOptions: [],
       planDialogVisible: false,
-      planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
+      planEditor: { planName: '', remark: '', rules: [] },
       planEditorIndex: -1,
       billingElements: [
         '按重量',
@@ -756,6 +802,29 @@ export default {
     isSettlementRuleChange() {
       return this.form.changeType === '结算规则变更';
     },
+    /**
+     * 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
+     */
+    billingPartyOptions() {
+      const category = String(this.form.contractCategory || '').trim();
+      const allowedRoles =
+        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
+      return [
+        ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
+        ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
+        ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
+      ]
+        .filter(row => allowedRoles.includes(row.partyRole))
+        .filter(row => row.customerName || row.customerId)
+        .map(row => ({
+          value: row.id,
+          label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
+          partyRole: row.partyRole,
+          partyRowId: row.id,
+          customerId: row.customerId,
+          customerName: row.customerName,
+        }));
+    },
     changeAttachmentLocationOptions() {
       if (this.isSettlementRuleChange) {
         return ['变更材料'];
@@ -890,6 +959,9 @@ export default {
       };
       this.changeMaterials = this.parse(data.changeAttachmentsJson);
       this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
+      this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
+      this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
+      this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
       this.plans = this.parse(data.billingPlanJson);
       this.attachments = this.mergeChangeAttachments(
         this.parse(data.attachmentsJson),
@@ -1048,10 +1120,32 @@ export default {
         .replace(/\D/g, '')
         .replace(/^0+/, '');
     },
-    addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
-    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; }); },
+    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);
+    },
     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/contract-manage.vue

@@ -1707,12 +1707,21 @@ export default {
         { role: 'C', label: '丙方', rows: this.partyCRows },
       ];
     },
+    /**
+     * 计费方案适用客商：
+     * - 客户合同：仅甲方（仅 1 个甲方时编辑器自动选中）
+     * - 承运商合同：仅乙方、丙方（应付明细按这些方案生成）
+     */
     billingPartyOptions() {
+      const category = String(this.form.contractCategory || '').trim();
+      const allowedRoles =
+        category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
       return [
         ...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
         ...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
         ...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
       ]
+        .filter(row => allowedRoles.includes(row.partyRole))
         .filter(row => row.customerName || row.customerId)
         .map(row => ({
           value: row.id,
@@ -2344,7 +2353,6 @@ export default {
       if (!this.validatePartyRows(true)) return false;
       return (
         this.validateBillingPlanBindings() &&
-        this.validateBillingPlanDefault() &&
         this.validateSettlementRules() &&
         this.validatePaymentRatios()
       );
@@ -2940,10 +2948,17 @@ export default {
     validateBillingPlanBindings() {
       if (!this.billingPlanRows.length) return true;
       const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
+      const category = String(this.form.contractCategory || '').trim();
+      const roleHint =
+        category === '承运商合同'
+          ? '请选择乙方或丙方客商'
+          : category === '客户合同'
+            ? '请选择甲方客商'
+            : '请选择适用客商';
       for (let index = 0; index < this.billingPlanRows.length; index += 1) {
         const plan = this.billingPlanRows[index];
         if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
-          this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
+          this.$message.warning(`计费方案第${index + 1}个${roleHint}`);
           return false;
         }
       }
@@ -3198,21 +3213,13 @@ export default {
     openBillingPlan(row = {}, index = -1) {
       this.billingPlanIndex = index;
       this.billingPlanForm =
-        index < 0
-          ? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
-          : clone(row);
+        index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
       this.billingPlanBox = true;
       this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
     },
     saveBillingPlan(plan, index) {
       const nextPlan = clone(plan);
-      if (this.isDefaultBillingPlan(nextPlan)) {
-        this.billingPlanRows.forEach((item, itemIndex) => {
-          if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
-            item.defaultPlan = false;
-          }
-        });
-      }
+      delete nextPlan.defaultPlan;
       if (index < 0) this.billingPlanRows.push(nextPlan);
       else this.billingPlanRows.splice(index, 1, nextPlan);
       this.billingPlanBox = false;
@@ -3222,31 +3229,6 @@ export default {
         this.billingPlanRows.splice(index, 1);
       });
     },
-    isDefaultBillingPlan(plan) {
-      return (
-        plan?.defaultPlan === true ||
-        plan?.defaultPlan === 1 ||
-        ['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
-      );
-    },
-    validateBillingPlanDefault() {
-      if (!this.billingPlanRows.length) return true;
-      const defaultCountByTransportMode = this.billingPlanRows.reduce((result, plan) => {
-        const transportMode = plan.transportMode || '';
-        result[transportMode] =
-          (result[transportMode] || 0) + Number(this.isDefaultBillingPlan(plan));
-        return result;
-      }, {});
-      const invalidTransportMode = Object.entries(defaultCountByTransportMode).find(
-        ([, count]) => count > 1
-      );
-      if (invalidTransportMode) {
-        const [transportMode, count] = invalidTransportMode;
-        this.$message.warning(`运输方式“${transportMode}”仅支持配置一个默认计费方案`);
-        return false;
-      }
-      return true;
-    },
     isFixedCycleSettlementType(value) {
       return value === '按固定天数周期' || value === '固定天数周期结算';
     },
@@ -3580,8 +3562,7 @@ export default {
       return list
         .map(item => {
           if (!item || typeof item !== 'object') return String(item ?? '');
-          const name = item.planName || item.name || '未命名方案';
-          return item.defaultPlan ? `${name}（默认）` : name;
+          return item.planName || item.name || '未命名方案';
         })
         .filter(Boolean)
         .join('、');

src/views/business/loading-manage.vue

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

src/views/business/process-config.vue

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

src/views/business/project-apply.vue

@@ -761,6 +761,96 @@
           />
         </div>
 
+        <template v-if="showProjectContractSection">
+          <div class="dialog-section-title project-apply-form__table-title">项目合同</div>
+          <el-table
+            v-loading="projectContractLoading"
+            :data="projectContractRows"
+            border
+            class="project-apply-form__table"
+          >
+            <el-table-column type="index" label="序号" width="80" align="center" />
+            <el-table-column
+              prop="contractCategory"
+              label="合同类型"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractNo"
+              label="合同编号"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                <el-link
+                  v-if="row.id && row.contractNo"
+                  type="primary"
+                  @click.stop="openProjectContractDetail(row)"
+                >
+                  {{ row.contractNo }}
+                </el-link>
+                <span v-else>{{ row.contractNo || '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="contractName"
+              label="合同名称"
+              min-width="160"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyA"
+              label="甲方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyB"
+              label="乙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="partyC"
+              label="丙方"
+              min-width="140"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="startDate"
+              label="开始日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="endDate"
+              label="结束日期"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="contractAmount"
+              label="合同金额"
+              min-width="120"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="{ row }">
+                {{ formatAmount(row.contractAmount) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+
         <div
           v-if="!isChangeDialog && !isNewProjectDialog"
           class="dialog-section-title project-apply-form__table-title"
@@ -990,8 +1080,8 @@
 import { exportBlob } from '@/api/common';
 import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
+import { getList as getContractManageList } from '@/api/business/contract-manage';
 import {
-  getRisk,
   loadHcsImmediateEnabled,
   repush as hcsRepush,
   repushBatch as hcsRepushBatch,
@@ -1388,6 +1478,8 @@ export default {
         'zip',
       ],
       changeRows: [],
+      projectContractRows: [],
+      projectContractLoading: false,
       changeRecordDetailVisible: false,
       changeRecordDetail: null,
       changeRecordDetailRows: [],
@@ -1464,6 +1556,9 @@ export default {
     isNewProjectDialog() {
       return ['add', 'majorSupplement'].includes(this.dialogType);
     },
+    showProjectContractSection() {
+      return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
+    },
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
@@ -2112,6 +2207,8 @@ export default {
       this.attachmentRows = [];
       this.selectedAttachmentRows = [];
       this.changeRows = [];
+      this.projectContractRows = [];
+      this.projectContractLoading = false;
       this.selectedCustomerId = [];
       this.selectedCarrierIds = [];
     },
@@ -2160,6 +2257,40 @@ export default {
       this.syncSelectedCustomerOptions();
       this.ensureCurrentPlatformOption();
       this.ensureCurrentBusinessDeptOption();
+      this.loadProjectContracts(row?.id);
+    },
+    loadProjectContracts(projectId) {
+      if (!this.showProjectContractSection || !projectId) {
+        this.projectContractRows = [];
+        this.projectContractLoading = false;
+        return;
+      }
+      this.projectContractLoading = true;
+      getContractManageList(1, 1000, { projectId })
+        .then(res => {
+          const data = res.data?.data;
+          const records = Array.isArray(data) ? data : data?.records || [];
+          this.projectContractRows = records.filter(
+            item => String(item.projectId) === String(projectId)
+          );
+        })
+        .catch(() => {
+          this.projectContractRows = [];
+          this.$message.error('项目合同加载失败');
+        })
+        .finally(() => {
+          this.projectContractLoading = false;
+        });
+    },
+    openProjectContractDetail(row) {
+      if (!row?.id) {
+        this.$message.warning('合同信息不完整，无法跳转');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: row.id, name: '合同详情' },
+      });
     },
     fillDefaultUsers() {
       const userId = this.userInfo?.userId || this.userInfo?.id || '';

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

@@ -53,6 +53,15 @@
               </el-tooltip>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="税率">
+              <el-input
+                :model-value="formatRate(form.taxRate)"
+                disabled
+                placeholder="从金蝶票据池带出"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="开票金额">
               <el-input
@@ -100,50 +109,34 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结算组织" prop="deptId">
-              <el-cascader
-                v-if="!readonly"
-                :model-value="deptCascaderValue"
-                :options="deptTreeOptions"
-                :props="deptCascaderProps"
-                placeholder="请选择结算组织（合同承办部门）"
-                filterable
-                clearable
-                @change="handleDeptChange"
-              />
-              <el-input v-else :model-value="form.deptName" disabled />
+            <el-form-item label="关联结算单" prop="settlementIds">
+              <el-tooltip
+                :content="settlementLabel"
+                :disabled="!settlementLabel"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input
+                    :model-value="settlementLabel"
+                    readonly
+                    placeholder="请选择应付正式结算单"
+                  >
+                    <template v-if="!readonly" #append>
+                      <el-tooltip content="选择付款结算单" placement="top">
+                        <el-button :icon="Search" @click="openSettlementDialog" />
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
       </section-card>
 
-      <section-card title="发票明细">
-        <el-table :data="invoiceItems" border empty-text="选择金蝶票据池发票后带出发票明细行">
-          <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column prop="goodsName" label="货物名称" min-width="160" show-overflow-tooltip />
-          <el-table-column prop="specModel" label="规格型号" min-width="120" show-overflow-tooltip />
-          <el-table-column prop="unit" label="单位" min-width="80" align="center" />
-          <el-table-column label="数量" min-width="100" align="right">
-            <template #default="{ row }">{{ formatQuantity(row.num) }}</template>
-          </el-table-column>
-          <el-table-column label="单价" min-width="110" align="right">
-            <template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
-          </el-table-column>
-          <el-table-column label="金额" min-width="120" align="right">
-            <template #default="{ row }">{{ formatMoney(row.detailAmount) }}</template>
-          </el-table-column>
-          <el-table-column label="税率" min-width="90" align="center">
-            <template #default="{ row }">{{ formatRateText(row.taxRate) }}</template>
-          </el-table-column>
-          <el-table-column label="税额" min-width="110" align="right">
-            <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
-          </el-table-column>
-          <el-table-column prop="goodsCode" label="商品编码" min-width="140" show-overflow-tooltip />
-        </el-table>
-      </section-card>
-
       <section-card title="结算信息">
-        <el-table :data="form.settlements" border empty-text="暂无认领数据（认领关系由付款结算单侧维护）">
+        <el-table :data="form.settlements" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             label="结算单号"
@@ -163,8 +156,17 @@
           <el-table-column label="已收票金额" min-width="150" align="right">
             <template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
           </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="150" align="right">
-            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
+          <el-table-column label="分摊发票金额" min-width="180">
+            <template #default="{ row }">
+              <el-input-number
+                v-model="row.allocatedInvoiceAmount"
+                :disabled="readonly"
+                :min="0"
+                :max="remainingAmount(row)"
+                :precision="2"
+                :controls="false"
+              />
+            </template>
           </el-table-column>
         </el-table>
       </section-card>
@@ -214,6 +216,71 @@
       :query-api="apiQueryInvoicePool"
       @confirm="handleInvoicePicked"
     />
+
+    <el-dialog
+      v-model="settlementDialog.visible"
+      title="选择应付正式结算单"
+      width="86%"
+      append-to-body
+    >
+      <div class="receipt-form-page__dialog-search">
+        <el-input
+          v-model="settlementDialog.keyword"
+          clearable
+          placeholder="结算单号、项目或合同"
+          @keyup.enter="loadSettlementCandidates"
+        />
+        <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
+      </div>
+      <el-table
+        ref="settlementTable"
+        v-loading="settlementDialog.loading"
+        :data="settlementDialog.rows"
+        row-key="id"
+        border
+        @selection-change="settlementDialog.selection = $event"
+      >
+        <el-table-column type="selection" width="52" align="center" reserve-selection />
+        <el-table-column
+          prop="formalSettlementNo"
+          label="结算单号"
+          min-width="170"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="projectName"
+          label="所属项目"
+          min-width="150"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="deptName" label="所属组织" min-width="150" show-overflow-tooltip />
+        <el-table-column
+          prop="contractNo"
+          label="合同编号"
+          min-width="150"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="payerName" label="付款方" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="payeeName" label="收款方" min-width="150" show-overflow-tooltip />
+        <el-table-column label="结算总金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
+        </el-table-column>
+        <el-table-column label="已收票金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" fixed="right" align="center">
+          <template #default="{ row }">
+            <el-link type="primary" @click.stop="selectSettlement(row)">选择</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <el-button @click="settlementDialog.visible = false">取消</el-button>
+        <el-button type="primary" @click="confirmSettlements">
+          确定{{ settlementDialog.selection.length ? `（${settlementDialog.selection.length}）` : '' }}
+        </el-button>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -221,15 +288,11 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
-import { getDeptTree } from '@/api/system/dept';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
-// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
-const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
-
 const emptyForm = () => ({
   id: null,
   invoiceNo: '',
@@ -247,7 +310,6 @@ const emptyForm = () => ({
   customerEmails: [],
   departmentEmails: [],
   projectName: '',
-  deptId: null,
   deptName: '',
   payerName: '',
   payeeName: '',
@@ -268,24 +330,26 @@ export default {
       form: emptyForm(),
       customerEmailOptions: [],
       departmentEmailOptions: [],
-      invoiceItems: [],
-      deptTreeOptions: [],
-      deptMap: new Map(),
-      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
-      deptCascaderProps: { checkStrictly: true, emitPath: true },
       invoiceDialog: {
         visible: false,
       },
+      settlementDialog: {
+        visible: false,
+        loading: false,
+        keyword: '',
+        rows: [],
+        selection: [],
+      },
       rules: {
         invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
-        deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }],
+        settlementIds: [{ required: true, validator: this.validateSettlements, trigger: 'change' }],
         customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
         departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
       },
     };
   },
   computed: {
-    ...mapGetters(['permission', 'userInfo']),
+    ...mapGetters(['permission']),
     recordId() {
       return this.$route.query.id || '';
     },
@@ -299,11 +363,14 @@ export default {
       const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
       return this.hasPermission(code);
     },
-    deptCascaderValue() {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        return [];
-      }
-      return [String(this.form.deptId)];
+    settlementLabel() {
+      return this.form.settlements
+        .map(item => item.formalSettlementNo)
+        .filter(Boolean)
+        .join(',');
+    },
+    settlementIds() {
+      return this.form.settlements.map(item => item.formalSettlementId || item.settlementId);
     },
   },
   created() {
@@ -339,7 +406,6 @@ export default {
         .filter(Boolean);
     },
     async initialize() {
-      this.loadDepartments();
       if (this.isPublicViewPage) {
         await this.loadPublicDetail();
         return;
@@ -353,13 +419,14 @@ export default {
       }
       const data = this.unwrapData(await api.getDetail(this.recordId));
       this.applyDetail(data);
+      if (this.settlementIds.length) await this.loadReferenceInformation();
     },
     async loadPublicDetail() {
       if (!this.recordId) return;
       const data = this.unwrapData(await getMkPublicDetail('invoice-receipt', this.recordId));
       this.applyDetail(data);
     },
-    async applyDetail(data) {
+    applyDetail(data) {
       this.form = {
         ...emptyForm(),
         ...data,
@@ -371,7 +438,6 @@ export default {
         })),
         attachments: this.parse(data.attachmentsJson),
       };
-      await this.loadInvoiceDetail();
     },
     validateInvoice(rule, value, callback) {
       if (!value) {
@@ -380,9 +446,9 @@ export default {
       }
       callback();
     },
-    validateDept(rule, value, callback) {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        callback(new Error('请选择结算组织'));
+    validateSettlements(rule, value, callback) {
+      if (!this.form.settlements.length) {
+        callback(new Error('请选择应付正式结算单'));
         return;
       }
       callback();
@@ -403,7 +469,7 @@ export default {
     openInvoiceDialog() {
       this.invoiceDialog.visible = true;
     },
-    async confirmInvoice(row, options = {}) {
+    confirmInvoice(row, options = {}) {
       const selected = row;
       if (!selected) {
         this.$message.warning('请选择一张金蝶票据池发票');
@@ -438,63 +504,92 @@ export default {
         ...new Set([...this.departmentEmailOptions, ...this.form.departmentEmails]),
       ];
       this.invoiceDialog.visible = false;
-      await this.loadInvoiceDetail();
       this.$refs.formRef?.validateField('invoiceNo').catch(() => {});
       return true;
     },
-    // 发票明细区块：按票号带出金蝶发票明细行（A801-1 镜像，推送 A303-2 分录同源）
-    async loadInvoiceDetail() {
-      if (!this.form.invoiceNo) {
-        this.invoiceItems = [];
+    async openSettlementDialog() {
+      this.settlementDialog.visible = true;
+      this.settlementDialog.selection = [];
+      await this.loadSettlementCandidates();
+      await this.$nextTick();
+      const selectedIds = new Set(this.settlementIds.map(id => String(id)));
+      this.settlementDialog.rows.forEach(row => {
+        if (selectedIds.has(String(row.id))) {
+          this.$refs.settlementTable?.toggleRowSelection(row, true);
+        }
+      });
+    },
+    async loadSettlementCandidates() {
+      this.settlementDialog.loading = true;
+      try {
+        this.settlementDialog.rows =
+          this.unwrapData(
+            await api.getSettlementCandidates(this.settlementDialog.keyword, this.form.id)
+          ) || [];
+      } finally {
+        this.settlementDialog.loading = false;
+      }
+    },
+    async confirmSettlements() {
+      const rows = this.settlementDialog.selection;
+      if (!rows.length) {
+        this.$message.warning('请至少选择一张应付正式结算单');
         return;
       }
-      try {
-        this.invoiceItems = this.unwrapData(await api.invoiceDetailQuery(this.form.invoiceNo)) || [];
-      } catch {
-        this.invoiceItems = [];
+      const first = rows[0];
+      const incompatible = rows.some(
+        item =>
+          String(item.projectId) !== String(first.projectId) ||
+          String(item.deptId) !== String(first.deptId) ||
+          item.payerName !== first.payerName ||
+          item.payeeName !== first.payeeName
+      );
+      if (incompatible) {
+        this.$message.warning('关联结算单必须属于同一项目、组织及收付款方');
+        return;
+      }
+      const previousAmount = new Map(
+        this.form.settlements.map(item => [
+          String(item.formalSettlementId || item.settlementId),
+          item.allocatedInvoiceAmount,
+        ])
+      );
+      this.form.settlements = rows.map(item => ({
+        ...item,
+        formalSettlementId: item.id,
+        settlementId: item.id,
+        allocatedInvoiceAmount: previousAmount.has(String(item.id))
+          ? Number(previousAmount.get(String(item.id)) || 0)
+          : rows.length === 1
+            ? Number(item.settlementAmount || 0)
+            : 0,
+      }));
+      this.form.projectName = first.projectName;
+      this.form.deptName = first.deptName;
+      this.form.payerName = first.payerName;
+      this.form.payeeName = first.payeeName;
+      this.settlementDialog.visible = false;
+      await this.loadReferenceInformation();
+      this.$refs.formRef?.validateField('settlementIds').catch(() => {});
+    },
+    selectSettlement(row) {
+      this.$refs.settlementTable?.toggleRowSelection(row);
+    },
+    async loadReferenceInformation() {
+      const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(',')));
+      this.customerEmailOptions = data.customerEmails || [];
+      this.departmentEmailOptions = [
+        ...new Set([...this.departmentEmailOptions, ...(data.departmentEmails || [])]),
+      ];
+      if (!this.form.customerEmails.length && this.customerEmailOptions.length) {
+        this.form.customerEmails = [this.customerEmailOptions[0]];
       }
     },
-    loadDepartments() {
-      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
-      getDeptTree(this.userInfo?.tenantId)
-        .then(response => {
-          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
-          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
-          this.deptMap = new Map();
-          this.flattenDepartments(rows).forEach(item =>
-            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
-          );
-        })
-        .catch(() => {});
-    },
-    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 = []) {
-      return list.map(item => ({
-        label: item.title || item.deptName || item.name,
-        value: item.id == null || item.id === '' ? '' : String(item.id),
-        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
-      }));
-    },
-    flattenDepartments(rows) {
-      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
-    },
-    handleDeptChange(value) {
-      const deptId = Array.isArray(value) ? value.at(-1) : value;
-      this.form.deptId = deptId || null;
-      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
-      this.$refs.formRef?.validateField('deptId').catch(() => {});
+    remainingAmount(row) {
+      return Math.max(
+        Number(row.settlementAmount || 0) - Number(row.receivedInvoiceAmount || 0),
+        0
+      );
     },
     openSettlementDetail(row) {
       const id = row.formalSettlementId || row.settlementId || row.id;
@@ -507,6 +602,15 @@ export default {
     validateBusiness() {
       const invoiceAmount = Number(this.form.invoiceAmount || 0);
       if (invoiceAmount <= 0) throw new Error('开票金额必须大于0');
+      for (const row of this.form.settlements) {
+        const allocated = Number(row.allocatedInvoiceAmount);
+        if (!Number.isFinite(allocated) || allocated < 0) {
+          throw new Error('分摊发票金额必须大于或等于0');
+        }
+        if (allocated - this.remainingAmount(row) > 0.001) {
+          throw new Error(`结算单${row.formalSettlementNo}的累计收票金额不能超过结算总金额`);
+        }
+      }
     },
     payload() {
       return {
@@ -527,9 +631,10 @@ export default {
         departmentEmails: this.form.departmentEmails.join(';'),
         attachmentsJson: JSON.stringify(this.form.attachments || []),
         remark: this.form.remark,
-        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
-        deptId: this.form.deptId,
-        deptName: this.form.deptName,
+        settlements: this.form.settlements.map(item => ({
+          settlementId: item.formalSettlementId || item.settlementId,
+          allocatedInvoiceAmount: item.allocatedInvoiceAmount,
+        })),
       };
     },
     async saveDraft() {
@@ -558,7 +663,6 @@ export default {
         mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
-      sessionStorage.setItem(invoiceReceiptListRefreshKey, '1');
       this.goBack();
     },
     async syncReferenceData() {
@@ -574,7 +678,8 @@ export default {
         this.$message.warning('金蝶票池未查询到该发票');
         return;
       }
-      if (!(await this.confirmInvoice(invoice, { preserveUserInput: true }))) return;
+      if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
+      if (this.settlementIds.length) await this.loadReferenceInformation();
       this.$message.success('同步成功');
     },
     goBack() {
@@ -583,13 +688,8 @@ export default {
     formatMoney(value) {
       return Number(value || 0).toFixed(2);
     },
-    formatQuantity(value) {
-      const number = Number(value);
-      return Number.isFinite(number) ? String(number) : '-';
-    },
-    formatRateText(value) {
-      if (value === null || value === undefined || value === '') return '-';
-      return `${value}%`;
+    formatRate(value) {
+      return value === null || value === undefined || value === '' ? '' : `${Number(value)}%`;
     },
   },
 };
@@ -638,6 +738,15 @@ export default {
 :global(.avue-layout--horizontal .receipt-form-page__actions) {
   left: 0;
 }
+.receipt-form-page__dialog-search {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-bottom: 12px;
+}
+.receipt-form-page__dialog-search .el-input {
+  width: 360px;
+}
 .receipt-form-page :deep(.el-table) {
   --el-table-border-color: #eff1f7;
 }

src/views/payment/invoice-receipt.vue

@@ -223,10 +223,6 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
-// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
-const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
-const invoiceReceiptListRoute = '/payment/invoice-receipt';
-
 const emptyQuery = () => ({
   invoiceNo: '',
   invoiceDate: '',
@@ -285,28 +281,7 @@ export default {
         this.mkEnabled = false;
       });
   },
-  activated() {
-    this.consumeListRefreshFlag();
-  },
-  watch: {
-    $route(to, from) {
-      if (
-        to.path === invoiceReceiptListRoute &&
-        from?.path?.includes('/invoice-receipt/form')
-      ) {
-        this.consumeListRefreshFlag();
-      }
-    },
-  },
   methods: {
-    /** 表单提交成功后带标记返回时，重新拉取列表 */
-    consumeListRefreshFlag() {
-      if (!sessionStorage.getItem(invoiceReceiptListRefreshKey)) {
-        return;
-      }
-      sessionStorage.removeItem(invoiceReceiptListRefreshKey);
-      this.loadTable();
-    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },

src/views/payment/payment-application.vue

@@ -80,23 +80,6 @@
         </el-tooltip>
       </template>
 
-      <template #kingdeeAssignStatus="{ row }">
-        <el-tooltip
-          :disabled="row.kingdeeAssignStatus !== 'failed'"
-          :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在对应付款结算单查看页重新推送'"
-          placement="top"
-        >
-          <el-tag
-            v-if="row.kingdeeAssignStatus"
-            :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
-            size="small"
-          >
-            {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
-          </el-tag>
-          <span v-else>-</span>
-        </el-tooltip>
-      </template>
-
       <template #menu="{ row }">
         <el-link
           v-if="hasPermission('payment_application_view')"
@@ -426,12 +409,6 @@ export default {
         return;
       }
       this.syncLoading = true;
-      // 批量同步金蝶逐单串行推送耗时较长，加遮罩防重复操作（照审批通过遮罩）
-      const loading = this.$loading({
-        lock: true,
-        text: '正在批量同步金蝶，请稍候…',
-        background: 'rgba(255, 255, 255, 0.6)',
-      });
       try {
         const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
         const failedList = data.filter(item => String(item).includes('同步失败'));
@@ -448,7 +425,6 @@ export default {
         this.warnAttachmentNotUploaded(rows.map(row => row.id));
       } finally {
         this.syncLoading = false;
-        loading.close();
       }
     },
     // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传

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

@@ -440,15 +440,8 @@
       />
 
       <section-card title="发票信息">
-        <div v-if="editable" class="formal-editor__invoice-claim">
-          <!-- 先票后款：付款结算单选审批通过的收票单（全额认领）；收款结算单维持原票池认领 -->
-          <el-button
-            v-if="form.settlementType !== 'receivable'"
-            type="primary"
-            @click="openInvoiceReceiptDialog"
-            >选择收票单</el-button
-          >
-          <el-button v-else type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
+        <div class="formal-editor__invoice-claim">
+          <el-button type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
         </div>
         <el-table :data="invoices" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
@@ -459,6 +452,11 @@
           <el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center">
             <template #default="{ row }">{{ displayValue(row.invoiceType) }}</template>
           </el-table-column>
+          <el-table-column prop="taxRate" label="税率" min-width="100" align="center">
+            <template #default="{ row }">
+              {{ row.taxRate === null || row.taxRate === undefined ? '-' : `${row.taxRate}%` }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="invoiceAmount"
             label="发票金额（含税）"
@@ -482,39 +480,17 @@
             align="center"
           >
             <template #default="{ row }">
-              <!-- 匹配结算单金额支持手动修改：编辑态全放开；查看页仅指定失败行（failed）开放，重推时一并保存生效 -->
               <el-input-number
-                v-if="canEditMatchedAmount(row)"
+                v-if="editable"
                 v-model="row.matchedAmount"
                 :min="0"
-                :max="Number(row.availableInvoiceAmount || row.invoiceAmount || 0)"
+                :max="Number(row.availableInvoiceAmount || 0)"
                 :precision="2"
                 :controls="false"
               />
               <span v-else>{{ formatMoney(row.matchedAmount) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="是否已指定应付" min-width="130" align="center">
-            <template #default="{ row }">
-              <el-tooltip
-                :disabled="row.kingdeePushStatus !== 'failed'"
-                :content="row.kingdeePushMsg || '推送金蝶失败，可重新推送'"
-                placement="top"
-              >
-                <el-tag
-                  :type="
-                    { assigned: 'success', failed: 'danger' }[row.kingdeePushStatus] || 'info'
-                  "
-                  size="small"
-                >
-                  {{
-                    { assigned: '已指定应付', failed: '指定失败' }[row.kingdeePushStatus] ||
-                    '未指定'
-                  }}
-                </el-tag>
-              </el-tooltip>
-            </template>
-          </el-table-column>
           <el-table-column label="操作" width="220" fixed="right" align="center">
             <template #default="{ row, $index }">
               <div class="formal-editor__links">
@@ -530,14 +506,6 @@
                   @click="downloadInvoiceAttachment(row)"
                   >下载</el-link
                 >
-                <!-- 查看页重推入口：付款结算单已同步金蝶且认领票未指定应付（failed/pushed） -->
-                <el-link
-                  v-if="canRepushInvoice(row)"
-                  type="warning"
-                  :disabled="repushing"
-                  @click="repushInvoice(row)"
-                  >重新推送</el-link
-                >
                 <el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
               </div>
             </template>
@@ -578,11 +546,6 @@
         @confirm="handleInvoiceClaimConfirm"
       />
 
-      <invoice-receipt-candidates-dialog
-        v-model="invoiceReceiptDialog.visible"
-        @confirm="handleInvoiceReceiptConfirm"
-      />
-
       <section-card
         v-if="readonly"
         :title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
@@ -1090,7 +1053,6 @@ import {
   getNextNo,
   getReceiptClaims,
   claimInvoices as claimInvoicesApi,
-  repushClaimedInvoice,
   queryInvoicePool,
   save,
   syncKingdee,
@@ -1106,7 +1068,6 @@ import {
   settlementDetailPath,
 } from '@/utils/settlement-detail-link';
 import { getBfiExchangeRate } from '@/api/base/currency';
-import InvoiceReceiptCandidatesDialog from './invoice-receipt-candidates-dialog.vue';
 import {
   createFormalSettlementForm,
   formalSettlementFormFields,
@@ -1149,7 +1110,6 @@ export default {
   components: {
     InfoFilled,
     KingdeeInvoicePoolDialog,
-    InvoiceReceiptCandidatesDialog,
     ChangeRecordDetailDialog,
     ProjectAdvanceWriteOff,
   },
@@ -1189,8 +1149,6 @@ export default {
       attachments: [],
       selectedAttachmentRows: [],
       invoices: [],
-      // 查看页认领收票单重推进行中（行级操作守卫）
-      repushing: false,
       // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
       issuedInvoices: [],
       // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
@@ -1200,10 +1158,6 @@ export default {
         selected: [],
         confirming: false,
       },
-      // 先票后款：付款结算单选收票单（审批通过+未认领）弹窗
-      invoiceReceiptDialog: {
-        visible: false,
-      },
       attachmentUploadFiles: [],
       attachmentTypeOptions: [],
       attachmentFileTypes: [
@@ -2697,81 +2651,6 @@ export default {
     openInvoiceClaimDialog() {
       this.invoiceClaimDialog.visible = true;
     },
-    // 先票后款：选收票单（审批通过+未被认领），确认后按发票号全额认领
-    openInvoiceReceiptDialog() {
-      this.invoiceReceiptDialog.visible = true;
-    },
-    // 查看页重推入口展示条件：只读 + 付款结算单 + 审批通过 + 金蝶应付单已同步 + 该票未指定应付（failed/pushed）
-    canRepushInvoice(row) {
-      return (
-        !this.editable &&
-        this.form.settlementType !== 'receivable' &&
-        this.form.approvalStatus === 'approved' &&
-        this.form.kingdeeSyncStatus === 'synced' &&
-        ['failed', 'pushed'].includes(row.kingdeePushStatus || '')
-      );
-    },
-    // 查看页匹配金额编辑仅开放指定失败行（failed）；pushed 行等待自动补偿指定，金额保持只读
-    canEditMatchedAmount(row) {
-      return (
-        this.editable ||
-        (this.form.settlementType !== 'receivable' &&
-          this.form.approvalStatus === 'approved' &&
-          this.form.kingdeeSyncStatus === 'synced' &&
-          row.kingdeePushStatus === 'failed')
-      );
-    },
-    // 重推 = 收票单A303-2 + 指定应付A302-6 一步式，服务端返回结果描述；完成后重载详情刷新状态
-    async repushInvoice(row) {
-      try {
-        await this.$confirm(`确认重新推送发票${row.invoiceNo || ''}到金蝶并指定应付?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        });
-      } catch {
-        return;
-      }
-      this.repushing = true;
-      try {
-        const data = this.unwrapData(
-          await repushClaimedInvoice(this.form.id, row.invoiceNo, Number(row.matchedAmount || 0))
-        );
-        this.$message.success(data || '重新推送成功');
-        await this.loadFormalDetail(this.form.id);
-      } finally {
-        this.repushing = false;
-      }
-    },
-    async handleInvoiceReceiptConfirm(rows) {
-      // 收票单行 → 结算单发票行：匹配金额固定=发票金额（全额认领），附件契约归一为单数 attachmentJson
-      const invoices = rows.map(row => ({
-        ...row,
-        attachmentJson: row.attachmentJson || row.attachmentsJson,
-        invoiceType: row.invoiceType || '',
-        taxRate: row.taxRate ?? null,
-        availableInvoiceAmount: Number(row.invoiceAmount || 0),
-        matchedAmount: Number(row.invoiceAmount || 0),
-      }));
-      if (!this.form.id) {
-        const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
-        this.invoices = [
-          ...this.invoices,
-          ...invoices.filter(row => !existingNumbers.has(String(row.invoiceNo))),
-        ];
-        this.$message.success(`已选择${invoices.length}条收票单，保存正式结算单后生效`);
-        return;
-      }
-      const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
-      const newInvoices = invoices.filter(row => !existingNumbers.has(String(row.invoiceNo)));
-      if (!newInvoices.length) {
-        this.$message.warning('所选收票单均已认领');
-        return;
-      }
-      await claimInvoicesApi({ formalSettlementId: this.form.id, invoices: newInvoices });
-      await this.loadFormalDetail(this.form.id);
-      this.$message.success('收票单认领成功，已同步正式结算单及关联付款单据');
-    },
     invoicePoolQueryApi(params) {
       return queryInvoicePool(params);
     },
@@ -2886,7 +2765,10 @@ export default {
         }
         matchedTotal += matchedAmount;
       }
-      // 先票后款全额认领：匹配金额=发票全额，可超过结算金额，不再校验合计上限（收票状态按覆盖判定）
+      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
+        this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
+        return false;
+      }
       return true;
     },
     removeInvoice(index) {

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

@@ -23,15 +23,6 @@
         @click="$emit('payment')"
         >付款申请</el-button
       >
-      <!-- 先票后款：付款结算单审批通过后可发票登记（关联收票单并推送指定应付），选中一条付款结算单操作 -->
-      <el-button
-        v-if="showPaymentAction && hasPermission('invoice_register')"
-        type="primary"
-        plain
-        :disabled="!selection.length"
-        @click="emitSingle('invoiceRegister')"
-        >发票登记</el-button
-      >
       <el-button
         v-if="hasPermission('sync')"
         type="primary"
@@ -97,23 +88,6 @@
       <span v-else>-</span>
     </template>
 
-    <template #kingdeeAssignStatus="{ row }">
-      <el-tooltip
-        :disabled="row.kingdeeAssignStatus !== 'failed'"
-        :content="row.kingdeeAssignFailReason || '收票单指定应付失败，可在查看页对失败行重新推送'"
-        placement="top"
-      >
-        <el-tag
-          v-if="row.kingdeeAssignStatus"
-          :type="{ assigned: 'success', failed: 'danger' }[row.kingdeeAssignStatus] || 'info'"
-          size="small"
-        >
-          {{ { assigned: '已指定应付', failed: '指定失败' }[row.kingdeeAssignStatus] || '未指定' }}
-        </el-tag>
-        <span v-else>-</span>
-      </el-tooltip>
-    </template>
-
     <template #menu="{ row }">
       <el-link
         v-for="action in rowActions(row)"

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

@@ -1,186 +0,0 @@
-<template>
-  <el-dialog
-    v-model="visible"
-    title="选择收票单"
-    width="86%"
-    append-to-body
-    destroy-on-close
-    @open="handleOpen"
-  >
-    <div class="invoice-candidates-dialog__search">
-      <el-input
-        v-model="keyword"
-        clearable
-        placeholder="发票号 / 销方（开票单位） / 购方（受票单位）"
-        @keyup.enter="handleQuery"
-      />
-      <el-button type="primary" :loading="loading" @click="handleQuery">查询</el-button>
-    </div>
-    <el-table
-      ref="candidatesTable"
-      v-loading="loading"
-      :data="rows"
-      row-key="id"
-      border
-      height="460"
-      @selection-change="selection = $event"
-    >
-      <el-table-column type="selection" width="52" fixed="left" align="center" reserve-selection />
-      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
-      <el-table-column prop="invoiceDate" label="开票日期" min-width="110" align="center">
-        <template #default="{ row }">{{ row.invoiceDate || '-' }}</template>
-      </el-table-column>
-      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
-      <el-table-column prop="issuerName" label="开票单位（销方）" min-width="180" show-overflow-tooltip />
-      <el-table-column prop="receiverName" label="受票单位（购方）" min-width="180" show-overflow-tooltip />
-      <el-table-column label="发票金额（含税）" min-width="140" align="right">
-        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
-      </el-table-column>
-      <el-table-column label="推送状态" min-width="120" align="center">
-        <template #default="{ row }">
-          <el-tooltip
-            :disabled="row.kingdeePushStatus !== 'failed'"
-            :content="row.kingdeePushMsg || '推送金蝶失败，可在收票登记列表重推'"
-            placement="top"
-          >
-            <el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
-              {{ pushStatusName(row.kingdeePushStatus) }}
-            </el-tag>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="invoice-candidates-dialog__pagination">
-      <el-pagination
-        v-model:current-page="page.current"
-        v-model:page-size="page.size"
-        :total="page.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @current-change="load"
-        @size-change="handleSizeChange"
-      />
-    </div>
-    <div class="invoice-candidates-dialog__tip">
-      仅列出审批通过且未被其他付款结算单认领的收票单
-    </div>
-    <template #footer>
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="handleConfirm">
-        确定{{ selection.length ? `（${selection.length}）` : '' }}
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import { claimCandidates } from '@/api/payment/invoiceReceipt';
-
-export default {
-  name: 'InvoiceReceiptCandidatesDialog',
-  props: {
-    modelValue: { type: Boolean, required: true },
-  },
-  emits: ['update:modelValue', 'confirm'],
-  data() {
-    return {
-      loading: false,
-      keyword: '',
-      rows: [],
-      selection: [],
-      page: { current: 1, size: 10, total: 0 },
-    };
-  },
-  computed: {
-    visible: {
-      get() {
-        return this.modelValue;
-      },
-      set(value) {
-        this.$emit('update:modelValue', value);
-      },
-    },
-  },
-  methods: {
-    unwrap(response) {
-      const body = response?.data || response || {};
-      return body?.data || body;
-    },
-    handleOpen() {
-      this.keyword = '';
-      this.page = { current: 1, size: 10, total: 0 };
-      this.selection = [];
-      this.$refs.candidatesTable?.clearSelection?.();
-      this.load();
-    },
-    handleQuery() {
-      this.page.current = 1;
-      this.load();
-    },
-    handleSizeChange() {
-      this.page.current = 1;
-      this.load();
-    },
-    async load() {
-      this.loading = true;
-      try {
-        const data = this.unwrap(
-          await claimCandidates({
-            current: this.page.current,
-            size: this.page.size,
-            keyword: this.keyword,
-          })
-        );
-        this.rows = data?.records || [];
-        this.page.total = Number(data?.total || 0);
-      } finally {
-        this.loading = false;
-      }
-    },
-    handleConfirm() {
-      if (!this.selection.length) {
-        this.$message.warning('请至少选择一条收票单');
-        return;
-      }
-      this.$emit('confirm', this.selection.map(row => ({ ...row })));
-      this.visible = false;
-    },
-    pushStatusName(value) {
-      return (
-        { pushed: '已保存收票单', assigned: '已指定应付', failed: '推送失败', unsynced: '未推送' }[
-          value
-        ] || '未推送'
-      );
-    },
-    pushStatusType(value) {
-      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
-    },
-    formatMoney(value) {
-      const number = Number(value);
-      return Number.isFinite(number) ? number.toFixed(2) : '-';
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.invoice-candidates-dialog__search {
-  display: flex;
-  justify-content: flex-end;
-  gap: 8px;
-  margin-bottom: 12px;
-
-  .el-input {
-    width: 360px;
-  }
-}
-.invoice-candidates-dialog__pagination {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 12px;
-}
-.invoice-candidates-dialog__tip {
-  margin-top: 8px;
-  color: #909399;
-  font-size: 12px;
-}
-</style>

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

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

src/views/settlement/formal-settlement.vue

@@ -98,125 +98,6 @@
         ></template
       >
     </el-dialog>
-
-    <!-- 先票后款路径B：结算单审批后发票登记（关联收票单 → 确认推送指定应付） -->
-    <el-dialog
-      v-model="invoiceRegisterDialog.visible"
-      title="发票登记"
-      width="86%"
-      append-to-body
-      class="invoice-register-dialog"
-    >
-      <section-card title="结算基本信息">
-        <el-descriptions :column="4" border size="small">
-          <el-descriptions-item label="结算单号">
-            {{ invoiceRegisterDialog.row.formalSettlementNo || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="项目名称">
-            {{ invoiceRegisterDialog.row.projectName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="所属组织">
-            {{ invoiceRegisterDialog.row.deptName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="合同编号">
-            {{ invoiceRegisterDialog.row.contractNo || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="付款方">
-            {{ invoiceRegisterDialog.row.payerName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="收款方">
-            {{ invoiceRegisterDialog.row.payeeName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="结算类型">
-            {{ settlementTypeName(invoiceRegisterDialog.row.settlementType) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="业务模式">
-            {{ invoiceRegisterDialog.row.businessModelName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="结算总金额">
-            {{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="已匹配发票金额">
-            {{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="创建人">
-            {{ invoiceRegisterDialog.row.createUserName || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="创建时间">
-            {{ invoiceRegisterDialog.row.createTime || '-' }}
-          </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态" :span="2">
-            {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
-          </el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">
-            {{ invoiceRegisterDialog.row.remark || '-' }}
-          </el-descriptions-item>
-        </el-descriptions>
-      </section-card>
-      <section-card title="认领收票单">
-        <div class="invoice-register-dialog__actions">
-          <el-button
-            type="primary"
-            plain
-            :disabled="invoiceRegisterDialog.saving"
-            @click="candidatesDialog.visible = true"
-            >选择收票单</el-button
-          >
-        </div>
-        <el-table :data="invoiceRegisterDialog.candidates" border class="invoice-register-dialog__table">
-          <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column prop="invoiceNo" label="发票号" min-width="160" align="center" />
-          <el-table-column prop="invoiceDate" label="开票日期" min-width="120" align="center" />
-          <el-table-column prop="invoiceType" label="发票类型" min-width="140" align="center" />
-          <el-table-column prop="issuerName" label="开票单位（销方）" min-width="170" show-overflow-tooltip />
-          <el-table-column label="发票金额（含税）" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
-          </el-table-column>
-          <el-table-column label="匹配结算单金额" min-width="160" align="right">
-            <template #default="{ row }">
-              <!-- 匹配金额支持手动修改（默认=发票金额全额），已认领回显行只读 -->
-              <el-input-number
-                v-if="!row.claimed"
-                v-model="row.matchedAmount"
-                :min="0"
-                :max="Number(row.invoiceAmount || 0)"
-                :precision="2"
-                :controls="false"
-              />
-              <span v-else>{{ formatMoney(row.matchedAmount || row.invoiceAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="90" fixed="right" align="center">
-            <template #default="{ row, $index }">
-              <!-- 已认领票回显：认领保存为增量逻辑不支持移除，仅新增票可移除 -->
-              <el-tag v-if="row.claimed" size="small">已认领</el-tag>
-              <el-link
-                v-else
-                type="danger"
-                :disabled="invoiceRegisterDialog.saving"
-                @click="invoiceRegisterDialog.candidates.splice($index, 1)"
-                >移除</el-link
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </section-card>
-      <template #footer>
-        <el-button @click="invoiceRegisterDialog.visible = false">取消</el-button>
-        <el-button
-          type="primary"
-          :loading="invoiceRegisterDialog.saving"
-          :disabled="!invoiceRegisterDialog.candidates.length"
-          @click="submitInvoiceRegister"
-          >保存认领</el-button
-        >
-      </template>
-    </el-dialog>
-
-    <invoice-receipt-candidates-dialog
-      v-model="candidatesDialog.visible"
-      @confirm="addInvoiceRegisterCandidates"
-    />
   </basic-container>
 </template>
 
@@ -232,18 +113,16 @@ import { isAdministrator } from '@/utils/auth';
 import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
-import * as invoiceReceiptApi from '@/api/payment/invoiceReceipt';
-import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement';
+import { formalSettlementOption } from '@/option/settlement/formalSettlement';
 import organizationSearch from '@/mixins/organization-search';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
-import InvoiceReceiptCandidatesDialog from './components/invoice-receipt-candidates-dialog.vue';
 import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 
 export default {
   name: 'FormalSettlement',
-  components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog },
+  components: { FormalSettlementEditor, FormalSettlementTablePanel },
   mixins: [organizationSearch],
   props: {
     /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
@@ -272,16 +151,6 @@ export default {
         rows: [],
         form: { appliedAmount: 0, remark: '' },
       },
-      // 先票后款路径B：发票登记（关联收票单 + 确认推送指定应付）
-      invoiceRegisterDialog: {
-        visible: false,
-        saving: false,
-        row: {},
-        candidates: [],
-      },
-      candidatesDialog: {
-        visible: false,
-      },
       mkEnabled: false,
       // keep-alive 多标签下仅激活实例响应 detailNo，避免缓存页重复弹窗
       isPageActive: true,
@@ -428,7 +297,6 @@ export default {
         return: () => this.handleReturn(row),
         void: () => this.handleVoid(row),
         print: () => this.handlePrint(row),
-        invoiceRegister: () => this.openInvoiceRegisterDialog(row),
       };
       (handlers[type] || (() => {}))();
     },
@@ -728,68 +596,6 @@ export default {
         this.paymentDialog.loading = false;
       }
     },
-    // 先票后款路径B：发票登记——认领收票单（claim-invoices 走增量认领并同步收票侧关系）
-    // 打开时回显本单已认领收票单（claimed 标记禁止移除），已认领过票的可直接保存推送补指定应付
-    async openInvoiceRegisterDialog(row) {
-      if ((row?.approvalStatus || '') !== 'approved') {
-        this.$message.warning('仅审批通过的付款结算单允许发票登记');
-        return;
-      }
-      this.invoiceRegisterDialog.row = row || {};
-      this.invoiceRegisterDialog.candidates = [];
-      this.invoiceRegisterDialog.visible = true;
-      try {
-        const claimed = this.unwrapData(await invoiceReceiptApi.claimedReceipts(row.id)) || [];
-        this.invoiceRegisterDialog.candidates = claimed.map(item => ({ ...item, claimed: true }));
-      } catch (error) {
-        this.invoiceRegisterDialog.candidates = [];
-      }
-    },
-    addInvoiceRegisterCandidates(rows) {
-      const existing = new Set(
-        this.invoiceRegisterDialog.candidates.map(item => String(item.invoiceNo))
-      );
-      const added = rows.filter(row => !existing.has(String(row.invoiceNo)));
-      if (!added.length) {
-        this.$message.warning('所选收票单均已登记');
-        return;
-      }
-      // 全额认领：匹配金额固定=发票金额（仅暂存展示，点保存认领确认后才落库）
-      this.invoiceRegisterDialog.candidates.push(
-        ...added.map(row => ({ ...row, matchedAmount: Number(row.invoiceAmount || 0) }))
-      );
-    },
-    async submitInvoiceRegister() {
-      const settlement = this.invoiceRegisterDialog.row;
-      const invoices = this.invoiceRegisterDialog.candidates.map(row => ({
-        ...row,
-        attachmentJson: row.attachmentJson || row.attachmentsJson,
-        invoiceType: row.invoiceType || '',
-        taxRate: row.taxRate ?? null,
-        availableInvoiceAmount: Number(row.invoiceAmount || 0),
-        matchedAmount: Number(row.matchedAmount || row.invoiceAmount || 0),
-      }));
-      try {
-        // 先确认后保存：确定才认领并推送指定应付，取消不保存任何数据
-        await this.$confirm('确认认领并推送金蝶指定应付?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        });
-      } catch {
-        return;
-      }
-      this.invoiceRegisterDialog.saving = true;
-      try {
-        await api.claimInvoices({ formalSettlementId: settlement.id, invoices });
-        const data = this.unwrapData(await api.invoiceAssignKingdee(settlement.id));
-        this.$message.success(data || '发票登记推送金蝶成功');
-        this.invoiceRegisterDialog.visible = false;
-        this.onLoad(this.page);
-      } finally {
-        this.invoiceRegisterDialog.saving = false;
-      }
-    },
     handlePrint(row) {
       if (!row) {
         row = this.selectedOne('打印');
@@ -839,9 +645,6 @@ export default {
       params.settlementType = this.lockedSettlementType || this.activeSettlementType;
       return params;
     },
-    settlementTypeName(value) {
-      return { payable: '付款', receivable: '收款' }[value] || '-';
-    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -882,11 +685,6 @@ export default {
   margin-bottom: 12px;
   color: #606266;
 }
-.invoice-register-dialog__actions {
-  display: flex;
-  justify-content: flex-end;
-  margin-bottom: 8px;
-}
 :deep(.formal-page.basic-container .basic-container__card > .el-card__body) {
   padding: 0;
 }

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

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

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

@@ -20,6 +20,13 @@
       @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"
@@ -117,7 +124,7 @@ export default {
         editBtn: false,
         delBtn: false,
         viewBtn: false,
-        menuWidth: 140,
+        menuWidth: 220,
         dialogWidth: 900,
         dialogClickModal: false,
         labelPosition: 'right',

src/views/system/dept.vue

@@ -203,7 +203,6 @@ import { mapGetters } from 'vuex';
 import website from '@/config/website';
 import func from '@/utils/func';
 
-const escapeRegExp = value => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 const ORGANIZATION_TYPE_DICT_CODE = 'organization_type';
 /**
  * 组织类型名称 → 字典数字键（兼容 dictKey 配成中文的情况）
@@ -323,7 +322,7 @@ export default {
               {
                 validator: (rule, value, callback) => {
                   const deptCode = String(value || '').trim();
-                  // 组织编码非必填，为空直接通过
+                  // 组织编码非必填，为空直接通过；不再校验 GWWL/上级编码+三位数字格式
                   if (!deptCode) {
                     callback();
                     return;
@@ -332,34 +331,6 @@ export default {
                     callback(new Error('组织编码不能超过30个字符'));
                     return;
                   }
-                  const parentId = this.normalizeParentId(this.form?.parentId);
-                  // 顶级组织不选择上级时，编码不依赖上级编码
-                  if (!parentId) {
-                    callback();
-                    return;
-                  }
-                  if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
-                    this.loadParentDeptCode(parentId);
-                    callback(new Error('正在加载上级组织编码，请稍后重试'));
-                    return;
-                  }
-                  if (!this.parentDeptCode) {
-                    callback(new Error('上级组织未配置组织编码，请先完善上级组织编码'));
-                    return;
-                  }
-                  // 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字（中间不加-）
-                  let expectedPrefix = this.parentDeptCode;
-                  const category = Number(this.form?.deptCategory);
-                  if (category === 2) {
-                    expectedPrefix = 'GWWL';
-                  } else if (category === 3 && this.form?.belongCompanyCode) {
-                    expectedPrefix = String(this.form.belongCompanyCode).trim();
-                  }
-                  const pattern = new RegExp(`^${escapeRegExp(expectedPrefix)}\\d{3}$`);
-                  if (!pattern.test(deptCode)) {
-                    callback(new Error(`组织编码格式应为：${expectedPrefix}三位数字（不足补零，中间不加-）`));
-                    return;
-                  }
                   callback();
                 },
                 trigger: 'blur',
@@ -431,50 +402,22 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
             order: 36,
             search: true,
             searchOrder: 2,
             searchPlaceholder: '请选择是否平台公司',
             formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
-            change: ({ value }) => this.handlePlatformCompanyChange(value),
-            rules: [
-              {
-                required: true,
-                message: '请选择是否平台公司',
-                trigger: 'change',
-              },
-            ],
-          },
-          {
-            label: '金蝶部门代码',
-            prop: 'kingdeeDeptCode',
-            minWidth: 140,
-            order: 35,
-            maxlength: 64,
-            showWordLimit: true,
-            // 仅平台公司维护/展示金蝶组织代码；非平台公司列表留空
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            formatter: row =>
-              Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
             rules: [
               {
                 validator: (rule, value, callback) => {
-                  const code = String(value || '').trim();
-                  if (!code) {
-                    callback();
-                    return;
-                  }
-                  if (code.length > 64) {
-                    callback(new Error('金蝶部门代码不能超过64个字符'));
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否平台公司'));
                     return;
                   }
                   callback();
                 },
-                trigger: 'blur',
+                trigger: 'change',
               },
             ],
           },
@@ -487,7 +430,6 @@ export default {
               { label: '是', value: 1 },
             ],
             dataType: 'number',
-            value: 0,
             width: 120,
             order: 34,
             search: true,
@@ -496,8 +438,14 @@ export default {
             formatter: row => (Number(row.isBusinessDept) === 1 ? '是' : '否'),
             rules: [
               {
-                required: true,
-                message: '请选择是否业务部门',
+                validator: (rule, value, callback) => {
+                  // 不能用 required:true：值为 0（否）时会被当成空
+                  if (value === undefined || value === null || value === '') {
+                    callback(new Error('请选择是否业务部门'));
+                    return;
+                  }
+                  callback();
+                },
                 trigger: 'change',
               },
             ],
@@ -988,6 +936,7 @@ export default {
     /**
      * 提交前将组织类型规范为 Integer；空状态/排序字段去掉，避免 "" 反序列化失败。
      * 排序为空时由后端默认填充 1。
+     * 是否平台公司 / 是否业务部门强制规范为数字 0/1，避免下拉值类型导致漏更新。
      */
     prepareDeptSubmitRow(row) {
       const category = this.resolveDeptCategoryValue(row.deptCategory);
@@ -995,6 +944,8 @@ export default {
         return false;
       }
       row.deptCategory = category;
+      row.isPlatformCompany = Number(row.isPlatformCompany) === 1 ? 1 : 0;
+      row.isBusinessDept = Number(row.isBusinessDept) === 1 ? 1 : 0;
       if (row.status === '' || row.status === null || row.status === undefined) {
         delete row.status;
       } else {
@@ -1007,6 +958,9 @@ export default {
       }
       return true;
     },
+    normalizeYesNoFlag(value) {
+      return Number(value) === 1 ? 1 : 0;
+    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1163,21 +1117,6 @@ export default {
         row.parentId = 0;
       }
     },
-    handlePlatformCompanyChange(value) {
-      const isPlatform = Number(value) === 1;
-      this.syncKingdeeDeptCodeDisplay(isPlatform);
-      if (!isPlatform && this.form) {
-        this.form.kingdeeDeptCode = '';
-      }
-    },
-    syncKingdeeDeptCodeDisplay(isPlatformCompany) {
-      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
-      if (!column) return;
-      const visible = Number(isPlatformCompany) === 1;
-      column.addDisplay = visible;
-      column.editDisplay = visible;
-      column.viewDisplay = visible;
-    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -1322,9 +1261,6 @@ export default {
     rowSave(row, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
-      row.kingdeeDeptCode =
-        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1370,9 +1306,6 @@ export default {
     rowUpdate(row, index, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
-      // 合同前缀/流水已迁至业务部门配置；组织管理仅维护平台公司金蝶代码
-      row.kingdeeDeptCode =
-        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1479,34 +1412,40 @@ export default {
     beforeOpen(done, type) {
       if (type === 'add') {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
-        if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
-          this.form.isPlatformCompany = 0;
-        }
-        if (this.form.isBusinessDept === undefined || this.form.isBusinessDept === null) {
-          this.form.isBusinessDept = 0;
-        }
-        this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
+        this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
+        this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
+        done();
+        return;
       }
       if (type === 'edit') {
         this.initData(this.form.tenantId || this.userInfo.tenantId || website.tenantId);
       }
       if (['edit', 'view'].includes(type)) {
-        getDept(this.form.id).then(res => {
-          this.form = Object.assign(res.data.data, {
-            hasChildren: this.form.hasChildren,
+        // 等详情返回后再打开弹窗，避免异步回填覆盖用户已改值；就地赋值保持 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();
           });
-          if (this.form.parentId === '0') {
-            this.form.parentId = '';
-          }
-          this.syncKingdeeDeptCodeDisplay(this.form.isPlatformCompany);
-          this.loadParentDeptCode(this.form.parentId);
-          if (this.form.hasOwnProperty('leaderId')) {
-            const splitResult = func.split(this.form.leaderId);
-            this.form.leaderId = Array.isArray(splitResult) ? splitResult : [];
-          }
-        });
+        return;
       }
       done();
     },

src/views/system/user.vue

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