项目基础信息、合约规划、指导价法明细、项目成本测算字段调整、菜单名称调整、专业人员报表与导出内容修复

This commit is contained in:
lzm
2026-05-15 17:57:24 +08:00
parent 5cb913cb0a
commit 4a0ff37963
10 changed files with 124 additions and 103 deletions

View File

@@ -78,21 +78,21 @@
</template>
</el-table-column>
<el-table-column align="center" label="开始年度" prop="projectStartYear" width="100" />
<el-table-column align="center" label="合同产值(元)" width="120">
<el-table-column align="center" label="合同产值(元)" width="120">
<template #default="scope">
{{ formatAmountText(scope.row.contractAmount) }}
</template>
</el-table-column>
<el-table-column align="center" label="最终结算金额(元)" width="140">
<el-table-column align="center" label="结算合同总产值(元)" width="150">
<template #default="scope">
{{ formatAmountText(scope.row.finalSettlementAmount) }}
</template>
</el-table-column>
<el-table-column align="center" label="测算采用金额(元)" width="140">
<el-table-column align="center" label="项目预算产值总计(元)" width="160">
<template #default="scope">
<el-tooltip
v-if="isUsingContractAmount(scope.row)"
content="最终结算金额未填写,当前暂按合同产值测算"
content="结算合同总产值未填写,当前暂按合同产值测算"
placement="top"
>
<span>{{ formatAmountText(scope.row.effectiveSettlementAmount) }}</span>
@@ -100,22 +100,27 @@
<span v-else>{{ formatAmountText(scope.row.effectiveSettlementAmount) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="综合所协作金额(元)" width="150">
<el-table-column align="center" label="综合所人工成本(元)" width="150">
<template #default="scope">
{{ formatAmountText(scope.row.comprehensivePlanningAmount) }}
</template>
</el-table-column>
<el-table-column align="center" label="专分包金额(元)" width="150">
<el-table-column align="center" label="专分包人工成本(元)" width="170">
<template #default="scope">
{{ formatAmountText(scope.row.subcontractPlanningAmount) }}
{{ formatAmountText(scope.row.specialSubcontractPlanningAmount) }}
</template>
</el-table-column>
<el-table-column align="center" label="专业所产值(元)" width="130">
<el-table-column align="center" label="源头合作分包人工成本(元)" width="200">
<template #default="scope">
{{ formatAmountText(scope.row.sourceCoopSubcontractPlanningAmount) }}
</template>
</el-table-column>
<el-table-column align="center" label="专业所考核产值(元)" width="150">
<template #default="scope">
{{ formatAmountText(scope.row.majorOutputValue) }}
</template>
</el-table-column>
<el-table-column align="center" label="专业所预计绩效(元)" width="150">
<el-table-column align="center" label="专业所人工成本(元)" width="150">
<template #default="scope">
{{ formatAmountText(scope.row.majorExpectedPerformance) }}
</template>
@@ -135,14 +140,14 @@
{{ formatAmountText(scope.row.otherCost) }}
</template>
</el-table-column>
<el-table-column align="center" label="盈亏值(元)" width="120">
<el-table-column align="center" label="预算盈亏值(元)" width="130">
<template #default="scope">
<span :class="profitLossClass(scope.row.profitLossValue)">
{{ formatAmountText(scope.row.profitLossValue) }}
</span>
</template>
</el-table-column>
<el-table-column align="center" label="盈亏百分比" width="120">
<el-table-column align="center" label="预算盈亏百分比" width="140">
<template #default="scope">
<span :class="profitLossClass(scope.row.profitLossValue)">
{{ formatPercentText(scope.row.profitLossRate) }}
@@ -166,21 +171,21 @@
<div class="text-16px font-600">{{ currentProfit.projectName }}</div>
<el-button plain type="primary" @click="openProfitEditDialog">
<Icon class="mr-5px" icon="ep:edit" />
编辑盈亏参数
编辑项目成本参数
</el-button>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="合同产值(元)">
<el-descriptions-item label="合同产值(元)">
{{ formatAmountText(currentProfit.contractAmount) }}
</el-descriptions-item>
<el-descriptions-item label="最终结算金额(元)">
<el-descriptions-item label="结算合同总产值(元)">
{{ formatAmountText(currentProfit.finalSettlementAmount) }}
</el-descriptions-item>
<el-descriptions-item label="测算采用金额(元)">
<el-descriptions-item label="项目预算产值总计(元)">
<el-tooltip
v-if="isUsingContractAmount(currentProfit)"
content="最终结算金额未填写,当前暂按合同产值测算"
content="结算合同总产值未填写,当前暂按合同产值测算"
placement="top"
>
<span>{{ formatAmountText(currentProfit.effectiveSettlementAmount) }}</span>
@@ -190,16 +195,19 @@
<el-descriptions-item label="项目开始年度">
{{ currentProfit.projectStartYear || '-' }}
</el-descriptions-item>
<el-descriptions-item label="综合所协作金额(元)">
<el-descriptions-item label="综合所人工成本(元)">
{{ formatAmountText(currentProfit.comprehensivePlanningAmount) }}
</el-descriptions-item>
<el-descriptions-item label="专分包金额(元)">
{{ formatAmountText(currentProfit.subcontractPlanningAmount) }}
<el-descriptions-item label="专分包人工成本(元)">
{{ formatAmountText(currentProfit.specialSubcontractPlanningAmount) }}
</el-descriptions-item>
<el-descriptions-item label="专业所产值(元)">
<el-descriptions-item label="源头合作分包人工成本(元)">
{{ formatAmountText(currentProfit.sourceCoopSubcontractPlanningAmount) }}
</el-descriptions-item>
<el-descriptions-item label="专业所考核产值(元)">
{{ formatAmountText(currentProfit.majorOutputValue) }}
</el-descriptions-item>
<el-descriptions-item label="专业所预计绩效(元)">
<el-descriptions-item label="专业所人工成本(元)">
{{ formatAmountText(currentProfit.majorExpectedPerformance) }}
</el-descriptions-item>
<el-descriptions-item label="科创产值比例">
@@ -211,12 +219,12 @@
<el-descriptions-item label="其他成本(元)">
{{ formatAmountText(currentProfit.otherCost) }}
</el-descriptions-item>
<el-descriptions-item label="盈亏值(元)">
<el-descriptions-item label="预算盈亏值(元)">
<span :class="profitLossClass(currentProfit.profitLossValue)">
{{ formatAmountText(currentProfit.profitLossValue) }}
</span>
</el-descriptions-item>
<el-descriptions-item label="盈亏百分比">
<el-descriptions-item label="预算盈亏百分比">
<span :class="profitLossClass(currentProfit.profitLossValue)">
{{ formatPercentText(currentProfit.profitLossRate) }}
</span>
@@ -224,13 +232,13 @@
</el-descriptions>
</template>
<el-empty v-else-if="!detailLoading" description="请选择项目后查看盈亏详情" />
<el-empty v-else-if="!detailLoading" description="请选择项目后查看项目成本详情" />
</div>
</ContentWrap>
<Dialog v-model="dialogVisible" title="编辑盈亏参数" width="520">
<Dialog v-model="dialogVisible" title="编辑项目成本参数" width="520">
<el-form ref="formRef" v-loading="dialogLoading" :model="formData" label-width="140px">
<el-form-item label="最终结算金额(元)" prop="finalSettlementAmount">
<el-form-item label="结算合同总产值(元)" prop="finalSettlementAmount">
<el-input-number
v-model="formData.finalSettlementAmount"
:min="0"