Merge branch 'master' into feature/20261103-bfi-warehouse-web
# Conflicts: # src/option/settlement/formalSettlement.js
This commit is contained in:
刘泉佳
@@ -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)
|
||||
);
|
||||
|
||||
@@ -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 || '';
|
||||
}
|
||||
// 承运商变更后清空司机/车辆，避免跨组织脏数据
|
||||
|
||||
@@ -299,25 +299,27 @@
|
||||
><el-radio label="system">系统生成</el-radio
|
||||
><el-radio label="manual">账单导入生成</el-radio></el-radio-group
|
||||
>
|
||||
<el-table :data="plans" border class="change-table"
|
||||
><el-table-column type="index" label="序号" width="70" /><el-table-column
|
||||
prop="planName"
|
||||
label="方案名称"
|
||||
min-width="220"
|
||||
/><el-table-column label="默认方案" min-width="120"
|
||||
><template #default="{ row }">{{
|
||||
row.defaultPlan ? '是' : '否'
|
||||
}}</template></el-table-column
|
||||
><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
|
||||
v-if="!pageReadonly"
|
||||
label="操作"
|
||||
width="180"
|
||||
><template #default="{ row, $index }"
|
||||
><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
|
||||
><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
|
||||
></el-table-column
|
||||
></el-table
|
||||
>
|
||||
<el-table :data="plans" border class="change-table">
|
||||
<el-table-column type="index" label="序号" width="70" />
|
||||
<el-table-column prop="planName" label="方案名称" min-width="180" />
|
||||
<el-table-column label="适用客商" min-width="180">
|
||||
<template #default="{ row }">
|
||||
{{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" min-width="200" />
|
||||
<el-table-column v-if="!pageReadonly" label="操作" width="180">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
|
||||
<el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-else label="操作" width="100">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section>
|
||||
|
||||
<section class="change-section">
|
||||
@@ -491,7 +493,9 @@
|
||||
v-model="planDialogVisible"
|
||||
:value="planEditor"
|
||||
:index="planEditorIndex"
|
||||
:readonly="pageReadonly"
|
||||
:settlement-currency="form.settlementCurrency"
|
||||
:party-options="billingPartyOptions"
|
||||
@save="savePlan"
|
||||
/>
|
||||
|
||||
@@ -630,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
|
||||
endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
|
||||
}));
|
||||
|
||||
const createPartyRow = (row = {}) => ({
|
||||
id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
|
||||
customerId: row.customerId || '',
|
||||
customerName: row.customerName || '',
|
||||
creditCode: row.creditCode || row.unifiedCreditCode || '',
|
||||
contactId: row.contactId || '',
|
||||
contactName: row.contactName || '',
|
||||
contactPhone: row.contactPhone || '',
|
||||
});
|
||||
|
||||
const partyRoleLabel = role => {
|
||||
if (role === 'A') return '甲方';
|
||||
if (role === 'B') return '乙方';
|
||||
if (role === 'C') return '丙方';
|
||||
return role || '';
|
||||
};
|
||||
|
||||
const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
|
||||
const rows = (() => {
|
||||
if (Array.isArray(partyJson)) return partyJson;
|
||||
if (!partyJson) return [];
|
||||
try {
|
||||
const data = JSON.parse(partyJson);
|
||||
return Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
return [];
|
||||
}
|
||||
})().map(item => createPartyRow(item));
|
||||
if (rows.length) return rows;
|
||||
if (fallbackName) {
|
||||
return String(fallbackName)
|
||||
.split(/[、,]/)
|
||||
.map(name => name.trim())
|
||||
.filter(Boolean)
|
||||
.map(name => createPartyRow({ customerName: name }));
|
||||
}
|
||||
return requireOne ? [createPartyRow()] : [];
|
||||
};
|
||||
|
||||
export default {
|
||||
components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
|
||||
data() {
|
||||
@@ -637,6 +680,9 @@ export default {
|
||||
form: {},
|
||||
period: [],
|
||||
plans: [],
|
||||
partyARows: [],
|
||||
partyBRows: [],
|
||||
partyCRows: [],
|
||||
attachments: [],
|
||||
contractFiles: [],
|
||||
contractFileRows: [],
|
||||
@@ -675,7 +721,7 @@ export default {
|
||||
settlementModeDictOptions: [],
|
||||
contractFormatDictOptions: [],
|
||||
planDialogVisible: false,
|
||||
planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
|
||||
planEditor: { planName: '', remark: '', rules: [] },
|
||||
planEditorIndex: -1,
|
||||
billingElements: [
|
||||
'按重量',
|
||||
@@ -756,6 +802,29 @@ export default {
|
||||
isSettlementRuleChange() {
|
||||
return this.form.changeType === '结算规则变更';
|
||||
},
|
||||
/**
|
||||
* 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
|
||||
*/
|
||||
billingPartyOptions() {
|
||||
const category = String(this.form.contractCategory || '').trim();
|
||||
const allowedRoles =
|
||||
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
|
||||
return [
|
||||
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
|
||||
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
|
||||
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
|
||||
]
|
||||
.filter(row => allowedRoles.includes(row.partyRole))
|
||||
.filter(row => row.customerName || row.customerId)
|
||||
.map(row => ({
|
||||
value: row.id,
|
||||
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
|
||||
partyRole: row.partyRole,
|
||||
partyRowId: row.id,
|
||||
customerId: row.customerId,
|
||||
customerName: row.customerName,
|
||||
}));
|
||||
},
|
||||
changeAttachmentLocationOptions() {
|
||||
if (this.isSettlementRuleChange) {
|
||||
return ['变更材料'];
|
||||
@@ -890,6 +959,9 @@ export default {
|
||||
};
|
||||
this.changeMaterials = this.parse(data.changeAttachmentsJson);
|
||||
this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
|
||||
this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
|
||||
this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
|
||||
this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
|
||||
this.plans = this.parse(data.billingPlanJson);
|
||||
this.attachments = this.mergeChangeAttachments(
|
||||
this.parse(data.attachmentsJson),
|
||||
@@ -1048,10 +1120,32 @@ export default {
|
||||
.replace(/\D/g, '')
|
||||
.replace(/^0+/, '');
|
||||
},
|
||||
addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
|
||||
editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
|
||||
toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
|
||||
savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
|
||||
addPlan() {
|
||||
this.planEditorIndex = -1;
|
||||
this.planEditor = {
|
||||
planName: `计费方案${this.plans.length + 1}`,
|
||||
remark: '',
|
||||
rules: [{}],
|
||||
};
|
||||
this.planDialogVisible = true;
|
||||
},
|
||||
editPlan(row, index) {
|
||||
this.planEditorIndex = index;
|
||||
this.planEditor = JSON.parse(JSON.stringify(row));
|
||||
this.planDialogVisible = true;
|
||||
},
|
||||
billingPlanCustomerLabel(row) {
|
||||
const matched = this.billingPartyOptions.find(
|
||||
item => String(item.partyRowId) === String(row.partyRowId)
|
||||
);
|
||||
return matched?.label || row.customerName || '';
|
||||
},
|
||||
savePlan(value, index) {
|
||||
const nextPlan = { ...value };
|
||||
delete nextPlan.defaultPlan;
|
||||
if (index < 0) this.plans.push(nextPlan);
|
||||
else this.plans.splice(index, 1, nextPlan);
|
||||
},
|
||||
handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
|
||||
handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
|
||||
attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
|
||||
|
||||
@@ -176,10 +176,14 @@
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="甲方">{{ detailValue('partyA') }}</el-descriptions-item>
|
||||
<el-descriptions-item label="乙方">{{ detailValue('partyB') }}</el-descriptions-item>
|
||||
<el-descriptions-item label="丙方">{{ detailValue('partyC') || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="合同期限">{{ detailContractPeriod }}</el-descriptions-item>
|
||||
<el-descriptions-item label="合同负责部门">{{
|
||||
detailValue('organizationName')
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="平台公司">{{
|
||||
detailValue('platformCompanyName')
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="经办人">{{
|
||||
detailValue('handlerUserName')
|
||||
}}</el-descriptions-item>
|
||||
@@ -445,7 +449,9 @@
|
||||
maxlength="100"
|
||||
clearable
|
||||
:placeholder="
|
||||
formMode === 'add' ? '不填写则按部门规则自动生成' : '请输入合同编号'
|
||||
formMode === 'add'
|
||||
? '不填写则按照部门规则自动生成'
|
||||
: '请输入合同编号'
|
||||
"
|
||||
@input="handleContractNoInput"
|
||||
/>
|
||||
@@ -487,49 +493,37 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="合同负责部门" prop="organizationName">
|
||||
<el-cascader
|
||||
v-model="organizationCascaderValue"
|
||||
:options="organizationOptions"
|
||||
:props="organizationCascaderProps"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
filterable
|
||||
@visible-change="visible => visible && loadOrganizationOptions()"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="甲方" prop="partyA">
|
||||
<el-select
|
||||
v-model="form.partyA"
|
||||
placeholder="请选择甲方"
|
||||
v-model="selectedOrganizationId"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
:loading="contractPartyLoading"
|
||||
@visible-change="visible => visible && loadContractPartyOptions()"
|
||||
@change="queryPartyRisk('partyA')"
|
||||
:loading="businessDeptLoading"
|
||||
@visible-change="visible => visible && loadBusinessDeptOptions()"
|
||||
@change="handleOrganizationChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in contractPartyAOptions"
|
||||
:key="item.value"
|
||||
v-for="item in businessDeptOptions"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="乙方" prop="partyB">
|
||||
<el-form-item label="平台公司" prop="platformCompanyName">
|
||||
<el-select
|
||||
v-model="form.partyB"
|
||||
placeholder="请选择乙方"
|
||||
v-model="form.platformCompanyId"
|
||||
placeholder="请选择平台公司"
|
||||
filterable
|
||||
clearable
|
||||
:loading="contractPartyLoading"
|
||||
@visible-change="visible => visible && loadContractPartyOptions()"
|
||||
@change="queryPartyRisk('partyB')"
|
||||
:disabled="!form.projectId"
|
||||
@change="handlePlatformCompanyChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in contractPartyBOptions"
|
||||
:key="item.value"
|
||||
v-for="item in platformCompanyOptions"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -685,6 +679,81 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section
|
||||
v-for="party in partySections"
|
||||
:key="party.role"
|
||||
class="contract-manage-form__section contract-manage-form__section--panel"
|
||||
>
|
||||
<div class="contract-manage-form__party-head">
|
||||
<div class="dialog-section-title">{{ party.label }}</div>
|
||||
<el-button type="primary" @click="addPartyRow(party.role)">添加</el-button>
|
||||
</div>
|
||||
<el-table :data="party.rows" border>
|
||||
<el-table-column type="index" label="序号" width="70" align="center" />
|
||||
<el-table-column label="客商名称" min-width="200" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-select
|
||||
v-model="row.customerId"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择客商"
|
||||
:loading="contractPartyLoading"
|
||||
@visible-change="visible => visible && loadContractPartyOptions()"
|
||||
@change="value => handlePartyCustomerChange(party.role, row, value)"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in contractPartyOptions"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="统一信用代码" min-width="180" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.creditCode" disabled placeholder="选择客商后带出" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系人" min-width="160" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-select
|
||||
v-model="row.contactId"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择联系人"
|
||||
:loading="!!row.contactLoading"
|
||||
@visible-change="visible => visible && ensurePartyContacts(row)"
|
||||
@change="value => handlePartyContactChange(row, value)"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in row.contactOptions || []"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="联系电话" min-width="150" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.contactPhone" disabled placeholder="选择联系人后带出" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100" align="center" fixed="right">
|
||||
<template #default="{ $index }">
|
||||
<el-link
|
||||
type="danger"
|
||||
:disabled="!canRemovePartyRow(party.role)"
|
||||
@click="removePartyRow(party.role, $index)"
|
||||
>
|
||||
删除
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section>
|
||||
|
||||
<contract-attachment-section
|
||||
title="用印材料"
|
||||
description
|
||||
@@ -720,8 +789,13 @@
|
||||
</div>
|
||||
<el-table :data="billingPlanRows" border>
|
||||
<el-table-column type="index" label="序号" width="80" align="center" />
|
||||
<el-table-column prop="planName" label="方案名称" min-width="220" align="center" />
|
||||
<el-table-column label="运输方式" min-width="180" align="center">
|
||||
<el-table-column prop="planName" label="方案名称" min-width="180" align="center" />
|
||||
<el-table-column label="适用客商" min-width="180" align="center">
|
||||
<template #default="{ row }">{{
|
||||
row.customerName || billingPlanCustomerLabel(row) || '-'
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="运输方式" min-width="160" align="center">
|
||||
<template #default="{ row }">{{
|
||||
row.transportModeLabel || row.transportMode || '-'
|
||||
}}</template>
|
||||
@@ -1024,6 +1098,7 @@
|
||||
:value="billingPlanForm"
|
||||
:index="billingPlanIndex"
|
||||
:settlement-currency="form.settlementCurrency"
|
||||
:party-options="billingPartyOptions"
|
||||
@save="saveBillingPlan"
|
||||
/>
|
||||
|
||||
@@ -1126,8 +1201,11 @@ import { isContractBlack, isRiskyTag, resolveRiskTagName } from '@/utils/risk-di
|
||||
import { Position } from '@element-plus/icons-vue';
|
||||
import { getMkPublicDetail } from '@/api/mk-process';
|
||||
import { getList as getProjectList } from '@/api/business/project-apply';
|
||||
import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
|
||||
import { getDeptTree } from '@/api/system/dept';
|
||||
import {
|
||||
getDetail as getCustomerArchiveDetail,
|
||||
getList as getCustomerArchiveList,
|
||||
} from '@/api/vehicle/customer-archive';
|
||||
import { getBusinessDeptSelect, getDeptTree } from '@/api/system/dept';
|
||||
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
|
||||
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
|
||||
import { config, option } from '@/option/business/contract-manage';
|
||||
@@ -1217,10 +1295,16 @@ const defaultForm = () => ({
|
||||
projectName: '',
|
||||
organizationId: '',
|
||||
organizationName: '',
|
||||
platformCompanyId: '',
|
||||
platformCompanyName: '',
|
||||
signType: '',
|
||||
settlementMode: '',
|
||||
partyA: '',
|
||||
partyB: '',
|
||||
partyC: '',
|
||||
partyAJson: '',
|
||||
partyBJson: '',
|
||||
partyCJson: '',
|
||||
handlerUserName: '',
|
||||
signDate: '',
|
||||
applyDate: '',
|
||||
@@ -1265,6 +1349,9 @@ const createCopiedDetail = (detail = {}) => {
|
||||
contractFileJson: stripSpecAttachments(detail.contractFileJson),
|
||||
attachmentsJson: stripSpecAttachments(detail.attachmentsJson),
|
||||
billingPlanJson: detail.billingPlanJson || '',
|
||||
partyAJson: detail.partyAJson || '',
|
||||
partyBJson: detail.partyBJson || '',
|
||||
partyCJson: detail.partyCJson || '',
|
||||
paymentRatioJson: detail.paymentRatioJson || '',
|
||||
settlementRuleJson: detail.settlementRuleJson || '',
|
||||
preSettlementConfigJson: detail.preSettlementConfigJson || '',
|
||||
@@ -1272,6 +1359,35 @@ const createCopiedDetail = (detail = {}) => {
|
||||
changeRecordJson: '',
|
||||
};
|
||||
};
|
||||
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 || '',
|
||||
contactOptions: row.contactOptions || [],
|
||||
contactLoading: false,
|
||||
});
|
||||
const serializePartyRows = rows =>
|
||||
JSON.stringify(
|
||||
(rows || []).map(row => ({
|
||||
id: row.id,
|
||||
customerId: row.customerId || null,
|
||||
customerName: row.customerName || '',
|
||||
creditCode: row.creditCode || '',
|
||||
contactId: row.contactId || null,
|
||||
contactName: row.contactName || '',
|
||||
contactPhone: row.contactPhone || '',
|
||||
}))
|
||||
);
|
||||
const partyRoleLabel = role => {
|
||||
if (role === 'A') return '甲方';
|
||||
if (role === 'B') return '乙方';
|
||||
if (role === 'C') return '丙方';
|
||||
return role || '';
|
||||
};
|
||||
const parseArray = value => {
|
||||
if (Array.isArray(value)) return value;
|
||||
if (!value) return [];
|
||||
@@ -1372,8 +1488,7 @@ export default {
|
||||
settlementCurrency: [{ required: true, message: '请选择结算币种', trigger: 'change' }],
|
||||
projectName: [{ required: true, message: '请选择所属项目', trigger: 'change' }],
|
||||
organizationName: [{ required: true, message: '请选择合同负责部门', trigger: 'change' }],
|
||||
partyA: [{ required: true, message: '请选择甲方', trigger: 'change' }],
|
||||
partyB: [{ required: true, message: '请选择乙方', trigger: 'change' }],
|
||||
platformCompanyName: [{ required: true, message: '请选择平台公司', trigger: 'change' }],
|
||||
signDate: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
|
||||
settlementMode: [{ required: true, message: '请选择结算方式', trigger: 'change' }],
|
||||
contractFormat: [{ required: true, message: '请选择合同格式', trigger: 'change' }],
|
||||
@@ -1416,9 +1531,11 @@ export default {
|
||||
settlementModeDictOptions: [],
|
||||
contractFormatDictOptions: [],
|
||||
contractCategoryDictOptions: [],
|
||||
contractPartyAOptions: [],
|
||||
contractPartyBOptions: [],
|
||||
// 合规客商风险（C101-1 展示用）：甲方/乙方选择后即时查询
|
||||
contractPartyOptions: [],
|
||||
partyARows: [createPartyRow()],
|
||||
partyBRows: [createPartyRow()],
|
||||
partyCRows: [],
|
||||
// 合规客商风险（C101-1 展示用）：客商选择后即时查询
|
||||
contractPartyCodeMap: {},
|
||||
partyRisk: {},
|
||||
contractPartyLoading: false,
|
||||
@@ -1427,6 +1544,9 @@ export default {
|
||||
organizationFlatOptions: [],
|
||||
selectedOrganizationId: '',
|
||||
organizationLoading: false,
|
||||
businessDeptOptions: [],
|
||||
businessDeptLoading: false,
|
||||
platformCompanyOptions: [],
|
||||
contractFileRows: [],
|
||||
attachmentRows: [],
|
||||
listUploadContractFileRows: [],
|
||||
@@ -1580,6 +1700,38 @@ export default {
|
||||
? this.contractFormatDictOptions
|
||||
: this.columnOptions('contractFormat');
|
||||
},
|
||||
partySections() {
|
||||
return [
|
||||
{ role: 'A', label: '甲方', rows: this.partyARows },
|
||||
{ role: 'B', label: '乙方', rows: this.partyBRows },
|
||||
{ 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,
|
||||
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
|
||||
partyRole: row.partyRole,
|
||||
partyRowId: row.id,
|
||||
customerId: row.customerId,
|
||||
customerName: row.customerName,
|
||||
}));
|
||||
},
|
||||
organizationCascaderProps() {
|
||||
return {
|
||||
label: 'label',
|
||||
@@ -1641,14 +1793,10 @@ export default {
|
||||
// 高风险/黑名单客商签约提示（C101-1，签约前提示；强制拦截在后端提交校验与推送链路）
|
||||
partyRiskText() {
|
||||
const parts = [];
|
||||
['partyA', 'partyB'].forEach(prop => {
|
||||
const risk = this.partyRisk[prop];
|
||||
Object.keys(this.partyRisk || {}).forEach(key => {
|
||||
const risk = this.partyRisk[key];
|
||||
if (!risk?.risky) return;
|
||||
// riskTip 由后端按风险项拼装（【公司名称】：黑名单；涉诉；被执行人等），缺失时兜底通用提示
|
||||
parts.push(
|
||||
risk.riskTip ||
|
||||
`${prop === 'partyA' ? '甲方' : '乙方'}[${this.form[prop] || ''}]为高风险/黑名单客商`
|
||||
);
|
||||
parts.push(risk.riskTip || `[${risk.customerName || key}]为高风险/黑名单客商`);
|
||||
});
|
||||
if (!parts.length) return '';
|
||||
return `${parts.join('；')}，按集团规定不可直接签约，提交前须上传「特批附件」类型附件，审批通过后将自动发起合同特批`;
|
||||
@@ -1998,6 +2146,8 @@ export default {
|
||||
},
|
||||
initFormPage() {
|
||||
this.resetFormState();
|
||||
this.loadBusinessDeptOptions();
|
||||
this.loadProjectOptions();
|
||||
if (this.formMode === 'add') {
|
||||
const copyId = this.$route.query.copyId;
|
||||
if (copyId) {
|
||||
@@ -2020,8 +2170,12 @@ export default {
|
||||
};
|
||||
this.selectedProjectId = '';
|
||||
this.selectedOrganizationId = '';
|
||||
this.contractPartyAOptions = [];
|
||||
this.contractPartyBOptions = [];
|
||||
this.platformCompanyOptions = [];
|
||||
this.contractPartyOptions = [];
|
||||
this.partyARows = [createPartyRow()];
|
||||
this.partyBRows = [createPartyRow()];
|
||||
this.partyCRows = [];
|
||||
this.partyRisk = {};
|
||||
this.contractFileRows = [];
|
||||
this.attachmentRows = [];
|
||||
this.billingPlanRows = [];
|
||||
@@ -2050,9 +2204,30 @@ export default {
|
||||
detail.feeGenerationMode || (Number(detail.billingEnabled) === 0 ? 'manual' : 'system'),
|
||||
};
|
||||
this.selectedProjectId = projectId;
|
||||
this.selectedOrganizationId = detail.organizationId || '';
|
||||
this.selectedOrganizationId = detail.organizationId ? String(detail.organizationId) : '';
|
||||
this.form.platformCompanyId = detail.platformCompanyId
|
||||
? String(detail.platformCompanyId)
|
||||
: '';
|
||||
this.form.platformCompanyName = detail.platformCompanyName || '';
|
||||
this.loadBusinessDeptOptions();
|
||||
const syncPlatform = () => {
|
||||
const project = this.projectOptions.find(item => String(item.id) === String(projectId));
|
||||
if (project) {
|
||||
this.applyProjectPlatformCompanies(project, false);
|
||||
} else {
|
||||
this.syncCurrentPlatformCompanyOption();
|
||||
}
|
||||
};
|
||||
if (!this.projectOptions.length && projectId) {
|
||||
this.loadProjectOptions().then(syncPlatform);
|
||||
} else {
|
||||
syncPlatform();
|
||||
}
|
||||
this.contractFileRows = normalizeContractFileRows(parseArray(detail.contractFileJson));
|
||||
this.attachmentRows = parseArray(detail.attachmentsJson);
|
||||
this.partyARows = this.normalizePartyRows(detail.partyAJson, detail.partyA, true);
|
||||
this.partyBRows = this.normalizePartyRows(detail.partyBJson, detail.partyB, true);
|
||||
this.partyCRows = this.normalizePartyRows(detail.partyCJson, detail.partyC, false);
|
||||
this.billingPlanRows = parseArray(detail.billingPlanJson);
|
||||
this.paymentRatioRows = parseArray(detail.paymentRatioJson);
|
||||
this.changeRecordRows = parseArray(detail.changeRecordJson);
|
||||
@@ -2109,8 +2284,7 @@ export default {
|
||||
['contractCategory', '合同类型'],
|
||||
['projectName', '所属项目'],
|
||||
['organizationName', '合同负责部门'],
|
||||
['partyA', '甲方'],
|
||||
['partyB', '乙方'],
|
||||
['platformCompanyName', '平台公司'],
|
||||
['contractAmount', '合同金额'],
|
||||
];
|
||||
const empty = required.find(([prop]) => {
|
||||
@@ -2129,6 +2303,8 @@ export default {
|
||||
this.$message.warning('合同金额不能小于0');
|
||||
return false;
|
||||
}
|
||||
if (!this.validatePartyRows(true)) return false;
|
||||
if (!this.validateBillingPlanBindings()) return false;
|
||||
return true;
|
||||
}
|
||||
if (!this.form.contractName?.trim()) {
|
||||
@@ -2152,8 +2328,7 @@ export default {
|
||||
const required = [
|
||||
['projectName', '所属项目'],
|
||||
['organizationName', '合同负责部门'],
|
||||
['partyA', '甲方'],
|
||||
['partyB', '乙方'],
|
||||
['platformCompanyName', '平台公司'],
|
||||
['startDate', '合同开始日期'],
|
||||
['endDate', '合同结束日期'],
|
||||
['signDate', '签订日期'],
|
||||
@@ -2175,8 +2350,9 @@ export default {
|
||||
this.$message.warning('合同金额不能小于0');
|
||||
return false;
|
||||
}
|
||||
if (!this.validatePartyRows(true)) return false;
|
||||
return (
|
||||
this.validateBillingPlanDefault() &&
|
||||
this.validateBillingPlanBindings() &&
|
||||
this.validateSettlementRules() &&
|
||||
this.validatePaymentRatios()
|
||||
);
|
||||
@@ -2185,11 +2361,29 @@ export default {
|
||||
this.syncSettlementConfig();
|
||||
const projectId = normalizeProjectValue(this.form.projectId);
|
||||
const projectName = projectId ? normalizeProjectValue(this.form.projectName) : '';
|
||||
const partyAJson = serializePartyRows(this.partyARows);
|
||||
const partyBJson = serializePartyRows(this.partyBRows);
|
||||
const partyCJson = this.partyCRows.length ? serializePartyRows(this.partyCRows) : '';
|
||||
return {
|
||||
...this.form,
|
||||
contractNo: String(this.form.contractNo || '').trim(),
|
||||
projectId,
|
||||
projectName,
|
||||
partyAJson,
|
||||
partyBJson,
|
||||
partyCJson,
|
||||
partyA: this.partyARows
|
||||
.map(row => row.customerName)
|
||||
.filter(Boolean)
|
||||
.join('、'),
|
||||
partyB: this.partyBRows
|
||||
.map(row => row.customerName)
|
||||
.filter(Boolean)
|
||||
.join('、'),
|
||||
partyC: this.partyCRows
|
||||
.map(row => row.customerName)
|
||||
.filter(Boolean)
|
||||
.join('、'),
|
||||
copyCount: normalizeOptionalInteger(this.form.copyCount),
|
||||
invoiceCycle: normalizeOptionalInteger(this.form.invoiceCycle),
|
||||
paymentDays: normalizeOptionalInteger(this.form.paymentDays),
|
||||
@@ -2375,12 +2569,15 @@ export default {
|
||||
}
|
||||
},
|
||||
loadProjectOptions() {
|
||||
if (this.projectLoading) return;
|
||||
if (this.projectLoading) {
|
||||
return Promise.resolve(this.projectOptions);
|
||||
}
|
||||
this.projectLoading = true;
|
||||
getProjectList(1, 9999, this.config.projectQueryParams || {})
|
||||
return getProjectList(1, 9999, this.config.projectQueryParams || {})
|
||||
.then(res => {
|
||||
this.projectOptions = extractRecords(res);
|
||||
this.syncCurrentProjectOption();
|
||||
return this.projectOptions;
|
||||
})
|
||||
.finally(() => {
|
||||
this.projectLoading = false;
|
||||
@@ -2442,7 +2639,15 @@ export default {
|
||||
handleProjectChange(projectId) {
|
||||
const project = this.projectOptions.find(item => String(item.id) === String(projectId));
|
||||
if (!project) {
|
||||
Object.assign(this.form, { projectId: '', projectName: '', settlementMode: '' });
|
||||
Object.assign(this.form, {
|
||||
projectId: '',
|
||||
projectName: '',
|
||||
settlementMode: '',
|
||||
platformCompanyId: '',
|
||||
platformCompanyName: '',
|
||||
});
|
||||
this.platformCompanyOptions = [];
|
||||
if (this.formMode === 'add') this.refreshPreviewContractNo();
|
||||
return;
|
||||
}
|
||||
Object.assign(this.form, {
|
||||
@@ -2450,6 +2655,71 @@ export default {
|
||||
projectName: project.projectName || '',
|
||||
settlementMode: project.settlementMode || this.form.settlementMode || '',
|
||||
});
|
||||
this.applyProjectPlatformCompanies(project, true);
|
||||
},
|
||||
parseUndertakeDeptIds(value) {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map(item => String(item || '').trim()).filter(Boolean);
|
||||
}
|
||||
return String(value || '')
|
||||
.split(',')
|
||||
.map(item => item.trim())
|
||||
.filter(Boolean);
|
||||
},
|
||||
parseUndertakeDeptNames(value) {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map(item => String(item || '').trim()).filter(Boolean);
|
||||
}
|
||||
return String(value || '')
|
||||
.split(/[、,，]/)
|
||||
.map(item => item.trim())
|
||||
.filter(Boolean);
|
||||
},
|
||||
applyProjectPlatformCompanies(project, autoSelect = false) {
|
||||
const ids = this.parseUndertakeDeptIds(project?.undertakeDeptId);
|
||||
const names = this.parseUndertakeDeptNames(project?.undertakeDeptName);
|
||||
this.platformCompanyOptions = ids.map((id, index) => ({
|
||||
id: String(id),
|
||||
label: names[index] || String(id),
|
||||
}));
|
||||
if (!autoSelect) {
|
||||
this.syncCurrentPlatformCompanyOption();
|
||||
return;
|
||||
}
|
||||
if (this.platformCompanyOptions.length === 1) {
|
||||
this.form.platformCompanyId = this.platformCompanyOptions[0].id;
|
||||
this.form.platformCompanyName = this.platformCompanyOptions[0].label;
|
||||
} else if (
|
||||
!this.platformCompanyOptions.some(
|
||||
item => String(item.id) === String(this.form.platformCompanyId)
|
||||
)
|
||||
) {
|
||||
this.form.platformCompanyId = '';
|
||||
this.form.platformCompanyName = '';
|
||||
} else {
|
||||
this.handlePlatformCompanyChange(this.form.platformCompanyId);
|
||||
}
|
||||
if (this.formMode === 'add') this.refreshPreviewContractNo();
|
||||
},
|
||||
handlePlatformCompanyChange(value) {
|
||||
const matched = this.platformCompanyOptions.find(item => String(item.id) === String(value));
|
||||
this.form.platformCompanyId = matched ? matched.id : '';
|
||||
this.form.platformCompanyName = matched ? matched.label : '';
|
||||
if (this.formMode === 'add') this.refreshPreviewContractNo();
|
||||
},
|
||||
syncCurrentPlatformCompanyOption() {
|
||||
if (!this.form.platformCompanyId || !this.form.platformCompanyName) return;
|
||||
if (
|
||||
this.platformCompanyOptions.some(
|
||||
item => String(item.id) === String(this.form.platformCompanyId)
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.platformCompanyOptions.unshift({
|
||||
id: String(this.form.platformCompanyId),
|
||||
label: this.form.platformCompanyName,
|
||||
});
|
||||
},
|
||||
loadContractPartyOptions() {
|
||||
if (this.contractPartyLoading) return;
|
||||
@@ -2463,42 +2733,170 @@ export default {
|
||||
.then(responses => {
|
||||
if (requestId !== this.contractPartyRequestId) return;
|
||||
const records = responses.flatMap(extractRecords);
|
||||
// 名称→客商编码映射，供 C101-1 风险查询使用（§9-U6 编码体系联调确认）
|
||||
const codeMap = {};
|
||||
const options = [];
|
||||
const optionIds = new Set();
|
||||
records.forEach(item => {
|
||||
const id = item.id;
|
||||
if (!id || optionIds.has(String(id))) return;
|
||||
optionIds.add(String(id));
|
||||
const label = String(
|
||||
item.fullName || item.shortName || item.customerName || item.customerCode || ''
|
||||
).trim();
|
||||
if (!label) return;
|
||||
const code = item.customerCode;
|
||||
if (!code) return;
|
||||
[item.fullName, item.shortName, item.customerName]
|
||||
.map(name => String(name || '').trim())
|
||||
.filter(Boolean)
|
||||
.forEach(name => {
|
||||
codeMap[name] = code;
|
||||
});
|
||||
if (code) {
|
||||
[item.fullName, item.shortName, item.customerName, label]
|
||||
.map(name => String(name || '').trim())
|
||||
.filter(Boolean)
|
||||
.forEach(name => {
|
||||
codeMap[name] = code;
|
||||
});
|
||||
codeMap[String(id)] = code;
|
||||
}
|
||||
options.push({
|
||||
id,
|
||||
label,
|
||||
value: id,
|
||||
customerName: label,
|
||||
creditCode: item.unifiedCreditCode || '',
|
||||
customerCode: code || '',
|
||||
});
|
||||
});
|
||||
this.contractPartyCodeMap = codeMap;
|
||||
const names = records
|
||||
.map(item => item.fullName || item.shortName || item.customerName || item.customerCode)
|
||||
.map(name => String(name || '').trim())
|
||||
.filter(Boolean);
|
||||
[this.form.partyA, this.form.partyB].filter(Boolean).forEach(name => names.unshift(name));
|
||||
const options = [...new Set(names)].map(name => ({ label: name, value: name }));
|
||||
this.contractPartyAOptions = options;
|
||||
this.contractPartyBOptions = options;
|
||||
// 复制/编辑回填的甲乙方不会触发下拉 change，加载选项后主动查一次 C101-1 风险
|
||||
['partyA', 'partyB'].forEach(prop => {
|
||||
if (this.form[prop]) this.queryPartyRisk(prop);
|
||||
this.contractPartyOptions = options;
|
||||
this.syncPartyRowsWithOptions();
|
||||
[...this.partyARows, ...this.partyBRows, ...this.partyCRows].forEach(row => {
|
||||
if (row.customerId || row.customerName) this.queryPartyRiskByRow(row);
|
||||
});
|
||||
})
|
||||
.finally(() => {
|
||||
if (requestId === this.contractPartyRequestId) this.contractPartyLoading = false;
|
||||
});
|
||||
},
|
||||
// C101-1 客商风险查询（展示用，强校验在后端提交/推送链路）：失败静默不阻塞填写
|
||||
queryPartyRisk(prop) {
|
||||
const name = this.form[prop];
|
||||
const code = name ? this.contractPartyCodeMap[name] : null;
|
||||
syncPartyRowsWithOptions() {
|
||||
const fill = rows => {
|
||||
rows.forEach(row => {
|
||||
if (row.customerId) {
|
||||
const matched = this.contractPartyOptions.find(
|
||||
item => String(item.id) === String(row.customerId)
|
||||
);
|
||||
if (matched) {
|
||||
row.customerName = matched.customerName;
|
||||
row.creditCode = matched.creditCode || row.creditCode || '';
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (row.customerName) {
|
||||
const matched = this.contractPartyOptions.find(
|
||||
item => item.customerName === row.customerName
|
||||
);
|
||||
if (matched) {
|
||||
row.customerId = matched.id;
|
||||
row.creditCode = matched.creditCode || row.creditCode || '';
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
fill(this.partyARows);
|
||||
fill(this.partyBRows);
|
||||
fill(this.partyCRows);
|
||||
},
|
||||
normalizePartyRows(partyJson, fallbackName, requireOne) {
|
||||
const rows = parseArray(partyJson).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()] : [];
|
||||
},
|
||||
partyRowsByRole(role) {
|
||||
if (role === 'A') return this.partyARows;
|
||||
if (role === 'B') return this.partyBRows;
|
||||
return this.partyCRows;
|
||||
},
|
||||
setPartyRowsByRole(role, rows) {
|
||||
if (role === 'A') this.partyARows = rows;
|
||||
else if (role === 'B') this.partyBRows = rows;
|
||||
else this.partyCRows = rows;
|
||||
},
|
||||
addPartyRow(role) {
|
||||
const rows = [...this.partyRowsByRole(role), createPartyRow()];
|
||||
this.setPartyRowsByRole(role, rows);
|
||||
},
|
||||
canRemovePartyRow(role) {
|
||||
if (role === 'C') return true;
|
||||
return this.partyRowsByRole(role).length > 1;
|
||||
},
|
||||
removePartyRow(role, index) {
|
||||
if (!this.canRemovePartyRow(role)) return;
|
||||
const rows = [...this.partyRowsByRole(role)];
|
||||
rows.splice(index, 1);
|
||||
this.setPartyRowsByRole(role, rows);
|
||||
},
|
||||
handlePartyCustomerChange(role, row, customerId) {
|
||||
const matched = this.contractPartyOptions.find(item => String(item.id) === String(customerId));
|
||||
row.customerId = matched?.id || '';
|
||||
row.customerName = matched?.customerName || '';
|
||||
row.creditCode = matched?.creditCode || '';
|
||||
row.contactId = '';
|
||||
row.contactName = '';
|
||||
row.contactPhone = '';
|
||||
row.contactOptions = [];
|
||||
this.queryPartyRiskByRow(row);
|
||||
if (row.customerId) this.ensurePartyContacts(row);
|
||||
},
|
||||
ensurePartyContacts(row) {
|
||||
if (!row.customerId) return Promise.resolve();
|
||||
if ((row.contactOptions || []).length) return Promise.resolve();
|
||||
row.contactLoading = true;
|
||||
return getCustomerArchiveDetail(row.customerId)
|
||||
.then(res => {
|
||||
const detail = res?.data?.data || res?.data || {};
|
||||
const contacts = Array.isArray(detail.contacts) ? detail.contacts : [];
|
||||
row.contactOptions = contacts
|
||||
.map(item => ({
|
||||
id: item.id,
|
||||
label: item.contactName || item.name || '',
|
||||
contactName: item.contactName || item.name || '',
|
||||
contactPhone: item.contactPhone || item.phone || '',
|
||||
}))
|
||||
.filter(item => item.id && item.label);
|
||||
if (row.contactId) {
|
||||
const matched = row.contactOptions.find(
|
||||
item => String(item.id) === String(row.contactId)
|
||||
);
|
||||
if (matched) {
|
||||
row.contactName = matched.contactName;
|
||||
row.contactPhone = matched.contactPhone;
|
||||
}
|
||||
}
|
||||
if (!row.creditCode && detail.unifiedCreditCode) {
|
||||
row.creditCode = detail.unifiedCreditCode;
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
row.contactLoading = false;
|
||||
});
|
||||
},
|
||||
handlePartyContactChange(row, contactId) {
|
||||
const matched = (row.contactOptions || []).find(item => String(item.id) === String(contactId));
|
||||
row.contactId = matched?.id || '';
|
||||
row.contactName = matched?.contactName || '';
|
||||
row.contactPhone = matched?.contactPhone || '';
|
||||
},
|
||||
queryPartyRiskByRow(row) {
|
||||
const key = String(row.customerId || row.customerName || '');
|
||||
if (!key) return;
|
||||
const code =
|
||||
this.contractPartyCodeMap[String(row.customerId)] ||
|
||||
this.contractPartyCodeMap[row.customerName];
|
||||
if (!code) {
|
||||
this.partyRisk = { ...this.partyRisk, [prop]: null };
|
||||
this.partyRisk = { ...this.partyRisk, [key]: null };
|
||||
return;
|
||||
}
|
||||
getRisk(code)
|
||||
@@ -2506,18 +2904,72 @@ export default {
|
||||
const risk = res?.data?.data ?? res?.data ?? {};
|
||||
this.partyRisk = {
|
||||
...this.partyRisk,
|
||||
[prop]: {
|
||||
[key]: {
|
||||
customerName: row.customerName || '',
|
||||
customerKind: risk.customerKind || '',
|
||||
// risky 由后端统一判定：外部客商高风险（等级=2）或黑名单；内部组织客商默认无风险恒为 false
|
||||
risky: risk.risky === true,
|
||||
riskTip: risk.riskTip || '',
|
||||
},
|
||||
};
|
||||
})
|
||||
.catch(() => {
|
||||
this.partyRisk = { ...this.partyRisk, [prop]: null };
|
||||
this.partyRisk = { ...this.partyRisk, [key]: null };
|
||||
});
|
||||
},
|
||||
validatePartyRows(requireCustomerId) {
|
||||
const validate = (label, rows, required) => {
|
||||
if (required && !rows.length) {
|
||||
this.$message.warning(`请至少添加一个${label}客商`);
|
||||
return false;
|
||||
}
|
||||
for (let index = 0; index < rows.length; index += 1) {
|
||||
const row = rows[index];
|
||||
if (!row.customerName) {
|
||||
this.$message.warning(`${label}第${index + 1}行请选择客商`);
|
||||
return false;
|
||||
}
|
||||
if (requireCustomerId && !row.customerId) {
|
||||
this.$message.warning(`${label}第${index + 1}行请选择有效客商`);
|
||||
return false;
|
||||
}
|
||||
if (row.contactName && !row.contactPhone) {
|
||||
this.$message.warning(`${label}第${index + 1}行联系人需带出联系电话`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
return (
|
||||
validate('甲方', this.partyARows, true) &&
|
||||
validate('乙方', this.partyBRows, true) &&
|
||||
validate('丙方', this.partyCRows, false)
|
||||
);
|
||||
},
|
||||
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}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
},
|
||||
billingPlanCustomerLabel(row) {
|
||||
const matched = this.billingPartyOptions.find(
|
||||
item => String(item.partyRowId) === String(row.partyRowId)
|
||||
);
|
||||
return matched?.label || row.customerName || '';
|
||||
},
|
||||
loadOrganizationOptions() {
|
||||
if (this.organizationLoading) return;
|
||||
this.organizationLoading = true;
|
||||
@@ -2587,7 +3039,10 @@ export default {
|
||||
return null;
|
||||
},
|
||||
handleOrganizationChange(id) {
|
||||
const organization = this.findOrganization(id);
|
||||
const organizationId = Array.isArray(id) ? id.at(-1) : id;
|
||||
const organization =
|
||||
this.businessDeptOptions.find(item => String(item.id) === String(organizationId)) ||
|
||||
this.findOrganization(organizationId);
|
||||
Object.assign(
|
||||
this.form,
|
||||
organization
|
||||
@@ -2597,6 +3052,9 @@ export default {
|
||||
}
|
||||
: { organizationId: '', organizationName: '' }
|
||||
);
|
||||
this.selectedOrganizationId = this.form.organizationId
|
||||
? String(this.form.organizationId)
|
||||
: '';
|
||||
if (this.formMode === 'add') {
|
||||
this.refreshPreviewContractNo();
|
||||
}
|
||||
@@ -2607,23 +3065,58 @@ export default {
|
||||
refreshPreviewContractNo() {
|
||||
if (this.formMode !== 'add') return;
|
||||
const organizationId = this.form.organizationId;
|
||||
if (!organizationId) {
|
||||
const platformCompanyId = this.form.platformCompanyId;
|
||||
if (!organizationId || !platformCompanyId) {
|
||||
if (!this.contractNoManual) this.form.contractNo = '';
|
||||
return;
|
||||
}
|
||||
const requestId = (this.contractNoPreviewRequestId =
|
||||
(this.contractNoPreviewRequestId || 0) + 1);
|
||||
api
|
||||
.nextContractNo(organizationId)
|
||||
.nextContractNo(organizationId, platformCompanyId)
|
||||
.then(res => {
|
||||
if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
|
||||
this.form.contractNo = res.data?.data || '';
|
||||
})
|
||||
.catch(() => {
|
||||
.catch(error => {
|
||||
if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
|
||||
this.form.contractNo = '';
|
||||
const message =
|
||||
error?.response?.data?.msg ||
|
||||
error?.message ||
|
||||
'部门合同前缀未配置，无法自动生成，请手动输入合同编号';
|
||||
this.$message.warning(message);
|
||||
});
|
||||
},
|
||||
loadBusinessDeptOptions() {
|
||||
if (this.businessDeptLoading) return;
|
||||
this.businessDeptLoading = true;
|
||||
getBusinessDeptSelect()
|
||||
.then(res => {
|
||||
this.businessDeptOptions = (res.data?.data || []).map(item => ({
|
||||
id: String(item.id),
|
||||
label: item.deptName || item.fullName || String(item.id),
|
||||
rawLabel: item.deptName || item.fullName || String(item.id),
|
||||
}));
|
||||
this.syncCurrentBusinessDeptOption();
|
||||
})
|
||||
.finally(() => {
|
||||
this.businessDeptLoading = false;
|
||||
});
|
||||
},
|
||||
syncCurrentBusinessDeptOption() {
|
||||
if (!this.form.organizationId || !this.form.organizationName) return;
|
||||
if (
|
||||
this.businessDeptOptions.some(item => String(item.id) === String(this.form.organizationId))
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.businessDeptOptions.unshift({
|
||||
id: String(this.form.organizationId),
|
||||
label: this.form.organizationName,
|
||||
rawLabel: this.form.organizationName,
|
||||
});
|
||||
},
|
||||
syncCurrentOrganizationOption() {
|
||||
if (!this.form.organizationId || !this.form.organizationName) return;
|
||||
if (this.findOrganization(this.form.organizationId)) return;
|
||||
@@ -2720,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;
|
||||
@@ -2744,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 === '固定天数周期结算';
|
||||
},
|
||||
@@ -3102,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('、');
|
||||
@@ -3646,6 +4105,7 @@ export default {
|
||||
}
|
||||
|
||||
&__billing-head,
|
||||
&__party-head,
|
||||
&__attachment-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -535,7 +535,6 @@ export default {
|
||||
created() {
|
||||
this.resetNodeRows();
|
||||
this.loadProjectOptions('');
|
||||
this.applyDefaultDeptSearch();
|
||||
this.initDeptOptions();
|
||||
},
|
||||
methods: {
|
||||
@@ -566,27 +565,6 @@ export default {
|
||||
}
|
||||
});
|
||||
},
|
||||
defaultDeptId() {
|
||||
const raw = (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
|
||||
return (
|
||||
String(raw)
|
||||
.split(',')
|
||||
.map(item => item.trim())
|
||||
.filter(Boolean)[0] || ''
|
||||
);
|
||||
},
|
||||
applyDefaultDeptSearch() {
|
||||
const deptId = this.defaultDeptId();
|
||||
const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
|
||||
if (!deptId || !deptColumn) return;
|
||||
deptColumn.searchValue = deptId;
|
||||
this.query = { ...this.query, deptId };
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs.crud?.searchForm) {
|
||||
this.$refs.crud.searchForm.searchDeptId = deptId;
|
||||
}
|
||||
});
|
||||
},
|
||||
flattenDept(tree, level = 0) {
|
||||
return tree.flatMap(item => {
|
||||
const id =
|
||||
@@ -1113,7 +1091,6 @@ export default {
|
||||
},
|
||||
searchReset() {
|
||||
this.query = {};
|
||||
this.applyDefaultDeptSearch();
|
||||
this.page.currentPage = 1;
|
||||
this.onLoad(this.page, this.query);
|
||||
},
|
||||
|
||||
@@ -258,15 +258,21 @@
|
||||
<div class="project-apply-form__field-tooltip">{{ businessDeptTooltipText }}</div>
|
||||
</template>
|
||||
<span class="project-apply-form__field-tooltip-trigger">
|
||||
<el-cascader
|
||||
v-model="businessDeptCascaderValue"
|
||||
:options="businessDeptTreeOptions"
|
||||
:props="deptCascaderProps"
|
||||
<el-select
|
||||
v-model="form.businessDeptId"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
@change="handleBusinessDeptChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deptOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
@@ -755,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"
|
||||
@@ -984,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 {
|
||||
getRisk,
|
||||
loadHcsImmediateEnabled,
|
||||
@@ -996,7 +1093,7 @@ import {
|
||||
getList as getCustomerArchiveList,
|
||||
getDetail as getCustomerArchiveDetail,
|
||||
} from '@/api/vehicle/customer-archive';
|
||||
import { getBusinessDeptSelect, getDeptTree, getPlatformCompanySelect } from '@/api/system/dept';
|
||||
import { getBusinessDeptSelect, getPlatformCompanySelect } from '@/api/system/dept';
|
||||
import { getDictionary as getSystemDictionary } from '@/api/system/dict';
|
||||
import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
|
||||
import { getList as getUserList } from '@/api/system/user';
|
||||
@@ -1340,7 +1437,6 @@ export default {
|
||||
],
|
||||
},
|
||||
deptOptions: [],
|
||||
businessDeptTreeOptions: [],
|
||||
platformCompanyOptions: [],
|
||||
cargoTypeOptions: [],
|
||||
selectedCustomerId: [],
|
||||
@@ -1383,6 +1479,8 @@ export default {
|
||||
'zip',
|
||||
],
|
||||
changeRows: [],
|
||||
projectContractRows: [],
|
||||
projectContractLoading: false,
|
||||
changeRecordDetailVisible: false,
|
||||
changeRecordDetail: null,
|
||||
changeRecordDetailRows: [],
|
||||
@@ -1405,44 +1503,14 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
// 部门级联配置：checkStrictly 允许选中任意层级，不必选到末级
|
||||
deptCascaderProps() {
|
||||
return {
|
||||
label: 'label',
|
||||
value: 'value',
|
||||
children: 'children',
|
||||
emitPath: true,
|
||||
checkStrictly: true,
|
||||
expandTrigger: 'click',
|
||||
};
|
||||
},
|
||||
// 业务部门：form 存部门 id，级联控件用根到节点的 id 路径，两者在此双向转换
|
||||
businessDeptCascaderValue: {
|
||||
get() {
|
||||
const id = this.form.businessDeptId;
|
||||
return id ? this.findDeptPath(id, this.businessDeptTreeOptions) || [id] : [];
|
||||
},
|
||||
set(path) {
|
||||
const value = Array.isArray(path)
|
||||
? path.filter(item => item !== undefined && item !== null && item !== '')
|
||||
: [];
|
||||
this.form.businessDeptId = value.length ? value.at(-1) : '';
|
||||
this.handleBusinessDeptChange(this.form.businessDeptId);
|
||||
},
|
||||
},
|
||||
// 查看态禁用控件无 hover，用完整路径/名称做 tooltip
|
||||
// 查看态禁用控件无 hover，用业务部门名称做 tooltip
|
||||
businessDeptTooltipText() {
|
||||
const pathIds = this.businessDeptCascaderValue || [];
|
||||
if (pathIds.length && this.businessDeptTreeOptions?.length) {
|
||||
const labels = [];
|
||||
let nodes = this.businessDeptTreeOptions;
|
||||
for (const id of pathIds) {
|
||||
const node = (nodes || []).find(item => String(item.value) === String(id));
|
||||
if (!node) break;
|
||||
labels.push(node.label);
|
||||
nodes = node.children;
|
||||
const id = this.form.businessDeptId;
|
||||
if (id) {
|
||||
const matched = this.deptOptions.find(item => String(item.value) === String(id));
|
||||
if (matched?.rawLabel || matched?.label) {
|
||||
return matched.rawLabel || matched.label;
|
||||
}
|
||||
if (labels.length) return labels.join(' / ');
|
||||
}
|
||||
return String(this.form.businessDeptName || '').trim();
|
||||
},
|
||||
@@ -1489,6 +1557,9 @@ export default {
|
||||
isNewProjectDialog() {
|
||||
return ['add', 'majorSupplement'].includes(this.dialogType);
|
||||
},
|
||||
showProjectContractSection() {
|
||||
return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
|
||||
},
|
||||
isProjectFormPage() {
|
||||
return this.isFormPageInstance;
|
||||
},
|
||||
@@ -1674,9 +1745,10 @@ export default {
|
||||
detail.settlementMode
|
||||
);
|
||||
if (detail.businessDeptId) {
|
||||
const label = detail.businessDeptName || String(detail.businessDeptId);
|
||||
this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
|
||||
this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
|
||||
const id = String(detail.businessDeptId);
|
||||
const label = detail.businessDeptName || id;
|
||||
this.form.businessDeptId = id;
|
||||
this.deptOptions = [{ label, rawLabel: label, value: id }];
|
||||
}
|
||||
const undertakeDeptIds = this.parseUndertakeDeptIds(detail.undertakeDeptId);
|
||||
const undertakeDeptNames = this.parseUndertakeDeptNames(detail.undertakeDeptName);
|
||||
@@ -2013,15 +2085,20 @@ export default {
|
||||
const run = value => {
|
||||
const args = operation.prompt ? [row.id, value] : [row.id];
|
||||
const request = () => this.api[operation.action](...args);
|
||||
// 先本地提交再调 MK：MK 成功后会把状态同步成 reviewing，
|
||||
// 若先 MK 再本地，已撤回/已驳回单据会被「当前状态不允许编辑」拦住。
|
||||
const afterMk =
|
||||
operation.action === 'submitApproval'
|
||||
? submitMkApprovalFlow({
|
||||
bizType: 'project-apply',
|
||||
bizId: row.id,
|
||||
subjectName: row.projectName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
}).then(() => request())
|
||||
? request().then(() =>
|
||||
submitMkApprovalFlow({
|
||||
bizType: 'project-apply',
|
||||
bizId: row.id,
|
||||
subjectName: row.projectName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: row.projectType || '' },
|
||||
})
|
||||
)
|
||||
: request();
|
||||
// 项目通过会同步等待合规推送，加遮罩防重复点击
|
||||
const loading =
|
||||
@@ -2131,6 +2208,8 @@ export default {
|
||||
this.attachmentRows = [];
|
||||
this.selectedAttachmentRows = [];
|
||||
this.changeRows = [];
|
||||
this.projectContractRows = [];
|
||||
this.projectContractLoading = false;
|
||||
this.selectedCustomerId = [];
|
||||
this.selectedCarrierIds = [];
|
||||
},
|
||||
@@ -2179,6 +2258,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 || '';
|
||||
@@ -2265,6 +2378,9 @@ export default {
|
||||
subjectName: name,
|
||||
approvalStatus: status,
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: {
|
||||
projectType: this.form.projectType || data.projectType || '',
|
||||
},
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
@@ -2385,6 +2501,7 @@ export default {
|
||||
subjectName: this.form.projectName || '',
|
||||
approvalStatus,
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: this.form.projectType || '' },
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
@@ -2410,6 +2527,7 @@ export default {
|
||||
subjectName: this.form.projectName || '',
|
||||
approvalStatus: this.form.approvalStatus || 'change_rejected',
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: this.form.projectType || '' },
|
||||
}).then(() => {
|
||||
this.$message.success('提交成功!');
|
||||
this.closeProjectForm();
|
||||
@@ -2813,10 +2931,10 @@ export default {
|
||||
return `${base}-BG${this.$dayjs().format('YYYYMMDD')}`;
|
||||
},
|
||||
handleBusinessDeptChange(value) {
|
||||
// 兼容级联路径数组（取末级）与单个部门 id
|
||||
const id = Array.isArray(value) ? value.at(-1) : value;
|
||||
const dept = this.deptOptions.find(item => String(item.value) === String(id));
|
||||
this.form.businessDeptName = dept ? dept.rawLabel : '';
|
||||
const id = value == null || value === '' ? '' : String(value);
|
||||
this.form.businessDeptId = id;
|
||||
const dept = this.deptOptions.find(item => String(item.value) === id);
|
||||
this.form.businessDeptName = dept ? dept.rawLabel || dept.label : '';
|
||||
this.$refs.projectForm?.validateField('businessDeptId');
|
||||
},
|
||||
handleUndertakeDeptChange(value) {
|
||||
@@ -2854,77 +2972,44 @@ export default {
|
||||
firstUndertakeDeptId(value) {
|
||||
return this.parseUndertakeDeptIds(value)[0] || '';
|
||||
},
|
||||
// 由部门 id 反查「根 → 该节点」的 id 路径，供级联回显（找不到返回 null）
|
||||
findDeptPath(id, tree = [], parents = []) {
|
||||
const target = Array.isArray(id) ? id.at(-1) : id;
|
||||
if (target === undefined || target === null || target === '') return null;
|
||||
for (const node of tree || []) {
|
||||
const path = [...parents, node.value];
|
||||
if (String(node.value) === String(target)) return path;
|
||||
const matched = this.findDeptPath(target, node.children, path);
|
||||
if (matched) return matched;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
handleProjectTypeChange() {
|
||||
this.normalizeAttachmentFileTypes();
|
||||
this.$refs.projectForm?.validateField('projectType');
|
||||
},
|
||||
loadDeptOptions() {
|
||||
Promise.all([getDeptTree(), getBusinessDeptSelect()])
|
||||
.then(([treeRes, bizRes]) => {
|
||||
const deptTree = this.excludeExternalOrganization(treeRes.data.data || []);
|
||||
const bizList = bizRes.data.data || [];
|
||||
const bizIds = new Set(
|
||||
bizList
|
||||
.map(item => (item.id == null || item.id === '' ? '' : String(item.id)))
|
||||
.filter(Boolean)
|
||||
);
|
||||
// 仅保留「是否业务部门=是」的节点及其祖先，祖先不可选
|
||||
const businessDeptTree = this.filterBusinessDeptTree(deptTree, bizIds);
|
||||
this.deptOptions = this.flattenDept(businessDeptTree).filter(item =>
|
||||
bizIds.has(String(item.value))
|
||||
);
|
||||
this.businessDeptTreeOptions = this.toDeptCascaderOptions(businessDeptTree, bizIds);
|
||||
getBusinessDeptSelect()
|
||||
.then(res => {
|
||||
const bizList = res.data.data || [];
|
||||
// 仅展示「是否业务部门=是」的本级部门，扁平下拉
|
||||
this.deptOptions = bizList
|
||||
.map(item => {
|
||||
const value = item.id == null || item.id === '' ? '' : String(item.id);
|
||||
const label = item.deptName || item.fullName || item.title || item.name || value;
|
||||
return {
|
||||
label,
|
||||
rawLabel: label,
|
||||
value,
|
||||
};
|
||||
})
|
||||
.filter(item => item.value);
|
||||
this.fillDefaultBusinessDept();
|
||||
this.ensureCurrentBusinessDeptOption();
|
||||
})
|
||||
.catch(() => {
|
||||
this.deptOptions = [];
|
||||
this.businessDeptTreeOptions = [];
|
||||
});
|
||||
this.loadPlatformCompanyOptions();
|
||||
},
|
||||
/**
|
||||
* 剪枝组织树：只保留业务部门节点及其祖先路径。
|
||||
*/
|
||||
filterBusinessDeptTree(list = [], bizIds = new Set()) {
|
||||
return (list || []).reduce((result, item) => {
|
||||
const children = item.children?.length
|
||||
? this.filterBusinessDeptTree(item.children, bizIds)
|
||||
: [];
|
||||
const isBiz = bizIds.has(String(item.id));
|
||||
if (!isBiz && !children.length) {
|
||||
return result;
|
||||
}
|
||||
result.push({
|
||||
...item,
|
||||
children: children.length ? children : undefined,
|
||||
});
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
ensureCurrentBusinessDeptOption() {
|
||||
const id = this.form.businessDeptId;
|
||||
const id = this.form.businessDeptId == null || this.form.businessDeptId === ''
|
||||
? ''
|
||||
: String(this.form.businessDeptId);
|
||||
if (!id) return;
|
||||
const exists = this.deptOptions.some(item => String(item.value) === String(id));
|
||||
this.form.businessDeptId = id;
|
||||
const exists = this.deptOptions.some(item => String(item.value) === id);
|
||||
if (exists) return;
|
||||
const label = this.form.businessDeptName || String(id);
|
||||
const label = this.form.businessDeptName || id;
|
||||
this.deptOptions.unshift({ label, rawLabel: label, value: id });
|
||||
const pathExists = this.findDeptPath(id, this.businessDeptTreeOptions);
|
||||
if (!pathExists) {
|
||||
this.businessDeptTreeOptions.unshift({ label, value: id });
|
||||
}
|
||||
},
|
||||
loadPlatformCompanyOptions() {
|
||||
getPlatformCompanySelect().then(res => {
|
||||
@@ -2956,50 +3041,6 @@ export default {
|
||||
return matched ? matched.value : id;
|
||||
});
|
||||
},
|
||||
excludeExternalOrganization(list = []) {
|
||||
return list.reduce((result, item) => {
|
||||
const deptName = item.title || item.deptName || item.name;
|
||||
if (String(deptName || '').trim() === '外部组织') return result;
|
||||
result.push({
|
||||
...item,
|
||||
children: item.children?.length
|
||||
? this.excludeExternalOrganization(item.children)
|
||||
: item.children,
|
||||
});
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
toDeptCascaderOptions(list = [], bizIds = null) {
|
||||
return list.map(item => {
|
||||
const value = item.id == null || item.id === '' ? item.value : item.id;
|
||||
const option = {
|
||||
label: item.title || item.deptName || item.name || item.label,
|
||||
value: value == null || value === '' ? '' : String(value),
|
||||
children: item.children?.length
|
||||
? this.toDeptCascaderOptions(item.children, bizIds)
|
||||
: undefined,
|
||||
};
|
||||
// 仅业务部门可选；祖先节点保留路径但禁用
|
||||
if (bizIds && !bizIds.has(String(option.value))) {
|
||||
option.disabled = true;
|
||||
}
|
||||
return option;
|
||||
});
|
||||
},
|
||||
flattenDept(list = [], level = 0) {
|
||||
return list.reduce((result, item) => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
rawLabel: label,
|
||||
value: item.id,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
result.push(...this.flattenDept(item.children, level + 1));
|
||||
}
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
loadCargoTypeOptions() {
|
||||
getSystemDictionary({ code: 'type_of_goods' }).then(res => {
|
||||
this.cargoTypeOptions = (res.data.data || []).map(item => ({
|
||||
|
||||
@@ -214,15 +214,19 @@ export default {
|
||||
}
|
||||
const run = () => {
|
||||
const request = () => this.api[operation.action](row.id);
|
||||
// 先本地提交再调 MK，避免 MK 回写 reviewing 后本地 submitApproval 被编辑校验拦住。
|
||||
const afterMk =
|
||||
operation.action === 'submitApproval'
|
||||
? submitMkApprovalFlow({
|
||||
bizType: 'project-change',
|
||||
bizId: row.id,
|
||||
subjectName: row.projectName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
}).then(() => request())
|
||||
? request().then(() =>
|
||||
submitMkApprovalFlow({
|
||||
bizType: 'project-change',
|
||||
bizId: row.id,
|
||||
subjectName: row.projectName || '',
|
||||
approvalStatus: row.approvalStatus || '',
|
||||
mkEnabled: this.mkEnabled,
|
||||
tempVarData: { projectType: row.projectType || '' },
|
||||
})
|
||||
)
|
||||
: request();
|
||||
const loading =
|
||||
operation.action === 'approve'
|
||||
|
||||
Reference in New Issue
Block a user