yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mod 增加累积净利润和溢价率字段，调整相关表格展示逻辑

pull/853/head
wersd 2025-12-22 23:55:58 +08:00
parent 3543bce085
commit 82adba183f
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/crm/project/index.ts
View File

@ -39,6 +39,8 @@ export interface ProjectVO {
RevenueSharePartners: [] RevenueSharePartners: []
projectStatus: number // 状态 projectStatus: number // 状态
estimatedPiles: number //枪数 estimatedPiles: number //枪数
actualExpenditure?: number // 实际投入支出
premiumRate?: number // 溢价率%
} }
// 查询CRM 项目信息分页 // 查询CRM 项目信息分页

1
src/api/crm/project/settlement/index.ts
View File

@ -33,6 +33,7 @@ export interface ProjectSettlementVO {
expenseRemark?: string; // 支出备注 expenseRemark?: string; // 支出备注
proofAttachment?: string; // 结算凭证附件 proofAttachment?: string; // 结算凭证附件
remark?: string; // 结算备注 remark?: string; // 结算备注
cumulativeNetProfit?: number; // 累积净利润
} }
// 查询项目利润结算分页 // 查询项目利润结算分页

2
src/views/crm/project/index.vue
View File

@ -90,6 +90,8 @@
</el-table-column> </el-table-column>
<el-table-column label="项目总投资额(万元)" align="center" prop="totalInvestment" width="180"/> <el-table-column label="项目总投资额(万元)" align="center" prop="totalInvestment" width="180"/>
<el-table-column label="实际投入支出(万元)" align="center" prop="actualExpenditure" width="180"/>
<el-table-column label="溢价率%" align="center" prop="premiumRate" width="120"/>
<el-table-column label="枪数" align="center" prop="estimatedPiles" /> <el-table-column label="枪数" align="center" prop="estimatedPiles" />
<el-table-column label="单枪成本(万元)" align="center" min-width="120"> <el-table-column label="单枪成本(万元)" align="center" min-width="120">
<template #default="{ row }"> <template #default="{ row }">

1
src/views/crm/project/settlement/detail/index.vue
View File

@ -210,6 +210,7 @@ const expenseTable = computed(() => [
const profitTable = computed(() => [ const profitTable = computed(() => [
{ name: '当期利润/亏损', amount: settlement.value.netProfit, remark: '收入合计-支出合计' }, { name: '当期利润/亏损', amount: settlement.value.netProfit, remark: '收入合计-支出合计' },
{ name: '当期可分配利润', amount: settlement.value.shareAmount && settlement.value.shareAmount < 0 ? 0 : (settlement.value.shareAmount ?? 0), remark: '当期利润亏损时填0' }, { name: '当期可分配利润', amount: settlement.value.shareAmount && settlement.value.shareAmount < 0 ? 0 : (settlement.value.shareAmount ?? 0), remark: '当期利润亏损时填0' },
{ name: '累积净利润', amount: settlement.value.cumulativeNetProfit, remark: '累计到当期的净利润总额' },
]) ])
const profitDistributionTable = computed(() => { const profitDistributionTable = computed(() => {
const partners = settlement.value.partners || []; const partners = settlement.value.partners || [];

1
src/views/crm/project/settlement/index.vue
View File

@ -106,6 +106,7 @@
<el-table-column label="毛利润" align="center" prop="grossProfit" width="200px"/> <el-table-column label="毛利润" align="center" prop="grossProfit" width="200px"/>
<el-table-column label="上期亏损转结" align="center" prop="previousLossCarryover" width="200px" /> <el-table-column label="上期亏损转结" align="center" prop="previousLossCarryover" width="200px" />
<el-table-column label="净利润" align="center" prop="netProfit" width="200px"/> <el-table-column label="净利润" align="center" prop="netProfit" width="200px"/>
<el-table-column label="累积净利润" align="center" prop="cumulativeNetProfit" width="200px"/>
<!-- <el-table-column label="结算状态" align="center" prop="settlementStatus" /> --> <!-- <el-table-column label="结算状态" align="center" prop="settlementStatus" /> -->
<el-table-column label="结算日期" align="center" prop="settlementDate" width="200px"> <el-table-column label="结算日期" align="center" prop="settlementDate" width="200px">
<template #default="scope"> <template #default="scope">