✨ 计费/调度/结算支持多方客商与承运商区分

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 21:12:56 +08:00
parent 8388a55481
commit c0ba9ba39b
6 changed files with 337 additions and 90 deletions
@@ -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,