🔀 合并主干 master 到 dev

This commit is contained in:
2026-11-04 18:24:39 +08:00
52 changed files with 1339 additions and 549 deletions
@@ -12,12 +12,12 @@
<el-descriptions-item label="方案名称">{{
displayValue(draft.planName)
}}</el-descriptions-item>
<el-descriptions-item label="适用客商">{{
displayValue(draft.customerName || partyOptionLabel(draft.partyRowId))
}}</el-descriptions-item>
<el-descriptions-item label="运输方式">{{
transportModeLabel(draft.transportMode)
}}</el-descriptions-item>
<el-descriptions-item label="默认方案">{{
isDefaultPlan(draft) ? '是' : '否'
}}</el-descriptions-item>
<el-descriptions-item label="备注">{{ displayValue(draft.remark) }}</el-descriptions-item>
</el-descriptions>
<el-form
@@ -37,6 +37,20 @@
:disabled="readonly" /></el-form-item
></el-col>
<el-col :span="8"
><el-form-item label="适用客商" prop="partyRowId"
><el-select
v-model="draft.partyRowId"
clearable
filterable
placeholder="请选择适用客商"
@change="handlePartyChange"
><el-option
v-for="item in partyOptions"
:key="item.value"
:label="item.label"
:value="item.value" /></el-select></el-form-item
></el-col>
<el-col :span="8"
><el-form-item label="运输方式" prop="transportMode"
><el-select
v-model="draft.transportMode"
@@ -51,16 +65,6 @@
:label="item.label"
:value="item.value" /></el-select></el-form-item
></el-col>
<el-col :span="8"
><el-form-item
><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox
><el-tooltip content="同一运输方式仅支持配置一个默认计费方案" placement="top">
<el-icon class="billing-plan-editor__default-tip"
><InfoFilled
/></el-icon> </el-tooltip
></el-form-item
></el-col
>
<el-col :span="24"
><el-form-item label="备注"
><el-input
@@ -380,6 +384,7 @@ import { InfoFilled } from '@element-plus/icons-vue';
import { getDictionary } from '@/api/system/dictbiz';
import SectionCard from '@/components/section-card/main.vue';
import { currencyUnit } from '@/utils/currency';
// InfoFilled 仅用于保底计费重量列头提示
const clone = value => JSON.parse(JSON.stringify(value));
/** 计费要素与计量单位维度的对应关系(这些要素可选计费单位) */
@@ -433,6 +438,7 @@ export default {
index: { type: Number, default: -1 },
readonly: Boolean,
settlementCurrency: { type: String, default: 'RMB' },
partyOptions: { type: Array, default: () => [] },
},
emits: ['update:modelValue', 'save'],
data() {
@@ -476,6 +482,7 @@ export default {
cargoRequest: null,
formRules: {
planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }],
partyRowId: [{ required: true, message: '请选择适用客商', trigger: 'change' }],
transportMode: [{ required: true, message: '请选择运输方式', trigger: 'change' }],
},
};
@@ -516,10 +523,24 @@ export default {
handler(value) {
if (this.modelValue) {
this.draft = this.normalizePlan(value);
this.applyDefaultPartySelection();
this.loadRuleItems();
}
},
},
modelValue(visible) {
if (visible) {
this.$nextTick(() => this.applyDefaultPartySelection());
}
},
partyOptions: {
deep: true,
handler() {
if (this.modelValue) {
this.applyDefaultPartySelection();
}
},
},
},
methods: {
displayValue(value) {
@@ -539,27 +560,62 @@ export default {
);
return this.displayValue(option?.label || this.draft.transportModeLabel || value);
},
isDefaultPlan(plan) {
return (
plan?.defaultPlan === true ||
plan?.defaultPlan === 1 ||
['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
);
},
normalizePlan(value = {}) {
const plan = {
planName: '',
partyRowId: '',
partyRole: '',
customerId: '',
customerName: '',
transportMode: '',
transportModeLabel: '',
defaultPlan: false,
remark: '',
...clone(value || {}),
};
// 一个客商对应一个方案,不再维护默认方案字段
delete plan.defaultPlan;
plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
this.normalizeRule(rule)
);
return plan;
},
partyOptionLabel(partyRowId) {
const matched = (this.partyOptions || []).find(
item => String(item.value) === String(partyRowId)
);
return matched?.label || '';
},
/**
* 仅一个可选客商时默认选中(客户合同仅一个甲方的常见场景)
*/
applyDefaultPartySelection() {
if (this.readonly) {
return;
}
const options = this.partyOptions || [];
if (options.length !== 1) {
return;
}
const current = String(this.draft.partyRowId || '');
const only = options[0];
const onlyValue = String(only?.value || only?.partyRowId || '');
if (!onlyValue) {
return;
}
if (current && current === onlyValue) {
return;
}
this.handlePartyChange(only.value || only.partyRowId);
},
handlePartyChange(partyRowId) {
const matched = (this.partyOptions || []).find(
item => String(item.value) === String(partyRowId)
);
this.draft.partyRowId = matched?.partyRowId || matched?.value || '';
this.draft.partyRole = matched?.partyRole || '';
this.draft.customerId = matched?.customerId || '';
this.draft.customerName = matched?.customerName || '';
},
normalizeRule(rule = {}) {
const next = { ...defaultRule(), ...clone(rule) };
if (next.billingType === '阶梯单价' && next.minimumBillingWeight === '') {
@@ -1032,6 +1088,11 @@ export default {
this.$refs.formRef.validate(valid => {
if (!valid || !this.validateRules()) return;
const plan = clone(this.draft);
this.handlePartyChange(plan.partyRowId);
plan.partyRowId = this.draft.partyRowId;
plan.partyRole = this.draft.partyRole;
plan.customerId = this.draft.customerId;
plan.customerName = this.draft.customerName;
const transportMode = this.transportModeOptions.find(
item => String(item.value) === String(plan.transportMode)
);
@@ -38,7 +38,7 @@
contract.hcsFdId || '-'
}}</el-descriptions-item>
<el-descriptions-item label="客商风险">
<template v-if="contract.hcsRiskLevel || contract.hcsBlackStatus">
<template v-if="contract.hcsRiskLevel || contract.kingdeeBlackStatus">
<el-tag
v-if="isBlacklist"
type="danger"
@@ -130,7 +130,7 @@ export default {
name: 'HcsContractPanel',
components: { UploadFilled },
props: {
// 合同详情行(须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/hcsBlackStatus/hcsSpecStatus 等)
// 合同详情行(须含 id/hcsSyncStatus/hcsFdId/hcsRiskLevel/kingdeeBlackStatus/hcsSpecStatus 等)
contract: { type: Object, required: true },
},
emits: ['refresh'],
@@ -152,7 +152,7 @@ export default {
return this.contract.hcsSyncMsg || '';
},
isBlacklist() {
return String(this.contract.hcsBlackStatus || '').toLowerCase() === 'yes';
return String(this.contract.kingdeeBlackStatus || '').toLowerCase() === 'yes';
},
specLabel() {
return SPEC_STATUS_OPTIONS.find(item => item.value === this.contract.hcsSpecStatus)?.label || '';
@@ -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,
@@ -4650,9 +4650,14 @@ export default {
},
taskCarrierValue: {
get() {
return this.form.carrierType === '自运'
? this.form.carrierName || ''
: this.form.carrierContractId || this.form.carrierName || '';
if (this.form.carrierType === '自运') {
return this.form.carrierName || '';
}
return this.taskCarrierOptionValue({
carrierContractId: this.form.carrierContractId,
carrierPartyId: this.form.carrierPartyId,
carrierName: this.form.carrierName,
});
},
set(value) {
this.handleTaskCarrierChange(value);
@@ -7290,6 +7295,8 @@ export default {
this.form.carrierName = '';
this.form.carrierId = '';
this.form.carrierContractId = '';
this.form.carrierPartyId = '';
this.form.carrierPartyRole = '';
this.hasProjectProcessConfig = false;
this.waybillProcessConfigRows = [];
return;
@@ -7304,6 +7311,8 @@ export default {
this.form.carrierName = '';
this.form.carrierId = '';
this.form.carrierContractId = '';
this.form.carrierPartyId = '';
this.form.carrierPartyRole = '';
this.loadProjectProcessConfigState();
this.loadTaskCarrierOptions(project);
if (this.contractSelectEnabled) {
@@ -7760,6 +7769,8 @@ export default {
this.form.carrierName = '';
this.form.carrierId = '';
this.form.carrierContractId = '';
this.form.carrierPartyId = '';
this.form.carrierPartyRole = '';
this.form.driverId = '';
this.form.driverName = '';
this.form.driverPhone = '';
@@ -7814,7 +7825,9 @@ export default {
},
taskCarrierOptionValue(item = {}) {
if (this.form.carrierType !== '自运') {
return item.carrierContractId || item.value || item.id || '';
if (item.value) return item.value;
return [item.carrierContractId || item.id || '', item.carrierPartyId || '', item.carrierName || '']
.join('__');
}
return (
item.carrierName ||
@@ -7852,55 +7865,76 @@ export default {
names.forEach(append);
return options;
},
parseContractPartyRows(partyJson, fallbackName = '', partyRole = 'B') {
const rows = this.parseJsonArray(partyJson)
.map(item => ({
id: item.id || '',
customerId: item.customerId || '',
customerName: String(item.customerName || '').trim(),
creditCode: item.creditCode || '',
partyRole,
}))
.filter(item => item.customerName);
if (rows.length) return rows;
return String(fallbackName || '')
.split(/[、,,]/)
.map(name => name.trim())
.filter(Boolean)
.map(name => ({
id: '',
customerId: '',
customerName: name,
creditCode: '',
partyRole,
}));
},
getWaybillCarrierContractOptions(contracts = []) {
const carrierNameCounts = contracts.reduce((counts, contract) => {
const carrierName = String(
contract.partyB ||
contract.partyBName ||
contract.contractPartyB ||
contract.customerContractPartyB ||
contract.secondParty ||
contract.secondPartyName ||
''
).trim();
if (carrierName) counts[carrierName] = (counts[carrierName] || 0) + 1;
return counts;
}, {});
return contracts
.map(contract => {
const carrierName = String(
const options = [];
contracts.forEach(contract => {
if (!contract?.id) return;
const parties = [
...this.parseContractPartyRows(contract.partyBJson, contract.partyB, 'B'),
...this.parseContractPartyRows(contract.partyCJson, contract.partyC, 'C'),
];
if (!parties.length) {
const fallbackName = String(
contract.partyB ||
contract.partyBName ||
contract.contractPartyB ||
contract.customerContractPartyB ||
contract.secondParty ||
contract.secondPartyName ||
''
contract.partyBName ||
contract.contractPartyB ||
contract.customerContractPartyB ||
contract.secondParty ||
contract.secondPartyName ||
''
).trim();
if (!carrierName || !contract.id) return null;
const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
return {
if (fallbackName) {
parties.push({
id: '',
customerId: '',
customerName: fallbackName,
creditCode: '',
partyRole: 'B',
});
}
}
const contractIdentifier = contract.contractName || contract.contractNo || contract.id;
parties.forEach(party => {
const roleLabel = party.partyRole === 'C' ? '丙方' : '乙方';
const optionValue = [contract.id, party.id || '', party.customerName].join('__');
options.push({
id: contract.id,
carrierId:
contract.partyBId ||
contract.partyBUserId ||
contract.contractPartyBId ||
contract.customerContractPartyBId ||
contract.secondPartyId ||
contract.secondPartyUserId ||
contract.carrierId ||
'',
value: contract.id,
label:
carrierNameCounts[carrierName] > 1
? `${carrierName}(${contractIdentifier})`
: carrierName,
carrierName,
fullName: carrierName,
carrierId: party.customerId || '',
value: optionValue,
label: `${party.customerName}(${roleLabel}) - ${contractIdentifier}`,
carrierName: party.customerName,
fullName: party.customerName,
carrierContractId: contract.id,
};
})
.filter(Boolean);
carrierPartyId: party.id || '',
carrierPartyRole: party.partyRole,
creditCode: party.creditCode || '',
});
});
});
return options;
},
resetWaybillCarrierContractState() {
this.waybillCarrierContractRequestId += 1;
@@ -7930,6 +7964,8 @@ export default {
this.form.carrierName = '';
this.form.carrierId = '';
this.form.carrierContractId = '';
this.form.carrierPartyId = '';
this.form.carrierPartyRole = '';
}
return options;
})
@@ -8020,10 +8056,14 @@ export default {
);
if (this.form.carrierType !== '自运') {
this.form.carrierContractId = carrier?.carrierContractId || '';
this.form.carrierPartyId = carrier?.carrierPartyId || '';
this.form.carrierPartyRole = carrier?.carrierPartyRole || '';
this.form.carrierId = carrier?.carrierId || '';
this.form.carrierName = carrier?.carrierName || '';
} else {
this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
this.form.carrierPartyId = '';
this.form.carrierPartyRole = '';
this.form.carrierName = value || '';
}
// 承运商变更后清空司机/车辆,避免跨组织脏数据
+119 -25
View File
@@ -299,25 +299,27 @@
><el-radio label="system">系统生成</el-radio
><el-radio label="manual">账单导入生成</el-radio></el-radio-group
>
<el-table :data="plans" border class="change-table"
><el-table-column type="index" label="序号" width="70" /><el-table-column
prop="planName"
label="方案名称"
min-width="220"
/><el-table-column label="默认方案" min-width="120"
><template #default="{ row }">{{
row.defaultPlan ? '是' : '否'
}}</template></el-table-column
><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
v-if="!pageReadonly"
label="操作"
width="180"
><template #default="{ row, $index }"
><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
></el-table-column
></el-table
>
<el-table :data="plans" border class="change-table">
<el-table-column type="index" label="序号" width="70" />
<el-table-column prop="planName" label="方案名称" min-width="180" />
<el-table-column label="适用客商" min-width="180">
<template #default="{ row }">
{{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column v-if="!pageReadonly" label="操作" width="180">
<template #default="{ row, $index }">
<el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
<el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
</template>
</el-table-column>
<el-table-column v-else label="操作" width="100">
<template #default="{ row, $index }">
<el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
</template>
</el-table-column>
</el-table>
</section>
<section class="change-section">
@@ -491,7 +493,9 @@
v-model="planDialogVisible"
:value="planEditor"
:index="planEditorIndex"
:readonly="pageReadonly"
:settlement-currency="form.settlementCurrency"
:party-options="billingPartyOptions"
@save="savePlan"
/>
@@ -630,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
}));
const createPartyRow = (row = {}) => ({
id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
customerId: row.customerId || '',
customerName: row.customerName || '',
creditCode: row.creditCode || row.unifiedCreditCode || '',
contactId: row.contactId || '',
contactName: row.contactName || '',
contactPhone: row.contactPhone || '',
});
const partyRoleLabel = role => {
if (role === 'A') return '甲方';
if (role === 'B') return '乙方';
if (role === 'C') return '丙方';
return role || '';
};
const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
const rows = (() => {
if (Array.isArray(partyJson)) return partyJson;
if (!partyJson) return [];
try {
const data = JSON.parse(partyJson);
return Array.isArray(data) ? data : [];
} catch (error) {
return [];
}
})().map(item => createPartyRow(item));
if (rows.length) return rows;
if (fallbackName) {
return String(fallbackName)
.split(/[、,]/)
.map(name => name.trim())
.filter(Boolean)
.map(name => createPartyRow({ customerName: name }));
}
return requireOne ? [createPartyRow()] : [];
};
export default {
components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
data() {
@@ -637,6 +680,9 @@ export default {
form: {},
period: [],
plans: [],
partyARows: [],
partyBRows: [],
partyCRows: [],
attachments: [],
contractFiles: [],
contractFileRows: [],
@@ -675,7 +721,7 @@ export default {
settlementModeDictOptions: [],
contractFormatDictOptions: [],
planDialogVisible: false,
planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
planEditor: { planName: '', remark: '', rules: [] },
planEditorIndex: -1,
billingElements: [
'按重量',
@@ -745,7 +791,7 @@ export default {
// 高风险/黑名单客商提示:按合同推送合规留痕 hcs_risk_level/hcs_black_status 判定(与合同详情口径一致)
riskTipText() {
const riskLevel = String(this.form.hcsRiskLevel || '').trim();
const blacklist = String(this.form.hcsBlackStatus || '').toLowerCase() === 'yes';
const blacklist = String(this.form.kingdeeBlackStatus || '').toLowerCase() === 'yes';
if (riskLevel !== '2' && !blacklist) return '';
const parties = [this.form.partyA, this.form.partyB]
.map(name => String(name || '').trim())
@@ -756,6 +802,29 @@ export default {
isSettlementRuleChange() {
return this.form.changeType === '结算规则变更';
},
/**
* 计费方案适用客商:客户合同仅甲方;承运商合同仅乙方、丙方
*/
billingPartyOptions() {
const category = String(this.form.contractCategory || '').trim();
const allowedRoles =
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
return [
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
]
.filter(row => allowedRoles.includes(row.partyRole))
.filter(row => row.customerName || row.customerId)
.map(row => ({
value: row.id,
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
partyRole: row.partyRole,
partyRowId: row.id,
customerId: row.customerId,
customerName: row.customerName,
}));
},
changeAttachmentLocationOptions() {
if (this.isSettlementRuleChange) {
return ['变更材料'];
@@ -890,6 +959,9 @@ export default {
};
this.changeMaterials = this.parse(data.changeAttachmentsJson);
this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
this.plans = this.parse(data.billingPlanJson);
this.attachments = this.mergeChangeAttachments(
this.parse(data.attachmentsJson),
@@ -1048,10 +1120,32 @@ export default {
.replace(/\D/g, '')
.replace(/^0+/, '');
},
addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
addPlan() {
this.planEditorIndex = -1;
this.planEditor = {
planName: `计费方案${this.plans.length + 1}`,
remark: '',
rules: [{}],
};
this.planDialogVisible = true;
},
editPlan(row, index) {
this.planEditorIndex = index;
this.planEditor = JSON.parse(JSON.stringify(row));
this.planDialogVisible = true;
},
billingPlanCustomerLabel(row) {
const matched = this.billingPartyOptions.find(
item => String(item.partyRowId) === String(row.partyRowId)
);
return matched?.label || row.customerName || '';
},
savePlan(value, index) {
const nextPlan = { ...value };
delete nextPlan.defaultPlan;
if (index < 0) this.plans.push(nextPlan);
else this.plans.splice(index, 1, nextPlan);
},
handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
+56 -40
View File
@@ -93,6 +93,27 @@
<span v-else>-</span>
</template>
<!-- 客商风险:等级与金蝶黑名单组合展示(推送链路按金蝶命中口径落库),复用公共展示方法;非无风险标签悬浮见明细 -->
<template #customerRisk="{ row }">
<el-tooltip
v-if="contractRiskTagName(row)"
placement="top"
effect="dark"
popper-class="customer-risk-popper"
>
<template #content>
<div>{{ row.hcsRiskDetail || contractRiskTagName(row) }}</div>
</template>
<el-tag
:type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
class="status-text"
>
{{ contractRiskTagName(row) }}
</el-tag>
</el-tooltip>
<span v-else>-</span>
</template>
<template #menu="{ row }">
<el-link
v-if="hasPermission(`${config.permission}_view`)"
@@ -1176,6 +1197,7 @@ import {
repush as hcsRepush,
repushBatch as hcsRepushBatch,
} from '@/api/business/hcs';
import { isContractBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-display';
import { Position } from '@element-plus/icons-vue';
import { getMkPublicDetail } from '@/api/mk-process';
import { getList as getProjectList } from '@/api/business/project-apply';
@@ -1685,12 +1707,21 @@ export default {
{ role: 'C', label: '丙方', rows: this.partyCRows },
];
},
/**
* 计费方案适用客商:
* - 客户合同:仅甲方(仅 1 个甲方时编辑器自动选中)
* - 承运商合同:仅乙方、丙方(应付明细按这些方案生成)
*/
billingPartyOptions() {
const category = String(this.form.contractCategory || '').trim();
const allowedRoles =
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
return [
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
]
.filter(row => allowedRoles.includes(row.partyRole))
.filter(row => row.customerName || row.customerId)
.map(row => ({
value: row.id,
@@ -1773,7 +1804,7 @@ export default {
// 详情风险客商提示(基本信息备注后展示):按推送留痕 hcs_risk_level/hcs_black_status 判定(甲乙取高/任一),文案与后端 riskTip 一致
detailRiskTipText() {
const riskLevel = String(this.detailRow.hcsRiskLevel || '').trim();
const blacklist = String(this.detailRow.hcsBlackStatus || '').toLowerCase() === 'yes';
const blacklist = String(this.detailRow.kingdeeBlackStatus || '').toLowerCase() === 'yes';
if (riskLevel !== '2' && !blacklist) return '';
const parties = [this.detailRow.partyA, this.detailRow.partyB]
.map(name => String(name || '').trim())
@@ -1913,6 +1944,13 @@ export default {
hcsSyncLabel(value) {
return { unsynced: '待推送', synced: '已推送', failed: '推送失败' }[value] || value;
},
// ==================== 客商风险(推送链路按金蝶黑名单命中口径落库,展示复用公共方法) ====================
contractRiskTagName(row) {
return resolveRiskTagName(row.hcsRiskLevel, isContractBlack(row.kingdeeBlackStatus));
},
isContractRisky(row) {
return isRiskyTag(row.hcsRiskLevel, isContractBlack(row.kingdeeBlackStatus));
},
hcsSyncTagType(value) {
return { unsynced: 'info', synced: 'success', failed: 'danger' }[value] || 'info';
},
@@ -2315,7 +2353,6 @@ export default {
if (!this.validatePartyRows(true)) return false;
return (
this.validateBillingPlanBindings() &&
this.validateBillingPlanDefault() &&
this.validateSettlementRules() &&
this.validatePaymentRatios()
);
@@ -2911,10 +2948,17 @@ export default {
validateBillingPlanBindings() {
if (!this.billingPlanRows.length) return true;
const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
const category = String(this.form.contractCategory || '').trim();
const roleHint =
category === '承运商合同'
? '请选择乙方或丙方客商'
: category === '客户合同'
? '请选择甲方客商'
: '请选择适用客商';
for (let index = 0; index < this.billingPlanRows.length; index += 1) {
const plan = this.billingPlanRows[index];
if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
this.$message.warning(`计费方案第${index + 1}个${roleHint}`);
return false;
}
}
@@ -3169,21 +3213,13 @@ export default {
openBillingPlan(row = {}, index = -1) {
this.billingPlanIndex = index;
this.billingPlanForm =
index < 0
? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
: clone(row);
index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
this.billingPlanBox = true;
this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
},
saveBillingPlan(plan, index) {
const nextPlan = clone(plan);
if (this.isDefaultBillingPlan(nextPlan)) {
this.billingPlanRows.forEach((item, itemIndex) => {
if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
item.defaultPlan = false;
}
});
}
delete nextPlan.defaultPlan;
if (index < 0) this.billingPlanRows.push(nextPlan);
else this.billingPlanRows.splice(index, 1, nextPlan);
this.billingPlanBox = false;
@@ -3193,31 +3229,6 @@ export default {
this.billingPlanRows.splice(index, 1);
});
},
isDefaultBillingPlan(plan) {
return (
plan?.defaultPlan === true ||
plan?.defaultPlan === 1 ||
['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
);
},
validateBillingPlanDefault() {
if (!this.billingPlanRows.length) return true;
const defaultCountByTransportMode = this.billingPlanRows.reduce((result, plan) => {
const transportMode = plan.transportMode || '';
result[transportMode] =
(result[transportMode] || 0) + Number(this.isDefaultBillingPlan(plan));
return result;
}, {});
const invalidTransportMode = Object.entries(defaultCountByTransportMode).find(
([, count]) => count > 1
);
if (invalidTransportMode) {
const [transportMode, count] = invalidTransportMode;
this.$message.warning(`运输方式“${transportMode}”仅支持配置一个默认计费方案`);
return false;
}
return true;
},
isFixedCycleSettlementType(value) {
return value === '按固定天数周期' || value === '固定天数周期结算';
},
@@ -3551,8 +3562,7 @@ export default {
return list
.map(item => {
if (!item || typeof item !== 'object') return String(item ?? '');
const name = item.planName || item.name || '未命名方案';
return item.defaultPlan ? `${name}(默认)` : name;
return item.planName || item.name || '未命名方案';
})
.filter(Boolean)
.join('、');
@@ -4298,4 +4308,10 @@ export default {
white-space: normal;
line-height: 1.2;
}
/* 风险客商悬浮提示(同客商列表页):popper 挂在 body 下,约束宽度 */
.customer-risk-popper {
max-width: 360px;
line-height: 1.6;
}
</style>
+63 -14
View File
@@ -1448,7 +1448,7 @@
<el-select
:model-value="
dialogForm.carrierType === '承运商'
? dialogForm.carrierContractId
? taskCarrierSelectedValue
: dialogForm.carrierName
"
clearable
@@ -1465,7 +1465,7 @@
>
<el-option
v-for="item in taskCarrierOptions"
:key="item.id || item.carrierName"
:key="carrierOptionValue(item)"
:label="
dialogForm.carrierType === '承运商'
? formatTaskCarrierContractLabel(item)
@@ -1473,7 +1473,7 @@
"
:value="
dialogForm.carrierType === '承运商'
? item.id
? carrierOptionValue(item)
: item.carrierName || item.partyB
"
/>
@@ -1953,6 +1953,8 @@ const createDialogForm = () => ({
carrierType: '承运商',
carrierName: '',
carrierContractId: '',
carrierPartyId: '',
carrierPartyRole: '',
escortName: '',
escortPhone: '',
departureAddress: '',
@@ -2256,6 +2258,13 @@ export default {
if (!this.taskCarrierLoading && !this.taskCarrierOptions.length) return '暂无可用承运商合同';
return '请选择';
},
taskCarrierSelectedValue() {
return this.carrierOptionValue({
id: this.dialogForm.carrierContractId,
carrierPartyId: this.dialogForm.carrierPartyId,
carrierName: this.dialogForm.carrierName,
});
},
detailStatusType() {
const typeMap = {
pending: 'success',
@@ -2391,11 +2400,23 @@ export default {
driverOptionText,
formatTaskCarrierContractLabel(item = {}) {
const carrierName = item.carrierName || item.partyB || '';
const roleLabel =
item.carrierPartyRole === 'C' || item.carrierPartyRole === '丙'
? '丙方'
: item.carrierPartyRole === 'B' || item.carrierPartyRole === '乙'
? '乙方'
: '';
const contractLabel = formatContractOptionLabel(item);
if (carrierName && contractLabel) {
return `${carrierName}(${contractLabel})`;
const nameWithRole = roleLabel && carrierName ? `${carrierName}(${roleLabel})` : carrierName;
if (nameWithRole && contractLabel) {
return `${nameWithRole} - ${contractLabel}`;
}
return carrierName || contractLabel;
return nameWithRole || contractLabel;
},
carrierOptionValue(item = {}) {
return [item.id || '', item.carrierPartyId || '', item.carrierName || item.partyB || ''].join(
'__'
);
},
syncStandaloneTagTitle() {
if (!this.isStandalonePage) return;
@@ -4555,6 +4576,8 @@ export default {
},
handleCarrierTypeChange() {
this.dialogForm.carrierContractId = '';
this.dialogForm.carrierPartyId = '';
this.dialogForm.carrierPartyRole = '';
this.dialogForm.carrierName = '';
this.dialogForm.carrierId = '';
this.clearDialogDriverVehicleFields();
@@ -4565,17 +4588,25 @@ export default {
}
if (this.dialogForm.carrierType === '自运') {
this.dialogForm.carrierContractId = '';
this.dialogForm.carrierPartyId = '';
this.dialogForm.carrierPartyRole = '';
}
this.loadTaskCarrierOptions();
},
handleTaskCarrierChange(contractId) {
const contract = this.taskCarrierOptions.find(item =>
[item.id, item.carrierName, item.partyB].some(
value => String(value || '') === String(contractId || '')
)
handleTaskCarrierChange(selectedValue) {
const contract = this.taskCarrierOptions.find(
item =>
this.carrierOptionValue(item) === String(selectedValue || '') ||
[item.id, item.carrierName, item.partyB].some(
value => String(value || '') === String(selectedValue || '')
)
);
this.dialogForm.carrierContractId =
this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
this.dialogForm.carrierPartyId =
this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyId || '' : '';
this.dialogForm.carrierPartyRole =
this.dialogForm.carrierType === '承运商' ? contract?.carrierPartyRole || '' : '';
this.dialogForm.carrierName = contract?.carrierName || '';
this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
this.clearDialogDriverVehicleFields();
@@ -4758,30 +4789,45 @@ export default {
.map(item => ({
...item,
carrierName:
item.carrierName ||
item.partyB ||
item.partyBName ||
item.contractPartyB ||
item.customerContractPartyB ||
item.carrierName ||
'',
carrierId:
item.customerId ||
item.partyBId ||
item.partyBUserId ||
item.contractPartyBId ||
item.customerContractPartyBId ||
item.carrierId ||
'',
carrierPartyId: item.carrierPartyId || '',
carrierPartyRole: item.carrierPartyRole || '',
}))
.filter(item => item.carrierName);
const current =
contracts.find(item => String(item.id) === String(this.dialogForm.carrierContractId)) ||
this.taskCarrierOptions.find(
item =>
this.carrierOptionValue(item) === this.taskCarrierSelectedValue ||
(String(item.id) === String(this.dialogForm.carrierContractId) &&
(!this.dialogForm.carrierPartyId ||
String(item.carrierPartyId) === String(this.dialogForm.carrierPartyId)) &&
(!this.dialogForm.carrierName ||
item.carrierName === this.dialogForm.carrierName))
) ||
this.taskCarrierOptions.find(item => item.carrierName === this.dialogForm.carrierName);
if (current) {
this.dialogForm.carrierContractId = current.id;
this.dialogForm.carrierPartyId = current.carrierPartyId || '';
this.dialogForm.carrierPartyRole = current.carrierPartyRole || '';
this.dialogForm.carrierName = current.carrierName;
this.dialogForm.carrierId = current.carrierId || '';
} else {
this.dialogForm.carrierContractId = '';
this.dialogForm.carrierPartyId = '';
this.dialogForm.carrierPartyRole = '';
this.dialogForm.carrierName = '';
this.dialogForm.carrierId = '';
}
@@ -4792,19 +4838,22 @@ export default {
.map(item => ({
...item,
carrierName:
item.carrierName ||
item.partyB ||
item.partyBName ||
item.contractPartyB ||
item.customerContractPartyB ||
item.carrierName ||
'',
carrierId:
item.customerId ||
item.partyBId ||
item.partyBUserId ||
item.contractPartyBId ||
item.customerContractPartyBId ||
item.carrierId ||
'',
carrierPartyId: item.carrierPartyId || '',
carrierPartyRole: item.carrierPartyRole || '',
}))
.filter(item => item.carrierName);
const current = this.taskCarrierOptions.find(
+132
View File
@@ -761,6 +761,96 @@
/>
</div>
<template v-if="showProjectContractSection">
<div class="dialog-section-title project-apply-form__table-title">项目合同</div>
<el-table
v-loading="projectContractLoading"
:data="projectContractRows"
border
class="project-apply-form__table"
>
<el-table-column type="index" label="序号" width="80" align="center" />
<el-table-column
prop="contractCategory"
label="合同类型"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="contractNo"
label="合同编号"
min-width="140"
align="center"
show-overflow-tooltip
>
<template #default="{ row }">
<el-link
v-if="row.id && row.contractNo"
type="primary"
@click.stop="openProjectContractDetail(row)"
>
{{ row.contractNo }}
</el-link>
<span v-else>{{ row.contractNo || '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
min-width="160"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyA"
label="甲方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyB"
label="乙方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyC"
label="丙方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="startDate"
label="开始日期"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="endDate"
label="结束日期"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="contractAmount"
label="合同金额"
min-width="120"
align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ formatAmount(row.contractAmount) }}
</template>
</el-table-column>
</el-table>
</template>
<div
v-if="!isChangeDialog && !isNewProjectDialog"
class="dialog-section-title project-apply-form__table-title"
@@ -990,6 +1080,7 @@
import { exportBlob } from '@/api/common';
import { defineAsyncComponent } from 'vue';
import * as api from '@/api/business/project-apply';
import { getList as getContractManageList } from '@/api/business/contract-manage';
import {
loadHcsImmediateEnabled,
repush as hcsRepush,
@@ -1387,6 +1478,8 @@ export default {
'zip',
],
changeRows: [],
projectContractRows: [],
projectContractLoading: false,
changeRecordDetailVisible: false,
changeRecordDetail: null,
changeRecordDetailRows: [],
@@ -1463,6 +1556,9 @@ export default {
isNewProjectDialog() {
return ['add', 'majorSupplement'].includes(this.dialogType);
},
showProjectContractSection() {
return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
},
isProjectFormPage() {
return this.isFormPageInstance;
},
@@ -2111,6 +2207,8 @@ export default {
this.attachmentRows = [];
this.selectedAttachmentRows = [];
this.changeRows = [];
this.projectContractRows = [];
this.projectContractLoading = false;
this.selectedCustomerId = [];
this.selectedCarrierIds = [];
},
@@ -2159,6 +2257,40 @@ export default {
this.syncSelectedCustomerOptions();
this.ensureCurrentPlatformOption();
this.ensureCurrentBusinessDeptOption();
this.loadProjectContracts(row?.id);
},
loadProjectContracts(projectId) {
if (!this.showProjectContractSection || !projectId) {
this.projectContractRows = [];
this.projectContractLoading = false;
return;
}
this.projectContractLoading = true;
getContractManageList(1, 1000, { projectId })
.then(res => {
const data = res.data?.data;
const records = Array.isArray(data) ? data : data?.records || [];
this.projectContractRows = records.filter(
item => String(item.projectId) === String(projectId)
);
})
.catch(() => {
this.projectContractRows = [];
this.$message.error('项目合同加载失败');
})
.finally(() => {
this.projectContractLoading = false;
});
},
openProjectContractDetail(row) {
if (!row?.id) {
this.$message.warning('合同信息不完整,无法跳转');
return;
}
this.$router.push({
path: '/business/contract-manage/detail',
query: { id: row.id, name: '合同详情' },
});
},
fillDefaultUsers() {
const userId = this.userInfo?.userId || this.userInfo?.id || '';