✨ 合同管理搜索表单新增客商筛选，合同名称移到最后，生效类型改为合同状态

src/option/base/measurement-unit.js

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

src/option/business/contract-manage.js

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

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

src/views/base/currency.vue

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

src/views/base/customer-type.vue

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

src/views/base/fee-item.vue

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

src/views/base/measurement-unit.vue

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

src/views/base/port-terminal.vue

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

src/views/base/railway-station.vue

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

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

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

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

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

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

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

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

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

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

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

@@ -1685,21 +1685,12 @@ 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,
@@ -2324,6 +2315,7 @@ export default {
       if (!this.validatePartyRows(true)) return false;
       return (
         this.validateBillingPlanBindings() &&
+        this.validateBillingPlanDefault() &&
         this.validateSettlementRules() &&
         this.validatePaymentRatios()
       );
@@ -2919,17 +2911,10 @@ 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}个${roleHint}`);
+          this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
           return false;
         }
       }
@@ -3184,13 +3169,21 @@ export default {
     openBillingPlan(row = {}, index = -1) {
       this.billingPlanIndex = index;
       this.billingPlanForm =
-        index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
+        index < 0
+          ? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
+          : clone(row);
       this.billingPlanBox = true;
       this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
     },
     saveBillingPlan(plan, index) {
       const nextPlan = clone(plan);
-      delete nextPlan.defaultPlan;
+      if (this.isDefaultBillingPlan(nextPlan)) {
+        this.billingPlanRows.forEach((item, itemIndex) => {
+          if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
+            item.defaultPlan = false;
+          }
+        });
+      }
       if (index < 0) this.billingPlanRows.push(nextPlan);
       else this.billingPlanRows.splice(index, 1, nextPlan);
       this.billingPlanBox = false;
@@ -3200,6 +3193,31 @@ 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 === '固定天数周期结算';
     },
@@ -3533,7 +3551,8 @@ export default {
       return list
         .map(item => {
           if (!item || typeof item !== 'object') return String(item ?? '');
-          return item.planName || item.name || '未命名方案';
+          const name = item.planName || item.name || '未命名方案';
+          return item.defaultPlan ? `${name}（默认）` : name;
         })
         .filter(Boolean)
         .join('、');

src/views/business/loading-manage.vue

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

src/views/business/process-config.vue

@@ -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) {
+      const isEnabledNode = key => this.nodeRows.some(item => item.key === key && item.enabled);
-        this.$message.warning('请至少选择一个过程节点');
+      if (!PICKUP_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('发货、装货、到场至少选择一个');
+        return false;
+      }
+      if (!DELIVERY_NODE_KEYS.some(isEnabledNode)) {
+        this.$message.warning('卸货、到货、签收、回单至少选择一个');
+        return false;
+      }
+      // 装货端没有节点采集货量时，整条配置在小程序侧等于不采集货量
+      const collectsCargo = CARGO_NODE_KEYS.some(key =>
+        this.nodeRows.some(
+          item =>
+            item.key === key && item.enabled && item.uploadCargo && (item.cargoTypes || []).length
+        )
+      );
+      if (!collectsCargo) {
+        this.$message.warning('发货或装货至少勾选一个货量类型');
         return false;
       }
       const transit = this.nodeRows.find(item => item.key === 'transit');

src/views/business/project-apply.vue

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

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

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

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

@@ -2904,33 +2904,10 @@ export default {
     buildRequestParams(params = {}) {
       return this.settlementType ? { ...params, settlementType: this.settlementType } : params;
     },
-    syncBillingPlanOptions(contractId, counterpartyName = '') {
+    syncBillingPlanOptions(contractId) {
       const contracts = [...this.updateContractOptions, ...this.contractOptions];
       const contract = contracts.find(item => String(item.id) === String(contractId));
-      let plans = this.parseJson(contract?.billingPlanJson);
+      const 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 ||
@@ -2939,16 +2916,11 @@ export default {
           item.planName ||
           item.billingPlanName ||
           `plan-${index}`,
-        name: [
+        name: item.name || item.planName || item.billingPlanName || `计费方案${index + 1}`,
-          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,13 +20,6 @@
       @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"
@@ -124,7 +117,7 @@ export default {
         editBtn: false,
         delBtn: false,
         viewBtn: false,
-        menuWidth: 220,
+        menuWidth: 140,
         dialogWidth: 900,
         dialogClickModal: false,
         labelPosition: 'right',

src/views/system/dept.vue

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

src/views/system/user.vue

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