b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

✨ 组织编码/平台公司、合同计费客商角色与基础模块查看按钮

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
b2894lxlx
2026-11-04 03:15:44 +08:00
parent 5bde60d844
commit 014ee537a0
15 changed files with 428 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/business/components/billing-plan-editor.vue
+39 -21
View File
@@ -18,9 +18,6 @@
<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
@@ -68,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
@@ -397,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));
/** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
@@ -535,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) {
@@ -558,13 +560,6 @@ 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: '',
@@ -574,10 +569,11 @@ export default {
customerName: '',
transportMode: '',
transportModeLabel: '',
defaultPlan: false,
remark: '',
...clone(value || {}),
};
// 一个客商对应一个方案，不再维护默认方案字段
delete plan.defaultPlan;
plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule =>
this.normalizeRule(rule)
);
@@ -589,6 +585,28 @@ export default {
);
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)
src/views/business/contract-manage-change.vue
+118 -24
View File
@@ -299,25 +299,27 @@
><el-radio label="system">系统生成</el-radio
><el-radio label="manual">账单导入生成</el-radio></el-radio-group
>
<el-table :data="plans" border class="change-table"
><el-table-column type="index" label="序号" width="70" /><el-table-column
prop="planName"
label="方案名称"
min-width="220"
/><el-table-column label="默认方案" min-width="120"
><template #default="{ row }">{{
row.defaultPlan ? '是' : '否'
}}</template></el-table-column
><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column
v-if="!pageReadonly"
label="操作"
width="180"
><template #default="{ row, $index }"
><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link
><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template
></el-table-column
></el-table
>
<el-table :data="plans" border class="change-table">
<el-table-column type="index" label="序号" width="70" />
<el-table-column prop="planName" label="方案名称" min-width="180" />
<el-table-column label="适用客商" min-width="180">
<template #default="{ row }">
{{ row.customerName || billingPlanCustomerLabel(row) || '-' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column v-if="!pageReadonly" label="操作" width="180">
<template #default="{ row, $index }">
<el-link type="primary" @click="editPlan(row, $index)">编辑</el-link>
<el-link type="danger" @click="plans.splice($index, 1)">删除</el-link>
</template>
</el-table-column>
<el-table-column v-else label="操作" width="100">
<template #default="{ row, $index }">
<el-link type="primary" @click="editPlan(row, $index)">查看</el-link>
</template>
</el-table-column>
</el-table>
</section>
<section class="change-section">
@@ -491,7 +493,9 @@
v-model="planDialogVisible"
:value="planEditor"
:index="planEditorIndex"
:readonly="pageReadonly"
:settlement-currency="form.settlementCurrency"
:party-options="billingPartyOptions"
@save="savePlan"
/>
@@ -630,6 +634,45 @@ const normalizeCustomPeriods = (periods = []) =>
endDay: Number(item?.endDay) > 0 ? Number(item.endDay) : '',
}));
const createPartyRow = (row = {}) => ({
id: row.id || `${Date.now()}${Math.floor(Math.random() * 1000)}`,
customerId: row.customerId || '',
customerName: row.customerName || '',
creditCode: row.creditCode || row.unifiedCreditCode || '',
contactId: row.contactId || '',
contactName: row.contactName || '',
contactPhone: row.contactPhone || '',
});
const partyRoleLabel = role => {
if (role === 'A') return '甲方';
if (role === 'B') return '乙方';
if (role === 'C') return '丙方';
return role || '';
};
const normalizePartyRows = (partyJson, fallbackName, requireOne) => {
const rows = (() => {
if (Array.isArray(partyJson)) return partyJson;
if (!partyJson) return [];
try {
const data = JSON.parse(partyJson);
return Array.isArray(data) ? data : [];
} catch (error) {
return [];
}
})().map(item => createPartyRow(item));
if (rows.length) return rows;
if (fallbackName) {
return String(fallbackName)
.split(/[、,]/)
.map(name => name.trim())
.filter(Boolean)
.map(name => createPartyRow({ customerName: name }));
}
return requireOne ? [createPartyRow()] : [];
};
export default {
components: { BillingPlanEditor, ContractAttachmentSection, ElImageViewer, OpenFileViewer },
data() {
@@ -637,6 +680,9 @@ export default {
form: {},
period: [],
plans: [],
partyARows: [],
partyBRows: [],
partyCRows: [],
attachments: [],
contractFiles: [],
contractFileRows: [],
@@ -675,7 +721,7 @@ export default {
settlementModeDictOptions: [],
contractFormatDictOptions: [],
planDialogVisible: false,
planEditor: { planName: '', defaultPlan: false, remark: '', rules: [] },
planEditor: { planName: '', remark: '', rules: [] },
planEditorIndex: -1,
billingElements: [
'按重量',
@@ -756,6 +802,29 @@ export default {
isSettlementRuleChange() {
return this.form.changeType === '结算规则变更';
},
/**
* 计费方案适用客商：客户合同仅甲方；承运商合同仅乙方、丙方
*/
billingPartyOptions() {
const category = String(this.form.contractCategory || '').trim();
const allowedRoles =
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
return [
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
]
.filter(row => allowedRoles.includes(row.partyRole))
.filter(row => row.customerName || row.customerId)
.map(row => ({
value: row.id,
label: `${partyRoleLabel(row.partyRole)}-${row.customerName || row.customerId}`,
partyRole: row.partyRole,
partyRowId: row.id,
customerId: row.customerId,
customerName: row.customerName,
}));
},
changeAttachmentLocationOptions() {
if (this.isSettlementRuleChange) {
return ['变更材料'];
@@ -890,6 +959,9 @@ export default {
};
this.changeMaterials = this.parse(data.changeAttachmentsJson);
this.period = data.startDate && data.endDate ? [data.startDate, data.endDate] : [];
this.partyARows = normalizePartyRows(data.partyAJson, data.partyA, true);
this.partyBRows = normalizePartyRows(data.partyBJson, data.partyB, true);
this.partyCRows = normalizePartyRows(data.partyCJson, data.partyC, false);
this.plans = this.parse(data.billingPlanJson);
this.attachments = this.mergeChangeAttachments(
this.parse(data.attachmentsJson),
@@ -1048,10 +1120,32 @@ export default {
.replace(/\D/g, '')
.replace(/^0+/, '');
},
addPlan() { this.planEditorIndex = -1; this.planEditor = { planName: `计费方案${this.plans.length + 1}`, defaultPlan: !this.plans.length, remark: '', rules: [{}] }; this.planDialogVisible = true; },
editPlan(row, index) { this.planEditorIndex = index; this.planEditor = JSON.parse(JSON.stringify(row)); this.planDialogVisible = true; },
toggleDefaultPlan(value) { if (value) this.plans.forEach(item => { item.defaultPlan = false; }); },
savePlan(value, index) { if (index < 0) this.plans.push(value); else this.plans.splice(index, 1, value); if (value.defaultPlan) this.plans.forEach((item, current) => { if (current !== (index < 0 ? this.plans.length - 1 : index)) item.defaultPlan = false; }); },
addPlan() {
this.planEditorIndex = -1;
this.planEditor = {
planName: `计费方案${this.plans.length + 1}`,
remark: '',
rules: [{}],
};
this.planDialogVisible = true;
},
editPlan(row, index) {
this.planEditorIndex = index;
this.planEditor = JSON.parse(JSON.stringify(row));
this.planDialogVisible = true;
},
billingPlanCustomerLabel(row) {
const matched = this.billingPartyOptions.find(
item => String(item.partyRowId) === String(row.partyRowId)
);
return matched?.label || row.customerName || '';
},
savePlan(value, index) {
const nextPlan = { ...value };
delete nextPlan.defaultPlan;
if (index < 0) this.plans.push(nextPlan);
else this.plans.splice(index, 1, nextPlan);
},
handleSettlementTypeChange(value) { if (value !== '月结') { this.settlementRule.billCycleType = ''; this.settlementRule.billCutoffDay = ''; this.settlementRule.customPeriods = []; } else if (this.settlementRule.billCycleType === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; if (value !== '固定天数周期结算') this.settlementRule.cycleDays = ''; },
handleCycleTypeChange(value) { if (value !== '固定截单日') this.settlementRule.billCutoffDay = ''; if (value === '自定义多周期') this.settlementRule.customPeriods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); else this.settlementRule.customPeriods = []; },
attachmentUrl(row = {}) { return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || ''; },
src/views/business/contract-manage.vue
+20 -39
View File
@@ -1685,12 +1685,21 @@ export default {
{ role: 'C', label: '丙方', rows: this.partyCRows },
];
},
/**
* 计费方案适用客商：
* - 客户合同：仅甲方（仅 1 个甲方时编辑器自动选中）
* - 承运商合同：仅乙方、丙方（应付明细按这些方案生成）
*/
billingPartyOptions() {
const category = String(this.form.contractCategory || '').trim();
const allowedRoles =
category === '承运商合同' ? ['B', 'C'] : category === '客户合同' ? ['A'] : ['A', 'B', 'C'];
return [
...this.partyARows.map(row => ({ ...row, partyRole: 'A' })),
...this.partyBRows.map(row => ({ ...row, partyRole: 'B' })),
...this.partyCRows.map(row => ({ ...row, partyRole: 'C' })),
]
.filter(row => allowedRoles.includes(row.partyRole))
.filter(row => row.customerName || row.customerId)
.map(row => ({
value: row.id,
@@ -2315,7 +2324,6 @@ export default {
if (!this.validatePartyRows(true)) return false;
return (
this.validateBillingPlanBindings() &&
this.validateBillingPlanDefault() &&
this.validateSettlementRules() &&
this.validatePaymentRatios()
);
@@ -2911,10 +2919,17 @@ export default {
validateBillingPlanBindings() {
if (!this.billingPlanRows.length) return true;
const partyIds = new Set(this.billingPartyOptions.map(item => String(item.partyRowId)));
const category = String(this.form.contractCategory || '').trim();
const roleHint =
category === '承运商合同'
? '请选择乙方或丙方客商'
: category === '客户合同'
? '请选择甲方客商'
: '请选择适用客商';
for (let index = 0; index < this.billingPlanRows.length; index += 1) {
const plan = this.billingPlanRows[index];
if (!plan.partyRowId || !partyIds.has(String(plan.partyRowId))) {
this.$message.warning(`计费方案第${index + 1}个请选择适用客商`);
this.$message.warning(`计费方案第${index + 1}个${roleHint}`);
return false;
}
}
@@ -3169,21 +3184,13 @@ export default {
openBillingPlan(row = {}, index = -1) {
this.billingPlanIndex = index;
this.billingPlanForm =
index < 0
? { planName: '', transportMode: '', defaultPlan: false, remark: '', rules: [] }
: clone(row);
index < 0 ? { planName: '', transportMode: '', remark: '', rules: [] } : clone(row);
this.billingPlanBox = true;
this.$nextTick(() => this.$refs.billingPlanEditor?.ensureTransportModes?.());
},
saveBillingPlan(plan, index) {
const nextPlan = clone(plan);
if (this.isDefaultBillingPlan(nextPlan)) {
this.billingPlanRows.forEach((item, itemIndex) => {
if (itemIndex !== index && item.transportMode === nextPlan.transportMode) {
item.defaultPlan = false;
}
});
}
delete nextPlan.defaultPlan;
if (index < 0) this.billingPlanRows.push(nextPlan);
else this.billingPlanRows.splice(index, 1, nextPlan);
this.billingPlanBox = false;
@@ -3193,31 +3200,6 @@ export default {
this.billingPlanRows.splice(index, 1);
});
},
isDefaultBillingPlan(plan) {
return (
plan?.defaultPlan === true ||
plan?.defaultPlan === 1 ||
['true', '1'].includes(String(plan?.defaultPlan).toLowerCase())
);
},
validateBillingPlanDefault() {
if (!this.billingPlanRows.length) return true;
const defaultCountByTransportMode = this.billingPlanRows.reduce((result, plan) => {
const transportMode = plan.transportMode || '';
result[transportMode] =
(result[transportMode] || 0) + Number(this.isDefaultBillingPlan(plan));
return result;
}, {});
const invalidTransportMode = Object.entries(defaultCountByTransportMode).find(
([, count]) => count > 1
);
if (invalidTransportMode) {
const [transportMode, count] = invalidTransportMode;
this.$message.warning(`运输方式“${transportMode}”仅支持配置一个默认计费方案`);
return false;
}
return true;
},
isFixedCycleSettlementType(value) {
return value === '按固定天数周期' || value === '固定天数周期结算';
},
@@ -3551,8 +3533,7 @@ export default {
return list
.map(item => {
if (!item || typeof item !== 'object') return String(item ?? '');
const name = item.planName || item.name || '未命名方案';
return item.defaultPlan ? `${name}（默认）` : name;
return item.planName || item.name || '未命名方案';
})
.filter(Boolean)
.join('、');
src/views/business/project-apply.vue
+132
View File
@@ -761,6 +761,96 @@
/>
</div>
<template v-if="showProjectContractSection">
<div class="dialog-section-title project-apply-form__table-title">项目合同</div>
<el-table
v-loading="projectContractLoading"
:data="projectContractRows"
border
class="project-apply-form__table"
>
<el-table-column type="index" label="序号" width="80" align="center" />
<el-table-column
prop="contractCategory"
label="合同类型"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="contractNo"
label="合同编号"
min-width="140"
align="center"
show-overflow-tooltip
>
<template #default="{ row }">
<el-link
v-if="row.id && row.contractNo"
type="primary"
@click.stop="openProjectContractDetail(row)"
>
{{ row.contractNo }}
</el-link>
<span v-else>{{ row.contractNo || '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="contractName"
label="合同名称"
min-width="160"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyA"
label="甲方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyB"
label="乙方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="partyC"
label="丙方"
min-width="140"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="startDate"
label="开始日期"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="endDate"
label="结束日期"
min-width="120"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="contractAmount"
label="合同金额"
min-width="120"
align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ formatAmount(row.contractAmount) }}
</template>
</el-table-column>
</el-table>
</template>
<div
v-if="!isChangeDialog && !isNewProjectDialog"
class="dialog-section-title project-apply-form__table-title"
@@ -990,6 +1080,7 @@
import { exportBlob } from '@/api/common';
import { defineAsyncComponent } from 'vue';
import * as api from '@/api/business/project-apply';
import { getList as getContractManageList } from '@/api/business/contract-manage';
import {
loadHcsImmediateEnabled,
repush as hcsRepush,
@@ -1387,6 +1478,8 @@ export default {
'zip',
],
changeRows: [],
projectContractRows: [],
projectContractLoading: false,
changeRecordDetailVisible: false,
changeRecordDetail: null,
changeRecordDetailRows: [],
@@ -1463,6 +1556,9 @@ export default {
isNewProjectDialog() {
return ['add', 'majorSupplement'].includes(this.dialogType);
},
showProjectContractSection() {
return this.dialogReadonly && !this.isChangeDialog && !this.isNewProjectDialog && !this.isPublicViewPage;
},
isProjectFormPage() {
return this.isFormPageInstance;
},
@@ -2111,6 +2207,8 @@ export default {
this.attachmentRows = [];
this.selectedAttachmentRows = [];
this.changeRows = [];
this.projectContractRows = [];
this.projectContractLoading = false;
this.selectedCustomerId = [];
this.selectedCarrierIds = [];
},
@@ -2159,6 +2257,40 @@ export default {
this.syncSelectedCustomerOptions();
this.ensureCurrentPlatformOption();
this.ensureCurrentBusinessDeptOption();
this.loadProjectContracts(row?.id);
},
loadProjectContracts(projectId) {
if (!this.showProjectContractSection || !projectId) {
this.projectContractRows = [];
this.projectContractLoading = false;
return;
}
this.projectContractLoading = true;
getContractManageList(1, 1000, { projectId })
.then(res => {
const data = res.data?.data;
const records = Array.isArray(data) ? data : data?.records || [];
this.projectContractRows = records.filter(
item => String(item.projectId) === String(projectId)
);
})
.catch(() => {
this.projectContractRows = [];
this.$message.error('项目合同加载失败');
})
.finally(() => {
this.projectContractLoading = false;
});
},
openProjectContractDetail(row) {
if (!row?.id) {
this.$message.warning('合同信息不完整，无法跳转');
return;
}
this.$router.push({
path: '/business/contract-manage/detail',
query: { id: row.id, name: '合同详情' },
});
},
fillDefaultUsers() {
const userId = this.userInfo?.userId || this.userInfo?.id || '';