1

src/components/InvestmentRecoveryTable.vue

@@ -830,16 +830,19 @@ const calculateTotalRow = () => {
     // 年度表格合计
     let totalDecision = 0;
     let totalActual = 0;
+    let totalJzss = 0;
 
     tableDataRef.value.forEach((row) => {
       if (!row.isTotalRow && !row.noEdit) {
         totalDecision += parseFloat(row.decisionReceivable) || 0;
         totalActual += parseFloat(row.actualReceived) || 0;
+        totalJzss += parseFloat(row.jzss) || 0;
       }
     });
 
     totalRow.decisionReceivable = totalDecision;
     totalRow.actualReceived = totalActual;
+    totalRow.jzss = totalJzss;
     totalRow.shortfall = totalDecision - totalActual;
     if (totalDecision > 0) {
       totalRow.completionRate = (totalActual / totalDecision) * 100;
@@ -943,6 +946,24 @@ const calculateTotalRow = () => {
     const yearlyJzss = getYearlyJzss();
     totalRow.invoiceCompleted = yearTotalSum + yearlyJzss;
 
+    // 计算合计行的欠收金额
+    let shortfallAmountSum = 0;
+    tableDataRef.value.forEach((row) => {
+      if (!row.isTotalRow && !row.noEdit) {
+        shortfallAmountSum += parseFloat(row.shortfallAmount) || 0;
+      }
+    });
+    totalRow.shortfallAmount = shortfallAmountSum;
+
+    // 计算合计行的合同总金额
+    let contractTotalAmountSum = 0;
+    tableDataRef.value.forEach((row) => {
+      if (!row.isTotalRow && !row.noEdit) {
+        contractTotalAmountSum += parseFloat(row.contractTotalAmount) || 0;
+      }
+    });
+    totalRow.contractTotalAmount = contractTotalAmountSum;
+
     // 计算合计行的开累完成率
     // 从年度更新数据中获取合计的决策应收和计划应收值
     const getYearlyDecisionReceivable = () => {