From b4fe2c16274a91fee4fb26d91374f95fbe2dbcec Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 09 十一月 2026 15:28:21 +0800
Subject: [PATCH] 测试完成

---
 src/views/sfstatistics/percentage/components/CombinedFollowUp.vue |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 0 deletions(-)

diff --git a/src/views/sfstatistics/percentage/components/CombinedFollowUp.vue b/src/views/sfstatistics/percentage/components/CombinedFollowUp.vue
index ebdec78..b070bbf 100644
--- a/src/views/sfstatistics/percentage/components/CombinedFollowUp.vue
+++ b/src/views/sfstatistics/percentage/components/CombinedFollowUp.vue
@@ -621,6 +621,46 @@
           </el-table-column>
         </el-table-column>
 
+        <!-- ===== 闅忚鎯呭喌锛堜附姘村競涓尰闄紝浠庨娆¢殢璁跨Щ鍏ワ級 ===== -->
+        <el-table-column align="center" label="闅忚鎯呭喌">
+          <el-table-column
+            label="姝e父璇煶"
+            align="center"
+            width="100"
+            prop="taskSituation1"
+          />
+          <el-table-column
+            label="鎮h�呮嫆鎺ユ垨鎷掕"
+            align="center"
+            width="100"
+            prop="taskSituation2"
+          />
+          <el-table-column
+            label="闈㈣鎴栬�呮帴璇�"
+            align="center"
+            width="100"
+            prop="taskSituation3"
+          />
+          <el-table-column
+            label="寰俊闅忚"
+            align="center"
+            width="100"
+            prop="taskSituation4"
+          />
+          <el-table-column
+            label="闅忚鐢佃瘽涓嶆纭�"
+            align="center"
+            width="100"
+            prop="taskSituation5"
+          />
+          <el-table-column
+            label="鍏朵粬鎯呭喌涓嶅疁闅忚"
+            align="center"
+            width="100"
+            prop="taskSituation6"
+          />
+        </el-table-column>
+
         <!-- ===== 鏂板璁$畻鎸囨爣 ===== -->
         <el-table-column
           label="闅忚鐜�"
@@ -662,6 +702,39 @@
             >
               <span class="button-zx">{{ scope.row.manuallyCalled }}</span>
             </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="鍐嶆闅忚鎺ㄩ�佷汉鏁�"
+          align="center"
+          prop="againFollowUpPushCount"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="
+                handleViewDetails(
+                  scope.row,
+                  'againFollowUpPushCountInfo',
+                  '鍐嶆闅忚鎺ㄩ�佸垪琛�',
+                  '1'
+                )
+              "
+            >
+              <span class="button-zx">{{
+                scope.row.againFollowUpPushCount
+              }}</span>
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="杩借釜闅忚鎺ㄩ�佺巼"
+          align="center"
+          prop="againFollowUpPushRate"
+          :render-header="TooltipAgainFollowUpPushRate"
+        >
+          <template slot-scope="scope">
+            <span>{{ calculateAgainFollowUpPushRate(scope.row) }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -979,6 +1052,14 @@
       return ((successAgain / denominator) * 100).toFixed(2) + "%";
     },
 
+    // 杩借釜闅忚鎺ㄩ�佺巼 = 鍐嶆闅忚鎺ㄩ�佷汉鏁� / 鍑洪櫌浜烘
+    calculateAgainFollowUpPushRate(row) {
+      const pushCount = Number(row.againFollowUpPushCount) || 0;
+      const discharge = Number(row.dischargeCount) || 0;
+      if (discharge <= 0) return "0.00%";
+      return ((pushCount / discharge) * 100).toFixed(2) + "%";
+    },
+
     // ===================== 姹囨�� =====================
     getSummaries(param) {
       const { columns, data } = param;
@@ -1020,6 +1101,19 @@
             sums[index] =
               (values.reduce((a, b) => a + b, 0) / values.length).toFixed(2) +
               "%";
+        } else if (prop === "againFollowUpPushRate") {
+          const totalPush = data.reduce(
+            (s, row) => s + (Number(row.againFollowUpPushCount) || 0),
+            0
+          );
+          const totalDischarge = data.reduce(
+            (s, row) => s + (Number(row.dischargeCount) || 0),
+            0
+          );
+          sums[index] =
+            totalDischarge > 0
+              ? ((totalPush / totalDischarge) * 100).toFixed(2) + "%"
+              : "0.00%";
         } else {
           // 鏁板瓧鍒楁眰鍜�
           const values = data.map((item) => Number(item[prop]) || 0);
@@ -1714,6 +1808,19 @@
         [h("span", column.label)]
       );
     },
+    TooltipAgainFollowUpPushRate(h, { column }) {
+      return h(
+        "el-tooltip",
+        {
+          props: {
+            content: "鍐嶆闅忚鎺ㄩ�佷汉鏁�/鍑洪櫌浜烘",
+            placement: "top",
+            effect: "dark",
+          },
+        },
+        [h("span", column.label)]
+      );
+    },
   },
 };
 </script>

--
Gitblit v1.9.3