0512新功能优化a

src/views/tjt/profit/index.vue

@@ -88,6 +88,18 @@
           {{ formatAmountText(scope.row.finalSettlementAmount) }}
         </template>
       </el-table-column>
+      <el-table-column align="center" label="测算采用金额(元)" width="140">
+        <template #default="scope">
+          <el-tooltip
+            v-if="isUsingContractAmount(scope.row)"
+            content="最终结算金额未填写，当前暂按合同产值测算"
+            placement="top"
+          >
+            <span>{{ formatAmountText(scope.row.effectiveSettlementAmount) }}</span>
+          </el-tooltip>
+          <span v-else>{{ formatAmountText(scope.row.effectiveSettlementAmount) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="综合所协作金额(元)" width="150">
         <template #default="scope">
           {{ formatAmountText(scope.row.comprehensivePlanningAmount) }}
@@ -163,6 +175,16 @@
       <el-descriptions-item label="最终结算金额(元)">
         {{ formatAmountText(currentProfit.finalSettlementAmount) }}
       </el-descriptions-item>
+      <el-descriptions-item label="测算采用金额(元)">
+        <el-tooltip
+          v-if="isUsingContractAmount(currentProfit)"
+          content="最终结算金额未填写，当前暂按合同产值测算"
+          placement="top"
+        >
+          <span>{{ formatAmountText(currentProfit.effectiveSettlementAmount) }}</span>
+        </el-tooltip>
+        <span v-else>{{ formatAmountText(currentProfit.effectiveSettlementAmount) }}</span>
+      </el-descriptions-item>
       <el-descriptions-item label="项目开始年度">
         {{ currentProfit.projectStartYear || '-' }}
       </el-descriptions-item>
@@ -415,6 +437,9 @@ const profitLossClass = (value?: number) => {
   return 'text-[var(--el-text-color-primary)]'
 }
 
+const isUsingContractAmount = (row?: ProfitApi.ProjectProfitVO) =>
+  !!row && Number(row.finalSettlementAmount || 0) <= 0 && Number(row.contractAmount || 0) > 0
+
 onMounted(() => {
   getList()
 })